[WIP] Enable blockchain EEST #223

ulbqb · 2025-01-22T07:54:09Z

This PR is under refactoring.

refactoring Tasks:

main code
- remove common.IsPrecompiledContractAddress
- remove blockchain.UseKaiaCancunExtCodeHashFee
- remove blockchain.GasLimitInExecutionSpecTest
- remove blockchain.CreateContractWithCodeFormatInExecutionSpecTest
- remove types.IsPragueInExecutionSpecTest
- remove gxhash.CustomInitialize
- remove change of main code in decode
test code

test: Enable Shanghai and Cancun EIPs blockchain test by Cancun and Prague forks

test: Enable prague's EIP7623

* Enable eip 2935 on blockchain EEST * Fix cyclic import * Fix for lint

test: EETS Set precompile correctly

* Enable old forks other than frontier and byzantium * Restore all old fork tests

ulbqb · 2025-01-22T08:27:14Z

blockchain/genesis.go

+			if CreateContractWithCodeFormatInExecutionSpecTest {
+				stateDB.CreateSmartContractAccount(addr, params.CodeFormatEVM, g.Config.Rules(new(big.Int).SetUint64(g.Number)))
+			}


If a code has delegation prefix, SetCodeToEOA should be used for 7702.

This can be done in test code. Or this is bug.

ulbqb · 2025-01-22T08:35:50Z

tests/block_test.go

+	"github.com/kaiachain/kaia/blockchain/types"
+	"github.com/kaiachain/kaia/common"
+	"github.com/kaiachain/kaia/consensus/gxhash"
+	"github.com/stretchr/testify/suite"
 )

 func TestBlockchain(t *testing.T) {


I think it's ok to remove this.

Mdaiki0730 · 2025-01-22T09:58:53Z

tests/init_test.go

@@ -223,7 +224,7 @@ func (tm *testMatcher) runTestFile(t *testing.T, path, name string, runTest inte
 			t.Skip("Skipped by whitelist")
 		}
 	}
-	t.Parallel()
+	// t.Parallel()


Nice to have: Enable this

Mdaiki0730 · 2025-01-22T10:01:21Z

tests/block_test_util.go

@@ -159,11 +199,13 @@ See https://github.com/ethereum/tests/wiki/Blockchain-Tests-II
 	expected we are expected to ignore it and continue processing and then validate the
 	post state.
 */
