Skip to content

Fix default FeeProvider super economic fee #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cpacia wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix default FeeProvider super economic fee #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59fdd7c
Fix default FeeProvider super economic fee
cpacia May 21, 2020
52a371e
Set wallet-interface dep to master
cpacia May 21, 2020
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
2 changes: 1 addition & 1 deletion Gopkg.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
name = "github.com/OpenBazaar/spvwallet"

[[constraint]]
branch = "ethereum-master"
branch = "master"
name = "github.com/OpenBazaar/wallet-interface"

[[constraint]]
Expand Down
11 changes: 7 additions & 4 deletions util/fees.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ type FeeProvider struct {
type FeeTargetInUSDCents float64

const (
EconomicTarget FeeTargetInUSDCents = 0.1
NormalTarget FeeTargetInUSDCents = 1
PriorityTarget FeeTargetInUSDCents = 5
SuperEconomicTarget FeeTargetInUSDCents = 0.02
EconomicTarget FeeTargetInUSDCents = 0.1
NormalTarget FeeTargetInUSDCents = 1
PriorityTarget FeeTargetInUSDCents = 5

AverageTransactionSize = 226
)
Expand All @@ -60,6 +61,8 @@ func (fp *FeeProvider) GetFeePerByte(feeLevel wallet.FeeLevel) uint64 {
return fp.normalFee
case wallet.ECONOMIC:
return fp.economicFee
case wallet.SUPER_ECONOMIC:
return fp.superEconomicFee
case wallet.FEE_BUMP:
return fp.priorityFee * 2
default:
Expand All @@ -84,7 +87,7 @@ func (fp *FeeProvider) GetFeePerByte(feeLevel wallet.FeeLevel) uint64 {
case wallet.ECONOMIC:
target = EconomicTarget
case wallet.SUPER_ECONOMIC:
return fp.superEconomicFee
target = SuperEconomicTarget
case wallet.FEE_BUMP:
target = PriorityTarget * 2
default:
Expand Down