Merge branch 'ethereum-master' into eth_fees

Author: amangale

core/order.go

@@ -162,6 +162,10 @@ func (n *OpenBazaarNode) Purchase(data *repo.PurchaseData) (orderID string, paym
 		return "", "", retCurrency, false, err
 	}
 
+	if wal.IsDust(*total) {
+		return "", "", retCurrency, false, ErrSpendAmountIsDust
+	}
+
 	payment.BigAmount = total.String()
 
 	contract, err = n.SignOrder(contract)

repo/init.go

@@ -17,7 +17,7 @@ import (
 	"github.com/tyler-smith/go-bip39"
 )
 
-const RepoVersion = "32"
+const RepoVersion = "34"
 
 var log = logging.MustGetLogger("repo")
 var ErrRepoExists = errors.New("IPFS configuration file exists. Reinitializing would overwrite your keys. Use -f to force overwrite.")

repo/migration.go

@@ -53,6 +53,7 @@ var (
 		migrations.Migration030{},
 		migrations.Migration031{},
 		migrations.Migration032{},
+		migrations.Migration033{},
 	}
 )
 

repo/notification.go

@@ -436,7 +436,7 @@ type PaymentNotification struct {
 	ID           string           `json:"notificationId"`
 	Type         NotificationType `json:"type"`
 	OrderId      string           `json:"orderId"`
-	FundingTotal string           `json:"fundingTotal"`
+	FundingTotal *CurrencyValue   `json:"fundingTotal"`
 	CoinType     string           `json:"coinType"`
 }
 

wallet/listeners/transaction_listener.go

@@ -351,11 +351,21 @@ func (l *TransactionListener) processPurchasePayment(txid string, output wallet.
 				}
 			}
 		}
+		def, err := repo.AllCurrencies().Lookup(contract.BuyerOrder.Payment.AmountCurrency.Code)
+		if err != nil {
+			log.Errorf("Error looking up currency: %s", err)
+			return
+		}
+		cv, err := repo.NewCurrencyValue(funding.String(), def)
+		if err != nil {
+			log.Errorf("Error creating currency value: %s", err)
+			return
+		}
 		n := repo.PaymentNotification{
 			ID:           repo.NewNotificationID(),
 			Type:         "payment",
 			OrderId:      orderId,
-			FundingTotal: funding.String(),
+			FundingTotal: cv,
 			CoinType:     contract.BuyerOrder.Payment.AmountCurrency.Code,
 		}
 		l.broadcast <- n