From 66e96b507c2514468bc6df4a49fca8c8dd4a3517 Mon Sep 17 00:00:00 2001 From: wit liu <765765346@qq.com> Date: Sun, 7 Dec 2025 18:06:36 +0800 Subject: [PATCH] all: use 0x-prefix for `Address` type in log (#1830) --- XDCx/order_processor.go | 2 +- XDCx/tradingstate/orderitem.go | 2 +- XDCx/tradingstate/relayer_state.go | 30 ++++++++++----------- XDCxlending/lendingstate/lendingcontract.go | 2 +- XDCxlending/lendingstate/relayer.go | 30 ++++++++++----------- XDCxlending/order_processor.go | 4 +-- common/types.go | 4 +++ consensus/XDPoS/engines/engine_v1/engine.go | 4 +-- consensus/XDPoS/engines/engine_v2/engine.go | 2 +- consensus/XDPoS/engines/engine_v2/mining.go | 2 +- contracts/utils.go | 2 +- contracts/validator/validator_test.go | 2 +- core/blockchain.go | 2 +- internal/ethapi/api.go | 2 +- 14 files changed, 47 insertions(+), 43 deletions(-) diff --git a/XDCx/order_processor.go b/XDCx/order_processor.go index 0f7645441c..a9fc5ff575 100644 --- a/XDCx/order_processor.go +++ b/XDCx/order_processor.go @@ -636,7 +636,7 @@ func (XDCx *XDCX) ProcessCancelOrder(header *types.Header, tradingStateDB *tradi } baseTokenDecimal, err := XDCx.GetTokenDecimal(chain, statedb, order.BaseToken) if err != nil || baseTokenDecimal.Sign() == 0 { - log.Debug("Fail to get tokenDecimal ", "Token", order.BaseToken.String(), "err", err) + log.Debug("Fail to get tokenDecimal ", "Token", order.BaseToken, "err", err) return err, false } // order: basic order information (includes orderId, orderHash, baseToken, quoteToken) which user send to XDCx to cancel order diff --git a/XDCx/tradingstate/orderitem.go b/XDCx/tradingstate/orderitem.go index bf6608bd0c..d664efd409 100644 --- a/XDCx/tradingstate/orderitem.go +++ b/XDCx/tradingstate/orderitem.go @@ -312,7 +312,7 @@ func IsValidRelayer(statedb *state.StateDB, address common.Address) bool { locHashDeposit := common.BigToHash(locBigDeposit) balance := statedb.GetState(common.RelayerRegistrationSMC, locHashDeposit).Big() if balance.Cmp(new(big.Int).Mul(common.BasePrice, common.RelayerLockedFund)) <= 0 { - log.Debug("Relayer is not in relayer list", "relayer", address.String(), "balance", balance) + log.Debug("Relayer is not in relayer list", "relayer", address, "balance", balance) return false } if IsResignedRelayer(address, statedb) { diff --git a/XDCx/tradingstate/relayer_state.go b/XDCx/tradingstate/relayer_state.go index 31352df2a1..d2f1e1b20c 100644 --- a/XDCx/tradingstate/relayer_state.go +++ b/XDCx/tradingstate/relayer_state.go @@ -134,14 +134,14 @@ func SubRelayerFee(relayer common.Address, fee *big.Int, statedb *state.StateDB) locBigDeposit := new(big.Int).SetUint64(uint64(0)).Add(locBig, RelayerStructMappingSlot["_deposit"]) locHashDeposit := common.BigToHash(locBigDeposit) balance := statedb.GetState(common.RelayerRegistrationSMC, locHashDeposit).Big() - log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee BEFORE", "relayer", relayer.String(), "balance", balance) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee BEFORE", "relayer", relayer, "balance", balance) if balance.Cmp(fee) < 0 { return errors.Errorf("relayer %s isn't enough XDC fee", relayer.String()) } else { balance = new(big.Int).Sub(balance, fee) statedb.SetState(common.RelayerRegistrationSMC, locHashDeposit, common.BigToHash(balance)) statedb.SubBalance(common.RelayerRegistrationSMC, fee, tracing.BalanceChangeUnspecified) - log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee AFTER", "relayer", relayer.String(), "balance", balance) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee AFTER", "relayer", relayer, "balance", balance) return nil } } @@ -162,10 +162,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.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN XDC NATIVE BEFORE", "token", common.XDCNativeAddress, "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.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD XDC NATIVE BALANCE AFTER", "token", token.String(), "address", addr, "balance", balance, "orderValue", value) return nil } @@ -175,10 +175,10 @@ func AddTokenBalance(addr common.Address, value *big.Int, token common.Address, slot := TokenMappingSlot["balances"] locHash := common.BigToHash(GetLocMappingAtKey(addr.Hash(), slot)) balance := statedb.GetState(token, locHash).Big() - log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE BEFORE", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE BEFORE", "token", token, "address", addr, "balance", balance, "orderValue", value) balance = new(big.Int).Add(balance, value) statedb.SetState(token, locHash, common.BigToHash(balance)) - log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE AFTER", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE AFTER", "token", token, "address", addr, "balance", balance, "orderValue", value) return nil } else { return errors.Errorf("token %s isn't exist", token.String()) @@ -189,13 +189,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.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE BEFORE", "token", common.XDCNativeAddress, "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) } statedb.SubBalance(addr, value, tracing.BalanceChangeUnspecified) balance = statedb.GetBalance(addr) - log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE AFTER", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE AFTER", "token", token.String(), "address", addr, "balance", balance, "orderValue", value) return nil } @@ -204,13 +204,13 @@ func SubTokenBalance(addr common.Address, value *big.Int, token common.Address, slot := TokenMappingSlot["balances"] locHash := common.BigToHash(GetLocMappingAtKey(addr.Hash(), slot)) balance := statedb.GetState(token, locHash).Big() - log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE BEFORE", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE BEFORE", "token", token.String(), "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) } balance = new(big.Int).Sub(balance, value) statedb.SetState(token, locHash, common.BigToHash(balance)) - log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE AFTER", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE AFTER", "token", token.String(), "address", addr, "balance", balance, "orderValue", value) return nil } else { return errors.Errorf("token %s isn't exist", token.String()) @@ -230,7 +230,7 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), token.String(), balance, value) } newBalance := new(big.Int).Sub(balance, value) - log.Debug("CheckSubTokenBalance settle balance: SUB XDC NATIVE BALANCE ", "token", token.String(), "address", addr.String(), "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckSubTokenBalance settle balance: SUB XDC NATIVE BALANCE ", "token", token, "address", addr.String(), "balance", balance, "value", value, "newBalance", newBalance) return newBalance, nil } // TRC tokens @@ -247,7 +247,7 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), token.String(), balance, value) } newBalance := new(big.Int).Sub(balance, value) - log.Debug("CheckSubTokenBalance settle balance: SUB TOKEN BALANCE ", "token", token.String(), "address", addr.String(), "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckSubTokenBalance settle balance: SUB TOKEN BALANCE ", "token", token, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) return newBalance, nil } else { return nil, errors.Errorf("token %s isn't exist", token.String()) @@ -264,7 +264,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", token.String(), "address", addr.String(), "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckAddTokenBalance settle balance: ADD XDC NATIVE BALANCE ", "token", token, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) return newBalance, nil } // TRC tokens @@ -278,7 +278,7 @@ func CheckAddTokenBalance(addr common.Address, value *big.Int, token common.Addr balance = statedb.GetState(token, locHash).Big() } newBalance := new(big.Int).Add(balance, value) - log.Debug("CheckAddTokenBalance settle balance: ADD TOKEN BALANCE ", "token", token.String(), "address", addr.String(), "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckAddTokenBalance settle balance: ADD TOKEN BALANCE ", "token", token, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) if common.BigToHash(newBalance).Big().Cmp(newBalance) != 0 { return nil, fmt.Errorf("overflow when try add token balance , max is 2^256 , balance : %v , value : %v", balance, value) } else { @@ -298,7 +298,7 @@ func CheckSubRelayerFee(relayer common.Address, fee *big.Int, statedb *state.Sta locHashDeposit := common.BigToHash(locBigDeposit) balance = statedb.GetState(common.RelayerRegistrationSMC, locHashDeposit).Big() } - log.Debug("CheckSubRelayerFee settle balance: SubRelayerFee ", "relayer", relayer.String(), "balance", balance, "fee", fee) + log.Debug("CheckSubRelayerFee settle balance: SubRelayerFee ", "relayer", relayer, "balance", balance, "fee", fee) if balance.Cmp(fee) < 0 { return nil, errors.Errorf("relayer %s isn't enough XDC fee", relayer.String()) } else { diff --git a/XDCxlending/lendingstate/lendingcontract.go b/XDCxlending/lendingstate/lendingcontract.go index ccf517042b..3e533d886b 100644 --- a/XDCxlending/lendingstate/lendingcontract.go +++ b/XDCxlending/lendingstate/lendingcontract.go @@ -57,7 +57,7 @@ func IsValidRelayer(statedb *state.StateDB, coinbase common.Address) bool { balance := statedb.GetState(common.RelayerRegistrationSMC, locHashDeposit).Big() expectedFund := new(big.Int).Mul(common.BasePrice, common.RelayerLockedFund) if balance.Cmp(expectedFund) <= 0 { - log.Debug("Relayer is not in relayer list", "relayer", coinbase.String(), "balance", balance, "expected", expectedFund) + log.Debug("Relayer is not in relayer list", "relayer", coinbase, "balance", balance, "expected", expectedFund) return false } return true diff --git a/XDCxlending/lendingstate/relayer.go b/XDCxlending/lendingstate/relayer.go index c43e48b9cb..338b4e6242 100644 --- a/XDCxlending/lendingstate/relayer.go +++ b/XDCxlending/lendingstate/relayer.go @@ -86,14 +86,14 @@ func SubRelayerFee(relayer common.Address, fee *big.Int, statedb *state.StateDB) locBigDeposit := new(big.Int).SetUint64(uint64(0)).Add(locBig, RelayerStructMappingSlot["_deposit"]) locHashDeposit := common.BigToHash(locBigDeposit) balance := statedb.GetState(common.RelayerRegistrationSMC, locHashDeposit).Big() - log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee BEFORE", "relayer", relayer.String(), "balance", balance) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee BEFORE", "relayer", relayer, "balance", balance) if balance.Cmp(fee) < 0 { return errors.Errorf("relayer %s isn't enough XDC fee", relayer.String()) } else { balance = new(big.Int).Sub(balance, fee) statedb.SetState(common.RelayerRegistrationSMC, locHashDeposit, common.BigToHash(balance)) statedb.SubBalance(common.RelayerRegistrationSMC, fee, tracing.BalanceChangeUnspecified) - log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee AFTER", "relayer", relayer.String(), "balance", balance) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SubRelayerFee AFTER", "relayer", relayer, "balance", balance) return nil } } @@ -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.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN XDC NATIVE BEFORE", "token", common.XDCNativeAddress, "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.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD XDC NATIVE BALANCE AFTER", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "orderValue", value) return nil } @@ -127,10 +127,10 @@ func AddTokenBalance(addr common.Address, value *big.Int, token common.Address, slot := TokenMappingSlot["balances"] locHash := common.BigToHash(GetLocMappingAtKey(addr.Hash(), slot)) balance := statedb.GetState(token, locHash).Big() - log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE BEFORE", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE BEFORE", "token", token, "address", addr, "balance", balance, "orderValue", value) balance = new(big.Int).Add(balance, value) statedb.SetState(token, locHash, common.BigToHash(balance)) - log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE AFTER", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: ADD TOKEN BALANCE AFTER", "token", token, "address", addr, "balance", balance, "orderValue", value) return nil } else { return errors.Errorf("token %s isn't exist", token.String()) @@ -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.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE BEFORE", "token", common.XDCNativeAddress, "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) } 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.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB XDC NATIVE BALANCE AFTER", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "orderValue", value) return nil } @@ -157,13 +157,13 @@ func SubTokenBalance(addr common.Address, value *big.Int, token common.Address, slot := TokenMappingSlot["balances"] locHash := common.BigToHash(GetLocMappingAtKey(addr.Hash(), slot)) balance := statedb.GetState(token, locHash).Big() - log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE BEFORE", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE BEFORE", "token", token, "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) } balance = new(big.Int).Sub(balance, value) statedb.SetState(token, locHash, common.BigToHash(balance)) - log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE AFTER", "token", token.String(), "address", addr.String(), "balance", balance, "orderValue", value) + log.Debug("ApplyXDCXMatchedTransaction settle balance: SUB TOKEN BALANCE AFTER", "token", token, "address", addr, "balance", balance, "orderValue", value) return nil } else { return errors.Errorf("token %s isn't exist", token.String()) @@ -183,7 +183,7 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), common.XDCNativeAddress, balance, value) } newBalance := new(big.Int).Sub(balance, value) - log.Debug("CheckSubTokenBalance settle balance: SUB XDC NATIVE BALANCE ", "token", common.XDCNativeAddress, "address", addr.String(), "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckSubTokenBalance settle balance: SUB XDC NATIVE BALANCE ", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) return newBalance, nil } // TRC tokens @@ -200,7 +200,7 @@ func CheckSubTokenBalance(addr common.Address, value *big.Int, token common.Addr return nil, errors.Errorf("value %s in token %s not enough , have : %s , want : %s ", addr.String(), token.String(), balance, value) } newBalance := new(big.Int).Sub(balance, value) - log.Debug("CheckSubTokenBalance settle balance: SUB TOKEN BALANCE ", "token", token.String(), "address", addr.String(), "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckSubTokenBalance settle balance: SUB TOKEN BALANCE ", "token", token, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) return newBalance, nil } else { return nil, errors.Errorf("token %s isn't exist", token.String()) @@ -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.String(), "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckAddTokenBalance settle balance: ADD XDC NATIVE BALANCE ", "token", common.XDCNativeAddress, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) return newBalance, nil } // TRC tokens @@ -231,7 +231,7 @@ func CheckAddTokenBalance(addr common.Address, value *big.Int, token common.Addr balance = statedb.GetState(token, locHash).Big() } newBalance := new(big.Int).Add(balance, value) - log.Debug("CheckAddTokenBalance settle balance: ADD TOKEN BALANCE ", "token", token.String(), "address", addr.String(), "balance", balance, "value", value, "newBalance", newBalance) + log.Debug("CheckAddTokenBalance settle balance: ADD TOKEN BALANCE ", "token", token, "address", addr, "balance", balance, "value", value, "newBalance", newBalance) if common.BigToHash(newBalance).Big().Cmp(newBalance) != 0 { return nil, fmt.Errorf("overflow when try add token balance , max is 2^256 , balance : %v , value : %v", balance, value) } else { @@ -251,7 +251,7 @@ func CheckSubRelayerFee(relayer common.Address, fee *big.Int, statedb *state.Sta locHashDeposit := common.BigToHash(locBigDeposit) balance = statedb.GetState(common.RelayerRegistrationSMC, locHashDeposit).Big() } - log.Debug("CheckSubRelayerFee settle balance: SubRelayerFee ", "relayer", relayer.String(), "balance", balance, "fee", fee) + log.Debug("CheckSubRelayerFee settle balance: SubRelayerFee ", "relayer", relayer, "balance", balance, "fee", fee) if balance.Cmp(fee) < 0 { return nil, errors.Errorf("relayer %s isn't enough XDC fee", relayer.String()) } else { diff --git a/XDCxlending/order_processor.go b/XDCxlending/order_processor.go index ad1ac4614f..97a43a67fc 100644 --- a/XDCxlending/order_processor.go +++ b/XDCxlending/order_processor.go @@ -700,7 +700,7 @@ func (l *Lending) ProcessCancelOrder(header *types.Header, lendingStateDB *lendi } lendTokenDecimal, err := l.XDCx.GetTokenDecimal(chain, statedb, originOrder.LendingToken) if err != nil || lendTokenDecimal == nil || lendTokenDecimal.Sign() <= 0 { - log.Debug("Fail to get tokenDecimal ", "Token", originOrder.LendingToken.String(), "err", err) + log.Debug("Fail to get tokenDecimal ", "Token", originOrder.LendingToken, "err", err) return err, false } var tokenBalance *big.Int @@ -723,7 +723,7 @@ func (l *Lending) ProcessCancelOrder(header *types.Header, lendingStateDB *lendi } collateralTokenDecimal, err = l.XDCx.GetTokenDecimal(chain, statedb, originOrder.CollateralToken) if err != nil || collateralTokenDecimal == nil || collateralTokenDecimal.Sign() <= 0 { - log.Debug("Fail to get tokenDecimal ", "Token", originOrder.LendingToken.String(), "err", err) + log.Debug("Fail to get tokenDecimal ", "Token", originOrder.LendingToken, "err", err) return err, false } } diff --git a/common/types.go b/common/types.go index d07696acdd..a894d5e02f 100644 --- a/common/types.go +++ b/common/types.go @@ -245,6 +245,10 @@ func IsHexAddress(s string) bool { return len(s) == 2*AddressLength && isHex(s) } +func (a Address) TerminalString() string { + return string(a.checksumHex()) +} + // IsZero returns if a address is empty func (a Address) IsZero() bool { return a == Address{} } diff --git a/consensus/XDPoS/engines/engine_v1/engine.go b/consensus/XDPoS/engines/engine_v1/engine.go index 2b0f77cef5..1d8c6b453c 100644 --- a/consensus/XDPoS/engines/engine_v1/engine.go +++ b/consensus/XDPoS/engines/engine_v1/engine.go @@ -457,7 +457,7 @@ func (x *XDPoS_v1) yourTurn(chain consensus.ChainReader, parent *types.Header, s log.Debug("Masternodes cycle info", "number of masternodes", len(masternodes), "previous", pre, "position", preIndex, "current", signer, "position", curIndex) } for i, s := range masternodes { - log.Debug("Masternode:", "index", i, "address", s.String()) + log.Debug("Masternode:", "index", i, "address", s) } if (preIndex+1)%len(masternodes) == curIndex { return len(masternodes), preIndex, curIndex, true, nil @@ -616,7 +616,7 @@ func (x *XDPoS_v1) verifySeal(chain consensus.ChainReader, header *types.Header, } } if !valid { - log.Debug("Unauthorized creator found", "block number", number, "creator", creator.String(), "masternodes", mstring, "snapshot from parent block", nstring) + log.Debug("Unauthorized creator found", "block number", number, "creator", creator, "masternodes", mstring, "snapshot from parent block", nstring) return utils.ErrUnauthorized } } diff --git a/consensus/XDPoS/engines/engine_v2/engine.go b/consensus/XDPoS/engines/engine_v2/engine.go index 633467a486..4617ced2a7 100644 --- a/consensus/XDPoS/engines/engine_v2/engine.go +++ b/consensus/XDPoS/engines/engine_v2/engine.go @@ -598,7 +598,7 @@ func (x *XDPoS_v2) UpdateMasternodes(chain consensus.ChainReader, header *types. log.Info("[UpdateMasternodes] New set of masternodes has been updated to snapshot", "number", snap.Number, "hash", snap.Hash) for i, n := range ms { - log.Info("masternode", "index", i, "address", n.Address.String()) + log.Info("masternode", "index", i, "address", n.Address) } return nil diff --git a/consensus/XDPoS/engines/engine_v2/mining.go b/consensus/XDPoS/engines/engine_v2/mining.go index 550dd0831d..22a57653b4 100644 --- a/consensus/XDPoS/engines/engine_v2/mining.go +++ b/consensus/XDPoS/engines/engine_v2/mining.go @@ -41,7 +41,7 @@ func (x *XDPoS_v2) yourturn(chain consensus.ChainReader, round types.Round, pare } for i, s := range masterNodes { - log.Debug("[yourturn] Masternode:", "index", i, "address", s.String(), "parentBlockNum", parent.Number) + log.Debug("[yourturn] Masternode:", "index", i, "address", s, "parentBlockNum", parent.Number) } curIndex := utils.Position(masterNodes, signer) diff --git a/contracts/utils.go b/contracts/utils.go index b41e5691b4..8602d100d4 100644 --- a/contracts/utils.go +++ b/contracts/utils.go @@ -476,7 +476,7 @@ func GetRewardBalancesRate(foundationWalletAddr common.Address, statedb *state.S log.Error("Fail to parse json holders", "error", err) return nil, err } - log.Trace("Holders reward", "holders", string(jsonHolders), "masternode", masterAddr.String()) + log.Trace("Holders reward", "holders", string(jsonHolders), "masternode", masterAddr) return balances, nil } diff --git a/contracts/validator/validator_test.go b/contracts/validator/validator_test.go index 50578fdb38..4a48400e08 100644 --- a/contracts/validator/validator_test.go +++ b/contracts/validator/validator_test.go @@ -235,7 +235,7 @@ func GetRewardBalancesRate(foudationWalletAddr common.Address, masterAddr common log.Error("Fail to parse json holders", "error", err) return nil, err } - log.Info("Holders reward", "holders", string(jsonHolders), "masternode", masterAddr.String()) + log.Info("Holders reward", "holders", string(jsonHolders), "masternode", masterAddr) return balances, nil } diff --git a/core/blockchain.go b/core/blockchain.go index 122253d1df..697968b1f8 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -2808,7 +2808,7 @@ func (bc *BlockChain) UpdateM1() error { }) log.Info("Ordered list of masternode candidates") for _, m := range ms { - log.Info("", "address", m.Address.String(), "stake", m.Stake) + log.Info("", "address", m.Address, "stake", m.Stake) } // update masternodes diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 38829caf90..519967aba1 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -897,7 +897,7 @@ func (api *BlockChainAPI) GetCandidateStatus(ctx context.Context, coinbaseAddres result[fieldStatus] = statusMasternode if !isCandidate { result[fieldCapacity] = -1 - log.Warn("Find non-candidate masternode", "masternode", masternode.String(), "checkpointNumber", checkpointNumber, "epoch", epoch, "epochNumber", epochNumber) + log.Warn("Find non-candidate masternode", "masternode", masternode, "checkpointNumber", checkpointNumber, "epoch", epoch, "epochNumber", epochNumber) } return result, nil }