core/vm: implement EIP-3860: Limit and meter initcode #23847

gumb0 · 2021-11-02T14:55:41Z

Implementation of https://eips.ethereum.org/EIPS/eip-3860
Tests are in ethereum/tests#990 and ethereum/tests#1012

core/vm/gas_table.go

core/state_transition.go

axic · 2021-11-04T13:53:38Z

core/vm/gas_table.go

-	if wordGas, overflow = math.SafeMul(toWordSize(wordGas), params.Sha3WordGas); overflow {
+	lenWords := toWordSize(len)
+
+	hashingWordGas, overflow := math.SafeMul(lenWords, params.Sha3WordGas)


If this is moved to be the last step, then the size-related check can be deduplicated between gasCreate and gasCreate2. I think we also mentioned this in the EIP.

Not sure if this is a concern in geth, but thought to mention it.

It would be a bit tricky without having to repeat len, overflow := stack.Back(2).Uint64WithOverflow() and lenWords := toWordSize(len) calls, so I decided that maybe it's simpler to leave duplication.

core/vm/gas_table.go

holiman · 2021-11-05T18:45:23Z

core/state_transition.go

+	eip3860 := false
+	for _, eip := range st.evm.Config.ExtraEips {
+		if eip == 3860 {
+			eip3860 = true
+			break
+		}
+	}


I don't think this iteration should happen in here. IIRC we already do this somewhere else?

Yes in a private function in vm currently

Made HasEip3860() a public method of evm.Config, this iteration is not repeated now.

gumb0 · 2021-11-16T16:54:01Z

core/tx_pool.go

@@ -636,7 +636,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
 		return ErrInsufficientFunds
 	}
 	// Ensure the transaction has more gas than the basic tx fee.
-	intrGas, err := IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil, true, pool.istanbul)
+	intrGas, err := IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil, true, pool.istanbul, true)


Here TxPool is being conservative and always expects creation transactions to have enough gas to cover initcode charge.

Not sure yet how would we check here for extra EIP being activated and whether it's worth it.

Maybe it's better to change it to always assume EIP-3860 is not activated, then nothing changes for the tx pool right now, but with EIP activated it will not drop some txs that don't have enough gas to pay for initcode.

Which would be easier to solve when EIP is accepted to the fork, and not is an "extra EIP".

Suggested change

intrGas, err := IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil, true, pool.istanbul, true)

intrGas, err := IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil, true, pool.istanbul, false)

gumb0 · 2021-11-22T13:52:50Z

core/vm/eips.go

@@ -174,3 +175,13 @@ func opBaseFee(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]
 	scope.Stack.push(baseFee)
 	return nil, nil
 }
