diff --git a/Gopkg.lock b/Gopkg.lock index bb6ed82..cbe0299 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -44,7 +44,7 @@ revision = "10951cd851492bdf52b4f7b408adcb6752312b23" [[projects]] - branch = "ethereum-master" + branch = "master" digest = "1:c411c1051b3ab7c823786bf82887580f2d93898be2504e145a67419afef5ba2d" name = "github.com/OpenBazaar/wallet-interface" packages = ["."] diff --git a/Gopkg.toml b/Gopkg.toml index 4f0c684..62d5bd8 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -34,7 +34,7 @@ name = "github.com/OpenBazaar/spvwallet" [[constraint]] - branch = "ethereum-master" + branch = "master" name = "github.com/OpenBazaar/wallet-interface" [[constraint]] diff --git a/util/fees.go b/util/fees.go index 5c0fb4a..3afd0d9 100644 --- a/util/fees.go +++ b/util/fees.go @@ -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 ) @@ -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: @@ -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: