From fa4193524ac1fe40d64349f923b96774b4c7a146 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 4 Aug 2023 17:34:17 +0200 Subject: [PATCH 1/5] Add parent_beacon_block_root to AssembleBlockRequest (EIP-4788) --- execution/execution.proto | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/execution/execution.proto b/execution/execution.proto index 817e3ef..8646d03 100644 --- a/execution/execution.proto +++ b/execution/execution.proto @@ -113,11 +113,12 @@ message ValidationRequest { } message AssembleBlockRequest { - types.H256 parentHash = 1; + types.H256 parent_hash = 1; uint64 timestamp = 2; - types.H256 mixDigest = 3; - types.H160 suggestedFeeRecipent = 4; - repeated types.Withdrawal withdrawals = 5; + types.H256 mix_digest = 3; + types.H160 suggested_fee_recipient = 4; + repeated types.Withdrawal withdrawals = 5; // added in Shanghai (EIP-4895) + optional types.H256 parent_beacon_block_root = 6; // added in Cancun (EIP-4788) } message AssembleBlockResponse { From cd5828cfdccf4d93949377d31bde17594ca99a96 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 4 Aug 2023 17:35:36 +0200 Subject: [PATCH 2/5] whitespace --- execution/execution.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execution/execution.proto b/execution/execution.proto index 8646d03..83dd857 100644 --- a/execution/execution.proto +++ b/execution/execution.proto @@ -113,7 +113,7 @@ message ValidationRequest { } message AssembleBlockRequest { - types.H256 parent_hash = 1; + types.H256 parent_hash = 1; uint64 timestamp = 2; types.H256 mix_digest = 3; types.H160 suggested_fee_recipient = 4; From 3baf7f922a19afa12336ab94646504a3c34d00a7 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 4 Aug 2023 18:01:28 +0200 Subject: [PATCH 3/5] Add parent_beacon_block_root to Header --- execution/execution.proto | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/execution/execution.proto b/execution/execution.proto index 83dd857..d86b95f 100644 --- a/execution/execution.proto +++ b/execution/execution.proto @@ -51,9 +51,10 @@ message Header { types.H256 ommer_hash = 15; types.H256 transaction_hash = 16; optional types.H256 base_fee_per_gas = 17; - optional types.H256 withdrawal_hash = 18; - optional uint64 blob_gas_used = 19; - optional uint64 excess_blob_gas = 20; + optional types.H256 withdrawal_hash = 18; // added in Shanghai (EIP-4895) + optional uint64 blob_gas_used = 19; // added in Cancun (EIP-4844) + optional uint64 excess_blob_gas = 20; // added in Cancun (EIP-4844) + optional types.H256 parent_beacon_block_root = 21; // added in Cancun (EIP-4788) } // Body is a block body for execution From 7cd8ca6571d4b36b59e420c01864316fc3407e85 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 4 Aug 2023 18:16:15 +0200 Subject: [PATCH 4/5] mix_digest -> prev_randao (see EIP-4399) --- execution/execution.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execution/execution.proto b/execution/execution.proto index d86b95f..3ba8c01 100644 --- a/execution/execution.proto +++ b/execution/execution.proto @@ -116,7 +116,7 @@ message ValidationRequest { message AssembleBlockRequest { types.H256 parent_hash = 1; uint64 timestamp = 2; - types.H256 mix_digest = 3; + types.H256 prev_randao = 3; types.H160 suggested_fee_recipient = 4; repeated types.Withdrawal withdrawals = 5; // added in Shanghai (EIP-4895) optional types.H256 parent_beacon_block_root = 6; // added in Cancun (EIP-4788) From 0675d1519e04bdc06979a4a1e8175b4632a40ecb Mon Sep 17 00:00:00 2001 From: yperbasis Date: Sun, 6 Aug 2023 11:30:28 +0200 Subject: [PATCH 5/5] sightly better fork names --- execution/execution.proto | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/execution/execution.proto b/execution/execution.proto index 3ba8c01..60f7482 100644 --- a/execution/execution.proto +++ b/execution/execution.proto @@ -51,10 +51,10 @@ message Header { types.H256 ommer_hash = 15; types.H256 transaction_hash = 16; optional types.H256 base_fee_per_gas = 17; - optional types.H256 withdrawal_hash = 18; // added in Shanghai (EIP-4895) - optional uint64 blob_gas_used = 19; // added in Cancun (EIP-4844) - optional uint64 excess_blob_gas = 20; // added in Cancun (EIP-4844) - optional types.H256 parent_beacon_block_root = 21; // added in Cancun (EIP-4788) + optional types.H256 withdrawal_hash = 18; // added in Shapella (EIP-4895) + optional uint64 blob_gas_used = 19; // added in Dencun (EIP-4844) + optional uint64 excess_blob_gas = 20; // added in Dencun (EIP-4844) + optional types.H256 parent_beacon_block_root = 21; // added in Dencun (EIP-4788) } // Body is a block body for execution @@ -118,8 +118,8 @@ message AssembleBlockRequest { uint64 timestamp = 2; types.H256 prev_randao = 3; types.H160 suggested_fee_recipient = 4; - repeated types.Withdrawal withdrawals = 5; // added in Shanghai (EIP-4895) - optional types.H256 parent_beacon_block_root = 6; // added in Cancun (EIP-4788) + repeated types.Withdrawal withdrawals = 5; // added in Shapella (EIP-4895) + optional types.H256 parent_beacon_block_root = 6; // added in Dencun (EIP-4788) } message AssembleBlockResponse {