tests: Enable EEST blockchainTests

blockchain/blockchain.go

@@ -2764,6 +2764,16 @@ func (bc *BlockChain) ApplyTransaction(chainConfig *params.ChainConfig, author *
 	// Create a new environment which holds all relevant information
 	// about the transaction and calling mechanisms.
 	vmenv := vm.NewEVM(blockContext, txContext, statedb, chainConfig, vmConfig)
+
+	// change evm and msg for eest
+	if bc != nil {
+		if e, hasMethod := bc.Engine().(interface {
+			BeforeApplyMessage(*vm.EVM, *types.Transaction)
+		}); hasMethod {
+			e.BeforeApplyMessage(vmenv, msg)
+		}
+	}
+
 	// Apply the transaction to the current state (included in the env)
 	result, err := ApplyMessage(vmenv, msg)
 	if err != nil {

blockchain/chain_makers.go

@@ -102,6 +102,22 @@ func (b *BlockGen) AddTxWithChain(bc *BlockChain, tx *types.Transaction) {
 	b.receipts = append(b.receipts, receipt)
 }
 
+// AddTxWithChainEvenHasError is an AddTx that inherits the vmConfig of the received chain
+// and does not panic even if an error occurs.
+func (b *BlockGen) AddTxWithChainEvenHasError(bc *BlockChain, tx *types.Transaction) error {
+	b.statedb.SetTxContext(tx.Hash(), common.Hash{}, len(b.txs))
+	var vmConfig vm.Config
+	if bc != nil {
+		vmConfig = bc.vmConfig
+	}
+	receipt, _, _ := bc.ApplyTransaction(b.config, &params.AuthorAddressForTesting, b.statedb, b.header, tx, &b.header.GasUsed, &vmConfig)
+	b.txs = append(b.txs, tx)
+	if receipt != nil {
+		b.receipts = append(b.receipts, receipt)
+	}
+	return nil
+}
+
 // AddUncheckedTx forcefully adds a transaction to the block without any
 // validation.
 //

blockchain/genesis.go

@@ -310,7 +310,17 @@ func (g *Genesis) ToBlock(baseStateRoot common.Hash, db database.DBManager) *typ
 	for addr, account := range g.Alloc {
 		if len(account.Code) != 0 {
 			originalCode := stateDB.GetCode(addr)
-			stateDB.SetCode(addr, account.Code)
+			rules := g.Config.Rules(new(big.Int).SetUint64(g.Number))
+			if rules.IsPrague {
+				if _, ok := types.ParseDelegation(account.Code); ok {
+					stateDB.SetCodeToEOA(addr, account.Code, rules)
+				} else {
+					stateDB.CreateSmartContractAccount(addr, params.CodeFormatEVM, rules)
+					stateDB.SetCode(addr, account.Code)
+				}
+			} else {
+				stateDB.SetCode(addr, account.Code)
+			}
 			// If originalCode is not nil,
 			// just update the code and don't change the other states
 			if originalCode != nil {

blockchain/state/statedb.go

@@ -882,6 +882,19 @@ func (s *StateDB) SetLegacyAccountForTest(addr common.Address, nonce uint64, bal
 	s.setStateObject(newobj)
 }
 
+func (s *StateDB) ForEachAccount(cb func(addr common.Address, data account.Account)) {
+	it := statedb.NewIterator(s.trie.NodeIterator(nil))
+	for it.Next() {
+		addr := s.trie.GetKey(it.Key)
+		serializer := account.NewAccountSerializer()
+		if err := rlp.DecodeBytes(it.Value, serializer); err != nil {
+			panic(err)
+		}
+		data := serializer.GetAccount()
+		cb(common.BytesToAddress(addr), data)
+	}
+}
+
 func (s *StateDB) ForEachStorage(addr common.Address, cb func(key, value common.Hash) bool) {
 	so := s.getStateObject(addr)
 	if so == nil {

blockchain/types/tx_internal_data_account_creation.go

@@ -454,7 +454,7 @@ func (t *TxInternalDataAccountCreation) Validate(stateDB StateDB, currentBlockNu
 	//if t.HumanReadable {
 	//	return kerrors.ErrHumanReadableNotSupported
 	//}
-	//if common.IsPrecompiledContractAddress(t.Recipient) {
+	//if common.IsPrecompiledContractAddress(t.Recipient, fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 	//	return kerrors.ErrPrecompiledContractAddress
 	//}
 	//if err := t.Key.CheckInstallable(currentBlockNumber); err != nil {

blockchain/types/tx_internal_data_ethereum_access_list.go

@@ -429,7 +429,7 @@ func (t *TxInternalDataEthereumAccessList) String() string {
 
 func (t *TxInternalDataEthereumAccessList) Validate(stateDB StateDB, currentBlockNumber uint64) error {
 	if t.Recipient != nil {
-		if common.IsPrecompiledContractAddress(*t.Recipient) {
+		if common.IsPrecompiledContractAddress(*t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 			return kerrors.ErrPrecompiledContractAddress
 		}
 	}

blockchain/types/tx_internal_data_ethereum_dynamic_fee.go

@@ -425,7 +425,7 @@ func (t *TxInternalDataEthereumDynamicFee) SenderTxHash() common.Hash {
 
 func (t *TxInternalDataEthereumDynamicFee) Validate(stateDB StateDB, currentBlockNumber uint64) error {
 	if t.Recipient != nil {
-		if common.IsPrecompiledContractAddress(*t.Recipient) {
+		if common.IsPrecompiledContractAddress(*t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 			return kerrors.ErrPrecompiledContractAddress
 		}
 	}

blockchain/types/tx_internal_data_ethereum_set_code.go

@@ -407,7 +407,7 @@ func (t *TxInternalDataEthereumSetCode) Validate(stateDB StateDB, currentBlockNu
 	if t.Recipient == (common.Address{}) {
 		return kerrors.ErrEmptyRecipient
 	} else {
-		if common.IsPrecompiledContractAddress(t.Recipient) {
+		if common.IsPrecompiledContractAddress(t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 			return kerrors.ErrPrecompiledContractAddress
 		}
 	}

blockchain/types/tx_internal_data_fee_delegated_smart_contract_deploy.go

@@ -391,7 +391,7 @@ func (t *TxInternalDataFeeDelegatedSmartContractDeploy) Validate(stateDB StateDB
 	} else {
 		to = crypto.CreateAddress(t.From, t.AccountNonce)
 	}
-	if common.IsPrecompiledContractAddress(to) {
+	if common.IsPrecompiledContractAddress(to, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	if t.HumanReadable {

blockchain/types/tx_internal_data_fee_delegated_smart_contract_deploy_with_ratio.go

@@ -415,7 +415,7 @@ func (t *TxInternalDataFeeDelegatedSmartContractDeployWithRatio) Validate(stateD
 	} else {
 		to = crypto.CreateAddress(t.From, t.AccountNonce)
 	}
-	if common.IsPrecompiledContractAddress(to) {
+	if common.IsPrecompiledContractAddress(to, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	if t.HumanReadable {

blockchain/types/tx_internal_data_fee_delegated_value_transfer.go

@@ -28,6 +28,7 @@ import (
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/common/hexutil"
 	"github.com/kaiachain/kaia/crypto/sha3"
+	"github.com/kaiachain/kaia/fork"
 	"github.com/kaiachain/kaia/kerrors"
 	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/rlp"
@@ -316,7 +317,7 @@ func (t *TxInternalDataFeeDelegatedValueTransfer) SenderTxHash() common.Hash {
 }
 
 func (t *TxInternalDataFeeDelegatedValueTransfer) Validate(stateDB StateDB, currentBlockNumber uint64) error {
-	if common.IsPrecompiledContractAddress(t.Recipient) {
+	if common.IsPrecompiledContractAddress(t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	return t.ValidateMutableValue(stateDB, currentBlockNumber)

blockchain/types/tx_internal_data_fee_delegated_value_transfer_memo.go

@@ -343,7 +343,7 @@ func (t *TxInternalDataFeeDelegatedValueTransferMemo) SenderTxHash() common.Hash
 }
 
 func (t *TxInternalDataFeeDelegatedValueTransferMemo) Validate(stateDB StateDB, currentBlockNumber uint64) error {
-	if common.IsPrecompiledContractAddress(t.Recipient) {
+	if common.IsPrecompiledContractAddress(t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	return t.ValidateMutableValue(stateDB, currentBlockNumber)

blockchain/types/tx_internal_data_fee_delegated_value_transfer_memo_with_ratio.go

@@ -367,7 +367,7 @@ func (t *TxInternalDataFeeDelegatedValueTransferMemoWithRatio) SenderTxHash() co
 }
 
 func (t *TxInternalDataFeeDelegatedValueTransferMemoWithRatio) Validate(stateDB StateDB, currentBlockNumber uint64) error {
-	if common.IsPrecompiledContractAddress(t.Recipient) {
+	if common.IsPrecompiledContractAddress(t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	return t.ValidateMutableValue(stateDB, currentBlockNumber)

blockchain/types/tx_internal_data_fee_delegated_value_transfer_with_ratio.go

@@ -28,6 +28,7 @@ import (
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/common/hexutil"
 	"github.com/kaiachain/kaia/crypto/sha3"
+	"github.com/kaiachain/kaia/fork"
 	"github.com/kaiachain/kaia/kerrors"
 	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/rlp"
@@ -338,7 +339,7 @@ func (t *TxInternalDataFeeDelegatedValueTransferWithRatio) SenderTxHash() common
 }
 
 func (t *TxInternalDataFeeDelegatedValueTransferWithRatio) Validate(stateDB StateDB, currentBlockNumber uint64) error {
-	if common.IsPrecompiledContractAddress(t.Recipient) {
+	if common.IsPrecompiledContractAddress(t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	return t.ValidateMutableValue(stateDB, currentBlockNumber)

blockchain/types/tx_internal_data_legacy.go

@@ -361,7 +361,7 @@ func (t *TxInternalDataLegacy) String() string {
 
 func (t *TxInternalDataLegacy) Validate(stateDB StateDB, currentBlockNumber uint64) error {
 	if t.Recipient != nil {
-		if common.IsPrecompiledContractAddress(*t.Recipient) {
+		if common.IsPrecompiledContractAddress(*t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 			return kerrors.ErrPrecompiledContractAddress
 		}
 	}

blockchain/types/tx_internal_data_smart_contract_deploy.go

@@ -356,7 +356,7 @@ func (t *TxInternalDataSmartContractDeploy) Validate(stateDB StateDB, currentBlo
 	} else {
 		to = crypto.CreateAddress(t.From, t.AccountNonce)
 	}
-	if common.IsPrecompiledContractAddress(to) {
+	if common.IsPrecompiledContractAddress(to, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	if t.HumanReadable {

blockchain/types/tx_internal_data_value_transfer.go

@@ -27,6 +27,7 @@ import (
 	"github.com/kaiachain/kaia/common"
 	"github.com/kaiachain/kaia/common/hexutil"
 	"github.com/kaiachain/kaia/crypto/sha3"
+	"github.com/kaiachain/kaia/fork"
 	"github.com/kaiachain/kaia/kerrors"
 	"github.com/kaiachain/kaia/params"
 	"github.com/kaiachain/kaia/rlp"
@@ -284,7 +285,7 @@ func (t *TxInternalDataValueTransfer) SenderTxHash() common.Hash {
 }
 
 func (t *TxInternalDataValueTransfer) Validate(stateDB StateDB, currentBlockNumber uint64) error {
-	if common.IsPrecompiledContractAddress(t.Recipient) {
+	if common.IsPrecompiledContractAddress(t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	return t.ValidateMutableValue(stateDB, currentBlockNumber)

blockchain/types/tx_internal_data_value_transfer_memo.go

@@ -308,7 +308,7 @@ func (t *TxInternalDataValueTransferMemo) SenderTxHash() common.Hash {
 }
 
 func (t *TxInternalDataValueTransferMemo) Validate(stateDB StateDB, currentBlockNumber uint64) error {
-	if common.IsPrecompiledContractAddress(t.Recipient) {
+	if common.IsPrecompiledContractAddress(t.Recipient, *fork.Rules(big.NewInt(int64(currentBlockNumber)))) {
 		return kerrors.ErrPrecompiledContractAddress
 	}
 	return t.ValidateMutableValue(stateDB, currentBlockNumber)

blockchain/vm/contracts.go

@@ -23,7 +23,6 @@
 package vm
 
 import (
-	"bytes"
 	"crypto/ecdsa"
 	"crypto/sha256"
 	"encoding/binary"
@@ -218,31 +217,6 @@ func ActivePrecompiles(rules params.Rules) []common.Address {
 	}
 }
 
-// IsPrecompiledContractAddress returns true if this is used for TestExecutionSpecState and the input address is one of precompiled contract addresses.
-func IsPrecompiledContractAddress(addr common.Address, rules params.Rules) bool {
-	if relaxPrecompileRangeForTest {
-		activePrecompiles := ActivePrecompiles(rules)
-		for _, pre := range activePrecompiles {
-			// skip 0x0a and 0x0b if before Prague
-			if !rules.IsPrague && (bytes.Compare(pre.Bytes(), []byte{10}) == 0 || bytes.Compare(pre.Bytes(), []byte{11}) == 0) {
-				continue
-			}
-			if bytes.Compare(pre.Bytes(), addr.Bytes()) == 0 {
-				return true
-			}
-		}
-		return false
-	}
-	return common.IsPrecompiledContractAddress(addr)
-}
-
-var relaxPrecompileRangeForTest bool
-
-// Only for testing. Make sure to reset (false) after test.
-func RelaxPrecompileRangeForTest(enable bool) {
-	relaxPrecompileRangeForTest = enable
-}
-
 // RunPrecompiledContract runs and evaluates the output of a precompiled contract.
 func RunPrecompiledContract(p PrecompiledContract, input []byte, contract *Contract, evm *EVM) (ret []byte, computationCost uint64, err error) {
 	gas, computationCost := p.GetRequiredGasAndComputationCost(input)

blockchain/vm/evm.go

@@ -261,8 +261,7 @@ func (evm *EVM) Call(caller types.ContractRef, addr common.Address, input []byte
 	)
 
 	// Filter out invalid precompiled address calls, and create a precompiled contract object if it is not exist.
-	// Because IsPrecompiledContractAddress checks for 0..0x400 and ConsoleLog address is outside of the range, we add one more condition if UseConsoleLog.
-	if IsPrecompiledContractAddress(addr, evm.chainRules) || (addr == consoleLogContractAddress && evm.Config.UseConsoleLog) {
+	if common.IsPrecompiledContractAddress(addr, evm.chainRules) {
 		precompiles := evm.GetPrecompiledContractMap(caller.Address())
 		if precompiles[addr] == nil || value.Sign() != 0 {
 			// Return an error if an enabled precompiled address is called or a value is transferred to a precompiled address.
@@ -540,7 +539,7 @@ func (evm *EVM) create(caller types.ContractRef, codeAndHash *codeAndHash, gas u
 		return nil, common.Address{}, 0, ErrContractAddressCollision
 	}
 
-	if IsPrecompiledContractAddress(address, evm.chainRules) {
+	if common.IsPrecompiledContractAddress(address, evm.chainRules) {
 		return nil, common.Address{}, gas, kerrors.ErrPrecompiledContractAddress
 	}
 

common/types.go

@@ -353,10 +353,8 @@ func BigToAddress(b *big.Int) Address { return BytesToAddress(b.Bytes()) }
 // If s is larger than len(h), s will be cropped from the left.
 func HexToAddress(s string) Address { return BytesToAddress(FromHex(s)) }
 
-var relaxPrecompileRangeForTest bool
-
 // IsPrecompiledContractAddress returns true if the input address is in the range of precompiled contract addresses.
-func IsPrecompiledContractAddress(addr Address) bool {
+var IsPrecompiledContractAddress func(addr Address, rules interface{}) bool = func(addr Address, rules interface{}) bool {
 	if bytes.Compare(addr.Bytes(), lastPrecompiledContractAddressHex) > 0 || addr == (Address{}) {
 		return false
 	}