diff --git a/beacon/engine/gen_ed.go b/beacon/engine/gen_ed.go
index 6893d64a1626a..c3db180226401 100644
--- a/beacon/engine/gen_ed.go
+++ b/beacon/engine/gen_ed.go
@@ -34,6 +34,7 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
Withdrawals []*types.Withdrawal `json:"withdrawals"`
BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"`
ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"`
+ Deposits types.Deposits `json:"depositRequests"`
}
var enc ExecutableData
enc.ParentHash = e.ParentHash
@@ -58,6 +59,7 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
enc.Withdrawals = e.Withdrawals
enc.BlobGasUsed = (*hexutil.Uint64)(e.BlobGasUsed)
enc.ExcessBlobGas = (*hexutil.Uint64)(e.ExcessBlobGas)
+ enc.Deposits = e.Deposits
return json.Marshal(&enc)
}
@@ -81,6 +83,7 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
Withdrawals []*types.Withdrawal `json:"withdrawals"`
BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"`
ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"`
+ Deposits *types.Deposits `json:"depositRequests"`
}
var dec ExecutableData
if err := json.Unmarshal(input, &dec); err != nil {
@@ -154,5 +157,8 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
if dec.ExcessBlobGas != nil {
e.ExcessBlobGas = (*uint64)(dec.ExcessBlobGas)
}
+ if dec.Deposits != nil {
+ e.Deposits = *dec.Deposits
+ }
return nil
}
diff --git a/beacon/engine/types.go b/beacon/engine/types.go
index a73691ca0576d..b66bc27fb63a8 100644
--- a/beacon/engine/types.go
+++ b/beacon/engine/types.go
@@ -35,6 +35,7 @@ var (
PayloadV1 PayloadVersion = 0x1
PayloadV2 PayloadVersion = 0x2
PayloadV3 PayloadVersion = 0x3
+ PayloadV4 PayloadVersion = 0x4
)
//go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out gen_blockparams.go
@@ -75,6 +76,7 @@ type ExecutableData struct {
Withdrawals []*types.Withdrawal `json:"withdrawals"`
BlobGasUsed *uint64 `json:"blobGasUsed"`
ExcessBlobGas *uint64 `json:"excessBlobGas"`
+ Deposits types.Deposits `json:"depositRequests"`
}
// JSON type overrides for executableData.
@@ -229,6 +231,17 @@ func ExecutableDataToBlock(params ExecutableData, versionedHashes []common.Hash,
h := types.DeriveSha(types.Withdrawals(params.Withdrawals), trie.NewStackTrie(nil))
withdrawalsRoot = &h
}
+
+ var (
+ requestsHash *common.Hash
+ requests types.Requests
+ )
+ if params.Deposits != nil {
+ requests = make(types.Requests, 0)
+ requests = append(requests, params.Deposits.Requests()...)
+ h := types.DeriveSha(requests, trie.NewStackTrie(nil))
+ requestsHash = &h
+ }
header := &types.Header{
ParentHash: params.ParentHash,
UncleHash: types.EmptyUncleHash,
@@ -249,8 +262,9 @@ func ExecutableDataToBlock(params ExecutableData, versionedHashes []common.Hash,
ExcessBlobGas: params.ExcessBlobGas,
BlobGasUsed: params.BlobGasUsed,
ParentBeaconRoot: beaconRoot,
+ RequestsHash: requestsHash,
}
- block := types.NewBlockWithHeader(header).WithBody(types.Body{Transactions: txs, Uncles: nil, Withdrawals: params.Withdrawals})
+ block := types.NewBlockWithHeader(header).WithBody(types.Body{Transactions: txs, Uncles: nil, Withdrawals: params.Withdrawals, Requests: requests})
if block.Hash() != params.BlockHash {
return nil, fmt.Errorf("blockhash mismatch, want %x, got %x", params.BlockHash, block.Hash())
}
@@ -278,6 +292,7 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types.
Withdrawals: block.Withdrawals(),
BlobGasUsed: block.BlobGasUsed(),
ExcessBlobGas: block.ExcessBlobGas(),
+ Deposits: block.Deposits(),
}
bundle := BlobsBundleV1{
Commitments: make([]hexutil.Bytes, 0),
diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
index 3c09229e1c5c5..dcc8a154bc3eb 100644
--- a/cmd/evm/internal/t8ntool/execution.go
+++ b/cmd/evm/internal/t8ntool/execution.go
@@ -66,6 +66,8 @@ type ExecutionResult struct {
WithdrawalsRoot *common.Hash `json:"withdrawalsRoot,omitempty"`
CurrentExcessBlobGas *math.HexOrDecimal64 `json:"currentExcessBlobGas,omitempty"`
CurrentBlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed,omitempty"`
+ RequestsRoot *common.Hash `json:"requestsRoot,omitempty"`
+ DepositRequests *types.Deposits `json:"depositRequests,omitempty"`
}
type ommer struct {
@@ -368,6 +370,23 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
execRs.CurrentExcessBlobGas = (*math.HexOrDecimal64)(&excessBlobGas)
execRs.CurrentBlobGasUsed = (*math.HexOrDecimal64)(&blobGasUsed)
}
+ if chainConfig.IsPrague(vmContext.BlockNumber, vmContext.Time) {
+ // Parse the requests from the logs
+ var allLogs []*types.Log
+ for _, receipt := range receipts {
+ allLogs = append(allLogs, receipt.Logs...)
+ }
+ requests, err := core.ParseDepositLogs(allLogs, chainConfig)
+ if err != nil {
+ return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not parse requests logs: %v", err))
+ }
+ // Calculate the requests root
+ h := types.DeriveSha(requests, trie.NewStackTrie(nil))
+ execRs.RequestsRoot = &h
+ // Get the deposits from the requests
+ deposits := requests.Deposits()
+ execRs.DepositRequests = &deposits
+ }
// Re-create statedb instance with new root upon the updated database
// for accessing latest states.
statedb, err = state.New(root, statedb.Database(), nil)
diff --git a/core/block_validator.go b/core/block_validator.go
index 3d49f4e6a3dfc..2964ca7437f67 100644
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -121,22 +121,32 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
// ValidateState validates the various changes that happen after a state transition,
// such as amount of used gas, the receipt roots and the state root itself.
-func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateDB, receipts types.Receipts, usedGas uint64) error {
+func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateDB, res *ProcessResult) error {
+ if res == nil {
+ return fmt.Errorf("nil ProcessResult value")
+ }
header := block.Header()
- if block.GasUsed() != usedGas {
- return fmt.Errorf("invalid gas used (remote: %d local: %d)", block.GasUsed(), usedGas)
+ if block.GasUsed() != res.GasUsed {
+ return fmt.Errorf("invalid gas used (remote: %d local: %d)", block.GasUsed(), res.GasUsed)
}
// Validate the received block's bloom with the one derived from the generated receipts.
// For valid blocks this should always validate to true.
- rbloom := types.CreateBloom(receipts)
+ rbloom := types.CreateBloom(res.Receipts)
if rbloom != header.Bloom {
return fmt.Errorf("invalid bloom (remote: %x local: %x)", header.Bloom, rbloom)
}
// The receipt Trie's root (R = (Tr [[H1, R1], ... [Hn, Rn]]))
- receiptSha := types.DeriveSha(receipts, trie.NewStackTrie(nil))
+ receiptSha := types.DeriveSha(res.Receipts, trie.NewStackTrie(nil))
if receiptSha != header.ReceiptHash {
return fmt.Errorf("invalid receipt root hash (remote: %x local: %x)", header.ReceiptHash, receiptSha)
}
+ // Validate the parsed requests match the expected header value.
+ if header.RequestsHash != nil {
+ depositSha := types.DeriveSha(res.Requests, trie.NewStackTrie(nil))
+ if depositSha != *header.RequestsHash {
+ return fmt.Errorf("invalid deposit root hash (remote: %x local: %x)", *header.RequestsHash, depositSha)
+ }
+ }
// Validate the state root against the received state root and throw
// an error if they don't match.
if root := statedb.IntermediateRoot(v.config.IsEIP158(header.Number)); header.Root != root {
diff --git a/core/blockchain.go b/core/blockchain.go
index 7c8ab3abc44a2..f60a022c03208 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1614,6 +1614,7 @@ func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) {
return 0, errChainStopped
}
defer bc.chainmu.Unlock()
+
return bc.insertChain(chain, true)
}
@@ -1916,16 +1917,16 @@ func (bc *BlockChain) processBlock(block *types.Block, statedb *state.StateDB, s
// Process block using the parent state as reference point
pstart := time.Now()
- receipts, logs, usedGas, err := bc.processor.Process(block, statedb, bc.vmConfig)
+ res, err := bc.processor.Process(block, statedb, bc.vmConfig)
if err != nil {
- bc.reportBlock(block, receipts, err)
+ bc.reportBlock(block, nil, err)
return nil, err
}
ptime := time.Since(pstart)
vstart := time.Now()
- if err := bc.validator.ValidateState(block, statedb, receipts, usedGas); err != nil {
- bc.reportBlock(block, receipts, err)
+ if err := bc.validator.ValidateState(block, statedb, res); err != nil {
+ bc.reportBlock(block, res.Receipts, err)
return nil, err
}
vtime := time.Since(vstart)
@@ -1953,9 +1954,9 @@ func (bc *BlockChain) processBlock(block *types.Block, statedb *state.StateDB, s
)
if !setHead {
// Don't set the head, only insert the block
- err = bc.writeBlockWithState(block, receipts, statedb)
+ err = bc.writeBlockWithState(block, res.Receipts, statedb)
} else {
- status, err = bc.writeBlockAndSetHead(block, receipts, logs, statedb, false)
+ status, err = bc.writeBlockAndSetHead(block, res.Receipts, res.Logs, statedb, false)
}
if err != nil {
return nil, err
@@ -1969,7 +1970,7 @@ func (bc *BlockChain) processBlock(block *types.Block, statedb *state.StateDB, s
blockWriteTimer.Update(time.Since(wstart) - max(statedb.AccountCommits, statedb.StorageCommits) /* concurrent */ - statedb.SnapshotCommits - statedb.TrieDBCommits)
blockInsertTimer.UpdateSince(start)
- return &blockProcessingResult{usedGas: usedGas, procTime: proctime, status: status}, nil
+ return &blockProcessingResult{usedGas: res.GasUsed, procTime: proctime, status: status}, nil
}
// insertSideChain is called when an import batch hits upon a pruned ancestor
diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index e4bc3e09a657d..0a35875cef7cd 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -163,14 +163,14 @@ func testBlockChainImport(chain types.Blocks, blockchain *BlockChain) error {
if err != nil {
return err
}
- receipts, _, usedGas, err := blockchain.processor.Process(block, statedb, vm.Config{})
+ res, err := blockchain.processor.Process(block, statedb, vm.Config{})
if err != nil {
- blockchain.reportBlock(block, receipts, err)
+ blockchain.reportBlock(block, res.Receipts, err)
return err
}
- err = blockchain.validator.ValidateState(block, statedb, receipts, usedGas)
+ err = blockchain.validator.ValidateState(block, statedb, res)
if err != nil {
- blockchain.reportBlock(block, receipts, err)
+ blockchain.reportBlock(block, res.Receipts, err)
return err
}
@@ -4221,3 +4221,86 @@ func TestEIP3651(t *testing.T) {
t.Fatalf("sender balance incorrect: expected %d, got %d", expected, actual)
}
}
+
+func TestEIP6110(t *testing.T) {
+ var (
+ engine = beacon.NewFaker()
+
+ // A sender who makes transactions, has some funds
+ key, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
+ addr = crypto.PubkeyToAddress(key.PublicKey)
+ funds = new(big.Int).Mul(common.Big1, big.NewInt(params.Ether))
+ config = *params.AllEthashProtocolChanges
+ gspec = &Genesis{
+ Config: &config,
+ Alloc: types.GenesisAlloc{
+ addr: {Balance: funds},
+ config.DepositContractAddress: {
+ // Simple deposit generator, source: https://gist.github.com/lightclient/54abb2af2465d6969fa6d1920b9ad9d7
+ Code: common.Hex2Bytes("6080604052366103aa575f603067ffffffffffffffff811115610025576100246103ae565b5b6040519080825280601f01601f1916602001820160405280156100575781602001600182028036833780820191505090505b5090505f8054906101000a900460ff1660f81b815f8151811061007d5761007c6103db565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690815f1a9053505f602067ffffffffffffffff8111156100c7576100c66103ae565b5b6040519080825280601f01601f1916602001820160405280156100f95781602001600182028036833780820191505090505b5090505f8054906101000a900460ff1660f81b815f8151811061011f5761011e6103db565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690815f1a9053505f600867ffffffffffffffff811115610169576101686103ae565b5b6040519080825280601f01601f19166020018201604052801561019b5781602001600182028036833780820191505090505b5090505f8054906101000a900460ff1660f81b815f815181106101c1576101c06103db565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690815f1a9053505f606067ffffffffffffffff81111561020b5761020a6103ae565b5b6040519080825280601f01601f19166020018201604052801561023d5781602001600182028036833780820191505090505b5090505f8054906101000a900460ff1660f81b815f81518110610263576102626103db565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690815f1a9053505f600867ffffffffffffffff8111156102ad576102ac6103ae565b5b6040519080825280601f01601f1916602001820160405280156102df5781602001600182028036833780820191505090505b5090505f8054906101000a900460ff1660f81b815f81518110610305576103046103db565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690815f1a9053505f8081819054906101000a900460ff168092919061035090610441565b91906101000a81548160ff021916908360ff160217905550507f649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c585858585856040516103a09594939291906104d9565b60405180910390a1005b5f80fd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f60ff82169050919050565b5f61044b82610435565b915060ff820361045e5761045d610408565b5b600182019050919050565b5f81519050919050565b5f82825260208201905092915050565b8281835e5f83830152505050565b5f601f19601f8301169050919050565b5f6104ab82610469565b6104b58185610473565b93506104c5818560208601610483565b6104ce81610491565b840191505092915050565b5f60a0820190508181035f8301526104f181886104a1565b9050818103602083015261050581876104a1565b9050818103604083015261051981866104a1565b9050818103606083015261052d81856104a1565b9050818103608083015261054181846104a1565b9050969550505050505056fea26469706673582212208569967e58690162d7d6fe3513d07b393b4c15e70f41505cbbfd08f53eba739364736f6c63430008190033"),
+ Nonce: 0,
+ Balance: big.NewInt(0),
+ },
+ },
+ }
+ )
+
+ gspec.Config.BerlinBlock = common.Big0
+ gspec.Config.LondonBlock = common.Big0
+ gspec.Config.TerminalTotalDifficulty = common.Big0
+ gspec.Config.TerminalTotalDifficultyPassed = true
+ gspec.Config.ShanghaiTime = u64(0)
+ gspec.Config.CancunTime = u64(0)
+ gspec.Config.PragueTime = u64(0)
+ signer := types.LatestSigner(gspec.Config)
+
+ _, blocks, _ := GenerateChainWithGenesis(gspec, engine, 1, func(i int, b *BlockGen) {
+ for i := 0; i < 5; i++ {
+ txdata := &types.DynamicFeeTx{
+ ChainID: gspec.Config.ChainID,
+ Nonce: uint64(i),
+ To: &config.DepositContractAddress,
+ Gas: 500000,
+ GasFeeCap: newGwei(5),
+ GasTipCap: big.NewInt(2),
+ AccessList: nil,
+ Data: []byte{},
+ }
+ tx := types.NewTx(txdata)
+ tx, _ = types.SignTx(tx, signer, key)
+ b.AddTx(tx)
+ }
+ })
+ chain, err := NewBlockChain(rawdb.NewMemoryDatabase(), nil, gspec, nil, engine, vm.Config{Tracer: logger.NewMarkdownLogger(&logger.Config{DisableStack: true}, os.Stderr).Hooks()}, nil, nil)
+ if err != nil {
+ t.Fatalf("failed to create tester chain: %v", err)
+ }
+ defer chain.Stop()
+ if n, err := chain.InsertChain(blocks); err != nil {
+ t.Fatalf("block %d: failed to insert into chain: %v", n, err)
+ }
+
+ block := chain.GetBlockByNumber(1)
+ if len(block.Deposits()) != 5 {
+ t.Fatalf("failed to retreive deposits: have %d, want %d", len(block.Deposits()), 5)
+ }
+
+ // Verify each index is correct.
+ for want, d := range block.Deposits() {
+ if got := int(d.PublicKey[0]); got != want {
+ t.Fatalf("invalid pubkey: have %d, want %d", got, want)
+ }
+ if got := int(d.WithdrawalCredentials[0]); got != want {
+ t.Fatalf("invalid withdrawal credentials: have %d, want %d", got, want)
+ }
+ if d.Amount != uint64(want) {
+ t.Fatalf("invalid amounbt: have %d, want %d", d.Amount, want)
+ }
+ if got := int(d.Signature[0]); got != want {
+ t.Fatalf("invalid signature: have %d, want %d", got, want)
+ }
+ if d.Index != uint64(want) {
+ t.Fatalf("invalid index: have %d, want %d", d.Index, want)
+ }
+ }
+}
diff --git a/core/chain_makers.go b/core/chain_makers.go
index 58985347bb317..da3e148508c7a 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -346,7 +346,18 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
gen(i, b)
}
- body := types.Body{Transactions: b.txs, Uncles: b.uncles, Withdrawals: b.withdrawals}
+ var requests types.Requests
+ if config.IsPrague(b.header.Number, b.header.Time) {
+ for _, r := range b.receipts {
+ d, err := ParseDepositLogs(r.Logs, config)
+ if err != nil {
+ panic(fmt.Sprintf("failed to parse deposit log: %v", err))
+ }
+ requests = append(requests, d...)
+ }
+ }
+
+ body := types.Body{Transactions: b.txs, Uncles: b.uncles, Withdrawals: b.withdrawals, Requests: requests}
block, err := b.engine.FinalizeAndAssemble(cm, b.header, statedb, &body, b.receipts)
if err != nil {
panic(err)
diff --git a/core/genesis.go b/core/genesis.go
index 042071c531eb2..b74d27825e4c4 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -453,7 +453,10 @@ func (g *Genesis) ToBlock() *types.Block {
head.BaseFee = new(big.Int).SetUint64(params.InitialBaseFee)
}
}
- var withdrawals []*types.Withdrawal
+ var (
+ withdrawals []*types.Withdrawal
+ requests types.Requests
+ )
if conf := g.Config; conf != nil {
num := big.NewInt(int64(g.Number))
if conf.IsShanghai(num, g.Timestamp) {
@@ -475,8 +478,12 @@ func (g *Genesis) ToBlock() *types.Block {
head.BlobGasUsed = new(uint64)
}
}
+ if conf.IsPrague(num, g.Timestamp) {
+ head.RequestsHash = &types.EmptyRequestsHash
+ requests = make(types.Requests, 0)
+ }
}
- return types.NewBlock(head, &types.Body{Withdrawals: withdrawals}, nil, trie.NewStackTrie(nil))
+ return types.NewBlock(head, &types.Body{Withdrawals: withdrawals, Requests: requests}, nil, trie.NewStackTrie(nil))
}
// Commit writes the block and state of a genesis specification to the database.
diff --git a/core/state_processor.go b/core/state_processor.go
index 7166ed8bd8726..f6abdd53af341 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -57,7 +57,7 @@ func NewStateProcessor(config *params.ChainConfig, bc *BlockChain, engine consen
// Process returns the receipts and logs accumulated during the process and
// returns the amount of gas that was used in the process. If any of the
// transactions failed to execute due to insufficient gas it will return an error.
-func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg vm.Config) (types.Receipts, []*types.Log, uint64, error) {
+func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg vm.Config) (*ProcessResult, error) {
var (
receipts types.Receipts
usedGas = new(uint64)
@@ -76,6 +76,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
context = NewEVMBlockContext(header, p.bc, nil)
vmenv = vm.NewEVM(context, vm.TxContext{}, statedb, p.config, cfg)
signer = types.MakeSigner(p.config, header.Number, header.Time)
+ err error
)
if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
ProcessBeaconBlockRoot(*beaconRoot, vmenv, statedb)
@@ -84,13 +85,13 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
for i, tx := range block.Transactions() {
msg, err := TransactionToMessage(tx, signer, header.BaseFee)
if err != nil {
- return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
+ return nil, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
}
statedb.SetTxContext(tx.Hash(), i)
receipt, err := ApplyTransactionWithEVM(msg, p.config, gp, statedb, blockNumber, blockHash, tx, usedGas, vmenv)
if err != nil {
- return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
+ return nil, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
}
receipts = append(receipts, receipt)
allLogs = append(allLogs, receipt.Logs...)
@@ -98,12 +99,26 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
// Fail if Shanghai not enabled and len(withdrawals) is non-zero.
withdrawals := block.Withdrawals()
if len(withdrawals) > 0 && !p.config.IsShanghai(block.Number(), block.Time()) {
- return nil, nil, 0, errors.New("withdrawals before shanghai")
+ return nil, errors.New("withdrawals before shanghai")
}
+ // Read requests if Prague is enabled.
+ var requests types.Requests
+ if p.config.IsPrague(block.Number(), block.Time()) {
+ requests, err = ParseDepositLogs(allLogs, p.config)
+ if err != nil {
+ return nil, err
+ }
+ }
+
// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
p.engine.Finalize(p.bc, header, statedb, block.Body())
- return receipts, allLogs, *usedGas, nil
+ return &ProcessResult{
+ Receipts: receipts,
+ Requests: requests,
+ Logs: allLogs,
+ GasUsed: *usedGas,
+ }, nil
}
// ApplyTransactionWithEVM attempts to apply a transaction to the given state database
@@ -209,3 +224,19 @@ func ProcessBeaconBlockRoot(beaconRoot common.Hash, vmenv *vm.EVM, statedb *stat
_, _, _ = vmenv.Call(vm.AccountRef(msg.From), *msg.To, msg.Data, 30_000_000, common.U2560)
statedb.Finalise(true)
}
+
+// ParseDepositLogs extracts the EIP-6110 deposit values from logs emitted by
+// BeaconDepositContract.
+func ParseDepositLogs(logs []*types.Log, config *params.ChainConfig) (types.Requests, error) {
+ deposits := make(types.Requests, 0)
+ for _, log := range logs {
+ if log.Address == config.DepositContractAddress {
+ d, err := types.UnpackIntoDeposit(log.Data)
+ if err != nil {
+ return nil, fmt.Errorf("unable to parse deposit data: %v", err)
+ }
+ deposits = append(deposits, types.NewRequest(d))
+ }
+ }
+ return deposits, nil
+}
diff --git a/core/types.go b/core/types.go
index 36eb0d1dedbed..9d666073f3d9f 100644
--- a/core/types.go
+++ b/core/types.go
@@ -31,9 +31,9 @@ type Validator interface {
// ValidateBody validates the given block's content.
ValidateBody(block *types.Block) error
- // ValidateState validates the given statedb and optionally the receipts and
- // gas used.
- ValidateState(block *types.Block, state *state.StateDB, receipts types.Receipts, usedGas uint64) error
+ // ValidateState validates the given statedb and the values computed by
+ // Process against the header.
+ ValidateState(block *types.Block, state *state.StateDB, res *ProcessResult) error
}
// Prefetcher is an interface for pre-caching transaction signatures and state.
@@ -49,5 +49,13 @@ type Processor interface {
// Process processes the state changes according to the Ethereum rules by running
// the transaction messages using the statedb and applying any rewards to both
// the processor (coinbase) and any included uncles.
- Process(block *types.Block, statedb *state.StateDB, cfg vm.Config) (types.Receipts, []*types.Log, uint64, error)
+ Process(block *types.Block, statedb *state.StateDB, cfg vm.Config) (*ProcessResult, error)
+}
+
+// ProcessResult contains the values computed by Process.
+type ProcessResult struct {
+ Receipts types.Receipts
+ Requests types.Requests
+ Logs []*types.Log
+ GasUsed uint64
}
diff --git a/core/types/block.go b/core/types/block.go
index 4857cd6e50c80..22006e1887309 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -94,6 +94,9 @@ type Header struct {
// ParentBeaconRoot was added by EIP-4788 and is ignored in legacy headers.
ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"`
+
+ // RequestsHash was added by EIP-7685 and is ignored in legacy headers.
+ RequestsHash *common.Hash `json:"requestsRoot" rlp:"optional"`
}
// field type overrides for gencodec
@@ -172,6 +175,7 @@ type Body struct {
Transactions []*Transaction
Uncles []*Header
Withdrawals []*Withdrawal `rlp:"optional"`
+ Requests []*Request `rlp:"optional"`
}
// Block represents an Ethereum block.
@@ -196,6 +200,7 @@ type Block struct {
uncles []*Header
transactions Transactions
withdrawals Withdrawals
+ requests Requests
// caches
hash atomic.Pointer[common.Hash]
@@ -213,6 +218,7 @@ type extblock struct {
Txs []*Transaction
Uncles []*Header
Withdrawals []*Withdrawal `rlp:"optional"`
+ Requests []*Request `rlp:"optional"`
}
// NewBlock creates a new block. The input data is copied, changes to header and to the
@@ -229,6 +235,7 @@ func NewBlock(header *Header, body *Body, receipts []*Receipt, hasher TrieHasher
txs = body.Transactions
uncles = body.Uncles
withdrawals = body.Withdrawals
+ requests = body.Requests
)
if len(txs) == 0 {
@@ -267,6 +274,17 @@ func NewBlock(header *Header, body *Body, receipts []*Receipt, hasher TrieHasher
b.withdrawals = slices.Clone(withdrawals)
}
+ if requests == nil {
+ b.header.RequestsHash = nil
+ } else if len(requests) == 0 {
+ b.header.RequestsHash = &EmptyRequestsHash
+ b.requests = Requests{}
+ } else {
+ h := DeriveSha(Requests(requests), hasher)
+ b.header.RequestsHash = &h
+ b.requests = slices.Clone(requests)
+ }
+
return b
}
@@ -302,6 +320,10 @@ func CopyHeader(h *Header) *Header {
cpy.ParentBeaconRoot = new(common.Hash)
*cpy.ParentBeaconRoot = *h.ParentBeaconRoot
}
+ if h.RequestsHash != nil {
+ cpy.RequestsHash = new(common.Hash)
+ *cpy.RequestsHash = *h.RequestsHash
+ }
return &cpy
}
@@ -312,7 +334,7 @@ func (b *Block) DecodeRLP(s *rlp.Stream) error {
if err := s.Decode(&eb); err != nil {
return err
}
- b.header, b.uncles, b.transactions, b.withdrawals = eb.Header, eb.Uncles, eb.Txs, eb.Withdrawals
+ b.header, b.uncles, b.transactions, b.withdrawals, b.requests = eb.Header, eb.Uncles, eb.Txs, eb.Withdrawals, eb.Requests
b.size.Store(rlp.ListSize(size))
return nil
}
@@ -324,13 +346,14 @@ func (b *Block) EncodeRLP(w io.Writer) error {
Txs: b.transactions,
Uncles: b.uncles,
Withdrawals: b.withdrawals,
+ Requests: b.requests,
})
}
// Body returns the non-header content of the block.
// Note the returned data is not an independent copy.
func (b *Block) Body() *Body {
- return &Body{b.transactions, b.uncles, b.withdrawals}
+ return &Body{b.transactions, b.uncles, b.withdrawals, b.requests}
}
// Accessors for body data. These do not return a copy because the content
@@ -339,6 +362,22 @@ func (b *Block) Body() *Body {
func (b *Block) Uncles() []*Header { return b.uncles }
func (b *Block) Transactions() Transactions { return b.transactions }
func (b *Block) Withdrawals() Withdrawals { return b.withdrawals }
+func (b *Block) Requests() Requests { return b.requests }
+
+func (b *Block) Deposits() Deposits {
+ var deps Deposits
+ if b.requests != nil {
+ // If requests is non-nil, it means deposits are available in block and we
+ // should return an empty slice instead of nil if there are no deposits.
+ deps = make(Deposits, 0)
+ }
+ for _, r := range b.requests {
+ if d, ok := r.inner.(*Deposit); ok {
+ deps = append(deps, d)
+ }
+ }
+ return deps
+}
func (b *Block) Transaction(hash common.Hash) *Transaction {
for _, transaction := range b.transactions {
@@ -459,6 +498,7 @@ func (b *Block) WithBody(body Body) *Block {
transactions: slices.Clone(body.Transactions),
uncles: make([]*Header, len(body.Uncles)),
withdrawals: slices.Clone(body.Withdrawals),
+ requests: slices.Clone(body.Requests),
}
for i := range body.Uncles {
block.uncles[i] = CopyHeader(body.Uncles[i])
diff --git a/core/types/deposit.go b/core/types/deposit.go
new file mode 100644
index 0000000000000..159cc4df8a302
--- /dev/null
+++ b/core/types/deposit.go
@@ -0,0 +1,151 @@
+// Copyright 2024 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+package types
+
+import (
+ "bytes"
+ "encoding/binary"
+ "reflect"
+
+ "github.com/ethereum/go-ethereum/accounts/abi"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/rlp"
+)
+
+//go:generate go run github.com/fjl/gencodec -type Deposit -field-override depositMarshaling -out gen_deposit_json.go
+
+// Deposit contians EIP-6110 deposit data.
+type Deposit struct {
+ PublicKey BLSPublicKey `json:"pubkey"` // public key of validator
+ WithdrawalCredentials common.Hash `json:"withdrawalCredentials"` // beneficiary of the validator funds
+ Amount uint64 `json:"amount"` // deposit size in Gwei
+ Signature BLSSignature `json:"signature"` // signature over deposit msg
+ Index uint64 `json:"index"` // deposit count value
+}
+
+// field type overrides for gencodec
+type depositMarshaling struct {
+ PublicKey hexutil.Bytes
+ WithdrawalCredentials hexutil.Bytes
+ Amount hexutil.Uint64
+ Signature hexutil.Bytes
+ Index hexutil.Uint64
+}
+
+// field type overrides for abi upacking
+type depositUnpacking struct {
+ Pubkey []byte
+ WithdrawalCredentials []byte
+ Amount []byte
+ Signature []byte
+ Index []byte
+}
+
+// Deposits implements DerivableList for requests.
+type Deposits []*Deposit
+
+// Len returns the length of s.
+func (s Deposits) Len() int { return len(s) }
+
+// EncodeIndex encodes the i'th deposit to s.
+func (s Deposits) EncodeIndex(i int, w *bytes.Buffer) {
+ rlp.Encode(w, s[i])
+}
+
+// Requests creates a deep copy of each deposit and returns a slice of Request
+// objects.
+func (s Deposits) Requests() (reqs Requests) {
+ for _, d := range s {
+ reqs = append(reqs, NewRequest(d))
+ }
+ return
+}
+
+var (
+ // DepositABI is an ABI instance of beacon chain deposit events.
+ DepositABI = abi.ABI{Events: map[string]abi.Event{"DepositEvent": depositEvent}}
+ bytesT, _ = abi.NewType("bytes", "", nil)
+ depositEvent = abi.NewEvent("DepositEvent", "DepositEvent", false, abi.Arguments{
+ {Name: "pubkey", Type: bytesT, Indexed: false},
+ {Name: "withdrawal_credentials", Type: bytesT, Indexed: false},
+ {Name: "amount", Type: bytesT, Indexed: false},
+ {Name: "signature", Type: bytesT, Indexed: false},
+ {Name: "index", Type: bytesT, Indexed: false}},
+ )
+)
+
+// UnpackIntoDeposit unpacks a serialized DepositEvent.
+func UnpackIntoDeposit(data []byte) (*Deposit, error) {
+ var du depositUnpacking
+ if err := DepositABI.UnpackIntoInterface(&du, "DepositEvent", data); err != nil {
+ return nil, err
+ }
+ var d Deposit
+ copy(d.PublicKey[:], du.Pubkey)
+ copy(d.WithdrawalCredentials[:], du.WithdrawalCredentials)
+ d.Amount = binary.LittleEndian.Uint64(du.Amount)
+ copy(d.Signature[:], du.Signature)
+ d.Index = binary.LittleEndian.Uint64(du.Index)
+
+ return &d, nil
+}
+
+func (d *Deposit) requestType() byte { return DepositRequestType }
+func (d *Deposit) encode(b *bytes.Buffer) error { return rlp.Encode(b, d) }
+func (d *Deposit) decode(input []byte) error { return rlp.DecodeBytes(input, d) }
+func (d *Deposit) copy() RequestData {
+ return &Deposit{
+ PublicKey: d.PublicKey,
+ WithdrawalCredentials: d.WithdrawalCredentials,
+ Amount: d.Amount,
+ Signature: d.Signature,
+ Index: d.Index,
+ }
+}
+
+// misc bls types
+////
+
+var (
+ pubkeyT = reflect.TypeOf(BLSPublicKey{})
+ sigT = reflect.TypeOf(BLSSignature{})
+)
+
+type BLSPublicKey [48]byte
+
+// UnmarshalJSON parses a hash in hex syntax.
+func (h *BLSPublicKey) UnmarshalJSON(input []byte) error {
+ return hexutil.UnmarshalFixedJSON(pubkeyT, input, h[:])
+}
+
+// MarshalText returns the hex representation of h.
+func (h BLSPublicKey) MarshalText() ([]byte, error) {
+ return hexutil.Bytes(h[:]).MarshalText()
+}
+
+type BLSSignature [96]byte
+
+// UnmarshalJSON parses a hash in hex syntax.
+func (h *BLSSignature) UnmarshalJSON(input []byte) error {
+ return hexutil.UnmarshalFixedJSON(sigT, input, h[:])
+}
+
+// MarshalText returns the hex representation of h.
+func (h BLSSignature) MarshalText() ([]byte, error) {
+ return hexutil.Bytes(h[:]).MarshalText()
+}
diff --git a/core/types/gen_deposit_json.go b/core/types/gen_deposit_json.go
new file mode 100644
index 0000000000000..a65691188f58c
--- /dev/null
+++ b/core/types/gen_deposit_json.go
@@ -0,0 +1,70 @@
+// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
+
+package types
+
+import (
+ "encoding/json"
+ "errors"
+
+ "github.com/ethereum/go-ethereum/common/hexutil"
+)
+
+var _ = (*depositMarshaling)(nil)
+
+// MarshalJSON marshals as JSON.
+func (d Deposit) MarshalJSON() ([]byte, error) {
+ type Deposit struct {
+ PublicKey hexutil.Bytes `json:"pubkey"`
+ WithdrawalCredentials hexutil.Bytes `json:"withdrawalCredentials"`
+ Amount hexutil.Uint64 `json:"amount"`
+ Signature hexutil.Bytes `json:"signature"`
+ Index hexutil.Uint64 `json:"index"`
+ }
+ var enc Deposit
+ enc.PublicKey = d.PublicKey[:]
+ enc.WithdrawalCredentials = d.WithdrawalCredentials[:]
+ enc.Amount = hexutil.Uint64(d.Amount)
+ enc.Signature = d.Signature[:]
+ enc.Index = hexutil.Uint64(d.Index)
+ return json.Marshal(&enc)
+}
+
+// UnmarshalJSON unmarshals from JSON.
+func (d *Deposit) UnmarshalJSON(input []byte) error {
+ type Deposit struct {
+ PublicKey *hexutil.Bytes `json:"pubkey"`
+ WithdrawalCredentials *hexutil.Bytes `json:"withdrawalCredentials"`
+ Amount *hexutil.Uint64 `json:"amount"`
+ Signature *hexutil.Bytes `json:"signature"`
+ Index *hexutil.Uint64 `json:"index"`
+ }
+ var dec Deposit
+ if err := json.Unmarshal(input, &dec); err != nil {
+ return err
+ }
+ if dec.PublicKey != nil {
+ if len(*dec.PublicKey) != len(d.PublicKey) {
+ return errors.New("field 'pubkey' has wrong length, need 48 items")
+ }
+ copy(d.PublicKey[:], *dec.PublicKey)
+ }
+ if dec.WithdrawalCredentials != nil {
+ if len(*dec.WithdrawalCredentials) != len(d.WithdrawalCredentials) {
+ return errors.New("field 'withdrawalCredentials' has wrong length, need 32 items")
+ }
+ copy(d.WithdrawalCredentials[:], *dec.WithdrawalCredentials)
+ }
+ if dec.Amount != nil {
+ d.Amount = uint64(*dec.Amount)
+ }
+ if dec.Signature != nil {
+ if len(*dec.Signature) != len(d.Signature) {
+ return errors.New("field 'signature' has wrong length, need 96 items")
+ }
+ copy(d.Signature[:], *dec.Signature)
+ }
+ if dec.Index != nil {
+ d.Index = uint64(*dec.Index)
+ }
+ return nil
+}
diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go
index fb1f915d01d94..322c5d56423d3 100644
--- a/core/types/gen_header_json.go
+++ b/core/types/gen_header_json.go
@@ -36,6 +36,7 @@ func (h Header) MarshalJSON() ([]byte, error) {
BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed" rlp:"optional"`
ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas" rlp:"optional"`
ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"`
+ RequestsHash *common.Hash `json:"requestsRoot" rlp:"optional"`
Hash common.Hash `json:"hash"`
}
var enc Header
@@ -59,6 +60,7 @@ func (h Header) MarshalJSON() ([]byte, error) {
enc.BlobGasUsed = (*hexutil.Uint64)(h.BlobGasUsed)
enc.ExcessBlobGas = (*hexutil.Uint64)(h.ExcessBlobGas)
enc.ParentBeaconRoot = h.ParentBeaconRoot
+ enc.RequestsHash = h.RequestsHash
enc.Hash = h.Hash()
return json.Marshal(&enc)
}
@@ -86,6 +88,7 @@ func (h *Header) UnmarshalJSON(input []byte) error {
BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed" rlp:"optional"`
ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas" rlp:"optional"`
ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"`
+ RequestsHash *common.Hash `json:"requestsRoot" rlp:"optional"`
}
var dec Header
if err := json.Unmarshal(input, &dec); err != nil {
@@ -163,5 +166,8 @@ func (h *Header) UnmarshalJSON(input []byte) error {
if dec.ParentBeaconRoot != nil {
h.ParentBeaconRoot = dec.ParentBeaconRoot
}
+ if dec.RequestsHash != nil {
+ h.RequestsHash = dec.RequestsHash
+ }
return nil
}
diff --git a/core/types/gen_header_rlp.go b/core/types/gen_header_rlp.go
index ed6a1a002cdba..c79aa8a250230 100644
--- a/core/types/gen_header_rlp.go
+++ b/core/types/gen_header_rlp.go
@@ -42,7 +42,8 @@ func (obj *Header) EncodeRLP(_w io.Writer) error {
_tmp3 := obj.BlobGasUsed != nil
_tmp4 := obj.ExcessBlobGas != nil
_tmp5 := obj.ParentBeaconRoot != nil
- if _tmp1 || _tmp2 || _tmp3 || _tmp4 || _tmp5 {
+ _tmp6 := obj.RequestsHash != nil
+ if _tmp1 || _tmp2 || _tmp3 || _tmp4 || _tmp5 || _tmp6 {
if obj.BaseFee == nil {
w.Write(rlp.EmptyString)
} else {
@@ -52,34 +53,41 @@ func (obj *Header) EncodeRLP(_w io.Writer) error {
w.WriteBigInt(obj.BaseFee)
}
}
- if _tmp2 || _tmp3 || _tmp4 || _tmp5 {
+ if _tmp2 || _tmp3 || _tmp4 || _tmp5 || _tmp6 {
if obj.WithdrawalsHash == nil {
w.Write([]byte{0x80})
} else {
w.WriteBytes(obj.WithdrawalsHash[:])
}
}
- if _tmp3 || _tmp4 || _tmp5 {
+ if _tmp3 || _tmp4 || _tmp5 || _tmp6 {
if obj.BlobGasUsed == nil {
w.Write([]byte{0x80})
} else {
w.WriteUint64((*obj.BlobGasUsed))
}
}
- if _tmp4 || _tmp5 {
+ if _tmp4 || _tmp5 || _tmp6 {
if obj.ExcessBlobGas == nil {
w.Write([]byte{0x80})
} else {
w.WriteUint64((*obj.ExcessBlobGas))
}
}
- if _tmp5 {
+ if _tmp5 || _tmp6 {
if obj.ParentBeaconRoot == nil {
w.Write([]byte{0x80})
} else {
w.WriteBytes(obj.ParentBeaconRoot[:])
}
}
+ if _tmp6 {
+ if obj.RequestsHash == nil {
+ w.Write([]byte{0x80})
+ } else {
+ w.WriteBytes(obj.RequestsHash[:])
+ }
+ }
w.ListEnd(_tmp0)
return w.Flush()
}
diff --git a/core/types/hashes.go b/core/types/hashes.go
index 43e9130fd1704..cbd197072e5ec 100644
--- a/core/types/hashes.go
+++ b/core/types/hashes.go
@@ -41,6 +41,9 @@ var (
// EmptyWithdrawalsHash is the known hash of the empty withdrawal set.
EmptyWithdrawalsHash = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
+ // EmptyRequestsHash is the known hash of the empty requests set.
+ EmptyRequestsHash = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
+
// EmptyVerkleHash is the known hash of an empty verkle trie.
EmptyVerkleHash = common.Hash{}
)
diff --git a/core/types/request.go b/core/types/request.go
new file mode 100644
index 0000000000000..e895ac360c58c
--- /dev/null
+++ b/core/types/request.go
@@ -0,0 +1,162 @@
+// Copyright 2024 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+package types
+
+import (
+ "bytes"
+ "errors"
+ "fmt"
+ "io"
+
+ "github.com/ethereum/go-ethereum/rlp"
+)
+
+var (
+ ErrRequestTypeNotSupported = errors.New("request type not supported")
+ errShortTypedRequest = errors.New("typed request too short")
+)
+
+// Request types.
+const (
+ DepositRequestType = 0x00
+)
+
+// Request is an EIP-7685 request object. It represents execution layer
+// triggered messages bound for the consesus layer.
+type Request struct {
+ inner RequestData
+}
+
+// Type returns the EIP-7685 type of the request.
+func (r *Request) Type() byte {
+ return r.inner.requestType()
+}
+
+// NewRequest creates a new request.
+func NewRequest(inner RequestData) *Request {
+ req := new(Request)
+ req.inner = inner.copy()
+ return req
+}
+
+// Requests implements DerivableList for requests.
+type Requests []*Request
+
+// Len returns the length of s.
+func (s Requests) Len() int { return len(s) }
+
+// EncodeIndex encodes the i'th request to s.
+func (s Requests) EncodeIndex(i int, w *bytes.Buffer) {
+ s[i].encode(w)
+}
+
+// Retrieve deposits from a requests list.
+func (s Requests) Deposits() Deposits {
+ deposits := make(Deposits, 0, len(s))
+ for _, req := range s {
+ if req.Type() == DepositRequestType {
+ deposits = append(deposits, req.inner.(*Deposit))
+ }
+ }
+ return deposits
+}
+
+type RequestData interface {
+ requestType() byte
+ encode(*bytes.Buffer) error
+ decode([]byte) error
+ copy() RequestData // creates a deep copy and initializes all fields
+}
+
+// EncodeRLP implements rlp.Encoder
+func (r *Request) EncodeRLP(w io.Writer) error {
+ buf := encodeBufferPool.Get().(*bytes.Buffer)
+ defer encodeBufferPool.Put(buf)
+ buf.Reset()
+ if err := r.encode(buf); err != nil {
+ return err
+ }
+ return rlp.Encode(w, buf.Bytes())
+}
+
+// encode writes the canonical encoding of a request to w.
+func (r *Request) encode(w *bytes.Buffer) error {
+ w.WriteByte(r.Type())
+ return r.inner.encode(w)
+}
+
+// MarshalBinary returns the canonical encoding of the request.
+func (r *Request) MarshalBinary() ([]byte, error) {
+ var buf bytes.Buffer
+ err := r.encode(&buf)
+ return buf.Bytes(), err
+}
+
+// DecodeRLP implements rlp.Decoder
+func (r *Request) DecodeRLP(s *rlp.Stream) error {
+ kind, size, err := s.Kind()
+ switch {
+ case err != nil:
+ return err
+ case kind == rlp.List:
+ return fmt.Errorf("untyped request")
+ case kind == rlp.Byte:
+ return errShortTypedRequest
+ default:
+ // First read the request payload bytes into a temporary buffer.
+ b, buf, err := getPooledBuffer(size)
+ if err != nil {
+ return err
+ }
+ defer encodeBufferPool.Put(buf)
+ if err := s.ReadBytes(b); err != nil {
+ return err
+ }
+ // Now decode the inner request.
+ inner, err := r.decode(b)
+ if err == nil {
+ r.inner = inner
+ }
+ return err
+ }
+}
+
+// UnmarshalBinary decodes the canonical encoding of requests.
+func (r *Request) UnmarshalBinary(b []byte) error {
+ inner, err := r.decode(b)
+ if err != nil {
+ return err
+ }
+ r.inner = inner
+ return nil
+}
+
+// decode decodes a request from the canonical format.
+func (r *Request) decode(b []byte) (RequestData, error) {
+ if len(b) <= 1 {
+ return nil, errShortTypedRequest
+ }
+ var inner RequestData
+ switch b[0] {
+ case DepositRequestType:
+ inner = new(Deposit)
+ default:
+ return nil, ErrRequestTypeNotSupported
+ }
+ err := inner.decode(b[1:])
+ return inner, err
+}
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
index 0efa61587dc91..caedc3abc5372 100644
--- a/eth/catalyst/api.go
+++ b/eth/catalyst/api.go
@@ -86,9 +86,11 @@ var caps = []string{
"engine_getPayloadV1",
"engine_getPayloadV2",
"engine_getPayloadV3",
+ "engine_getPayloadV4",
"engine_newPayloadV1",
"engine_newPayloadV2",
"engine_newPayloadV3",
+ "engine_newPayloadV4",
"engine_getPayloadBodiesByHashV1",
"engine_getPayloadBodiesByRangeV1",
"engine_getClientVersionV1",
@@ -220,7 +222,7 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV3(update engine.ForkchoiceStateV1, pa
if params.BeaconRoot == nil {
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("missing beacon root"))
}
- if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun {
+ if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun && api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague {
return engine.STATUS_INVALID, engine.UnsupportedFork.With(errors.New("forkchoiceUpdatedV3 must only be called for cancun payloads"))
}
}
@@ -228,7 +230,11 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV3(update engine.ForkchoiceStateV1, pa
// hash, even if params are wrong. To do this we need to split up
// forkchoiceUpdate into a function that only updates the head and then a
// function that kicks off block construction.
- return api.forkchoiceUpdated(update, params, engine.PayloadV3, false)
+ payloadVersion := engine.PayloadV3
+ if params != nil && api.eth.BlockChain().Config().LatestFork(params.Timestamp) == forks.Prague {
+ payloadVersion = engine.PayloadV4
+ }
+ return api.forkchoiceUpdated(update, params, payloadVersion, false)
}
func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payloadAttributes *engine.PayloadAttributes, payloadVersion engine.PayloadVersion, simulatorMode bool) (engine.ForkChoiceResponse, error) {
@@ -456,6 +462,14 @@ func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.Execu
return api.getPayload(payloadID, false)
}
+// GetPayloadV4 returns a cached payload by id.
+func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
+ if !payloadID.Is(engine.PayloadV4) {
+ return nil, engine.UnsupportedFork
+ }
+ return api.getPayload(payloadID, false)
+}
+
func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool) (*engine.ExecutionPayloadEnvelope, error) {
log.Trace("Engine API request received", "method", "GetPayload", "id", payloadID)
data := api.localBlocks.get(payloadID, full)
@@ -521,6 +535,34 @@ func (api *ConsensusAPI) NewPayloadV3(params engine.ExecutableData, versionedHas
return api.newPayload(params, versionedHashes, beaconRoot)
}
+// NewPayloadV4 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
+func (api *ConsensusAPI) NewPayloadV4(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (engine.PayloadStatusV1, error) {
+ if params.Withdrawals == nil {
+ return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
+ }
+ if params.ExcessBlobGas == nil {
+ return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil excessBlobGas post-cancun"))
+ }
+ if params.BlobGasUsed == nil {
+ return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil blobGasUsed post-cancun"))
+ }
+ if params.Deposits == nil {
+ return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil deposits post-prague"))
+ }
+
+ if versionedHashes == nil {
+ return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil versionedHashes post-cancun"))
+ }
+ if beaconRoot == nil {
+ return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun"))
+ }
+
+ if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague {
+ return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadV4 must only be called for prague payloads"))
+ }
+ return api.newPayload(params, versionedHashes, beaconRoot)
+}
+
func (api *ConsensusAPI) newPayload(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (engine.PayloadStatusV1, error) {
// The locking here is, strictly, not required. Without these locks, this can happen:
//
@@ -566,6 +608,7 @@ func (api *ConsensusAPI) newPayload(params engine.ExecutableData, versionedHashe
"params.ExcessBlobGas", ebg,
"len(params.Transactions)", len(params.Transactions),
"len(params.Withdrawals)", len(params.Withdrawals),
+ "len(params.Deposits)", len(params.Deposits),
"beaconRoot", beaconRoot,
"error", err)
return api.invalid(err, nil), nil
diff --git a/eth/catalyst/simulated_beacon.go b/eth/catalyst/simulated_beacon.go
index fecd83f2762c6..77fb51e727d80 100644
--- a/eth/catalyst/simulated_beacon.go
+++ b/eth/catalyst/simulated_beacon.go
@@ -101,7 +101,7 @@ func NewSimulatedBeacon(period uint64, eth *eth.Ethereum) (*SimulatedBeacon, err
// if genesis block, send forkchoiceUpdated to trigger transition to PoS
if block.Number.Sign() == 0 {
- if _, err := engineAPI.ForkchoiceUpdatedV2(current, nil); err != nil {
+ if _, err := engineAPI.ForkchoiceUpdatedV3(current, nil); err != nil {
return nil, err
}
}
@@ -164,7 +164,7 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
Withdrawals: withdrawals,
Random: random,
BeaconRoot: &common.Hash{},
- }, engine.PayloadV3, true)
+ }, engine.PayloadV4, true)
if err != nil {
return err
}
@@ -202,13 +202,13 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
}
}
// Mark the payload as canon
- if _, err = c.engineAPI.NewPayloadV3(*payload, blobHashes, &common.Hash{}); err != nil {
+ if _, err = c.engineAPI.NewPayloadV4(*payload, blobHashes, &common.Hash{}); err != nil {
return err
}
c.setCurrentState(payload.BlockHash, finalizedHash)
// Mark the block containing the payload as canonical
- if _, err = c.engineAPI.ForkchoiceUpdatedV2(c.curForkchoiceState, nil); err != nil {
+ if _, err = c.engineAPI.ForkchoiceUpdatedV3(c.curForkchoiceState, nil); err != nil {
return err
}
c.lastBlockTime = payload.Timestamp
diff --git a/eth/state_accessor.go b/eth/state_accessor.go
index 372c76f496924..991bc67d4a7ca 100644
--- a/eth/state_accessor.go
+++ b/eth/state_accessor.go
@@ -146,7 +146,7 @@ func (eth *Ethereum) hashState(ctx context.Context, block *types.Block, reexec u
if current = eth.blockchain.GetBlockByNumber(next); current == nil {
return nil, nil, fmt.Errorf("block #%d not found", next)
}
- _, _, _, err := eth.blockchain.Processor().Process(current, statedb, vm.Config{})
+ _, err := eth.blockchain.Processor().Process(current, statedb, vm.Config{})
if err != nil {
return nil, nil, fmt.Errorf("processing block %d failed: %v", current.NumberU64(), err)
}
diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go
index ef1d47146682b..d7c956317f674 100644
--- a/eth/tracers/logger/logger.go
+++ b/eth/tracers/logger/logger.go
@@ -388,7 +388,7 @@ func (t *mdLogger) OnExit(depth int, output []byte, gasUsed uint64, err error, r
// OnOpcode also tracks SLOAD/SSTORE ops to track storage change.
func (t *mdLogger) OnOpcode(pc uint64, op byte, gas, cost uint64, scope tracing.OpContext, rData []byte, depth int, err error) {
stack := scope.StackData()
- fmt.Fprintf(t.out, "| %4d | %10v | %3d |", pc, op, cost)
+ fmt.Fprintf(t.out, "| %4d | %10v | %3d |", pc, vm.OpCode(op).String(), cost)
if !t.cfg.DisableStack {
// format stack
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
index 390f085677141..20d3b5b6553a1 100644
--- a/ethclient/ethclient.go
+++ b/ethclient/ethclient.go
@@ -123,6 +123,7 @@ type rpcBlock struct {
Transactions []rpcTransaction `json:"transactions"`
UncleHashes []common.Hash `json:"uncles"`
Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
+ Requests []*types.Request `json:"requests,omitempty"`
}
func (ec *Client) getBlock(ctx context.Context, method string, args ...interface{}) (*types.Block, error) {
@@ -196,6 +197,7 @@ func (ec *Client) getBlock(ctx context.Context, method string, args ...interface
Transactions: txs,
Uncles: uncles,
Withdrawals: body.Withdrawals,
+ Requests: body.Requests,
}), nil
}
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index d308cead627f8..0c27283416cd3 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -1263,6 +1263,9 @@ func RPCMarshalHeader(head *types.Header) map[string]interface{} {
if head.ParentBeaconRoot != nil {
result["parentBeaconBlockRoot"] = head.ParentBeaconRoot
}
+ if head.RequestsHash != nil {
+ result["requestsRoot"] = head.RequestsHash
+ }
return result
}
@@ -1298,6 +1301,9 @@ func RPCMarshalBlock(block *types.Block, inclTx bool, fullTx bool, config *param
if block.Header().WithdrawalsHash != nil {
fields["withdrawals"] = block.Withdrawals()
}
+ if block.Header().RequestsHash != nil {
+ fields["requests"] = block.Requests()
+ }
return fields
}
diff --git a/miner/worker.go b/miner/worker.go
index 5dc3e2056b81b..297f02f7b1cee 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -105,7 +105,20 @@ func (miner *Miner) generateWork(params *generateParams) *newPayloadResult {
log.Warn("Block building is interrupted", "allowance", common.PrettyDuration(miner.config.Recommit))
}
}
+
body := types.Body{Transactions: work.txs, Withdrawals: params.withdrawals}
+ allLogs := make([]*types.Log, 0)
+ for _, r := range work.receipts {
+ allLogs = append(allLogs, r.Logs...)
+ }
+ // Read requests if Prague is enabled.
+ if miner.chainConfig.IsPrague(work.header.Number, work.header.Time) {
+ requests, err := core.ParseDepositLogs(allLogs, miner.chainConfig)
+ if err != nil {
+ return &newPayloadResult{err: err}
+ }
+ body.Requests = requests
+ }
block, err := miner.engine.FinalizeAndAssemble(miner.chain, work.header, work.state, &body, work.receipts)
if err != nil {
return &newPayloadResult{err: err}
diff --git a/params/config.go b/params/config.go
index 871782399d14d..925a186a909e2 100644
--- a/params/config.go
+++ b/params/config.go
@@ -59,6 +59,7 @@ var (
TerminalTotalDifficultyPassed: true,
ShanghaiTime: newUint64(1681338455),
CancunTime: newUint64(1710338135),
+ DepositContractAddress: common.HexToAddress("0x00000000219ab540356cbb839cbe05303d7705fa"),
Ethash: new(EthashConfig),
}
// HoleskyChainConfig contains the chain parameters to run a node on the Holesky test network.
@@ -365,6 +366,8 @@ type ChainConfig struct {
// TODO(karalabe): Drop this field eventually (always assuming PoS mode)
TerminalTotalDifficultyPassed bool `json:"terminalTotalDifficultyPassed,omitempty"`
+ DepositContractAddress common.Address `json:"depositContractAddress,omitempty"`
+
// Various consensus engines
Ethash *EthashConfig `json:"ethash,omitempty"`
Clique *CliqueConfig `json:"clique,omitempty"`
diff --git a/rpc/subscription_test.go b/rpc/subscription_test.go
index a7dac705c9595..2ee43162c98b8 100644
--- a/rpc/subscription_test.go
+++ b/rpc/subscription_test.go
@@ -270,11 +270,20 @@ func TestNotify(t *testing.T) {
msg := &types.Header{
ParentHash: common.HexToHash("0x01"),
Number: big.NewInt(100),
+ Difficulty: common.Big0,
}
notifier.Notify(id, msg)
- have := strings.TrimSpace(out.String())
- want := `{"jsonrpc":"2.0","method":"_subscription","params":{"subscription":"test","result":{"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000001","sha3Uncles":"0x0000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","stateRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionsRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","receiptsRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","difficulty":null,"number":"0x64","gasLimit":"0x0","gasUsed":"0x0","timestamp":"0x0","extraData":"0x","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0000000000000000","baseFeePerGas":null,"withdrawalsRoot":null,"blobGasUsed":null,"excessBlobGas":null,"parentBeaconBlockRoot":null,"hash":"0xe5fb877dde471b45b9742bb4bb4b3d74a761e2fb7cb849a3d2b687eed90fb604"}}}`
- if have != want {
+
+ type Response struct {
+ Params struct {
+ Result types.Header
+ }
+ }
+ var resp Response
+ if err := json.Unmarshal(out.Bytes(), &resp); err != nil {
+ t.Errorf("failed to unmarshal response: %v", err)
+ }
+ if have, want := resp.Params.Result.Hash(), msg.Hash(); have != want {
t.Errorf("have:\n%v\nwant:\n%v\n", have, want)
}
}
diff --git a/tests/init.go b/tests/init.go
index c85e714c0023f..4bb83f9300bcf 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -373,6 +373,7 @@ var Forks = map[string]*params.ChainConfig{
ShanghaiTime: u64(0),
CancunTime: u64(0),
PragueTime: u64(0),
+ DepositContractAddress: params.MainnetChainConfig.DepositContractAddress,
},
"CancunToPragueAtTime15k": {
ChainID: big.NewInt(1),
@@ -393,6 +394,7 @@ var Forks = map[string]*params.ChainConfig{
ShanghaiTime: u64(0),
CancunTime: u64(0),
PragueTime: u64(15_000),
+ DepositContractAddress: params.MainnetChainConfig.DepositContractAddress,
},
}