Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Custom Fee Amount Support in OpenBazaar #2082

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions core/refunds.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
10 changes: 9 additions & 1 deletion core/spend.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 62 additions & 16 deletions vendor/github.com/OpenBazaar/go-ethwallet/wallet/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 32 additions & 10 deletions vendor/github.com/OpenBazaar/multiwallet/bitcoin/sign.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/OpenBazaar/multiwallet/bitcoin/wallet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading