Adjust starknet contracts

Author: fmkra

.tool-versions

@@ -1,2 +1,2 @@
 scarb 2.11.4
-starknet-foundry 0.46.0
+starknet-foundry 0.53.0-rc.0

cairo/Scarb.lock

@@ -131,15 +131,15 @@ checksum = "sha256:44f32d242af1e43982decc49c563e613a9b67ade552f5c3d5cde504e92f74
 
 [[package]]
 name = "snforge_scarb_plugin"
-version = "0.46.0"
+version = "0.52.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:6ffa10fe0ff525678138afd584fc2012e7b248f9c8e7b44aeae033cef3ee7826"
+checksum = "sha256:c33027f8ac078e4bbfc0bd1b7e7849ffe2e6bdd6c24649d0b5ede145095b4743"
 
 [[package]]
 name = "snforge_std"
-version = "0.46.0"
+version = "0.52.0"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:a4d4b4d3e8506a3907d1eabacb058c390aa13a70132f475cba5e3dcd7a60d0bb"
+checksum = "sha256:db8d395191bb2b526c44cee65b10a4044dc59e23a1c1d8009a73c7035760ed6b"
 dependencies = [
  "snforge_scarb_plugin",
 ]

cairo/Scarb.toml

@@ -12,7 +12,7 @@ openzeppelin = "0.20.0"
 integrity = { git = "https://github.com/HerodotusDev/integrity.git" }
 
 [dev-dependencies]
-snforge_std = "0.46.0"
+snforge_std = "0.52.0"
 assert_macros = "2.11.4"
 
 [[target.starknet-contract]]

cairo/deploy.toml

@@ -1,10 +1,10 @@
 [[call]]
 call_type = "deploy"
-class_hash = "0x19ed1f90f98ede33ad93ee15a82759afa27c270169a4a3af80c3ea7915bed0c"
+class_hash = "0x33d8074c4d5283cbad5d8b6c8d7b261b9bf11a56f6195f0c65f49f45a289c6b"
 inputs = [
-    "$CHAIN_ID",
+    "393402133025997798000961",
     "0",
-    "$OWNER"
+    "0x5a6c0f84179d695f0b598cc5d0be50421c247da95cfe63e4cd66fc27f32dfe6"
     # "0x07e4986c03d8a4fea74db3fa5a31467bea98d622570ae9daa74a94fb8dc71817"
 ]
 id = "satellite"
@@ -14,11 +14,11 @@ unique = false
 call_type = "invoke"
 contract_address = "satellite"
 function = "setL1MessageSender"
-inputs = ["$L1_ADDRESS"]
+inputs = ["0x0"]
 
 [[call]]
 call_type = "deploy"
-class_hash = "0x438e4f756b6339f3ec78c93daf15a9ab69b42836eae40b2f75defe0f04158a6"
+class_hash = "0x1a3b5f5e4d864a1a4f5ea6f63d65a6d7efbad80ef5a0ed2a5f99bff3f2a132"
 inputs = []
 id = "evm-growing-inner"
 unique = false

cairo/src/evm_growing.cairo

@@ -9,6 +9,24 @@ use starknet::ContractAddress;
 // Growing module is separated into different contract to reduce class size of the Satellite
 // contract.
 
