Fix bug handling big int inventory

cpacia · cpacia · commit 4a63ec4f1a8a · 2019-10-10T16:28:46.000-04:00
diff --git a/api/jsonapi.go b/api/jsonapi.go
@@ -1320,7 +1320,7 @@ func (i *jsonAPIHandler) POSTInventory(w http.ResponseWriter, r *http.Request) {
 	type inv struct {
 		Slug     string `json:"slug"`
 		Variant  int    `json:"variant"`
-		Quantity int64  `json:"quantity"`
+		Quantity string `json:"quantity"`
 	}
 	decoder := json.NewDecoder(r.Body)
 	var invList []inv
@@ -1330,7 +1330,12 @@ func (i *jsonAPIHandler) POSTInventory(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	for _, in := range invList {
-		err = i.node.Datastore.Inventory().Put(in.Slug, in.Variant, in.Quantity)
+		q, ok := new(big.Int).SetString(in.Quantity, 10)
+		if !ok {
+			ErrorResponse(w, http.StatusBadRequest, "error parsing quantity")
+			return
+		}
+		err = i.node.Datastore.Inventory().Put(in.Slug, in.Variant, q)
 		if err != nil {
 			ErrorResponse(w, http.StatusInternalServerError, err.Error())
 			return
diff --git a/core/errors.go b/core/errors.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"math/big"
 	"strconv"
 
 	peer "gx/ipfs/QmYVXrKrKHDC9FobgmcmshCDyWwdrfwfanNQN4oxJ9Fk3h/go-libp2p-peer"
@@ -67,17 +68,17 @@ func (err CodedError) Error() string {
 // purchasing too many of an item
 type ErrOutOfInventory struct {
 	CodedError
-	RemainingInventory int64 `json:"remainingInventory"`
+	RemainingInventory string `json:"remainingInventory"`
 }
 
 // NewErrOutOfInventory - return out of inventory err with available inventory
-func NewErrOutOfInventory(inventoryRemaining int64) ErrOutOfInventory {
+func NewErrOutOfInventory(inventoryRemaining *big.Int) ErrOutOfInventory {
 	return ErrOutOfInventory{
 		CodedError: CodedError{
 			Reason: "not enough inventory",
 			Code:   "ERR_INSUFFICIENT_INVENTORY",
 		},
-		RemainingInventory: inventoryRemaining,
+		RemainingInventory: inventoryRemaining.String(),
 	}
 }
 
diff --git a/core/inventory.go b/core/inventory.go
@@ -3,6 +3,7 @@ package core
 import (
 	"encoding/json"
 	"errors"
+	"math/big"
 
 	peer "gx/ipfs/QmYVXrKrKHDC9FobgmcmshCDyWwdrfwfanNQN4oxJ9Fk3h/go-libp2p-peer"
 	"time"
@@ -18,8 +19,8 @@ var (
 
 // InventoryListing is the listing representation stored on IPFS
 type InventoryListing struct {
-	Inventory   int64  `json:"inventory"`
-	LastUpdated string `json:"lastUpdated"`
+	Inventory   *big.Int `json:"inventory"`
+	LastUpdated string   `json:"lastUpdated"`
 }
 
 // Inventory is the complete inventory representation stored on IPFS
@@ -34,11 +35,11 @@ func (n *OpenBazaarNode) GetLocalInventory() (Inventory, error) {
 	}
 
 	inventory := make(Inventory, len(listings))
-	var totalCount int64
+	totalCount := big.NewInt(0)
 	for slug, variants := range listings {
-		totalCount = 0
+		totalCount = big.NewInt(0)
 		for _, variantCount := range variants {
-			totalCount += variantCount
+			totalCount = new(big.Int).Add(totalCount, variantCount)
 		}
 
 		inventory[slug] = &InventoryListing{
@@ -58,9 +59,9 @@ func (n *OpenBazaarNode) GetLocalInventoryForSlug(slug string) (*InventoryListin
 	}
 
 	var inventory *InventoryListing
-	var totalCount int64
+	totalCount := big.NewInt(0)
 	for _, variantCount := range variants {
-		totalCount += variantCount
+		totalCount = new(big.Int).Add(totalCount, variantCount)
 	}
 
 	inventory = &InventoryListing{
diff --git a/core/listings.go b/core/listings.go
@@ -84,7 +84,7 @@ func (n *OpenBazaarNode) SetListingInventory(l repo.Listing) error {
 
 	// If SKUs were omitted, set a default with unlimited inventory
 	if len(listingInv) == 0 {
-		err = n.Datastore.Inventory().Put(slug, 0, -1)
+		err = n.Datastore.Inventory().Put(slug, 0, big.NewInt(-1))
 		if err != nil {
 			return err
 		}
diff --git a/core/order.go b/core/order.go
@@ -1471,7 +1471,7 @@ collectListings:
 	type inventory struct {
 		Slug    string
 		Variant int
-		Count   int64
+		Count   *big.Int
 	}
 	var inventoryList []inventory
 	for _, item := range contract.BuyerOrder.Items {
@@ -1514,7 +1514,7 @@ collectListings:
 		}
 		// Create inventory paths to check later
 		if q := GetOrderQuantity(listingMap[item.ListingHash], item); q.IsInt64() {
-			inv.Count = q.Int64()
+			inv.Count = q
 		} else {
 			// TODO: https://github.com/OpenBazaar/openbazaar-go/issues/1739
 			return errors.New("big inventory quantity not supported")
@@ -1577,7 +1577,7 @@ collectListings:
 			if err != nil {
 				return errors.New("vendor has no inventory for the selected variant")
 			}
-			if amt >= 0 && amt < inv.Count {
+			if amt.Cmp(big.NewInt(0)) >= 0 && amt.Cmp(inv.Count) < 0 {
 				return NewErrOutOfInventory(amt)
 			}
 		}
diff --git a/core/signed_listings.go b/core/signed_listings.go
@@ -1,8 +1,8 @@
 package core
 
 import (
-	"fmt"
 	"io/ioutil"
+	"math/big"
 
 	"github.com/OpenBazaar/jsonpb"
 	"github.com/OpenBazaar/openbazaar-go/pb"
@@ -39,11 +39,11 @@ func AssignMatchingCoupons(savedCoupons []repo.Coupon, sl *pb.SignedListing) err
 	return nil
 }
 
-func AssignMatchingQuantities(inventory map[int]int64, sl *pb.SignedListing) error {
+func AssignMatchingQuantities(inventory map[int]*big.Int, sl *pb.SignedListing) error {
 	for variant, count := range inventory {
 		for i, s := range sl.Listing.Item.Skus {
 			if variant == i {
-				s.BigQuantity = fmt.Sprintf("%d", count)
+				s.BigQuantity = count.String()
 				break
 			}
 		}
diff --git a/qa/manage_crypto_listings.py b/qa/manage_crypto_listings.py
@@ -45,7 +45,6 @@ def run_test(self):
             raise TestFailure("ManageCryptoListingsTest - FAIL: Incorrect listing count: %d", len(resp))
         for listing in resp:
             if listing['contractType'] == 'CRYPTOCURRENCY':
-                print(listing)
                 if listing["cryptoCurrencyCode"] != "TETH":
                     raise TestFailure("ManageCryptoListingsTest - FAIL: cryptoCurrencyCode incorrect: %s", listing["cryptoCurrencyCode"])
 
diff --git a/qa/market_price_modifier.py b/qa/market_price_modifier.py
@@ -44,7 +44,7 @@ def run_test(self):
             listing_json["metadata"]["coinDivisibility"] = 8
             listing_json["metadata"]["acceptedCurrencies"] = ["T" + self.cointype]
             listing_json_with_modifier = deepcopy(listing_json)
-            listing_json_with_modifier["metadata"]["priceModifier"] = self.price_modifier
+            listing_json_with_modifier["item"]["priceModifier"] = self.price_modifier
 
         api_url = vendor["gateway_url"] + "ob/listing"
         r = requests.post(api_url, data=json.dumps(listing_json, indent=4))
@@ -71,7 +71,7 @@ def run_test(self):
             raise TestFailure("MarketPriceModifierTest - FAIL: Couldn't get vendor local listings")
         resp = json.loads(r.text)
         for listing in resp:
-            if "modifier" not in listing["price"]:
+            if "modifier" not in listing:
                 raise TestFailure("MarketPriceModifierTest - FAIL: Vendor's local listings index doesn't include price modifier")
 
         # check vendor's listings from buyer and check for modifier
@@ -81,7 +81,7 @@ def run_test(self):
             raise TestFailure("MarketPriceModifierTest - FAIL: Couldn't get vendor listings from buyer")
         resp = json.loads(r.text)
         for listing in resp:
-            if "modifier" not in listing["price"]:
+            if "modifier" not in listing:
                 raise TestFailure("MarketPriceModifierTest - FAIL: Vendor's listings don't include price modifier from buyer")
 
         # get listing hashes
@@ -122,7 +122,7 @@ def run_test(self):
         with open('testdata/order_crypto.json') as order_file:
             order_json = json.load(order_file, object_pairs_hook=OrderedDict)
         order_json["items"][0]["listingHash"] = listing_id_with_modifier
-        order_json["paymentCoin"] = "t" + self.cointype
+        order_json["paymentCoin"] = "T" + self.cointype
         api_url = buyer["gateway_url"] + "ob/purchase"
         r = requests.post(api_url, data=json.dumps(order_json, indent=4))
         if r.status_code == 404:
diff --git a/qa/testdata/listing_crypto.json b/qa/testdata/listing_crypto.json
@@ -15,6 +15,12 @@
         "description": "",
         "processingTime": "1 to 2 hours",
         "price": "0",
+        "priceCurrency": {
+            "code": "TETH",
+            "divisibility": 8,
+            "name": "A",
+            "currencyType": "A"
+        },
         "images": [{
             "tiny": "QmUAuYuiafnJRZxDDX7MuruMNsicYNuyub5vUeAcupUBNs",
             "small": "QmXSEqXLCzpCByJU4wqbJ37TcBEj77FKMUWUP1qLh56847",
@@ -26,7 +32,8 @@
         "grams": 0,
         "options": [],
         "skus": [{
-            "bigQuantity": "350000000"
+            "bigQuantity": "350000000",
+            "bigSurcharge": "0"
         }]
     },
     "moderators": [],
diff --git a/repo/datastore.go b/repo/datastore.go
@@ -2,6 +2,7 @@ package repo
 
 import (
 	"database/sql"
+	"math/big"
 
 	peer "gx/ipfs/QmYVXrKrKHDC9FobgmcmshCDyWwdrfwfanNQN4oxJ9Fk3h/go-libp2p-peer"
 	"time"
@@ -162,16 +163,16 @@ type InventoryStore interface {
 
 	/* Put an inventory count for a listing
 	   Override the existing count if it exists */
-	Put(slug string, variantIndex int, count int64) error
+	Put(slug string, variantIndex int, count *big.Int) error
 
 	// Return the count for a specific listing including variants
-	GetSpecific(slug string, variantIndex int) (int64, error)
+	GetSpecific(slug string, variantIndex int) (*big.Int, error)
 
 	// Get the count for all variants of a given listing
-	Get(slug string) (map[int]int64, error)
+	Get(slug string) (map[int]*big.Int, error)
 
 	// Fetch all inventory maps for each slug
-	GetAll() (map[string]map[int]int64, error)
+	GetAll() (map[string]map[int]*big.Int, error)
 
 	// Delete a listing and related count
 	Delete(slug string, variant int) error
diff --git a/repo/db/inventory.go b/repo/db/inventory.go
@@ -4,6 +4,8 @@ import (
 	"crypto/sha256"
 	"database/sql"
 	"encoding/hex"
+	"errors"
+	"math/big"
 	"strconv"
 	"sync"
 
@@ -18,7 +20,7 @@ func NewInventoryStore(db *sql.DB, lock *sync.Mutex) repo.InventoryStore {
 	return &InventoryDB{modelStore{db, lock}}
 }
 
-func (i *InventoryDB) Put(slug string, variantIndex int, count int64) error {
+func (i *InventoryDB) Put(slug string, variantIndex int, count *big.Int) error {
 	i.lock.Lock()
 	defer i.lock.Unlock()
 
@@ -30,7 +32,7 @@ func (i *InventoryDB) Put(slug string, variantIndex int, count int64) error {
 		return err
 	}
 	defer stmt.Close()
-	_, err = stmt.Exec(hex.EncodeToString(id[:]), slug, variantIndex, count)
+	_, err = stmt.Exec(hex.EncodeToString(id[:]), slug, variantIndex, count.String())
 	if err != nil {
 		err0 := tx.Rollback()
 		if err0 != nil {
@@ -45,26 +47,30 @@ func (i *InventoryDB) Put(slug string, variantIndex int, count int64) error {
 	return nil
 }
 
-func (i *InventoryDB) GetSpecific(slug string, variantIndex int) (int64, error) {
+func (i *InventoryDB) GetSpecific(slug string, variantIndex int) (*big.Int, error) {
 	i.lock.Lock()
 	defer i.lock.Unlock()
 	stmt, err := i.db.Prepare("select count from inventory where slug=? and variantIndex=?")
 	if err != nil {
-		return 0, err
+		return big.NewInt(0), err
 	}
 	defer stmt.Close()
-	var count int64
-	err = stmt.QueryRow(slug, variantIndex).Scan(&count)
+	var countStr string
+	err = stmt.QueryRow(slug, variantIndex).Scan(&countStr)
 	if err != nil {
-		return 0, err
+		return big.NewInt(0), err
+	}
+	count, ok := new(big.Int).SetString(countStr, 10)
+	if !ok {
+		return nil, errors.New("error parsing count")
 	}
 	return count, nil
 }
 
-func (i *InventoryDB) Get(slug string) (map[int]int64, error) {
+func (i *InventoryDB) Get(slug string) (map[int]*big.Int, error) {
 	i.lock.Lock()
 	defer i.lock.Unlock()
-	ret := make(map[int]int64)
+	ret := make(map[int]*big.Int)
 	stmt, err := i.db.Prepare("select slug, variantIndex, count from inventory where slug=?")
 	if err != nil {
 		return ret, err
@@ -77,12 +83,17 @@ func (i *InventoryDB) Get(slug string) (map[int]int64, error) {
 	defer rows.Close()
 	for rows.Next() {
 		var slug string
-		var count int64
+		var countStr string
 		var variantIndex int
-		err = rows.Scan(&slug, &variantIndex, &count)
+		err = rows.Scan(&slug, &variantIndex, &countStr)
 		if err != nil {
 			log.Errorf("scanning inventory for (%s): %s", slug, err.Error())
 		}
+		count, ok := new(big.Int).SetString(countStr, 10)
+		if !ok {
+			log.Errorf("scanning inventory for (%s): error parsing count", slug)
+			count = big.NewInt(0)
+		}
 		ret[variantIndex] = count
 	}
 	if err := rows.Err(); err != nil {
@@ -91,11 +102,11 @@ func (i *InventoryDB) Get(slug string) (map[int]int64, error) {
 	return ret, nil
 }
 
-func (i *InventoryDB) GetAll() (map[string]map[int]int64, error) {
+func (i *InventoryDB) GetAll() (map[string]map[int]*big.Int, error) {
 	i.lock.Lock()
 	defer i.lock.Unlock()
 
-	ret := make(map[string]map[int]int64)
+	ret := make(map[string]map[int]*big.Int)
 	stm := "select slug, variantIndex, count from inventory"
 	rows, err := i.db.Query(stm)
 	if err != nil {
@@ -104,15 +115,21 @@ func (i *InventoryDB) GetAll() (map[string]map[int]int64, error) {
 	defer rows.Close()
 	for rows.Next() {
 		var slug string
-		var count int64
+		var countStr string
 		var variantIndex int
-		err = rows.Scan(&slug, &variantIndex, &count)
+		err = rows.Scan(&slug, &variantIndex, &countStr)
 		if err != nil {
 			log.Error(err)
 		}
+		count, ok := new(big.Int).SetString(countStr, 10)
+		if !ok {
+			log.Errorf("scanning inventory for (%s): error parsing count", slug)
+			count = big.NewInt(0)
+		}
+
 		m, ok := ret[slug]
 		if !ok {
-			r := make(map[int]int64)
+			r := make(map[int]*big.Int)
 			r[variantIndex] = count
 			ret[slug] = r
 		} else {
diff --git a/repo/listing.go b/repo/listing.go
diff --git a/wallet/listeners/transaction_listener.go b/wallet/listeners/transaction_listener.go

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func (n *OpenBazaarNode) SetListingInventory(l repo.Listing) error {`
`84`	`84`
`85`	`85`	`// If SKUs were omitted, set a default with unlimited inventory`
`86`	`86`	`if len(listingInv) == 0 {`
`87`		`- err = n.Datastore.Inventory().Put(slug, 0, -1)`
	`87`	`+ err = n.Datastore.Inventory().Put(slug, 0, big.NewInt(-1))`
`88`	`88`	`if err != nil {`
`89`	`89`	`return err`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1471,7 +1471,7 @@ collectListings:`
`1471`	`1471`	`type inventory struct {`
`1472`	`1472`	`Slug string`
`1473`	`1473`	`Variant int`
`1474`		`- Count int64`
	`1474`	`+ Count *big.Int`
`1475`	`1475`	`}`
`1476`	`1476`	`var inventoryList []inventory`
`1477`	`1477`	`for _, item := range contract.BuyerOrder.Items {`
`@@ -1514,7 +1514,7 @@ collectListings:`
`1514`	`1514`	`}`
`1515`	`1515`	`// Create inventory paths to check later`
`1516`	`1516`	`if q := GetOrderQuantity(listingMap[item.ListingHash], item); q.IsInt64() {`
`1517`		`- inv.Count = q.Int64()`
	`1517`	`+ inv.Count = q`
`1518`	`1518`	`} else {`
`1519`	`1519`	`// TODO: https://github.com/OpenBazaar/openbazaar-go/issues/1739`
`1520`	`1520`	`return errors.New("big inventory quantity not supported")`
`@@ -1577,7 +1577,7 @@ collectListings:`
`1577`	`1577`	`if err != nil {`
`1578`	`1578`	`return errors.New("vendor has no inventory for the selected variant")`
`1579`	`1579`	`}`
`1580`		`- if amt >= 0 && amt < inv.Count {`
	`1580`	`+ if amt.Cmp(big.NewInt(0)) >= 0 && amt.Cmp(inv.Count) < 0 {`
`1581`	`1581`	`return NewErrOutOfInventory(amt)`
`1582`	`1582`	`}`
`1583`	`1583`	`}`