From 3c21125da5c1a2a61aabd9d7c901607270bc27b1 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Thu, 16 Mar 2023 11:33:58 +0800 Subject: [PATCH] fix EmptyAddress --- XDCxlending/lendingstate/common.go | 2 +- eth/hooks/engine_v1_hooks.go | 2 +- internal/ethapi/api.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/XDCxlending/lendingstate/common.go b/XDCxlending/lendingstate/common.go index 9527d79227..3f52854640 100644 --- a/XDCxlending/lendingstate/common.go +++ b/XDCxlending/lendingstate/common.go @@ -10,7 +10,7 @@ import ( ) var ( - EmptyAddress = "0x0000000000000000000000000000000000000000" + EmptyAddress = "xdc0000000000000000000000000000000000000000" EmptyRoot = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421") ) diff --git a/eth/hooks/engine_v1_hooks.go b/eth/hooks/engine_v1_hooks.go index d2d847ff5b..9d14e7a3a4 100644 --- a/eth/hooks/engine_v1_hooks.go +++ b/eth/hooks/engine_v1_hooks.go @@ -238,7 +238,7 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf if err != nil { return nil, err } - if address.String() != "0x0000000000000000000000000000000000000000" { + if address.String() != "xdc0000000000000000000000000000000000000000" { candidates = append(candidates, utils.Masternode{Address: address, Stake: v}) } } diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 105b59a523..de1171617d 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -754,7 +754,7 @@ func (s *PublicBlockChainAPI) GetCandidateStatus(ctx context.Context, coinbaseAd candidatesAddresses := state.GetCandidates(statedb) for _, address := range candidatesAddresses { v := state.GetCandidateCap(statedb, address) - if address.String() != "0x0000000000000000000000000000000000000000" { + if address.String() != "xdc0000000000000000000000000000000000000000" { candidates = append(candidates, utils.Masternode{Address: address, Stake: v}) } } @@ -880,7 +880,7 @@ func (s *PublicBlockChainAPI) GetCandidates(ctx context.Context, epoch rpc.Epoch candidatesAddresses := state.GetCandidates(statedb) for _, address := range candidatesAddresses { v := state.GetCandidateCap(statedb, address) - if address.String() != "0x0000000000000000000000000000000000000000" { + if address.String() != "xdc0000000000000000000000000000000000000000" { candidates = append(candidates, utils.Masternode{Address: address, Stake: v}) } } @@ -1009,7 +1009,7 @@ func (s *PublicBlockChainAPI) getCandidatesFromSmartContract() ([]utils.Masterno if err != nil { return []utils.Masternode{}, err } - if candidate.String() != "0x0000000000000000000000000000000000000000" { + if candidate.String() != "xdc0000000000000000000000000000000000000000" { candidatesWithStakeInfo = append(candidatesWithStakeInfo, utils.Masternode{Address: candidate, Stake: v}) }