EIP-1559 implementation #22617

lightclient · 2021-04-04T05:57:16Z

I'm opening this PR to track the consensus changes for EIP-1559. Updates to non-consensus code has been started and will be opened in another PR. This is a WIP.

core/state_transition.go

lightclient · 2021-04-16T22:48:39Z

The EIP-1559 and EIP-3198 changes are ready for review. They've been running on Aleut for about a week now. Additionally, I've added --aleut to the cli here. Feel free to cherry-pick that commit onto this if you wish.
cc: @karalabe @holiman @fjl

lightclient · 2021-04-16T22:54:56Z

core/types/dynamic_fee_tx.go

+func (tx *DynamicFeeTx) gas() uint64            { return tx.Gas }
+func (tx *DynamicFeeTx) feeCap() *big.Int       { return tx.FeeCap }
+func (tx *DynamicFeeTx) tip() *big.Int          { return tx.Tip }
+func (tx *DynamicFeeTx) gasPrice() *big.Int     { return tx.Tip }


I'm not sure the best way to handle gasPrice in DynamicFeeTx. It seems like there are 3 options:

use tx.Tip as it still conveys the "urgency" like `gasPrice

use a sentinel value (e.g. 0)

refactor tx interface to be better "typed" (e.g. DynamicFeeTx simply does not have gas price as a method)

We discussed it in triage call and it should return tx.FeeCap

consensus/misc/eip1559.go

params/protocol_params.go

MariusVanDerWijden

Mostly minor nitpicks. Looks pretty good, thank you!
I'll do some more in-depth testing soonish

consensus/misc/eip1559.go

MariusVanDerWijden · 2021-04-19T10:39:17Z

core/types/block.go

@@ -92,6 +173,7 @@ type headerMarshaling struct {
 	GasUsed    hexutil.Uint64
 	Time       hexutil.Uint64
 	Extra      hexutil.Bytes
+	BaseFee    *hexutil.Big


I think you need to regenerate the headerMarshalling in core/types/gen_header_json.go

consensus/misc/eip1559.go

consensus/misc/eip1559_test.go

core/types/dynamic_fee_tx.go

core/types/transaction.go

core/vm/eips.go

params/config.go

consensus/misc/eip1559.go

holiman · 2021-04-28T13:46:47Z

See https://github.com/ledgerwatch/turbo-geth/pull/1834/files -- we need something similar applied here too, right?

holiman · 2021-04-28T13:52:13Z

state_processor.go:

func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg vm.Config) (types.Receipts, []*types.Log, uint64, error) {
	var (
		receipts types.Receipts
		usedGas  = new(uint64)
		header   = block.Header()
		allLogs  []*types.Log
		gp       = new(GasPool).AddGas(block.GasLimit())

^ here

holiman · 2021-04-28T13:54:34Z

And for the miner-part (another PR?), worker.go

	if w.current.gasPool == nil {
		w.current.gasPool = new(core.GasPool).AddGas(w.current.header.GasLimit)
	}

exceution.go

	gaspool.AddGas(pre.Env.GasLimit)

consensus/misc/eip1559.go

zsfelfoldi

LGTM (see my comments for minor nitpicks)

core/state_transition.go

lightclient · 2021-04-29T17:22:09Z

core/state_transition.go

+		}
+	case isAleut && st.evm.Context.BaseFee == nil:
+		return fmt.Errorf("baseFee missing")
+	case !isAleut && st.evm.Context.BaseFee != nil:


Looking back at this, do people think it makes sense to check that if EIP-1559 is not enable then the basefee should be nil? Can't seem to find it now, but I recall someone mentioning that they weren't fond of the BASEFEE op potentially dereferencing nil if somehow it made it past the fork checks and included the op in the jump table.

The reason I'm coming back to this is it seems t8n circumvents some of the code in state_processor so it can create blocks with no nil basefee even if Aleut is configured.

All of the errors here are named errors, like ErrNonceTooHigh, so the outer calller can do errors.Is(err, ErrNonceTooHigh). I think we should define these errors too

See core/state_processor_test.go: TestStateProcessorErrors. We should extend those tests for these cases.

…h spec

holiman · 2021-05-06T18:20:13Z

consensus/clique/clique.go

+		if err := misc.VerifyEip1559Header(chain.Config(), parent, header); err != nil {
+			return err
+		}
+	}


Need to also have an else-block to verify that the header does not have a basefee. And I don't quite get why there's no corresponding if header.GasUsed > header.GasLimit for clique (I mean previously) ?

You're right, I'll add this.

Not sure why that check wasn't here previously though. Should I add it?

karalabe · 2021-05-12T05:01:13Z

Closing in favor of #22837

lightclient force-pushed the eip1559 branch from 7baef5e to a72f919 Compare April 4, 2021 06:26

ryanschneider reviewed Apr 15, 2021

View reviewed changes

core/state_transition.go Show resolved Hide resolved

lightclient force-pushed the eip1559 branch 2 times, most recently from 7489ab6 to 37a7845 Compare April 16, 2021 20:12

lightclient marked this pull request as ready for review April 16, 2021 22:40

lightclient requested review from gballet, holiman, karalabe, MariusVanDerWijden, rjl493456442 and zsfelfoldi as code owners April 16, 2021 22:40

lightclient commented Apr 16, 2021

View reviewed changes

rjl493456442 reviewed Apr 19, 2021

View reviewed changes

consensus/misc/eip1559.go Outdated Show resolved Hide resolved

rjl493456442 reviewed Apr 19, 2021

View reviewed changes

params/protocol_params.go Show resolved Hide resolved

MariusVanDerWijden requested changes Apr 19, 2021

View reviewed changes

lightclient commented Apr 19, 2021

View reviewed changes

params/config.go Outdated Show resolved Hide resolved

holiman reviewed Apr 24, 2021

View reviewed changes

consensus/misc/eip1559.go Outdated Show resolved Hide resolved

consensus/misc/eip1559.go Outdated Show resolved Hide resolved

consensus/misc/eip1559.go Outdated Show resolved Hide resolved

consensus/misc/eip1559.go Outdated Show resolved Hide resolved

lightclient force-pushed the eip1559 branch from 259ffe5 to e878067 Compare April 27, 2021 18:43

lightclient force-pushed the eip1559 branch from 6ea3db1 to f02e851 Compare April 28, 2021 20:40

zsfelfoldi reviewed Apr 28, 2021

View reviewed changes

consensus/misc/eip1559.go Show resolved Hide resolved

lightclient force-pushed the eip1559 branch from f02e851 to f7054a0 Compare April 28, 2021 22:05

zsfelfoldi approved these changes Apr 28, 2021

View reviewed changes

core/state_transition.go Outdated Show resolved Hide resolved

lightclient commented Apr 29, 2021

View reviewed changes

lightclient force-pushed the eip1559 branch from 51dd8ea to a6741da Compare April 30, 2021 19:33

lightclient mentioned this pull request Apr 30, 2021

EIP-1559 tx pool support #22791

Closed

lightclient force-pushed the eip1559 branch from a6741da to c3e8b60 Compare April 30, 2021 22:24

lightclient and others added 17 commits May 6, 2021 15:13

core/evm: default baseFee to 0 even when inactive

c117772

core/consensus: add license text to eip1559 files

417235a

core/types: update license date and simplify newmessage func

e58da39

params/config: update aleut chainid

763fb87

consensus/misc/eip1559: reduce big int allocations

0490857

core/state_processor: fix block elasticity

1d05912

core/state_transition: throw if baseFee is invalid

6eca6d7

cmd/evm: add eip-1559 support for t8n

c5dab97

core/types: add aliases for tip and feeCap json unmarshallers to matc…

a22810d

…h spec

consensus/misc/eip1559: better invalid baseFee error msg

3b4e8b2

core/evm: don't initialize basefee unless header includes it

846b2ad

core,eth,les: calculate effective gas price in tx.AsMessage(..)

2846d89

consensus/misc/eip1559: check that base fee is not nil

75ed3be

tests/init: add new aluet testing configs

bc3b9f3

core/types/transaction_signing: update ACL reference in comment to AL

d98aed8

core,consensus: pass in chain config to eip1559 functions

a8fdd25

all: clean up rebase

455fa37

lightclient force-pushed the eip1559 branch from 2bd3959 to 455fa37 Compare May 6, 2021 14:30

params/config: update baikal london block to 500

0b7151f

holiman reviewed May 6, 2021

View reviewed changes

lightclient force-pushed the eip1559 branch 2 times, most recently from 24346e7 to f6a9d64 Compare May 6, 2021 22:00

lightclient added 3 commits May 7, 2021 03:31

consensus: verify basefee not defined before clique fork, imporve errors

50783a1

cmd/evm: account for elasticity parameter in gas limit

3183df6

core: name base fee errors

dda67a5

lightclient force-pushed the eip1559 branch from 424d8df to dda67a5 Compare May 7, 2021 01:32

fjl added the london label May 11, 2021

fjl added this to the 1.10.4 milestone May 11, 2021

karalabe closed this May 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EIP-1559 implementation #22617

EIP-1559 implementation #22617

lightclient commented Apr 4, 2021 •

edited

Loading

lightclient commented Apr 16, 2021 •

edited

Loading

lightclient Apr 16, 2021

fjl May 5, 2021

MariusVanDerWijden left a comment

MariusVanDerWijden Apr 19, 2021

holiman commented Apr 28, 2021

holiman commented Apr 28, 2021

holiman commented Apr 28, 2021

zsfelfoldi left a comment

lightclient Apr 29, 2021 •

edited

Loading

holiman May 5, 2021

holiman May 5, 2021

holiman May 6, 2021

lightclient May 6, 2021

karalabe commented May 12, 2021

EIP-1559 implementation #22617

EIP-1559 implementation #22617

Conversation

lightclient commented Apr 4, 2021 • edited Loading

lightclient commented Apr 16, 2021 • edited Loading

lightclient Apr 16, 2021

Choose a reason for hiding this comment

fjl May 5, 2021

Choose a reason for hiding this comment

MariusVanDerWijden left a comment

Choose a reason for hiding this comment

MariusVanDerWijden Apr 19, 2021

Choose a reason for hiding this comment

holiman commented Apr 28, 2021

holiman commented Apr 28, 2021

holiman commented Apr 28, 2021

zsfelfoldi left a comment

Choose a reason for hiding this comment

lightclient Apr 29, 2021 • edited Loading

Choose a reason for hiding this comment

holiman May 5, 2021

Choose a reason for hiding this comment

holiman May 5, 2021

Choose a reason for hiding this comment

holiman May 6, 2021

Choose a reason for hiding this comment

lightclient May 6, 2021

Choose a reason for hiding this comment

karalabe commented May 12, 2021

lightclient commented Apr 4, 2021 •

edited

Loading

lightclient commented Apr 16, 2021 •

edited

Loading

lightclient Apr 29, 2021 •

edited

Loading