Merge pull request #2018 from OpenBazaar/zero_mod_fee

(#2002, 2005, 2006, 2012) Handle zero mod fee

Author: cpacia

core/disputes.go

@@ -172,6 +172,10 @@ func (n *OpenBazaarNode) verifyEscrowFundsAreDisputeable(contract *pb.RicardianC
 			log.Errorf("Failed NewHashFromStr(%s): %s", r.Txid, err.Error())
 			return false
 		}
+		if hash == nil {
+			log.Errorf("Nil NewHashFromStr(%s)", r.Txid)
+			return false
+		}
 		actualConfirmations, _, err := wal.GetConfirmations(*hash)
 		if err != nil {
 			log.Errorf("Failed GetConfirmations(%s): %s", hash.String(), err.Error())

net/service/handlers.go

@@ -1309,11 +1309,13 @@ func (service *OpenBazaarService) handleDisputeOpen(p peer.ID, pmes *pb.Message,
 		log.Errorf("failed calc orderID")
 	}
 
-	err = service.node.Datastore.Messages().Put(
-		fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_OPEN)),
-		orderID, pb.Message_DISPUTE_OPEN, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
-	if err != nil {
-		log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_OPEN), err)
+	if orderID != "" {
+		err = service.node.Datastore.Messages().Put(
+			fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_OPEN)),
+			orderID, pb.Message_DISPUTE_OPEN, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
+		if err != nil {
+			log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_OPEN), err)
+		}
 	}
 
 	// Verify signature
@@ -1346,11 +1348,13 @@ func (service *OpenBazaarService) handleDisputeUpdate(p peer.ID, pmes *pb.Messag
 	}
 
 	orderID := update.OrderId
-	err = service.node.Datastore.Messages().Put(
-		fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_UPDATE)),
-		orderID, pb.Message_DISPUTE_UPDATE, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
-	if err != nil {
-		log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_UPDATE), err)
+	if orderID != "" {
+		err = service.node.Datastore.Messages().Put(
+			fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_UPDATE)),
+			orderID, pb.Message_DISPUTE_UPDATE, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
+		if err != nil {
+			log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_UPDATE), err)
+		}
 	}
 
 	dispute, err := service.node.Datastore.Cases().GetByCaseID(update.OrderId)
@@ -1448,11 +1452,13 @@ func (service *OpenBazaarService) handleDisputeClose(p peer.ID, pmes *pb.Message
 	}
 
 	orderID := rc.DisputeResolution.OrderId
-	err = service.node.Datastore.Messages().Put(
-		fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_CLOSE)),
-		orderID, pb.Message_DISPUTE_CLOSE, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
-	if err != nil {
-		log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_CLOSE), err)
+	if orderID != "" {
+		err = service.node.Datastore.Messages().Put(
+			fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_CLOSE)),
+			orderID, pb.Message_DISPUTE_CLOSE, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
+		if err != nil {
+			log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_CLOSE), err)
+		}
 	}
 
 	// Load the order

qa/testdata/eth_listing.json

@@ -18,7 +18,7 @@
 		  "name": "A",
 		  "currencyType": "A"
 		},
-		"bigPrice": "120000000000000",
+		"bigPrice": "4500000000000000",
 		"tags": [
 			"tshirts",
 			"clothing",