diff --git a/XDCx/tradingstate/relayer_state.go b/XDCx/tradingstate/relayer_state.go index b1da2ae6e0..53bbbec8be 100644 --- a/XDCx/tradingstate/relayer_state.go +++ b/XDCx/tradingstate/relayer_state.go @@ -162,7 +162,7 @@ func AddTokenBalance(addr common.Address, value *big.Int, token common.Address, // XDC native if token == common.XDCNativeAddressBinary { balance := statedb.GetBalance(addr) - log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN XDC NATIVE BEFORE", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN XDC NATIVE BEFORE", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "orderValue", value) statedb.AddBalance(addr, value, tracing.BalanceChangeUnspecified) balance = statedb.GetBalance(addr) log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD XDC NATIVE BALANCE AFTER", "token", token, "address", addr, "balance", balance, "orderValue", value) @@ -189,7 +189,7 @@ func SubTokenBalance(addr common.Address, value *big.Int, token common.Address, // XDC native if token == common.XDCNativeAddressBinary { balance := statedb.GetBalance(addr) - log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE BEFORE", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE BEFORE", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "orderValue", value) if balance.Cmp(value) < 0 { return errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), token.String(), balance, value) } diff --git a/XDCxlending/lendingstate/relayer.go b/XDCxlending/lendingstate/relayer.go index 338b4e6242..e5f63bfa80 100644 --- a/XDCxlending/lendingstate/relayer.go +++ b/XDCxlending/lendingstate/relayer.go @@ -114,10 +114,10 @@ func AddTokenBalance(addr common.Address, value *big.Int, token common.Address, // XDC native if token == common.XDCNativeAddressBinary { balance := statedb.GetBalance(addr) - log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN XDC NATIVE BEFORE", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN XDC NATIVE BEFORE", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "orderValue", value) statedb.AddBalance(addr, value, tracing.BalanceChangeUnspecified) balance = statedb.GetBalance(addr) - log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD XDC NATIVE BALANCE AFTER", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD XDC NATIVE BALANCE AFTER", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "orderValue", value) return nil } @@ -141,13 +141,13 @@ func SubTokenBalance(addr common.Address, value *big.Int, token common.Address, // XDC native if token == common.XDCNativeAddressBinary { balance := statedb.GetBalance(addr) - log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE BEFORE", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE BEFORE", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "orderValue", value) if balance.Cmp(value) < 0 { - return errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), common.XDCNativeAddress, balance, value) + return errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), common.XDCNativeAddressBinary, balance, value) } statedb.SubBalance(addr, value, tracing.BalanceChangeUnspecified) balance = statedb.GetBalance(addr) - log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE AFTER", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE AFTER", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "orderValue", value) return nil } @@ -180,10 +180,10 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr balance = statedb.GetBalance(addr) } if balance.Cmp(value) < 0 { - return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), common.XDCNativeAddress, balance, value) + return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), common.XDCNativeAddressBinary, balance, value) } newBalance := new(big.Int).Sub(balance, value) - log.Debug("CheckSubTokenBalance settle balance: SUB XDC NATIVE BALANCE ", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckSubTokenBalance settle balance: SUB XDC NATIVE BALANCE ", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) return newBalance, nil } // TRC tokens @@ -217,7 +217,7 @@ func CheckAddTokenBalance(addr common.Address, value *big.Int, token common.Addr balance = statedb.GetBalance(addr) } newBalance := new(big.Int).Add(balance, value) - log.Debug("CheckAddTokenBalance settle balance: ADD XDC NATIVE BALANCE ", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckAddTokenBalance settle balance: ADD XDC NATIVE BALANCE ", "token", common.XDCNativeAddressBinary, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) return newBalance, nil } // TRC tokens diff --git a/XDCxlending/order_processor.go b/XDCxlending/order_processor.go index 97a43a67fc..e9eb1e544d 100644 --- a/XDCxlending/order_processor.go +++ b/XDCxlending/order_processor.go @@ -859,7 +859,7 @@ func (l *Lending) LiquidationExpiredTrade(header *types.Header, chain consensus. } err = lendingstate.SubTokenBalance(common.LendingLockAddressBinary, lendingTrade.CollateralLockedAmount, lendingTrade.CollateralToken, statedb) if err != nil { - log.Warn("LiquidationExpiredTrade SubTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddress, "lendingTrade.CollateralLockedAmount", *lendingTrade.CollateralLockedAmount, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) + log.Warn("LiquidationExpiredTrade SubTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddressBinary, "lendingTrade.CollateralLockedAmount", *lendingTrade.CollateralLockedAmount, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) } err = lendingstate.AddTokenBalance(lendingTrade.Investor, repayAmount, lendingTrade.CollateralToken, statedb) if err != nil { @@ -902,7 +902,7 @@ func (l *Lending) LiquidationTrade(lendingStateDB *lendingstate.LendingStateDB, } err := lendingstate.SubTokenBalance(common.LendingLockAddressBinary, lendingTrade.CollateralLockedAmount, lendingTrade.CollateralToken, statedb) if err != nil { - log.Warn("LiquidationTrade SubTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddress, "lendingTrade.CollateralLockedAmount", *lendingTrade.CollateralLockedAmount, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) + log.Warn("LiquidationTrade SubTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddressBinary, "lendingTrade.CollateralLockedAmount", *lendingTrade.CollateralLockedAmount, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) } err = lendingstate.AddTokenBalance(lendingTrade.Investor, lendingTrade.CollateralLockedAmount, lendingTrade.CollateralToken, statedb) if err != nil { @@ -1137,7 +1137,7 @@ func (l *Lending) ProcessTopUpLendingTrade(lendingStateDB *lendingstate.LendingS } err = lendingstate.AddTokenBalance(common.LendingLockAddressBinary, quantity, lendingTrade.CollateralToken, statedb) if err != nil { - log.Warn("ProcessTopUpLendingTrade AddTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddress, "quantity", *quantity, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) + log.Warn("ProcessTopUpLendingTrade AddTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddressBinary, "quantity", *quantity, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) } oldLockedAmount := lendingTrade.CollateralLockedAmount newLockedAmount := new(big.Int).Add(quantity, oldLockedAmount) @@ -1203,7 +1203,7 @@ func (l *Lending) ProcessRepayLendingTrade(header *types.Header, chain consensus } err = lendingstate.SubTokenBalance(common.LendingLockAddressBinary, lendingTrade.CollateralLockedAmount, lendingTrade.CollateralToken, statedb) if err != nil { - log.Warn("ProcessRepayLendingTrade SubTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddress, "lendingTrade.CollateralLockedAmount", *lendingTrade.CollateralLockedAmount, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) + log.Warn("ProcessRepayLendingTrade SubTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddressBinary, "lendingTrade.CollateralLockedAmount", *lendingTrade.CollateralLockedAmount, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) } err = lendingstate.AddTokenBalance(lendingTrade.Borrower, lendingTrade.CollateralLockedAmount, lendingTrade.CollateralToken, statedb) if err != nil { @@ -1259,7 +1259,7 @@ func (l *Lending) ProcessRecallLendingTrade(lendingStateDB *lendingstate.Lending } err = lendingstate.SubTokenBalance(common.LendingLockAddressBinary, recallAmount, lendingTrade.CollateralToken, statedb) if err != nil { - log.Warn("ProcessRecallLendingTrade SubTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddress, "recallAmount", *recallAmount, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) + log.Warn("ProcessRecallLendingTrade SubTokenBalance", "err", err, "LendingLockAddress", common.LendingLockAddressBinary, "recallAmount", *recallAmount, "lendingTrade.CollateralToken", lendingTrade.CollateralToken) } lendingStateDB.UpdateLiquidationPrice(lendingBook, lendingTrade.TradeId, newLiquidationPrice) diff --git a/common/types.go b/common/types.go index a894d5e02f..60794037bf 100644 --- a/common/types.go +++ b/common/types.go @@ -33,17 +33,6 @@ import ( const ( HashLength = 32 AddressLength = 20 - BlockSigners = "xdc0000000000000000000000000000000000000089" - MasternodeVotingSMC = "xdc0000000000000000000000000000000000000088" - RandomizeSMC = "xdc0000000000000000000000000000000000000090" - FoudationAddr = "xdc0000000000000000000000000000000000000068" - TeamAddr = "xdc0000000000000000000000000000000000000099" - XDCXAddr = "xdc0000000000000000000000000000000000000091" - TradingStateAddr = "xdc0000000000000000000000000000000000000092" - XDCXLendingAddress = "xdc0000000000000000000000000000000000000093" - XDCXLendingFinalizedTradeAddress = "xdc0000000000000000000000000000000000000094" - XDCNativeAddress = "xdc0000000000000000000000000000000000000001" - LendingLockAddress = "xdc0000000000000000000000000000000000000011" VoteMethod = "0x6dd7d8ea" UnvoteMethod = "0x02aa9be2" ProposeMethod = "0x01267951" diff --git a/common/types_test.go b/common/types_test.go index 1faf101977..adf35cc797 100644 --- a/common/types_test.go +++ b/common/types_test.go @@ -340,17 +340,17 @@ var testCases = []struct { bin Address str string }{ - {BlockSignersBinary, BlockSigners}, - {MasternodeVotingSMCBinary, MasternodeVotingSMC}, - {RandomizeSMCBinary, RandomizeSMC}, - {FoudationAddrBinary, FoudationAddr}, - {TeamAddrBinary, TeamAddr}, - {XDCXAddrBinary, XDCXAddr}, - {TradingStateAddrBinary, TradingStateAddr}, - {XDCXLendingAddressBinary, XDCXLendingAddress}, - {XDCXLendingFinalizedTradeAddressBinary, XDCXLendingFinalizedTradeAddress}, - {XDCNativeAddressBinary, XDCNativeAddress}, - {LendingLockAddressBinary, LendingLockAddress}, + {BlockSignersBinary, "xdc0000000000000000000000000000000000000089"}, + {MasternodeVotingSMCBinary, "xdc0000000000000000000000000000000000000088"}, + {RandomizeSMCBinary, "xdc0000000000000000000000000000000000000090"}, + {FoudationAddrBinary, "xdc0000000000000000000000000000000000000068"}, + {TeamAddrBinary, "xdc0000000000000000000000000000000000000099"}, + {XDCXAddrBinary, "xdc0000000000000000000000000000000000000091"}, + {TradingStateAddrBinary, "xdc0000000000000000000000000000000000000092"}, + {XDCXLendingAddressBinary, "xdc0000000000000000000000000000000000000093"}, + {XDCXLendingFinalizedTradeAddressBinary, "xdc0000000000000000000000000000000000000094"}, + {XDCNativeAddressBinary, "xdc0000000000000000000000000000000000000001"}, + {LendingLockAddressBinary, "xdc0000000000000000000000000000000000000011"}, } func TestBinaryAddressToString(t *testing.T) {