Merge pull request #3157 from jorgemmsilva/fix/allow-unprotected-tx

fix: allow pre-EIP-155 transactions
iotaledger · Dec 11, 2023 · 70da30e · 70da30e
2 parents aa8a3fb + b7f8580
commit 70da30e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/packages/evm/jsonrpc/evmchain.go b/packages/evm/jsonrpc/evmchain.go
@@ -170,7 +170,7 @@ func (e *EVMChain) gasLimits() *gas.Limits {
 func (e *EVMChain) SendTransaction(tx *types.Transaction) error {
 	e.log.Debugf("SendTransaction(tx=%v)", tx)
 	chainID := e.ChainID()
-	if tx.ChainId().Uint64() != uint64(chainID) {
+	if tx.Protected() && tx.ChainId().Uint64() != uint64(chainID) {
 		return errors.New("chain ID mismatch")
 	}
 	signer, err := e.Signer()

diff --git a/packages/vm/core/evm/evmimpl/impl.go b/packages/vm/core/evm/evmimpl/impl.go
@@ -110,7 +110,7 @@ func applyTransaction(ctx isc.Sandbox) dict.Dict {
 
 	emu := createEmulator(ctx)
 
-	if tx.ChainId().Uint64() != uint64(emu.BlockchainDB().GetChainID()) {
+	if tx.Protected() && tx.ChainId().Uint64() != uint64(emu.BlockchainDB().GetChainID()) {
 		panic(errChainIDMismatch)
 	}
 

diff --git a/packages/vm/core/evm/evmtest/contractInstance.go b/packages/vm/core/evm/evmtest/contractInstance.go
@@ -103,7 +103,7 @@ func (e *EVMContractInstance) buildEthTx(opts []ethCallOptions, fnName string, a
 
 	unsignedTx := types.NewTransaction(nonce, e.address, opt.value, opt.gasLimit, opt.gasPrice, callData)
 
-	return types.SignTx(unsignedTx, e.chain.signer(), opt.sender)
+	return types.SignTx(unsignedTx, e.chain.getSigner(), opt.sender)
 }
 
 func (e *EVMContractInstance) estimateGas(opts []ethCallOptions, fnName string, args ...interface{}) (uint64, error) {

diff --git a/packages/vm/core/evm/evmtest/evm_test.go b/packages/vm/core/evm/evmtest/evm_test.go
@@ -1598,7 +1598,7 @@ func TestEVMGasPriceMismatch(t *testing.T) {
 	nonce := storage.chain.getNonce(senderAddress)
 	unsignedTx := types.NewTransaction(nonce, storage.address, util.Big0, env.maxGasLimit(), gasPrice, callArguments)
 
-	tx, err := types.SignTx(unsignedTx, storage.chain.signer(), ethKey)
+	tx, err := types.SignTx(unsignedTx, storage.chain.getSigner(), ethKey)
 	require.NoError(t, err)
 
 	err = storage.chain.evmChain.SendTransaction(tx)
@@ -2196,3 +2196,14 @@ func TestDecimalsConversion(t *testing.T) {
 	)
 	require.ErrorContains(t, err, "execution reverted")
 }
+
+func TestPreEIP155Transaction(t *testing.T) {
+	env := InitEVM(t)
+	ethKey, _ := env.Chain.EthereumAccountByIndexWithL2Funds(0)
+
+	// set a signer without replay protection
+	env.setSigner(types.HomesteadSigner{})
+
+	// deploy solidity `storage` contract, it should suceeed
+	env.deployStorageContract(ethKey)
+}
diff --git a/packages/vm/core/evm/evmtest/setup.go b/packages/vm/core/evm/evmtest/setup.go
@@ -36,6 +36,7 @@ type SoloChainEnv struct {
 	Chain      *solo.Chain
 	evmChainID uint16
 	evmChain   *jsonrpc.EVMChain
+	signer     types.Signer
 }
 
 type iscCallOptions struct {
@@ -70,6 +71,7 @@ func InitEVMWithSolo(t testing.TB, env *solo.Solo) *SoloChainEnv {
 		Chain:      soloChain,
 		evmChainID: evm.DefaultChainID,
 		evmChain:   soloChain.EVM(),
+		signer:     evmutil.Signer(big.NewInt(int64(evm.DefaultChainID))),
 	}
 }
 
@@ -256,8 +258,12 @@ func (e *SoloChainEnv) deployERC20ExampleContract(creator *ecdsa.PrivateKey) *er
 	return &erc20ContractInstance{e.DeployContract(creator, evmtest.ERC20ExampleContractABI, evmtest.ERC20ExampleContractBytecode)}
 }
 
-func (e *SoloChainEnv) signer() types.Signer {
-	return evmutil.Signer(big.NewInt(int64(e.evmChainID)))
+func (e *SoloChainEnv) setSigner(s types.Signer) {
+	e.signer = s
+}
+
+func (e *SoloChainEnv) getSigner() types.Signer {
+	return e.signer
 }
 
 func (e *SoloChainEnv) maxGasLimit() uint64 {
@@ -291,7 +297,7 @@ func (e *SoloChainEnv) DeployContract(creator *ecdsa.PrivateKey, abiJSON string,
 
 	tx, err := types.SignTx(
 		types.NewContractCreation(nonce, value, gasLimit, e.evmChain.GasPrice(), data),
-		e.signer(),
+		e.getSigner(),
 		creator,
 	)
 	require.NoError(e.t, err)