+
+func enable3860(jt *JumpTable) {
+	createOp := *jt[CREATE]


I clone operation struct here, because doing just jt[CREATE].dynamicCost = ... would modify existing operation in underlying global londonInstructionSet, and that would influence unit tests that switch between enabling / disabling EIP3860.

Not sure if this is also a problem for other enable... functions above (enable2200, enable3529)

Shouldn't be an issue -- NewXXInstructionSet uses a brand new instructionset.

But newLondonInstructionSet() is called only once when global is initialized

go-ethereum/core/vm/jump_table.go

Line 60 in 17f1c2d

londonInstructionSet = newLondonInstructionSet()

NewEVMInterpreter then creates a new JumpTable instance, but it contains the pointers to the same opertations of londonInstructionSet global.

go-ethereum/core/vm/interpreter.go

Line 78 in 17f1c2d

jt = londonInstructionSet

Better fix for this is in #23977

Does this code needs any changes after #23977?

Better fix for this is in #23977

Actually this hack is still needed, because JumpTable contains pointers to operations, so modification like jt[CREATE].dynamicGas = gasCreateEip3860 would change the operation for londonInstructionSet, too.

This is now not needed, I think, we changed it so ops are deep-copied.

In the latest commit I removed it anyway, because the new initcode charge is applied inside create implementation and not in dynamicGas calculation, so new cost functions are not needed.

gumb0 · 2021-11-24T12:18:31Z

@holiman Please take a look. Suggestions how to improve this are appreciated.

core/vm/gas_table_test.go

… long

MariusVanDerWijden · 2023-01-10T11:25:55Z

commit ff8a9aa49073bd033278b5ceed65e673d441b88e (HEAD -> eip-3860)
Author: Marius van der Wijden <m.vanderwijden@live.de>
Date:   Tue Jan 10 12:24:14 2023 +0100

    core/txpool: set shanghai by time correctly

diff --git a/core/state_processor_test.go b/core/state_processor_test.go
index 473a09f27..400ccd318 100644
--- a/core/state_processor_test.go
+++ b/core/state_processor_test.go
@@ -327,7 +327,7 @@ func TestStateProcessorErrors(t *testing.T) {
                                        ArrowGlacierBlock:   big.NewInt(0),
                                        GrayGlacierBlock:    big.NewInt(0),
                                        MergeNetsplitBlock:  big.NewInt(0),
-                                       ShanghaiBlock:       big.NewInt(0),
+                                       ShanghaiTime:        big.NewInt(0),
                                },
                                Alloc: GenesisAlloc{
                                        common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7"): GenesisAccount{
diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
index 4c7e73c39..dc6a71f07 100644
--- a/core/txpool/txpool.go
+++ b/core/txpool/txpool.go
@@ -1307,7 +1307,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
        pool.istanbul = pool.chainconfig.IsIstanbul(next)
        pool.eip2718 = pool.chainconfig.IsBerlin(next)
        pool.eip1559 = pool.chainconfig.IsLondon(next)
-       pool.shanghai = pool.chainconfig.IsShanghai(next)
+       pool.shanghai = pool.chainconfig.IsShanghai(big.NewInt(time.Now().Unix()))
 }
 
 // promoteExecutables moves transactions that have become processable from the
diff --git a/light/txpool.go b/light/txpool.go
index 798ef1708..e12f6ef94 100644
--- a/light/txpool.go
+++ b/light/txpool.go
@@ -318,7 +318,7 @@ func (pool *TxPool) setNewHead(head *types.Header) {
        next := new(big.Int).Add(head.Number, big.NewInt(1))
        pool.istanbul = pool.config.IsIstanbul(next)
        pool.eip2718 = pool.config.IsBerlin(next)
-       pool.shanghai = pool.config.IsShanghai(next)
+       pool.shanghai = pool.config.IsShanghai(big.NewInt(time.Now().Unix()))
 }
 
 // Stop stops the light transaction pool

I can't push to this repo, @chfast could you add this diff pls

rakita · 2023-02-12T19:37:48Z

core/state_transition.go

@@ -120,16 +120,17 @@ func (result *ExecutionResult) Revert() []byte {
 }

 // IntrinsicGas computes the 'intrinsic gas' for a message with the given data.
-func IntrinsicGas(data []byte, accessList types.AccessList, isContractCreation bool, isHomestead, isEIP2028 bool) (uint64, error) {
+func IntrinsicGas(data []byte, accessList types.AccessList, isContractCreation bool, isHomestead, isEIP2028 bool, isEIP3860 bool) (uint64, error) {


isEIP2028 bool seems not used anymore

Yes it is, afaict:

nonZeroGas := params.TxDataNonZeroGasFrontier if isEIP2028 { nonZeroGas = params.TxDataNonZeroGasEIP2028 } ```

Implementation of https://eips.ethereum.org/EIPS/eip-3860, limit and meter initcode. This PR enables EIP-3860 as part of the Shanghai fork. Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>

#318) * core/vm: implement EIP-3860: Limit and meter initcode (ethereum#23847) Implementation of https://eips.ethereum.org/EIPS/eip-3860, limit and meter initcode. This PR enables EIP-3860 as part of the Shanghai fork. Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * add ishanghai * fix test * fix --------- Co-authored-by: Andrei Maiboroda <andrei@ethereum.org> Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

Implementation of https://eips.ethereum.org/EIPS/eip-3860, limit and meter initcode. This PR enables EIP-3860 as part of the Shanghai fork. Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>

gumb0 force-pushed the eip-3860 branch 2 times, most recently from d96f2af to 91542cc Compare November 2, 2021 15:08

axic reviewed Nov 2, 2021

View reviewed changes

core/vm/gas_table.go Outdated Show resolved Hide resolved

gumb0 force-pushed the eip-3860 branch from 91542cc to 3b43b0d Compare November 3, 2021 14:07

axic reviewed Nov 4, 2021

View reviewed changes

core/state_transition.go Show resolved Hide resolved

axic reviewed Nov 4, 2021

View reviewed changes

holiman reviewed Nov 5, 2021

View reviewed changes

core/vm/gas_table.go Outdated Show resolved Hide resolved

holiman reviewed Nov 5, 2021

View reviewed changes

gumb0 force-pushed the eip-3860 branch 4 times, most recently from cb25f4d to 7c6961f Compare November 15, 2021 11:59

gumb0 commented Nov 16, 2021

View reviewed changes

gumb0 mentioned this pull request Nov 17, 2021

Tests for EIP-3860: Limit and meter initcode ethereum/tests#990

Merged

gumb0 force-pushed the eip-3860 branch from 7fae555 to 0134ec5 Compare November 22, 2021 13:43

gumb0 commented Nov 22, 2021

View reviewed changes

gumb0 force-pushed the eip-3860 branch 2 times, most recently from aab6c14 to d986fb2 Compare November 23, 2021 10:12

gumb0 requested a review from holiman November 24, 2021 12:18

axic reviewed Nov 26, 2021

View reviewed changes

core/vm/gas_table_test.go Outdated Show resolved Hide resolved

gumb0 force-pushed the eip-3860 branch from d986fb2 to b6b7fd4 Compare November 30, 2021 17:39

gumb0 force-pushed the eip-3860 branch from add0275 to 6661828 Compare January 27, 2022 14:38

gumb0 mentioned this pull request Jan 27, 2022

Transaction tests for EIP-3860: Limit and meter initcode ethereum/tests#1012

Merged

gumb0 force-pushed the eip-3860 branch 4 times, most recently from a11480f to 3fa0c16 Compare February 9, 2022 11:17

holgerd77 mentioned this pull request Feb 15, 2022

VM, Tx, Common: Implement EIP3860 "limit and meter initcode" ethereumjs/ethereumjs-monorepo#1619

Merged

gumb0 force-pushed the eip-3860 branch from 3fa0c16 to a25b356 Compare May 2, 2022 13:01

gumb0 and others added 13 commits January 9, 2023 21:32

evm: Add EIP-3860 to supported extra EIPs

f0cf887

evm: EIP-3860: abort if initcode size above the limit

7eda541

evm: EIP-3860: extra charge for CREATE and CREATE2

493db58

core: EIP-3860: extra charge for creation transaction

b5a3aec

core/vm: Unit tests for initcode gas charge according to EIP-3860

0fe2b2c

core: Make creation transaction invalid if initcode size above limit

8896d41

core/vm: Change order of initcode charge checks and nonce update

9a109f3

core/vm: don't sub hashing cost for create2 initcode if length is too…

db41c88

… long

core/vm: modify tests for create2 gas consumption

8edb9d3

core/vm: move 3860-checks to separate gas calculator

5d73263

core/vm: simplify gas calculators for 3860

ed09df5

core/vm: fix CI warnings

a55f5cb

core: activate EIP-3860 in Shanghai

effeefc

chfast force-pushed the eip-3860 branch from 3f9eef1 to 431e30f Compare January 9, 2023 20:34

gumb0 added 2 commits January 9, 2023 21:41

cmd/evm: Support Shanghai in t8n tool

a326b8c

cmd/evm: Fix error message in t8n tool to be consistent with core error

9b558fb

chfast force-pushed the eip-3860 branch from 431e30f to 9b558fb Compare January 9, 2023 20:41

core/txpool: set shanghai by time correctly

56df86a

lightclient mentioned this pull request Jan 10, 2023

Update Shanghai tests to use solely fork name instead of EIP numbers. ethereum/execution-spec-tests#26

Merged

holiman merged commit 793f0f9 into ethereum:master Jan 11, 2023

chfast deleted the eip-3860 branch January 11, 2023 09:06

This was referenced Feb 11, 2023

Tracking: Shanghai Support paradigmxyz/reth#1295

Closed

Add EIP-3860 for Shanghai Support bluealloy/revm#372

Closed

rakita reviewed Feb 12, 2023

View reviewed changes

manav2401 mentioned this pull request Feb 14, 2023

core, params: add max code init size check in txpool maticnetwork/bor#739

Merged

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core/vm: implement EIP-3860: Limit and meter initcode #23847

core/vm: implement EIP-3860: Limit and meter initcode #23847

gumb0 commented Nov 2, 2021 •

edited

axic Nov 4, 2021

gumb0 Nov 5, 2021

holiman Nov 5, 2021

gumb0 Nov 5, 2021

gumb0 Nov 11, 2021

gumb0 Nov 16, 2021 •

edited

gumb0 Nov 30, 2021 •

edited

gumb0 Nov 22, 2021

holiman Nov 22, 2021

gumb0 Nov 22, 2021

gumb0 Nov 26, 2021

axic Nov 30, 2021

gumb0 Nov 30, 2021

holiman Nov 25, 2022

gumb0 Nov 25, 2022

gumb0 commented Nov 24, 2021

MariusVanDerWijden commented Jan 10, 2023

rakita Feb 12, 2023

MariusVanDerWijden Feb 13, 2023

	intrGas, err := IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil, true, pool.istanbul, true)
	intrGas, err := IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil, true, pool.istanbul, false)

core/vm: implement EIP-3860: Limit and meter initcode #23847

core/vm: implement EIP-3860: Limit and meter initcode #23847

Conversation

gumb0 commented Nov 2, 2021 • edited

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

gumb0 Nov 16, 2021 • edited

Choose a reason for hiding this comment

gumb0 Nov 30, 2021 • edited

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

gumb0 commented Nov 24, 2021

MariusVanDerWijden commented Jan 10, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gumb0 commented Nov 2, 2021 •

edited

gumb0 Nov 16, 2021 •

edited

gumb0 Nov 30, 2021 •

edited