feat: update to cairo 2.9.2 (#47)

* update to cairo 2.9.2

* add ci scarb fmt check

* update action version in ci to avoid warnings

* fix to the new usage of features

* add to ci the check to build default without features

Author: glihm

.github/workflows/build.yml

@@ -9,10 +9,16 @@ on:
 permissions: read-all
 
 jobs:
-  check:
+  build_default:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: asdf-vm/actions/install@v3
-      - run: scarb fmt --check
+      - uses: asdf-vm/actions/[email protected]
+      - run: scarb build
+
+  build_all_features:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: asdf-vm/actions/[email protected]
       - run: scarb build --all-features

.github/workflows/check.yml

@@ -19,9 +19,16 @@ jobs:
           mdl -s .github/linter/base_style.rb .github
           mdl -s .github/linter/book_style.rb book
 
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: asdf-vm/actions/[email protected]
+      - run: scarb fmt --check
+
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: asdf-vm/actions/install@v3
+      - uses: asdf-vm/actions/install@v3.0.2
       - run: scarb test --all-features

.tool-versions

@@ -1,2 +1,2 @@
-scarb 2.8.4
-starknet-foundry 0.27.0
+scarb 2.9.2
+starknet-foundry 0.34.0

Scarb.lock

@@ -3,11 +3,13 @@ version = 1
 
 [[package]]
 name = "openzeppelin"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:05fd9365be85a4a3e878135d5c52229f760b3861ce4ed314cb1e75b178b553da"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
+ "openzeppelin_finance",
  "openzeppelin_governance",
  "openzeppelin_introspection",
  "openzeppelin_merkle_tree",
@@ -20,85 +22,111 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin_access"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:7734901a0ca7a7065e69416fea615dd1dc586c8dc9e76c032f25ee62e8b2a06c"
 dependencies = [
  "openzeppelin_introspection",
- "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_account"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:1aa3a71e2f40f66f98d96aa9bf9f361f53db0fd20fa83ef7df04426a3c3a926a"
 dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_utils",
 ]
 
+[[package]]
+name = "openzeppelin_finance"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:f0c507fbff955e4180ea3fa17949c0ff85518c40101f4948948d9d9a74143d6c"
+dependencies = [
+ "openzeppelin_access",
+ "openzeppelin_token",
+]
+
 [[package]]
 name = "openzeppelin_governance"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:c0fb60fad716413d537fabd5fcbb2c499ca6beb95af5f0d1699955ecec4c6f63"
 dependencies = [
  "openzeppelin_access",
+ "openzeppelin_account",
  "openzeppelin_introspection",
+ "openzeppelin_token",
+ "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_introspection"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:13e04a2190684e6804229a77a6c56de7d033db8b9ef519e5e8dee400a70d8a3d"
 
 [[package]]
 name = "openzeppelin_merkle_tree"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:039608900e92f3dcf479bf53a49a1fd76452acd97eb86e390d1eb92cacdaf3af"
 
 [[package]]
 name = "openzeppelin_presets"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:5c07a8de32e5d9abe33988c7927eaa8b5f83bc29dc77302d9c8c44c898611042"
 dependencies = [
  "openzeppelin_access",
  "openzeppelin_account",
+ "openzeppelin_finance",
  "openzeppelin_introspection",
  "openzeppelin_token",
  "openzeppelin_upgrades",
+ "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_security"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:27155597019ecf971c48d7bfb07fa58cdc146d5297745570071732abca17f19f"
 
 [[package]]
 name = "openzeppelin_testing"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:2fa9aaadacffd6a95754781ed18f6ee660f52a30d27b024efcde2b4b5648e0b3"
 dependencies = [
  "snforge_std",
 ]
 
 [[package]]
 name = "openzeppelin_token"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:4452f449dc6c1ea97cf69d1d9182749abd40e85bd826cd79652c06a627eafd91"
 dependencies = [
+ "openzeppelin_access",
  "openzeppelin_account",
- "openzeppelin_governance",
  "openzeppelin_introspection",
+ "openzeppelin_utils",
 ]
 
 [[package]]
 name = "openzeppelin_upgrades"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:15fdd63f6b50a0fda7b3f8f434120aaf7637bcdfe6fd8d275ad57343d5ede5e1"
 
 [[package]]
 name = "openzeppelin_utils"
-version = "0.16.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.16.0#ba00ce76a93dcf25c081ab2698da20690b5a1cfb"
+version = "0.20.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:44f32d242af1e43982decc49c563e613a9b67ade552f5c3d5cde504e92f74607"
 
 [[package]]
 name = "piltover"
@@ -109,7 +137,17 @@ dependencies = [
  "snforge_std",
 ]
 
+[[package]]
+name = "snforge_scarb_plugin"
+version = "0.34.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:56f2b06ff2f0d8bbdfb7fb6c211fba7e4da6e5334ea70ba849af329a739faf11"
+
 [[package]]
 name = "snforge_std"
-version = "0.27.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.27.0#2d99b7c00678ef0363881ee0273550c44a9263de"
+version = "0.34.0"
+source = "registry+https://scarbs.xyz/"
+checksum = "sha256:bd20964bde07e6fd0f7adb50d41216f05d66abd422ed82241030369333385876"
+dependencies = [
+ "snforge_scarb_plugin",
+]

Scarb.toml

@@ -1,23 +1,24 @@
 [package]
 name = "piltover"
 version = "0.1.0"
-edition = "2023_10"
+edition = "2024_07"
 
 [dependencies]
-starknet = "2.8.4"
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.16.0" }
+starknet = "2.9.2"
+openzeppelin = "0.20.0"
 
 [dev-dependencies]
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.27.0" }
-openzeppelin_testing = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.16.0" }
+starknet = "2.9.2"
+snforge_std = "0.34.0"
+openzeppelin_testing = "0.20.0"
+
+[scripts]
+test = "snforge test"
 
 [lib]
 sierra = true
 casm = true
 
-[scripts]
-test = "snforge test"
-
 [[target.starknet-contract]]
 casm = true
 sierra = true

bindings/src/lib.rs

@@ -3644,6 +3644,35 @@ UpgradeableEvent
         new(__call, self.provider(),)
     } #[allow(clippy :: ptr_arg)] #[allow(clippy :: too_many_arguments)] pub
     fn
+    add_messages_hashes_from_appchain_getcall(& self, messages_hashes : & Vec
+    :: < starknet :: core :: types :: Felt >) -> starknet :: core :: types ::
+    Call
+    {
+        use cainome :: cairo_serde :: CairoSerde; let mut __calldata = vec!
+        [];
+        __calldata.extend(Vec :: < starknet :: core :: types :: Felt > ::
+        cairo_serialize(messages_hashes)); starknet :: core :: types :: Call
+        {
+            to : self.address, selector : starknet :: macros :: selector!
+            ("add_messages_hashes_from_appchain"), calldata : __calldata,
+        }
+    } #[allow(clippy :: ptr_arg)] #[allow(clippy :: too_many_arguments)] pub
+    fn
+    add_messages_hashes_from_appchain(& self, messages_hashes : & Vec :: <
+    starknet :: core :: types :: Felt >) -> starknet :: accounts ::
+    ExecutionV1 < A >
+    {
+        use cainome :: cairo_serde :: CairoSerde; let mut __calldata = vec!
+        [];
+        __calldata.extend(Vec :: < starknet :: core :: types :: Felt > ::
+        cairo_serialize(messages_hashes)); let __call = starknet :: core ::
+        types :: Call
+        {
+            to : self.address, selector : starknet :: macros :: selector!
+            ("add_messages_hashes_from_appchain"), calldata : __calldata,
+        }; self.account.execute_v1(vec! [__call])
+    } #[allow(clippy :: ptr_arg)] #[allow(clippy :: too_many_arguments)] pub
+    fn
     cancel_message_getcall(& self, to_address : & cainome :: cairo_serde ::
     ContractAddress, selector : & starknet :: core :: types :: Felt, payload :
     & Vec :: < starknet :: core :: types :: Felt > , nonce : & starknet ::

src/appchain.cairo

@@ -3,21 +3,20 @@
 //!
 
 mod errors {
-    const INVALID_ADDRESS: felt252 = 'Config: invalid address';
-    const SNOS_INVALID_PROGRAM_OUTPUT_SIZE: felt252 = 'snos: invalid output size';
-    const SNOS_INVALID_CONFIG_HASH: felt252 = 'snos: invalid config hash';
-    const SNOS_INVALID_MESSAGES_SEGMENTS: felt252 = 'snos: invalid messages segments';
-    const NO_STATE_TRANSITION_PROOF: felt252 = 'no state transition proof';
+    pub const INVALID_ADDRESS: felt252 = 'Config: invalid address';
+    pub const SNOS_INVALID_PROGRAM_OUTPUT_SIZE: felt252 = 'snos: invalid output size';
+    pub const SNOS_INVALID_CONFIG_HASH: felt252 = 'snos: invalid config hash';
+    pub const SNOS_INVALID_MESSAGES_SEGMENTS: felt252 = 'snos: invalid messages segments';
+    pub const NO_STATE_TRANSITION_PROOF: felt252 = 'no state transition proof';
 }
 
 /// Appchain settlement contract on starknet.
 #[starknet::contract]
-mod appchain {
+pub mod appchain {
     use core::iter::IntoIterator;
-    use core::poseidon::{Poseidon, PoseidonImpl, HashStateImpl, poseidon_hash_span};
+    use core::poseidon::{PoseidonImpl, poseidon_hash_span};
     use openzeppelin::access::ownable::{
         OwnableComponent as ownable_cpt, OwnableComponent::InternalTrait as OwnableInternal,
-        interface::IOwnable,
     };
     use openzeppelin::security::reentrancyguard::{
         ReentrancyGuardComponent,
@@ -28,19 +27,16 @@ mod appchain {
         UpgradeableComponent::InternalTrait as UpgradeableInternal, interface::IUpgradeable,
     };
     use piltover::components::onchain_data_fact_tree_encoder::{
-        encode_fact_with_onchain_data, DataAvailabilityFact,
+        DataAvailabilityFact, encode_fact_with_onchain_data,
     };
-    use piltover::config::{config_cpt, config_cpt::InternalTrait as ConfigInternal, IConfig};
+    use piltover::config::{IConfig, config_cpt, config_cpt::InternalTrait as ConfigInternal};
     use piltover::fact_registry::{IFactRegistryDispatcher, IFactRegistryDispatcherTrait};
     use piltover::interface::IAppchain;
-    use piltover::messaging::{
-        messaging_cpt, messaging_cpt::InternalTrait as MessagingInternal, IMessaging,
-    };
-    use piltover::snos_output::StarknetOsOutput;
+    use piltover::messaging::{messaging_cpt, messaging_cpt::InternalTrait as MessagingInternal};
     use piltover::snos_output::deserialize_os_output;
-    use piltover::state::component::state_cpt::HasComponent;
-    use piltover::state::{state_cpt, state_cpt::InternalTrait as StateInternal, IState};
-    use starknet::{ContractAddress, ClassHash};
+    use piltover::state::{IState, state_cpt, state_cpt::InternalTrait as StateInternal};
+    use starknet::storage::{StoragePointerReadAccess};
+    use starknet::{ClassHash, ContractAddress};
     use super::errors;
 
     /// The default cancellation delay of 5 days.
@@ -62,6 +58,11 @@ mod appchain {
     #[abi(embed_v0)]
     impl StateImpl = state_cpt::StateImpl<ContractState>;
 
+    #[cfg(feature: 'messaging_test')]
+    #[abi(embed_v0)]
+    impl MessagingTestImpl =
+        messaging_cpt::MessagingTestImpl<ContractState>;
+
     #[storage]
     struct Storage {
         #[substorage(v0)]
@@ -80,7 +81,7 @@ mod appchain {
 
     #[event]
     #[derive(Drop, starknet::Event)]
-    enum Event {
+    pub enum Event {
         #[flat]
         OwnableEvent: ownable_cpt::Event,
         #[flat]
@@ -98,15 +99,15 @@ mod appchain {
     }
 
     #[derive(Drop, starknet::Event)]
-    struct LogStateUpdate {
-        state_root: felt252,
-        block_number: felt252,
-        block_hash: felt252,
+    pub struct LogStateUpdate {
+        pub state_root: felt252,
+        pub block_number: felt252,
+        pub block_hash: felt252,
     }
 
     #[derive(Drop, starknet::Event)]
-    struct LogStateTransitionFact {
-        state_transition_fact: u256,
+    pub struct LogStateTransitionFact {
+        pub state_transition_fact: u256,
     }
 
     /// Initializes the contract.