+#[derive(Drop, Serde)]
+struct FromMmrProof {
+    mmr_index: MmrSize,
+    mmr_proof: Proof,
+    proof_mmr_peaks: Peaks,
+}
+
+#[derive(Drop, Serde)]
+struct FromParentHashProof {
+    reference_block: u256,
+}
+
+#[derive(Drop, Serde)]
+enum ProofType {
+    FromMmr: FromMmrProof,
+    FromParentHash: FromParentHashProof,
+}
+
 #[starknet::interface]
 pub trait IEvmGrowing<TContractState> {
     fn _setGrowingInnerContractAddress(
@@ -19,11 +37,9 @@ pub trait IEvmGrowing<TContractState> {
         ref self: TContractState,
         chain_id: u256,
         headers_rlp: Span<Words64>,
-        mmr_peaks: Peaks,
-        mmr_id: u256,
-        reference_block: Option<u256>,
-        mmr_index: Option<MmrSize>,
-        mmr_proof: Option<Proof>,
+        grow_mmr_peaks: Peaks,
+        grow_mmr_id: u256,
+        proof_type: ProofType,
     );
 }
 
@@ -81,18 +97,16 @@ pub mod evm_growing_component {
         fn onchainEvmAppendBlocksBatch(
             ref self: ComponentState<TContractState>,
             chain_id: u256,
-            mut headers_rlp: Span<Words64>,
-            mmr_peaks: Peaks,
-            mmr_id: u256,
-            reference_block: Option<u256>,
-            mmr_index: Option<MmrSize>,
-            mmr_proof: Option<Proof>,
+            headers_rlp: Span<Words64>,
+            grow_mmr_peaks: Peaks,
+            grow_mmr_id: u256,
+            proof_type: ProofType,
         ) {
             let mut state = get_dep_component_mut!(ref self, State);
             let mut mmr_data = state
                 .mmrs
                 .entry(chain_id)
-                .entry(mmr_id)
+                .entry(grow_mmr_id)
                 .entry(POSEIDON_HASHING_FUNCTION);
 
             let mmr_size = mmr_data.latest_size.read();
@@ -105,18 +119,18 @@ pub mod evm_growing_component {
                     .expect('ROOT_DOES_NOT_FIT'),
             };
 
-            let initial_blockhash = if mmr_proof.is_none() {
-                let reference_block = reference_block.unwrap();
-                Some(
-                    state
-                        .received_parent_hashes
-                        .entry(chain_id)
-                        .entry(POSEIDON_HASHING_FUNCTION)
-                        .entry(reference_block)
-                        .read(),
-                )
-            } else {
-                None
+            let initial_blockhash = match @proof_type {
+                ProofType::FromParentHash(FromParentHashProof { reference_block }) => {
+                    Some(
+                        state
+                            .received_parent_hashes
+                            .entry(chain_id)
+                            .entry(POSEIDON_HASHING_FUNCTION)
+                            .entry(*reference_block)
+                            .read(),
+                    )
+                },
+                _ => None
             };
 
             let (mmr, start_block, end_block) = IEvmGrowingInternalDispatcher {
@@ -125,11 +139,9 @@ pub mod evm_growing_component {
                 .inner_onchainEvmAppendBlocksBatch(
                     chain_id,
                     headers_rlp,
-                    mmr_peaks,
-                    mmr_id,
-                    reference_block,
-                    mmr_index,
-                    mmr_proof,
+                    grow_mmr_peaks,
+                    grow_mmr_id,
+                    proof_type,
                     mmr,
                     initial_blockhash,
                 );
@@ -151,7 +163,7 @@ pub mod evm_growing_component {
                             ]
                                 .span(),
                             mmr_size: mmr.last_pos,
-                            mmr_id,
+                            mmr_id: grow_mmr_id,
                             accumulated_chain_id: chain_id,
                             grown_by: GrownBy::EvmOnChainGrowing,
                         },
@@ -167,11 +179,9 @@ trait IEvmGrowingInternal<TContractState> {
         self: @TContractState,
         chain_id: u256,
         headers_rlp: Span<Words64>,
-        mmr_peaks: Peaks,
-        mmr_id: u256,
-        reference_block: Option<u256>,
-        mmr_index: Option<MmrSize>,
-        mmr_proof: Option<Proof>,
+        grow_mmr_peaks: Peaks,
+        grow_mmr_id: u256,
+        proof_type: ProofType,
         mmr: MMR,
         initial_blockhash: Option<u256>,
     ) -> (MMR, u256, u256);
@@ -192,11 +202,9 @@ pub mod evm_growing_contract {
             self: @ContractState,
             chain_id: u256,
             mut headers_rlp: Span<Words64>,
-            mmr_peaks: Peaks,
-            mmr_id: u256,
-            reference_block: Option<u256>,
-            mmr_index: Option<MmrSize>,
-            mmr_proof: Option<Proof>,
+            grow_mmr_peaks: Peaks,
+            grow_mmr_id: u256,
+            proof_type: ProofType,
             mut mmr: MMR,
             initial_blockhash: Option<u256>,
         ) -> (MMR, u256, u256) {
@@ -205,49 +213,50 @@ pub mod evm_growing_contract {
             let headers_rlp_len = headers_rlp.len();
             let header_rlp_first = *headers_rlp.pop_front().unwrap();
             let poseidon_hash = hash_words64(header_rlp_first);
-            let mut peaks = mmr_peaks;
+            let mut peaks = grow_mmr_peaks;
             let mut start_block: u256 = 0;
             let mut end_block: u256 = 0;
 
             let mut previous_parent_hash: u256 = 0;
 
-            if mmr_proof.is_some() {
-                // Start from block that is present in different mmr
-                // requires mmr_proof and mmr_index, reference_block to be None
+            match proof_type {
+                ProofType::FromMmr(FromMmrProof { mmr_index, mmr_proof, proof_mmr_peaks }) => {
+                    // Start from block that is present in different mmr
+                    // requires mmr_proof and mmr_index, reference_block to be None
 
-                assert(reference_block.is_none(), 'PROOF_AND_REF_BLOCK_NOT_ALLOWED');
-                assert(headers_rlp_len >= 2, 'INVALID_HEADER_RLP');
+                    assert(headers_rlp_len >= 2, 'INVALID_HEADER_RLP');
 
-                let (d, _) = decode_rlp(
-                    header_rlp_first,
-                    [header_rlp_index::PARENT_HASH, header_rlp_index::BLOCK_NUMBER].span(),
-                );
-                previous_parent_hash = decode_parent_hash(*d.at(0));
-                start_block = decode_block_number(*d.at(1)) - 1;
+                    let (d, _) = decode_rlp(
+                        header_rlp_first,
+                        [header_rlp_index::PARENT_HASH, header_rlp_index::BLOCK_NUMBER].span(),
+                    );
+                    previous_parent_hash = decode_parent_hash(*d.at(0));
+                    start_block = decode_block_number(*d.at(1)) - 1;
 
-                mmr
-                    .verify_proof(mmr_index.unwrap(), poseidon_hash, mmr_peaks, mmr_proof.unwrap())
-                    .expect('INVALID_MMR_PROOF');
+                    mmr
+                        .verify_proof(mmr_index, poseidon_hash, proof_mmr_peaks, mmr_proof)
+                        .expect('INVALID_MMR_PROOF');
 
-                end_block = (start_block + 2) - headers_rlp_len.into();
-            } else {
-                // Start from block for which we know the parent hash
+                    end_block = (start_block + 2) - headers_rlp_len.into();
+                },
+                ProofType::FromParentHash(FromParentHashProof { reference_block }) => {
+                    // Start from block for which we know the parent hash
 
-                assert(headers_rlp_len >= 1, 'INVALID_HEADER_RLP');
+                    assert(headers_rlp_len >= 1, 'INVALID_HEADER_RLP');
 
-                let (d, _) = decode_rlp(header_rlp_first, [header_rlp_index::PARENT_HASH].span());
-                previous_parent_hash = decode_parent_hash(*d.at(0));
+                    let (d, _) = decode_rlp(header_rlp_first, [header_rlp_index::PARENT_HASH].span());
+                    previous_parent_hash = decode_parent_hash(*d.at(0));
 
-                let reference_block = reference_block.unwrap();
-                start_block = reference_block - 1;
-                end_block = (start_block + 1) - headers_rlp_len.into();
+                    start_block = reference_block - 1;
+                    end_block = (start_block + 1) - headers_rlp_len.into();
 
-                let initial_blockhash = initial_blockhash.unwrap();
-                assert(initial_blockhash != 0, 'BLOCK_NOT_RECEIVED');
-                assert(initial_blockhash == poseidon_hash.into(), 'INVALID_INITIAL_HEADER_RLP');
+                    let initial_blockhash = initial_blockhash.unwrap();
+                    assert(initial_blockhash != 0, 'BLOCK_NOT_RECEIVED');
+                    assert(initial_blockhash == poseidon_hash.into(), 'INVALID_INITIAL_HEADER_RLP');
 
-                let (_, p) = mmr.append(poseidon_hash, mmr_peaks).expect('MMR_APPEND_FAILED');
-                peaks = p;
+                    let (_, p) = mmr.append(poseidon_hash, peaks).expect('MMR_APPEND_FAILED');
+                    peaks = p;
+                }
             }
 
             for header_rlp in headers_rlp {

cairo/upgrade.toml

@@ -2,4 +2,4 @@
 call_type = "invoke"
 contract_address = "0x06d523b16d7f6f71e250fc7f8d95df3e9e987a120878ea1a25ff312d92f42c8e"
 function = "upgrade"
-inputs = ["0x19ed1f90f98ede33ad93ee15a82759afa27c270169a4a3af80c3ea7915bed0c"]
+inputs = ["0x33d8074c4d5283cbad5d8b6c8d7b261b9bf11a56f6195f0c65f49f45a289c6b"]