Merge branch '2.10.1-update' into aggregation_verify

Author: aroralanuk

.github/workflows/rust.yml

@@ -28,34 +28,25 @@ jobs:
         run: |
           cd rust && cargo build --release
 
-      - name: Install dojoup
+      - name: Install starknet-devnet
         run: |
-          curl -L https://install.dojoengine.org | bash
-
-      - name: Install dojo
-        run: |-
-          /home/runner/.config/.dojo/bin/dojoup -v 1.1.0
-          sudo mv /home/runner/.config/.dojo/bin/katana /usr/local/bin/
+          cargo install starknet-devnet --locked
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 
-      - name: Run katana
+      - name: Run starknet-devnet
         run: |
-          katana -b 1000 &
+          starknet-devnet --seed 0 &
 
       - name: Run evm -> strk test
         run: |
           cd rust && cargo test -- test_mailbox_evm_to_strk
 
-      - name: Kill katana
-        run: |
-          pkill katana
-
-      - name: run katana
-        run: |
-          katana -b 1000 &
-
       - name: Run strk -> evm test
         run: |
           cd rust && cargo test -- test_mailbox_strk_to_evm
+
+      - name: Kill starknet-devnet
+        run: |
+          pkill starknet-devnet

rust/Cargo.lock

@@ -33,14 +33,14 @@ rpath = false
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-starknet = "0.13.0"
+starknet = "0.14.0"
 
 [dev-dependencies]
 # starknet
-cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.5.0", features = [
+cainome = { version = "0.6.0", features = [
     "abigen-rs",
 ] }
-starknet = "0.13.0"
+starknet = "0.14.0"
 cairo-lang-starknet-classes = "2.10.1"
 
 # eth
@@ -63,10 +63,12 @@ bytes = "1.6.0"
 sha3 = "0.10.8"
 k256 = { version = "0.13.1", default-features = false, features = ["ecdsa"] }
 
+# Add rand crate for random salt generation
+rand = "0.8"
 
 [build-dependencies]
 ethers = "2.0.7"
-cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.5.0", features = [
+cainome = { version = "0.6.0", features = [
     "abigen-rs",
 ] }
 

rust/Cargo.toml

@@ -1,3 +1,4 @@
+use cainome::rs::ExecutionVersion;
 use ethers::prelude::Abigen;
 use std::{
     collections::HashMap,
@@ -43,52 +44,28 @@ fn generate_strk_bind(name: &str, abi_file: &str, bind_out: PathBuf) {
 
     let mut aliases = HashMap::new();
     aliases.insert(
-        String::from("openzeppelin::access::ownable::ownable::OwnableComponent::Event"),
+        String::from("openzeppelin_access::ownable::ownable::OwnableComponent::Event"),
         String::from("OwnableCptEvent"),
     );
     aliases.insert(
-        String::from("openzeppelin::upgrades::upgradeable::UpgradeableComponent::Event"),
+        String::from("openzeppelin_upgrades::upgradeable::UpgradeableComponent::Event"),
         String::from("UpgradeableCptEvent"),
     );
     aliases.insert(
         String::from("contracts::client::mailboxclient_component::MailboxclientComponent::Event"),
         String::from("MailboxclientEvent"),
     );
-    // aliases.insert(
-    //     String::from("OwnableComponent::Event::OwnershipTransferred"),
-    //     String::from("OwnableOwnershipTransferred"),
-    // );
-    // aliases.insert(
-    //     String::from("OwnableComponent::Event::OwnershipTransferStarted"),
-    //     String::from("OwnableOwnershipTransferStarted"),
-    // );
-    // aliases.insert(
-    //     String::from("UpgradeableComponent::Event::Upgraded"),
-    //     String::from("UpgradeableUpgraded"),
-    // );
-    // aliases.insert(
-    //     String::from("Event"), 
-    //     format!("{}Event", name)
-    // );
-    // aliases.insert(
-    //     String::from("OwnableEvent"),
-    //     String::from("BoxedOwnableEvent"),
-    // );
-    // aliases.insert(
-    //     String::from("UpgradeableEvent"),
-    //     String::from("BoxedUpgradeableEvent"),
-    // );
-    // aliases.insert(
-    //     String::from("MailboxclientEvent"),
-    //     String::from("BoxedMailboxclientEvent"),
-    // );
-    
+    aliases.insert(
+        String::from("contracts::mailbox::mailbox::Event"),
+        String::from("MailboxEvent"),
+    );
 
     let abigen = cainome::rs::Abigen::new(name, abi_file)
-        .with_derives(vec!["Debug".to_string()])
+        .with_derives(vec!["serde::Serialize".to_string(), "serde::Deserialize".to_string()])
         .with_types_aliases(aliases);
 
     abigen
+        .with_execution_version(ExecutionVersion::V3)
         .generate()
         .expect("Fail to generate bindings")
         .write_to_file(bind_out.to_str().expect("valid utf8 path"))