Use v4 contract in dispute where needed

Author: cpacia

api/jsonapi.go

@@ -2122,7 +2122,13 @@ func (i *jsonAPIHandler) POSTOpenDispute(w http.ResponseWriter, r *http.Request)
 	}
 
 	// TODO: Remove once broken contracts are migrated
-	lookupCoin := contract.BuyerOrder.Payment.AmountCurrency.Code
+	v5order, err := repo.ToV5Order(contract.BuyerOrder, nil)
+	if err != nil {
+		ErrorResponse(w, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	lookupCoin := v5order.Payment.AmountCurrency.Code
 	_, err = i.node.LookupCurrency(lookupCoin)
 	if err != nil {
 		log.Warningf("invalid BuyerOrder.Payment.Coin (%s) on order (%s)", lookupCoin, d.OrderID)
@@ -2268,8 +2274,14 @@ func (i *jsonAPIHandler) POSTReleaseFunds(w http.ResponseWriter, r *http.Request
 		}
 	}
 
+	v5order, err := repo.ToV5Order(contract.BuyerOrder, nil)
+	if err != nil {
+		ErrorResponse(w, http.StatusBadRequest, err.Error())
+		return
+	}
+
 	// TODO: Remove once broken contracts are migrated
-	lookupCoin := contract.BuyerOrder.Payment.AmountCurrency.Code
+	lookupCoin := v5order.Payment.AmountCurrency.Code
 	_, err = i.node.LookupCurrency(lookupCoin)
 	if err != nil {
 		log.Warningf("invalid BuyerOrder.Payment.Coin (%s) on order (%s)", lookupCoin, rel.OrderID)

core/disputes.go

@@ -738,25 +738,39 @@ func (n *OpenBazaarNode) CloseDispute(orderID string, buyerPercentage, vendorPer
 	if out, ok := outMap["buyer"]; ok {
 		payout.BuyerOutput = &pb.DisputeResolution_Payout_Output{
 			ScriptOrAddress: &pb.DisputeResolution_Payout_Output_Address{Address: buyerAddr.String()},
-			BigAmount:       out.Value.String(),
+		}
+		if preferredContract.VendorListings[0].Metadata.Version >= repo.ListingVersion {
+			payout.BuyerOutput.BigAmount = out.Value.String()
+		} else {
+			payout.BuyerOutput.Amount = out.Value.Uint64()
 		}
 	}
 	if out, ok := outMap["vendor"]; ok {
 		payout.VendorOutput = &pb.DisputeResolution_Payout_Output{
 			ScriptOrAddress: &pb.DisputeResolution_Payout_Output_Address{Address: vendorAddr.String()},
-			BigAmount:       out.Value.String(),
+		}
+		if preferredContract.VendorListings[0].Metadata.Version >= repo.ListingVersion {
+			payout.VendorOutput.BigAmount = out.Value.String()
+		} else {
+			payout.VendorOutput.Amount = out.Value.Uint64()
 		}
 	}
 	if out, ok := outMap["moderator"]; ok {
 		payout.ModeratorOutput = &pb.DisputeResolution_Payout_Output{
 			ScriptOrAddress: &pb.DisputeResolution_Payout_Output_Address{Address: modAddr.String()},
-			BigAmount:       out.Value.String(),
+		}
+		if preferredContract.VendorListings[0].Metadata.Version >= repo.ListingVersion {
+			payout.ModeratorOutput.BigAmount = out.Value.String()
+		} else {
+			payout.ModeratorOutput.Amount = out.Value.Uint64()
 		}
 	}
 
-	payout.PayoutCurrency = &pb.CurrencyDefinition{
-		Code:         preferredOrder.Payment.AmountCurrency.Code,
-		Divisibility: preferredOrder.Payment.AmountCurrency.Divisibility,
+	if preferredContract.VendorListings[0].Metadata.Version >= repo.ListingVersion {
+		payout.PayoutCurrency = &pb.CurrencyDefinition{
+			Code:         preferredOrder.Payment.AmountCurrency.Code,
+			Divisibility: preferredOrder.Payment.AmountCurrency.Divisibility,
+		}
 	}
 
 	d.Payout = payout

qa/complete_disputed.py

@@ -65,7 +65,7 @@ def run_test(self):
         with open('testdata/'+ self.vendor_version +'/listing.json') as listing_file:
             listing_json = json.load(listing_file, object_pairs_hook=OrderedDict)
         listing_json["metadata"]["acceptedCurrencies"] = ["t" + self.cointype]
-        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
 
@@ -187,7 +187,7 @@ def run_test(self):
             resp = json.loads(r.text)
             raise TestFailure("CompleteDisputedTest - FAIL: Fulfillment POST failed. Reason: %s", resp["reason"])
         time.sleep(4)
-        
+
         # Bob open dispute
         dispute = {
             "orderId": orderId,
@@ -297,7 +297,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/complete_moderated_with_timeout.py

@@ -63,7 +63,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
 

repo/dispute_case_record.go

@@ -107,7 +107,8 @@ func (r *DisputeCaseRecord) ResolutionPaymentFeePerByte(ratio PayoutRatio, defau
 	n := new(big.Int)
 	switch {
 	case ratio.BuyerMajority(), ratio.EvenMajority():
-		n, _ = n.SetString(r.BuyerContract.BuyerOrder.BigRefundFee, 10)
+		v5order, _ := ToV5Order(r.BuyerContract.BuyerOrder, nil)
+		n, _ = n.SetString(v5order.BigRefundFee, 10)
 		return n
 	case ratio.VendorMajority():
 		if len(r.VendorContract.VendorOrderFulfillment) > 0 && r.VendorContract.VendorOrderFulfillment[0].Payout != nil {