From 1692596cc219b053bfa66799f6af6bdd87d9ad5e Mon Sep 17 00:00:00 2001 From: IronGauntlets Date: Fri, 17 Nov 2023 16:06:32 +0300 Subject: [PATCH] Remove extra_data and hash from BlockHeader --- p2p/proto/block.proto | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/p2p/proto/block.proto b/p2p/proto/block.proto index 684c65c..aa822f9 100644 --- a/p2p/proto/block.proto +++ b/p2p/proto/block.proto @@ -16,25 +16,23 @@ message Signatures { // Note: commitments may change to be for the previous blocks like comet/tendermint // hash of block header sent to L1 message BlockHeader { - Hash hash = 1; - Hash parent_hash = 2; - uint64 number = 3; - google.protobuf.Timestamp time = 4; // TODO: see if this needs to be Felt252 or can be converted - Address sequencer_address = 5; - Merkle state_diffs = 6; // By order of (contract, key), taking last in case of duplicates. + Hash parent_hash = 1; + uint64 number = 2; + google.protobuf.Timestamp time = 3; // TODO: see if this needs to be Felt252 or can be converted + Address sequencer_address = 4; + Merkle state_diffs = 5; // By order of (contract, key), taking last in case of duplicates. // This means the proposer needs to sort after finishing the block (TBD: patricia? ) // State is optional and appears every X blocks for the last block. This is to support // snapshot sync and also so that light nodes can sync on state without state diffs. - Patricia state = 7; // hash of contract and class patricia tries. Same as in L1. Later more trees will be included - Hash proof_fact = 8; // for Kth block behind. A hash of the output of the proof + Patricia state = 6; // hash of contract and class patricia tries. Same as in L1. Later more trees will be included + Hash proof_fact = 7; // for Kth block behind. A hash of the output of the proof // The following merkles can be built on the fly while sequencing/validating txs. - Merkle transactions = 9; // By order of execution. TBD: required? the client can execute (powerful machine) and match state diff - Merkle events = 10; // By order of issuance. TBD: in receipts? - Merkle receipts = 11; // By order of issuance. - string protocol_version = 12; // Starknet version - Felt252 extra_data = 13; - Felt252 gas_price = 14; + Merkle transactions = 8; // By order of execution. TBD: required? the client can execute (powerful machine) and match state diff + Merkle events = 9; // By order of issuance. TBD: in receipts? + Merkle receipts = 10; // By order of issuance. + string protocol_version = 11; // Starknet version + Felt252 gas_price = 12; } message BlockProof { @@ -83,9 +81,9 @@ message BlockBodiesResponse { StateDiff diff = 2; Classes classes = 3; BlockProof proof = 4; - Transactions transactions = 6; - Receipts receipts = 7; - Fin fin = 8; + Transactions transactions = 5; + Receipts receipts = 6; + Fin fin = 7; } }