Merge pull request #1654 from OpenBazaar/order_payment_network_message

Add ORDER_PAYMENT network message
OpenBazaar · Aug 8, 2019 · 2367b14 · 2367b14
2 parents 9d5e4e3 + 75eed3e
commit 2367b14
Show file tree

Hide file tree

Showing 56 changed files with 1,536 additions and 882 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/api/jsonapi.go b/api/jsonapi.go
@@ -764,6 +764,17 @@ func (i *jsonAPIHandler) POSTSpendCoinsForOrder(w http.ResponseWriter, r *http.R
 		ErrorResponse(w, http.StatusBadRequest, err.Error())
 		return
 	}
+	msg := pb.OrderPaymentTxn{
+		Coin:          spendArgs.Wallet,
+		OrderID:       result.OrderID,
+		TransactionID: result.Txid,
+		WithInput:     false,
+	}
+
+	err = i.node.SendOrderPayment(result.PeerID, &msg)
+	if err != nil {
+		log.Errorf("error sending order with id %s payment: %v", result.OrderID, err)
+	}
 
 	ser, err := json.MarshalIndent(result, "", "    ")
 	if err != nil {

diff --git a/core/net.go b/core/net.go
@@ -749,3 +749,29 @@ func (n *OpenBazaarNode) SendOfflineRelay(peerID string, encryptedMessage []byte
 	}
 	return n.sendMessage(peerID, nil, m)
 }
+
+// SendOrderPayment - send order payment msg to seller from buyer
+func (n *OpenBazaarNode) SendOrderPayment(peerID string, paymentMessage *pb.OrderPaymentTxn) error {
+	a, err := ptypes.MarshalAny(paymentMessage)
+	if err != nil {
+		return err
+	}
+	m := pb.Message{
+		MessageType: pb.Message_ORDER_PAYMENT,
+		Payload:     a,
+	}
+
+	p, err := peer.IDB58Decode(peerID)
+	if err != nil {
+		return err
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), n.OfflineMessageFailoverTimeout)
+	err = n.Service.SendMessage(ctx, p, &m)
+	cancel()
+	if err != nil {
+		if err := n.SendOfflineMessage(p, nil, &m); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/core/spend.go b/core/spend.go
@@ -37,6 +37,7 @@ type SpendResponse struct {
 	Timestamp          time.Time `json:"timestamp"`
 	Txid               string    `json:"txid"`
 	UnconfirmedBalance int64     `json:"unconfirmedBalance"`
+	PeerID             string    `json:"-"`
 }
 
 // Spend will attempt to move funds from the node to the destination address described in the

diff --git a/net/retriever/retriever.go b/net/retriever/retriever.go
@@ -416,6 +416,7 @@ var MessageProcessingOrder = []pb.Message_MessageType{
 	pb.Message_ORDER_CANCEL,
 	pb.Message_ORDER_REJECT,
 	pb.Message_ORDER_CONFIRMATION,
+	pb.Message_ORDER_PAYMENT,
 	pb.Message_ORDER_FULFILLMENT,
 	pb.Message_ORDER_COMPLETION,
 	pb.Message_DISPUTE_OPEN,