-func (t *BlockTest) insertBlocks(blockchain *blockchain.BlockChain) ([]btBlock, error) {
+func (t *BlockTest) insertBlocks(bc *blockchain.BlockChain, preBlock *types.Block) ([]btBlock, error) {


We may not need to change insertBlock since it is no longer used.
We can also consider deleting it.

Mdaiki0730 · 2025-01-22T10:03:40Z

tests/block_test_util.go

+
+				// Because it is a eth test, we don't have to think about fee payer
+				// Because the baseFee is set to 0, Kaia's gas fee may be 0 if the transaction has a dynamic fee.
+				senderMap[tx.ValidatedSender()] = new(big.Int).Sub(


If tx.ValidatedSender() is already present in the map, you must add it to it.

Mdaiki0730 · 2025-01-22T10:04:41Z

tests/block_test_util.go

+}
+
+// Modify the decode function
+func (bb *btBlock) decode(latestParentHash common.Hash, latestRoot common.Hash) (*types.Block, error) {


It seems that decode is no longer necessary.

Mdaiki0730 · 2025-01-22T10:05:40Z

tests/block_test_util.go

+	}
+
+	// Decode header
+	var header TestHeader


Can't we use btHeader?

ulbqb · 2025-01-23T01:52:57Z

blockchain/blockchain.go

+	if GasLimitInExecutionSpecTest != 0 {
+		blockContext.GasLimit = GasLimitInExecutionSpecTest
+	}


First, it's correct that Kaia's GasLimit is zero?

ulbqb · 2025-01-23T01:53:16Z

blockchain/blockchain.go

+
+	// when execution spec test, we can insert test GasLimit to blockContext.
+	if UseKaiaCancunExtCodeHashFee && chainConfig.Rules(header.Number).IsCancun {
+		// EIP-1052 must be activated for backward compatibility on Kaia. But EIP-2929 is activated instead of it on Ethereum
+		vm.ChangeGasCostForTest(&vmenv.Config.JumpTable, vm.EXTCODEHASH, params.WarmStorageReadCostEIP2929)
+	}
+


This can be implemented in test code.

ulbqb · 2025-01-23T01:57:04Z

blockchain/types/tx_internal_data_fee_delegated_value_transfer.go

@@ -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)))) {


This can be removed, executing test for each fork?

ulbqb · 2025-01-23T02:10:24Z

tests/block_test.go

+func (suite *ExecutionSpecBlockTestSuite) TearDownSuite() {
+	// Reset global variables for test
+	common.IsPrecompiledContractAddress = suite.originalIsPrecompiledContractAddress
+	blockchain.UseKaiaCancunExtCodeHashFee = false
+	blockchain.GasLimitInExecutionSpecTest = 0
+	blockchain.CreateContractWithCodeFormatInExecutionSpecTest = false
+	types.IsPragueInExecutionSpecTest = false
+	gxhash.CustomInitialize = nil
+}


Using build tag, can these be switched?

ulbqb · 2025-01-23T02:19:13Z

tests/block_test_util.go

-	if gblock.Hash() != t.json.Genesis.Hash {
-		return fmt.Errorf("genesis block hash doesn't match test: computed=%x, test=%x", gblock.Hash().Bytes()[:6], t.json.Genesis.Hash[:6])
+
+	st := MakePreState(db, t.json.Pre, true, config.Rules(gblock.Number()))


After this, can we overwrite pre state?

ulbqb · 2025-01-23T02:20:40Z

tests/block_test_util.go

+	config.SetDefaults()
+	// Since we calculate the baseFee differently than eth, we will set it to 0 to turn off the gas fee.
+	config.Governance.KIP71 = &params.KIP71Config{
+		LowerBoundBaseFee:         0,
+		UpperBoundBaseFee:         0,
+		GasTarget:                 0,
+		MaxBlockGasUsedForBaseFee: 0,
+		BaseFeeDenominator:        0,
+	}
+	blockchain.InitDeriveSha(config)


I want to know how config is. Description of blockchain config is needed.

ulbqb · 2025-01-23T02:54:31Z

tests/block_test_util.go

+			ethReward:  ethReward,
+		}
+
+		i, err := bc.InsertChain(blocks)


Is the same block executed twice?

No, only one block is generated by GenerateChain, so one block is inserted.

ulbqb · 2025-01-23T02:56:45Z

tests/block_test_util.go

+		if rewardList, exist := rewardMap[addr]; exist {
+			// In the case of rewardBaseAddress, the Kaia reward will be deducted once.
+			statedb.SubBalance(addr, rewardList.kaiaReward)
+			statedb.AddBalance(addr, rewardList.ethReward)
+		}


This should be run before loop.

* Remove gxhash global variable * Remove unused code

test: Remove some main code modifications in EETS

test: Refactor eets blockchain test flow

Mdaiki0730 · 2025-01-28T23:52:00Z

There are some comments for refactoring, so I will close this PR and create a new one.

Mdaiki0730 and others added 16 commits January 16, 2025 19:30

Exec blockchain test

c278eb6

Change common.IsPrecompiledContractAddress to a global variable

802eefc

Resolve gas differences with eth

24a5244

Resolve concurrency issues

e4d3eb4

Changed to be able to decode eth tx types other than legacy

43b8342

Refactor

877e495

Merge pull request #211 from Mdaiki0730/feat/shanghai-cancun-eets

b474ad6

test: Enable Shanghai and Cancun EIPs blockchain test by Cancun and Prague forks

Enable EIP7623 tests

3a3b74b

Merge pull request #214 from Mdaiki0730/feat/enable-prague-7623

7db495f

test: Enable prague's EIP7623

Enable eip2935 on Blockchain EEST (#213)

ca0ff65

* Enable eip 2935 on blockchain EEST * Fix cyclic import * Fix for lint

Enable checking storage (#215)

10405e2

Set precompile correctly

ca8395e

Merge pull request #220 from Mdaiki0730/feat/set-precompile-correctly

b012898

test: EETS Set precompile correctly

Enable old forks for blockchain EEST (#221)

7baf716

* Enable old forks other than frontier and byzantium * Restore all old fork tests

Reset global variables for gxhash (#222)

af57de8

Remove unused file (#224)

b0a2516

ulbqb commented Jan 22, 2025

View reviewed changes

Mdaiki0730 reviewed Jan 22, 2025

View reviewed changes

ulbqb commented Jan 23, 2025

View reviewed changes

ulbqb and others added 3 commits January 27, 2025 16:43

Remove a gxhash global variable (#234)

0276a4e

* Remove gxhash global variable * Remove unused code

Set reward in Finalize (#235)

77ad493

Self decode to convert to kaia's eth tx type

b4fc2d9

Mdaiki0730 and others added 7 commits January 27, 2025 19:55

Remove global variables and aggregate them in the test engine

bd1bee7

Merge pull request #231 from Mdaiki0730/feat/eets-refactor

64c368f

test: Remove some main code modifications in EETS

Add CodeFormatEVM when setting SCA in genesis

688ac24

Refactor eest blockchain test flow

b05c85c

Restore the isExecutionSpecTest condition

00b640c

Remove linter warning

8fcead0

Merge pull request #237 from Mdaiki0730/feat/eets-refactor-test-flow

621c6f2

test: Refactor eets blockchain test flow

Mdaiki0730 closed this Jan 28, 2025

github-actions bot locked and limited conversation to collaborators Jan 28, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Enable blockchain EEST #223

[WIP] Enable blockchain EEST #223

ulbqb commented Jan 22, 2025 •

edited by Mdaiki0730

Loading

ulbqb Jan 22, 2025

ulbqb Jan 23, 2025 •

edited

Loading

ulbqb Jan 22, 2025

Mdaiki0730 Jan 22, 2025

Mdaiki0730 Jan 22, 2025

Mdaiki0730 Jan 22, 2025

Mdaiki0730 Jan 22, 2025

Mdaiki0730 Jan 22, 2025

ulbqb Jan 23, 2025

ulbqb Jan 23, 2025

ulbqb Jan 23, 2025 •

edited

Loading

ulbqb Jan 23, 2025

ulbqb Jan 23, 2025

ulbqb Jan 23, 2025

ulbqb Jan 23, 2025 •

edited

Loading

Mdaiki0730 Jan 28, 2025

ulbqb Jan 23, 2025

Mdaiki0730 commented Jan 28, 2025

[WIP] Enable blockchain EEST #223

[WIP] Enable blockchain EEST #223

Conversation

ulbqb commented Jan 22, 2025 • edited by Mdaiki0730 Loading

Choose a reason for hiding this comment

ulbqb Jan 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ulbqb Jan 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ulbqb Jan 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mdaiki0730 commented Jan 28, 2025

ulbqb commented Jan 22, 2025 •

edited by Mdaiki0730

Loading

ulbqb Jan 23, 2025 •

edited

Loading

ulbqb Jan 23, 2025 •

edited

Loading

ulbqb Jan 23, 2025 •

edited

Loading