Fix disputes payouts to v4 vendor

Author: cpacia

core/disputes.go

@@ -502,12 +502,6 @@ func (n *OpenBazaarNode) CloseDispute(orderID string, buyerPercentage, vendorPer
 		return ErrCloseFailureCaseExpired
 	}
 
-	var outpoints = dispute.ResolutionPaymentOutpoints(payDivision)
-	if outpoints == nil {
-		log.Errorf("no outpoints to resolve in dispute for order %s", orderID)
-		return ErrCloseFailureNoOutpoints
-	}
-
 	if dispute.VendorContract == nil && vendorPercentage > 0 {
 		return errors.New("vendor must provide his copy of the contract before you can release funds to the vendor")
 	}
@@ -521,6 +515,24 @@ func (n *OpenBazaarNode) CloseDispute(orderID string, buyerPercentage, vendorPer
 		return err
 	}
 
+	var outpoints = dispute.ResolutionPaymentOutpoints(payDivision)
+	if outpoints == nil {
+		log.Errorf("no outpoints to resolve in dispute for order %s", orderID)
+		return ErrCloseFailureNoOutpoints
+	}
+	for i, o := range outpoints {
+		if preferredContract.VendorListings[0].Metadata.Version < repo.ListingVersion {
+			if o.BigValue != "" {
+				n, ok := new(big.Int).SetString(o.BigValue, 10)
+				if !ok {
+					return errors.New("invalid amount")
+				}
+				outpoints[i].Value = n.Uint64()
+				outpoints[i].BigValue = ""
+			}
+		}
+	}
+
 	// TODO: Remove once broken contracts are migrated
 	paymentCoin := preferredOrder.Payment.AmountCurrency.Code
 	_, err = n.LookupCurrency(paymentCoin)
@@ -563,9 +575,15 @@ func (n *OpenBazaarNode) CloseDispute(orderID string, buyerPercentage, vendorPer
 	// Calculate total out value
 	totalOut := big.NewInt(0)
 	for _, o := range outpoints {
-		n, ok := new(big.Int).SetString(o.BigValue, 10)
-		if !ok {
-			return errors.New("invalid total out amount")
+		var n *big.Int
+		if o.Value > 0 {
+			n = big.NewInt(int64(o.Value))
+		} else {
+			ok := false
+			n, ok = new(big.Int).SetString(o.BigValue, 10)
+			if !ok {
+				return errors.New("invalid amount")
+			}
 		}
 		totalOut = new(big.Int).Add(totalOut, n)
 	}
@@ -640,9 +658,15 @@ func (n *OpenBazaarNode) CloseDispute(orderID string, buyerPercentage, vendorPer
 		if err != nil {
 			return err
 		}
-		n, ok := new(big.Int).SetString(o.BigValue, 10)
-		if !ok {
-			return errors.New("invalid amount")
+		var n *big.Int
+		if o.Value > 0 {
+			n = big.NewInt(int64(o.Value))
+		} else {
+			ok := false
+			n, ok = new(big.Int).SetString(o.BigValue, 10)
+			if !ok {
+				return errors.New("invalid amount")
+			}
 		}
 		input := wallet.TransactionInput{
 			OutpointHash:  decodedHash,

qa/dispute_close_buyer.py

@@ -64,7 +64,7 @@ def run_test(self):
         # post listing to alice
         with open('testdata/'+ self.vendor_version +'/listing.json') as listing_file:
             listing_json = json.load(listing_file, object_pairs_hook=OrderedDict)
-        if self.vendor_version == 4:
+        if self.vendor_version == "v4":
             listing_json["metadata"]["priceCurrency"] = "t" + self.cointype
         else:
             listing_json["item"]["priceCurrency"]["code"] = "t" + self.cointype
@@ -137,7 +137,7 @@ def run_test(self):
             "feeLevel": "NORMAL",
             "requireAssociateOrder": False
         }
-        if self.buyer_version == 4:
+        if self.buyer_version == "v4":
             spend["amount"] = payment_amount
             spend["wallet"] = "T" + self.cointype
 
@@ -171,7 +171,7 @@ def run_test(self):
             raise TestFailure("DisputeCloseBuyerTest - FAIL: Alice failed to detect payment")
         if resp["funded"] == False:
             raise TestFailure("DisputeCloseBuyerTest - FAIL: Alice incorrectly saved as unfunded")
-        
+
         # Bob open dispute
         dispute = {
             "orderId": orderId,
@@ -281,7 +281,7 @@ def run_test(self):
             confirmed = int(resp["confirmed"])
             #unconfirmed = int(resp["unconfirmed"])
             amt = 0
-            if self.buyer_version == 4:
+            if self.buyer_version == "v4":
                 amt = payment_amount
             else:
                 amt = int(payment_amount["amount"])

qa/dispute_close_split.py

@@ -64,7 +64,7 @@ def run_test(self):
         # post listing to alice
         with open('testdata/'+ self.vendor_version +'/listing.json') as listing_file:
             listing_json = json.load(listing_file, object_pairs_hook=OrderedDict)
-        if self.vendor_version == 4:
+        if self.vendor_version == "v4":
             listing_json["metadata"]["priceCurrency"] = "t" + self.cointype
         else:
             listing_json["item"]["priceCurrency"]["code"] = "t" + self.cointype
@@ -137,7 +137,7 @@ def run_test(self):
             "feeLevel": "NORMAL",
             "requireAssociateOrder": False
         }
-        if self.buyer_version == 4:
+        if self.buyer_version == "v4":
             spend["amount"] = payment_amount
             spend["wallet"] = "T" + self.cointype
 
@@ -281,7 +281,7 @@ def run_test(self):
             confirmed = int(resp["confirmed"])
             unconfirmed = int(resp["unconfirmed"])
             amt = 0
-            if self.buyer_version == 4:
+            if self.buyer_version == "v4":
                 amt = payment_amount
             else:
                 amt = int(payment_amount["amount"])

qa/dispute_close_vendor.py

@@ -64,7 +64,7 @@ def run_test(self):
         # post listing to alice
         with open('testdata/'+ self.vendor_version +'/listing.json') as listing_file:
             listing_json = json.load(listing_file, object_pairs_hook=OrderedDict)
-        if self.vendor_version == 4:
+        if self.vendor_version == "v4":
             listing_json["metadata"]["priceCurrency"] = "t" + self.cointype
         else:
             listing_json["item"]["priceCurrency"]["code"] = "t" + self.cointype
@@ -139,7 +139,7 @@ def run_test(self):
             "feeLevel": "NORMAL",
             "requireAssociateOrder": False
         }
-        if self.buyer_version == 4:
+        if self.buyer_version == "v4":
             spend["amount"] = payment_amount
             spend["wallet"] = "T" + self.cointype
 
@@ -205,7 +205,7 @@ def run_test(self):
         resp = json.loads(r.text)
         if resp["state"] != "FULFILLED":
             raise TestFailure("FulfillDirectOnlineTest - FAIL: Alice failed to order fulfillment")
-        
+
         # Alice open dispute
         dispute = {
             "orderId": orderId,
@@ -304,7 +304,7 @@ def run_test(self):
         time.sleep(20)
 
         self.send_bitcoin_cmd("generate", 1)
-        time.sleep(2)
+        time.sleep(20)
 
         # Check alice received payout
         api_url = alice["gateway_url"] + "wallet/balance/T" + self.cointype