From 0b40d69b75be374c15904d8e044b9c468dbcce6d Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Tue, 11 Jan 2022 13:22:10 +0200 Subject: [PATCH 1/3] lint fixes --- accounts/abi/bind/backends/simulated.go | 22 +++++++++++----------- core/evm.go | 4 ++-- core/vm/arbitrum_evm.go | 1 - params/config.go | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 51d87b06986d..2eab7e77c2d5 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -800,17 +800,17 @@ type callMsg struct { } func (m callMsg) UnderlyingTransaction() *types.Transaction { return nil } -func (m callMsg) From() common.Address { return m.CallMsg.From } -func (m callMsg) Nonce() uint64 { return 0 } -func (m callMsg) IsFake() bool { return true } -func (m callMsg) To() *common.Address { return m.CallMsg.To } -func (m callMsg) GasPrice() *big.Int { return m.CallMsg.GasPrice } -func (m callMsg) GasFeeCap() *big.Int { return m.CallMsg.GasFeeCap } -func (m callMsg) GasTipCap() *big.Int { return m.CallMsg.GasTipCap } -func (m callMsg) Gas() uint64 { return m.CallMsg.Gas } -func (m callMsg) Value() *big.Int { return m.CallMsg.Value } -func (m callMsg) Data() []byte { return m.CallMsg.Data } -func (m callMsg) AccessList() types.AccessList { return m.CallMsg.AccessList } +func (m callMsg) From() common.Address { return m.CallMsg.From } +func (m callMsg) Nonce() uint64 { return 0 } +func (m callMsg) IsFake() bool { return true } +func (m callMsg) To() *common.Address { return m.CallMsg.To } +func (m callMsg) GasPrice() *big.Int { return m.CallMsg.GasPrice } +func (m callMsg) GasFeeCap() *big.Int { return m.CallMsg.GasFeeCap } +func (m callMsg) GasTipCap() *big.Int { return m.CallMsg.GasTipCap } +func (m callMsg) Gas() uint64 { return m.CallMsg.Gas } +func (m callMsg) Value() *big.Int { return m.CallMsg.Value } +func (m callMsg) Data() []byte { return m.CallMsg.Data } +func (m callMsg) AccessList() types.AccessList { return m.CallMsg.AccessList } // filterBackend implements filters.Backend to support filtering for logs without // taking bloom-bits acceleration structures into account. diff --git a/core/evm.go b/core/evm.go index 23e2e4eedd3f..4fcbae538130 100644 --- a/core/evm.go +++ b/core/evm.go @@ -73,8 +73,8 @@ func NewEVMTxContext(msg Message) vm.TxContext { originWasRemapped = txType == types.ArbitrumUnsignedTxType || txType == types.ArbitrumContractTxType } return vm.TxContext{ - Origin: msg.From(), - GasPrice: new(big.Int).Set(msg.GasPrice()), + Origin: msg.From(), + GasPrice: new(big.Int).Set(msg.GasPrice()), OriginWasRemapped: originWasRemapped, } } diff --git a/core/vm/arbitrum_evm.go b/core/vm/arbitrum_evm.go index 231085129199..e99788400631 100644 --- a/core/vm/arbitrum_evm.go +++ b/core/vm/arbitrum_evm.go @@ -34,7 +34,6 @@ func (p DefaultTxProcessor) GasChargingHook(gasRemaining *uint64) error { } func (p DefaultTxProcessor) EndTxHook(totalGasUsed uint64, success bool) { - return } func (p DefaultTxProcessor) NonrefundableGas() uint64 { diff --git a/params/config.go b/params/config.go index cf781694321f..d85f56b37a27 100644 --- a/params/config.go +++ b/params/config.go @@ -357,7 +357,7 @@ type ChainConfig struct { Ethash *EthashConfig `json:"ethash,omitempty"` Clique *CliqueConfig `json:"clique,omitempty"` - ArbitrumChainParams ArbitrumChainParams `json:"abitrum,omitempty` + ArbitrumChainParams ArbitrumChainParams `json:"arbitrum,omitempty"` } // EthashConfig is the consensus engine configs for proof-of-work based sealing. From 24765322b05a96d56b77b42dc770998cfc4629a8 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Wed, 19 Jan 2022 13:06:49 +0200 Subject: [PATCH 2/3] lint fixes avoiding merge conflicts --- accounts/abi/bind/backends/simulated.go | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 2eab7e77c2d5..614b9120b9ce 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -800,17 +800,18 @@ type callMsg struct { } func (m callMsg) UnderlyingTransaction() *types.Transaction { return nil } -func (m callMsg) From() common.Address { return m.CallMsg.From } -func (m callMsg) Nonce() uint64 { return 0 } -func (m callMsg) IsFake() bool { return true } -func (m callMsg) To() *common.Address { return m.CallMsg.To } -func (m callMsg) GasPrice() *big.Int { return m.CallMsg.GasPrice } -func (m callMsg) GasFeeCap() *big.Int { return m.CallMsg.GasFeeCap } -func (m callMsg) GasTipCap() *big.Int { return m.CallMsg.GasTipCap } -func (m callMsg) Gas() uint64 { return m.CallMsg.Gas } -func (m callMsg) Value() *big.Int { return m.CallMsg.Value } -func (m callMsg) Data() []byte { return m.CallMsg.Data } -func (m callMsg) AccessList() types.AccessList { return m.CallMsg.AccessList } + +func (m callMsg) From() common.Address { return m.CallMsg.From } +func (m callMsg) Nonce() uint64 { return 0 } +func (m callMsg) IsFake() bool { return true } +func (m callMsg) To() *common.Address { return m.CallMsg.To } +func (m callMsg) GasPrice() *big.Int { return m.CallMsg.GasPrice } +func (m callMsg) GasFeeCap() *big.Int { return m.CallMsg.GasFeeCap } +func (m callMsg) GasTipCap() *big.Int { return m.CallMsg.GasTipCap } +func (m callMsg) Gas() uint64 { return m.CallMsg.Gas } +func (m callMsg) Value() *big.Int { return m.CallMsg.Value } +func (m callMsg) Data() []byte { return m.CallMsg.Data } +func (m callMsg) AccessList() types.AccessList { return m.CallMsg.AccessList } // filterBackend implements filters.Backend to support filtering for logs without // taking bloom-bits acceleration structures into account. From ef0b0a0d5401b9dfcb509d6143987177f4304d10 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Sun, 23 Jan 2022 14:37:49 +0200 Subject: [PATCH 3/3] avoid conflicts --- core/evm.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/evm.go b/core/evm.go index 4fcbae538130..f2a33dfa2f3d 100644 --- a/core/evm.go +++ b/core/evm.go @@ -73,8 +73,9 @@ func NewEVMTxContext(msg Message) vm.TxContext { originWasRemapped = txType == types.ArbitrumUnsignedTxType || txType == types.ArbitrumContractTxType } return vm.TxContext{ - Origin: msg.From(), - GasPrice: new(big.Int).Set(msg.GasPrice()), + Origin: msg.From(), + GasPrice: new(big.Int).Set(msg.GasPrice()), + OriginWasRemapped: originWasRemapped, } }