diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 1d8cd01629..968cdb6941 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -23,12 +23,12 @@ import ( "fmt" "log" "math/big" + "reflect" "strings" "testing" - "reflect" - "github.com/XinFinOrg/XDPoSChain/common" + "github.com/XinFinOrg/XDPoSChain/common/hexutil" "github.com/XinFinOrg/XDPoSChain/common/math" "github.com/XinFinOrg/XDPoSChain/crypto" ) @@ -713,7 +713,7 @@ func TestABI_MethodById(t *testing.T) { } b := fmt.Sprintf("%v", m2) if a != b { - t.Errorf("Method %v (id %v) not 'findable' by id in ABI", name, common.ToHex(m.Id())) + t.Errorf("Method %v (id %v) not 'findable' by id in ABI", name, hexutil.Encode(m.Id())) } } diff --git a/common/bytes.go b/common/bytes.go index 9025e98b19..3aaf97bd68 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -17,19 +17,9 @@ // Package common contains various helper functions. package common -import "encoding/hex" - -// ToHex returns the hex representation of b, prefixed with '0x'. -// For empty slices, the return value is "0x0". -// -// Deprecated: use hexutil.Encode instead. -func ToHex(b []byte) string { - hex := Bytes2Hex(b) - if len(hex) == 0 { - hex = "0" - } - return "0x" + hex -} +import ( + "encoding/hex" +) // FromHex returns the bytes represented by the hexadecimal string s. // s may be prefixed with "0x". diff --git a/consensus/XDPoS/engines/engine_v2/verifyHeader.go b/consensus/XDPoS/engines/engine_v2/verifyHeader.go index 8341ae1c6b..b90f942d07 100644 --- a/consensus/XDPoS/engines/engine_v2/verifyHeader.go +++ b/consensus/XDPoS/engines/engine_v2/verifyHeader.go @@ -6,6 +6,7 @@ import ( "time" "github.com/XinFinOrg/XDPoSChain/common" + "github.com/XinFinOrg/XDPoSChain/common/hexutil" "github.com/XinFinOrg/XDPoSChain/consensus" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils" "github.com/XinFinOrg/XDPoSChain/consensus/misc" @@ -171,7 +172,7 @@ func (x *XDPoS_v2) verifyHeader(chain consensus.ChainReader, header *types.Heade for index, mn := range masterNodes { log.Error("[verifyHeader] masternode list during validator verification", "Masternode Address", mn.Hex(), "index", index) } - log.Error("[verifyHeader] Error while verifying header validator signature", "BlockNumber", header.Number, "Hash", header.Hash().Hex(), "validator in hex", common.ToHex(header.Validator)) + log.Error("[verifyHeader] Error while verifying header validator signature", "BlockNumber", header.Number, "Hash", header.Hash().Hex(), "validator in hex", hexutil.Encode(header.Validator)) return err } if !verified { diff --git a/contracts/blocksigner/blocksigner_test.go b/contracts/blocksigner/blocksigner_test.go index 54f89b2902..d1f8cbc0f4 100644 --- a/contracts/blocksigner/blocksigner_test.go +++ b/contracts/blocksigner/blocksigner_test.go @@ -18,14 +18,14 @@ package blocksigner import ( "context" "math/big" + "math/rand" "testing" "time" - "math/rand" - "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind/backends" "github.com/XinFinOrg/XDPoSChain/common" + "github.com/XinFinOrg/XDPoSChain/common/hexutil" "github.com/XinFinOrg/XDPoSChain/core" "github.com/XinFinOrg/XDPoSChain/crypto" "github.com/XinFinOrg/XDPoSChain/params" @@ -50,7 +50,7 @@ func TestBlockSigner(t *testing.T) { ctx, cancel := context.WithDeadline(context.Background(), d) defer cancel() code, _ := contractBackend.CodeAt(ctx, blockSignerAddress, nil) - t.Log("contract code", common.ToHex(code)) + t.Log("contract code", hexutil.Encode(code)) f := func(key, val common.Hash) bool { t.Log(key.Hex(), val.Hex()) return true diff --git a/contracts/randomize/randomize_test.go b/contracts/randomize/randomize_test.go index 3d4dead11d..14d229196c 100644 --- a/contracts/randomize/randomize_test.go +++ b/contracts/randomize/randomize_test.go @@ -24,6 +24,7 @@ import ( "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind/backends" "github.com/XinFinOrg/XDPoSChain/common" + "github.com/XinFinOrg/XDPoSChain/common/hexutil" "github.com/XinFinOrg/XDPoSChain/contracts" "github.com/XinFinOrg/XDPoSChain/core" "github.com/XinFinOrg/XDPoSChain/core/types" @@ -56,7 +57,7 @@ func TestRandomize(t *testing.T) { ctx, cancel := context.WithDeadline(context.Background(), d) defer cancel() code, _ := contractBackend.CodeAt(ctx, randomizeAddress, nil) - t.Log("contract code", common.ToHex(code)) + t.Log("contract code", hexutil.Encode(code)) f := func(key, val common.Hash) bool { t.Log(key.Hex(), val.Hex()) return true diff --git a/contracts/validator/validator_test.go b/contracts/validator/validator_test.go index 6ebe924b5c..c2b5d0fde1 100644 --- a/contracts/validator/validator_test.go +++ b/contracts/validator/validator_test.go @@ -29,6 +29,7 @@ import ( "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind/backends" "github.com/XinFinOrg/XDPoSChain/common" + "github.com/XinFinOrg/XDPoSChain/common/hexutil" contractValidator "github.com/XinFinOrg/XDPoSChain/contracts/validator/contract" "github.com/XinFinOrg/XDPoSChain/core" "github.com/XinFinOrg/XDPoSChain/core/state" @@ -68,7 +69,7 @@ func TestValidator(t *testing.T) { ctx, cancel := context.WithDeadline(context.Background(), d) defer cancel() code, _ := contractBackend.CodeAt(ctx, validatorAddress, nil) - t.Log("contract code", common.ToHex(code)) + t.Log("contract code", hexutil.Encode(code)) f := func(key, val common.Hash) bool { t.Log(key.Hex(), val.Hex()) return true diff --git a/core/types/transaction.go b/core/types/transaction.go index f0afdca060..dca1ef50a5 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -27,6 +27,7 @@ import ( "time" "github.com/XinFinOrg/XDPoSChain/common" + "github.com/XinFinOrg/XDPoSChain/common/hexutil" "github.com/XinFinOrg/XDPoSChain/common/math" "github.com/XinFinOrg/XDPoSChain/crypto" "github.com/XinFinOrg/XDPoSChain/rlp" @@ -513,7 +514,7 @@ func (tx *Transaction) IsSigningTransaction() bool { if len(data) != (32*2 + 4) { return false } - method := common.ToHex(data[0:4]) + method := hexutil.Encode(data[0:4]) return method == common.SignMethod } @@ -524,7 +525,7 @@ func (tx *Transaction) IsVotingTransaction() (bool, *common.Address) { } var end int data := tx.Data() - method := common.ToHex(data[0:4]) + method := hexutil.Encode(data[0:4]) if method == common.VoteMethod || method == common.ProposeMethod || method == common.ResignMethod { end = len(data) } else if method == common.UnvoteMethod { @@ -558,7 +559,7 @@ func (tx *Transaction) IsXDCXApplyTransaction() bool { if len(data) != (32 + 4) { return false } - method := common.ToHex(data[0:4]) + method := hexutil.Encode(data[0:4]) return method == common.XDCXApplyMethod } @@ -581,7 +582,7 @@ func (tx *Transaction) IsXDCZApplyTransaction() bool { if len(data) != (32 + 4) { return false } - method := common.ToHex(data[0:4]) + method := hexutil.Encode(data[0:4]) return method == common.XDCZApplyMethod } diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 936c081534..6b391d03db 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -527,7 +527,7 @@ func (ec *Client) SendTransaction(ctx context.Context, tx *types.Transaction) er if err != nil { return err } - return ec.c.CallContext(ctx, nil, "eth_sendRawTransaction", common.ToHex(data)) + return ec.c.CallContext(ctx, nil, "eth_sendRawTransaction", hexutil.Encode(data)) } func toBlockNumArg(number *big.Int) string { @@ -550,7 +550,7 @@ func (ec *Client) SendOrderTransaction(ctx context.Context, tx *types.OrderTrans if err != nil { return err } - return ec.c.CallContext(ctx, nil, "XDCx_sendOrderRawTransaction", common.ToHex(data)) + return ec.c.CallContext(ctx, nil, "XDCx_sendOrderRawTransaction", hexutil.Encode(data)) } // SendLendingTransaction send lending to pool @@ -559,7 +559,7 @@ func (ec *Client) SendLendingTransaction(ctx context.Context, tx *types.LendingT if err != nil { return err } - return ec.c.CallContext(ctx, nil, "XDCx_sendLendingRawTransaction", common.ToHex(data)) + return ec.c.CallContext(ctx, nil, "XDCx_sendLendingRawTransaction", hexutil.Encode(data)) } func toCallArg(msg ethereum.CallMsg) interface{} {