Custom Fee Amount Support in OpenBazaar

core/refunds.go

@@ -3,11 +3,12 @@ package core
 import (
 	"encoding/hex"
 	"errors"
-	"github.com/OpenBazaar/openbazaar-go/repo"
 	"math/big"
 	"strings"
 	"time"
 
+	"github.com/OpenBazaar/openbazaar-go/repo"
+
 	"github.com/OpenBazaar/openbazaar-go/pb"
 	"github.com/OpenBazaar/wallet-interface"
 	"github.com/golang/protobuf/proto"
@@ -97,7 +98,10 @@ func (n *OpenBazaarNode) RefundOrder(contract *pb.RicardianContract, records []*
 		if err != nil {
 			return err
 		}
-		txid, err := wal.Spend(*outValue, refundAddr, wallet.NORMAL, orderID, false)
+		fee := wallet.Fee{
+			FeeLevel: wallet.NORMAL,
+		}
+		txid, err := wal.Spend(*outValue, refundAddr, fee, orderID, false)
 		if err != nil {
 			return err
 		}

core/spend.go

@@ -29,6 +29,7 @@ type SpendRequest struct {
 	OrderID                string                   `json:"orderId"`
 	RequireAssociatedOrder bool                     `json:"requireOrder"`
 	SpendAll               bool                     `json:"spendAll"`
+	CustomFee              string                   `json:"customFee"`
 }
 
 type SpendResponse struct {
@@ -99,11 +100,18 @@ func (n *OpenBazaarNode) Spend(args *SpendRequest) (*SpendResponse, error) {
 		feeLevel = wallet.ECONOMIC
 	case "SUPER_ECONOMIC":
 		feeLevel = wallet.SUPER_ECONOMIC
+	case "CUSTOM":
+		feeLevel = wallet.CUSTOM
 	default:
 		feeLevel = wallet.ECONOMIC
 	}
 
-	txid, err := wal.Spend(*amt, addr, feeLevel, args.OrderID, args.SpendAll)
+	fee := wallet.Fee{
+		FeeLevel:  feeLevel,
+		CustomFee: args.CustomFee,
+	}
+
+	txid, err := wal.Spend(*amt, addr, fee, args.OrderID, args.SpendAll)
 	if err != nil {
 		switch {
 		case err == wallet.ErrInsufficientFunds: