fix(storage): remove option from state diff commitment (#2150)

Author: ShahakShama

Cargo.lock

@@ -128,7 +128,7 @@ serde_repr = "0.1"
 serde_yaml = "0.9.16"
 sha3 = "0.10.8"
 simple_logger = "4.0.0"
-starknet_api = "0.13.0-dev.4"
+starknet_api = "0.13.0-dev.6"
 starknet-core = "0.6.0"
 starknet-crypto = "0.5.1"
 starknet-types-core = "0.1.2"
@@ -151,3 +151,6 @@ url = "2.2.2"
 validator = "0.12"
 void = "1.0.2"
 zstd = "0.13.1"
+
+[patch.crates-io]
+starknet_api = { git = "https://github.com/starkware-libs/starknet-api", rev = "008afd0" }

Cargo.toml

@@ -17,6 +17,7 @@
     "l1_da_mode": "CALLDATA",
     "transaction_commitment": "0x03ef487dcb7c114e91ffba49b91567a5719a188abe7a03466943588a4b06c453",
     "event_commitment": "0x04ca88a5447b4885563a074af8316c6cd0e4e8949ba8f532f08770d2f986fc91",
+    "state_diff_commitment": "0x0",
     "n_transactions": 332,
     "n_events": 1561,
     "starknet_version": "0.12.1"

crates/papyrus_common/resources/block_hash.json

@@ -17,6 +17,7 @@
     "l1_da_mode": "CALLDATA",
     "transaction_commitment": "0x053191054b8acc338d6624212707ac73ec274150a032ac34fc2a5f22f0ff8104",
     "event_commitment": "0x0",
+    "state_diff_commitment": "0x0",
     "n_transactions": 31,
     "n_events": 0,
     "starknet_version": ""

crates/papyrus_common/resources/deprecated_block_hash_v0.json

@@ -17,6 +17,7 @@
     "l1_da_mode": "CALLDATA",
     "transaction_commitment": "0x071b80fd924ec690bee7c0bfe7c60c2e222d97e00b8ec5f8cc9cb9dad096dd9d",
     "event_commitment": "0x058795269651aea99e230f442a90ba2cf240f19a50b7e50bc36fc35bc7e29cfb",
+    "state_diff_commitment": "0x0",
     "n_transactions": 44,
     "n_events": 1,
     "starknet_version": ""

crates/papyrus_common/resources/deprecated_block_hash_v1.json

@@ -17,6 +17,7 @@
     "l1_da_mode": "CALLDATA",
     "transaction_commitment": "0x018990b555b92ed88c651f0e7e49fe22a3250c1f1d51766ed8c74f33eddb31ca",
     "event_commitment": "0x0",
+    "state_diff_commitment": "0x0",
     "n_transactions": 111,
     "n_events": 0,
     "starknet_version": ""

crates/papyrus_common/resources/deprecated_block_hash_v1_no_events.json

@@ -17,6 +17,7 @@
     "l1_da_mode": "CALLDATA",
     "transaction_commitment": "0x04d94f068f4ed885b4df1c88c7630d7a8d7fb5eb2293a3b302f94d291aff4d0e",
     "event_commitment": "0x05a778a5ae9b99428744b982fdb13c4cf5f08db15694c74ce0133c88faf26ba9",
+    "state_diff_commitment": "0x0",
     "n_transactions": 171,
     "n_events": 36,
     "starknet_version": ""

crates/papyrus_common/resources/deprecated_block_hash_v2.json

@@ -178,17 +178,18 @@ impl TryFrom<protobuf::SignedBlockHeader> for SignedBlockHeader {
             .map(|receipts| receipts.try_into().map(ReceiptCommitment))
             .transpose()?;
 
-        let state_diff_commitment = match value.state_diff_commitment {
-            None => None,
-            Some(state_diff_commitment) => Some(StateDiffCommitment(PoseidonHash(
-                state_diff_commitment
-                    .root
-                    .ok_or(ProtobufConversionError::MissingField {
-                        field_description: "StateDiffCommitment::root",
-                    })?
-                    .try_into()?,
-            ))),
-        };
+        let state_diff_commitment = StateDiffCommitment(PoseidonHash(
+            value
+                .state_diff_commitment
+                .ok_or(ProtobufConversionError::MissingField {
+                    field_description: "SignedBlockHeader::state_diff_commitment",
+                })?
+                .root
+                .ok_or(ProtobufConversionError::MissingField {
+                    field_description: "StateDiffCommitment::root",
+                })?
+                .try_into()?,
+        ));
 
         Ok(SignedBlockHeader {
             block_header: BlockHeader {
@@ -242,9 +243,7 @@ impl From<(BlockHeader, Vec<BlockSignature>)> for protobuf::SignedBlockHeader {
                     .unwrap_or(0)
                     .try_into()
                     .expect("Converting usize to u64 failed"),
-                root: header
-                    .state_diff_commitment
-                    .map(|state_diff_commitment| state_diff_commitment.0.0.into()),
+                root: Some(header.state_diff_commitment.0.0.into()),
             }),
             state_root: Some(header.state_root.0.into()),
             // This will be Some only if both n_transactions and transaction_commitment are Some.

crates/papyrus_protobuf/src/converters/header.rs

@@ -75,7 +75,7 @@ pub(crate) struct StorageBlockHeader {
     pub sequencer: SequencerContractAddress,
     pub timestamp: BlockTimestamp,
     pub l1_da_mode: L1DataAvailabilityMode,
-    pub state_diff_commitment: Option<StateDiffCommitment>,
+    pub state_diff_commitment: StateDiffCommitment,
     pub transaction_commitment: Option<TransactionCommitment>,
     pub event_commitment: Option<EventCommitment>,
     pub receipt_commitment: Option<ReceiptCommitment>,

crates/papyrus_storage/src/header.rs

@@ -159,7 +159,7 @@ auto_storage_serde! {
         pub sequencer: SequencerContractAddress,
         pub timestamp: BlockTimestamp,
         pub l1_da_mode: L1DataAvailabilityMode,
-        pub state_diff_commitment: Option<StateDiffCommitment>,
+        pub state_diff_commitment: StateDiffCommitment,
         pub transaction_commitment: Option<TransactionCommitment>,
         pub event_commitment: Option<EventCommitment>,
         pub receipt_commitment: Option<ReceiptCommitment>,

crates/papyrus_storage/src/serialization/serializers.rs

@@ -34,7 +34,7 @@ auto_impl_get_test_instance! {
         pub sequencer: SequencerContractAddress,
         pub timestamp: BlockTimestamp,
         pub l1_da_mode: L1DataAvailabilityMode,
-        pub state_diff_commitment: Option<StateDiffCommitment>,
+        pub state_diff_commitment: StateDiffCommitment,
         pub transaction_commitment: Option<TransactionCommitment>,
         pub event_commitment: Option<EventCommitment>,
         pub receipt_commitment: Option<ReceiptCommitment>,

crates/papyrus_storage/src/test_instances.rs

@@ -348,7 +348,7 @@ impl BlockOrDeprecated {
             timestamp: self.timestamp(),
             l1_data_gas_price: self.l1_data_gas_price(),
             l1_da_mode: self.l1_da_mode(),
-            state_diff_commitment: Some(StateDiffCommitment(PoseidonHash(state_diff_commitment.0))),
+            state_diff_commitment: StateDiffCommitment(PoseidonHash(state_diff_commitment.0)),
             transaction_commitment,
             event_commitment,
             // TODO(shahak): Add receipt commitment once it's added to the FGW

crates/starknet_client/src/reader/objects/block.rs

@@ -433,7 +433,7 @@ auto_impl_get_test_instance! {
         pub sequencer: SequencerContractAddress,
         pub timestamp: BlockTimestamp,
         pub l1_da_mode: L1DataAvailabilityMode,
-        pub state_diff_commitment: Option<StateDiffCommitment>,
+        pub state_diff_commitment: StateDiffCommitment,
         pub transaction_commitment: Option<TransactionCommitment>,
         pub event_commitment: Option<EventCommitment>,
         pub receipt_commitment: Option<ReceiptCommitment>,