Skip to content
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

[R4R] fix account may have currency with zero balance #679

Merged
merged 3 commits into from
Oct 30, 2019
Merged

[R4R] fix account may have currency with zero balance #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a222a8f
hardfork: fix possible zero currency balance
unclezoro Oct 23, 2019
a55f149
add change log
unclezoro Oct 23, 2019
78c2f43
fix review suggest
unclezoro Oct 23, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG_PENDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
## Develop

BUG FIXES
* [\#677](https://github.com/binance-chain/node/pull/677) [Dex] fix account may have currency with zero balance

IMPROVEMENTS
* [\#672](https://github.com/binance-chain/node/pull/672) [DEX] Change listing rule
1 change: 1 addition & 0 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ func SetUpgradeConfig(upgradeConfig *config.UpgradeConfig) {
upgrade.Mgr.AddUpgradeHeight(upgrade.FixSignBytesOverflow, upgradeConfig.FixSignBytesOverflowHeight)
upgrade.Mgr.AddUpgradeHeight(upgrade.LotSizeOptimization, upgradeConfig.LotSizeUpgradeHeight)
upgrade.Mgr.AddUpgradeHeight(upgrade.ListingRuleUpgrade, upgradeConfig.ListingRuleUpgradeHeight)
upgrade.Mgr.AddUpgradeHeight(upgrade.FixZeroBalance, upgradeConfig.FixZeroBalanceHeight)

// register store keys of upgrade
upgrade.Mgr.RegisterStoreKeys(upgrade.BEP9, common.TimeLockStoreKey.Name())
Expand Down
4 changes: 4 additions & 0 deletions app/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ FixSignBytesOverflowHeight = {{ .UpgradeConfig.FixSignBytesOverflowHeight }}
LotSizeUpgradeHeight = {{ .UpgradeConfig.LotSizeUpgradeHeight }}
# Block height of changing listing rule upgrade
ListingRuleUpgradeHeight = {{ .UpgradeConfig.ListingRuleUpgradeHeight }}
# Block height of FixZeroBalanceHeight upgrade
FixZeroBalanceHeight = {{ .UpgradeConfig.FixZeroBalanceHeight }}

[query]
# ABCI query interface black list, suggested value: ["custom/gov/proposals", "custom/timelock/timelocks", "custom/atomicSwap/swapcreator", "custom/atomicSwap/swaprecipient"]
Expand Down Expand Up @@ -320,6 +322,7 @@ type UpgradeConfig struct {
FixSignBytesOverflowHeight int64 `mapstructure:"FixSignBytesOverflowHeight"`
LotSizeUpgradeHeight int64 `mapstructure:"LotSizeUpgradeHeight"`
ListingRuleUpgradeHeight int64 `mapstructure:"ListingRuleUpgradeHeight"`
FixZeroBalanceHeight int64 `mapstructure:"FixZeroBalanceHeight"`
}

func defaultUpgradeConfig() *UpgradeConfig {
Expand All @@ -334,6 +337,7 @@ func defaultUpgradeConfig() *UpgradeConfig {
FixSignBytesOverflowHeight: math.MaxInt64,
LotSizeUpgradeHeight: math.MaxInt64,
ListingRuleUpgradeHeight: math.MaxInt64,
FixZeroBalanceHeight: math.MaxInt64,
}
}

Expand Down
1 change: 1 addition & 0 deletions common/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const (
FixSignBytesOverflow = sdk.FixSignBytesOverflow
LotSizeOptimization = "LotSizeOptimization"
ListingRuleUpgrade = "ListingRuleUpgrade" // Remove restriction that only the owner of base asset can list trading pair
FixZeroBalance = "FixZeroBalance"
)

func UpgradeBEP10(before func(), after func()) {
Expand Down
9 changes: 6 additions & 3 deletions plugins/dex/order/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,9 +564,12 @@ func (kp *Keeper) doTransfer(ctx sdk.Context, tran *Transfer) sdk.Error {
panic(errors.New("unlocked tokens cannot cover the expense"))
}
account.SetLockedCoins(newLocked)
account.SetCoins(account.GetCoins().
Plus(sdk.Coins{sdk.NewCoin(tran.inAsset, tran.in)}).
Plus(sdk.Coins{sdk.NewCoin(tran.outAsset, tran.unlock-tran.out)}))
accountCoin := account.GetCoins().
Plus(sdk.Coins{sdk.NewCoin(tran.inAsset, tran.in)})
if remain := tran.unlock-tran.out; remain > 0 || !sdk.IsUpgrade(upgrade.FixZeroBalance) {
accountCoin = accountCoin.Plus(sdk.Coins{sdk.NewCoin(tran.outAsset, remain)})
}
account.SetCoins(accountCoin)

kp.am.SetAccount(ctx, account)
kp.logger.Debug("Performed Trade Allocation", "account", account, "allocation", tran.String())
Expand Down