(#1785) Update test_framework.py to support version compatibility tests

.travis.yml

@@ -8,11 +8,11 @@ env:
   - "PATH=/home/travis/gopath/bin:$PATH"
 before_install:
   - go get -u github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/tcnksm/ghr
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.23.3
 install:
   - echo "No external dependencies required. Skipping travis default library dependency setup to use vendors..."
 script:
-  - $GOPATH/bin/golangci-lint run --deadline 10m --new-from-rev=24dc0f64
+  - $GOPATH/bin/golangci-lint run --deadline 10m --new-from-rev=
   - cd $TRAVIS_BUILD_DIR && go test -i && ./test_compile.sh
   - goveralls -coverprofile=coverage.out -service travis-ci -repotoken $COVERALLS_TOKEN
 after_success:

api/endpoints.go

@@ -115,6 +115,8 @@ func post(i *jsonAPIHandler, path string, w http.ResponseWriter, r *http.Request
 		i.POSTBulkUpdateCurrency(w, r)
 	case strings.HasPrefix(path, "/ob/resendordermessage"):
 		i.POSTResendOrderMessage(w, r)
+	case strings.HasPrefix(path, "/ob/hashmessage"):
+		i.POSTHashMessage(w, r)
 	default:
 		ErrorResponse(w, http.StatusNotFound, "Not Found")
 	}

api/jsonapi.go

@@ -1675,9 +1675,14 @@ func (i *jsonAPIHandler) POSTOrderCancel(w http.ResponseWriter, r *http.Request)
 		ErrorResponse(w, http.StatusNotFound, "order not found")
 		return
 	}
+	v5order, err := repo.ToV5Order(contract.BuyerOrder, nil)
+	if err != nil {
+		ErrorResponse(w, http.StatusNotFound, "order not found")
+		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, can.OrderID)
@@ -2022,8 +2027,14 @@ func (i *jsonAPIHandler) POSTOrderComplete(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
+	v5order, err := repo.ToV5Order(contract.BuyerOrder, nil)
+	if err != nil {
+		ErrorResponse(w, http.StatusNotFound, "order not found")
+		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, or.OrderID)
@@ -2111,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)
@@ -2257,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)
@@ -3696,7 +3719,10 @@ func (i *jsonAPIHandler) POSTFetchRatings(w http.ResponseWriter, r *http.Request
 		id := r.URL.Query().Get("asyncID")
 		if id == "" {
 			idBytes := make([]byte, 16)
-			rand.Read(idBytes)
+			_, err := rand.Read(idBytes)
+			if err != nil {
+				return
+			}
 			id = base58.Encode(idBytes)
 		}
 
@@ -4403,3 +4429,26 @@ func (i *jsonAPIHandler) GETScanOfflineMessages(w http.ResponseWriter, r *http.R
 	}
 	SanitizedResponse(w, `{}`)
 }
+
+func (i *jsonAPIHandler) POSTHashMessage(w http.ResponseWriter, r *http.Request) {
+	type hashRequest struct {
+		Content string `json:"content"`
+	}
+	var (
+		req hashRequest
+		err = json.NewDecoder(r.Body).Decode(&req)
+	)
+	if err != nil {
+		ErrorResponse(w, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	messageHash, err := ipfs.EncodeMultihash([]byte(req.Content))
+	if err != nil {
+		ErrorResponse(w, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	SanitizedResponse(w, fmt.Sprintf(`{"hash": "%s"}`,
+		messageHash.B58String()))
+}

core/core.go

@@ -31,7 +31,7 @@ import (
 
 const (
 	// VERSION - current version
-	VERSION = "0.13.8"
+	VERSION = "0.14.0"
 	// USERAGENT - user-agent header string
 	USERAGENT = "/openbazaar-go:" + VERSION + "/"
 )

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,
@@ -738,25 +762,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
@@ -1210,6 +1248,12 @@ func (n *OpenBazaarNode) ReleaseFunds(contract *pb.RicardianContract, records []
 
 	peerID := order.BuyerID.PeerID
 
+	// Build, sign, and broadcast transaction
+	txnID, err := wal.Multisign(inputs, outputs, mySigs, moderatorSigs, redeemScriptBytes, *big.NewInt(0), true)
+	if err != nil {
+		return err
+	}
+
 	// Update database
 	if n.IpfsNode.Identity.Pretty() == order.BuyerID.PeerID {
 		err = n.Datastore.Purchases().Put(orderID, *contract, pb.OrderState_DECIDED, true)
@@ -1221,12 +1265,6 @@ func (n *OpenBazaarNode) ReleaseFunds(contract *pb.RicardianContract, records []
 		log.Errorf("ReleaseFunds error updating database: %s", err.Error())
 	}
 
-	// Build, sign, and broadcast transaction
-	txnID, err := wal.Multisign(inputs, outputs, mySigs, moderatorSigs, redeemScriptBytes, *big.NewInt(0), true)
-	if err != nil {
-		return err
-	}
-
 	err = n.SendOrderPayment(&SpendResponse{
 		Txid:          util.NormalizeAddress(hexutil.Encode(txnID)),
 		Currency:      &currencyDef,