diff --git a/core/state_transition.go b/core/state_transition.go index 2aae94e3bff5..85db36bf2924 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -17,7 +17,6 @@ package core import ( - "bytes" "errors" "fmt" "math" @@ -35,7 +34,6 @@ import ( var ( errInsufficientBalanceForGas = errors.New("insufficient balance to pay for gas") executionManagerAbi abi.ABI - ZeroAddress = common.HexToAddress("0000000000000000000000000000000000000000") ) func init() { @@ -229,6 +227,11 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo vmerr error ) + to := "" + if msg.To() != nil { + to = msg.To().Hex() + } + executionMgrTime := st.evm.Time if executionMgrTime.Cmp(big.NewInt(0)) == 0 { executionMgrTime = big.NewInt(1) @@ -238,17 +241,11 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo queueOrigin := big.NewInt(0) l1MessageSender := msg.L1MessageSender() - if l1MessageSender == nil || bytes.Equal(l1MessageSender.Bytes(), ZeroAddress.Bytes()) { - addr := common.HexToAddress("0000000000000000000000000000000000000000") + if l1MessageSender == nil { + addr := common.HexToAddress("") l1MessageSender = &addr - } else { - sender = vm.AccountRef(common.HexToAddress("0000000000000000000000000000000000000000")) } - to := "" - if msg.To() != nil { - to = msg.To().Hex() - } log.Debug("Applying transaction", "from", sender.Address().Hex(), "to", to, "nonce", msg.Nonce(), "l1MessageSender", l1MessageSender.Hex(), "data", hexutil.Encode(msg.Data())) if contractCreation {