Bump account_sdk

Cargo.toml

@@ -61,7 +61,7 @@ inherits = "release"
 lto = "fat"
 
 [workspace.dependencies]
-cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.3.2", features = [ "abigen-rs" ] }
+cainome = { git = "https://github.com/cartridge-gg/cainome", rev = "0d29bb0", features = [ "abigen-rs" ] }
 dojo-utils = { path = "crates/dojo-utils" }
 
 # metrics
@@ -184,7 +184,7 @@ scarb-ui = { git = "https://github.com/software-mansion/scarb", tag = "v2.7.0" }
 semver = "1.0.5"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }
-serde_with = "2.3"
+serde_with = "3.9"
 similar-asserts = "1.5.0"
 smol_str = { version = "0.2.0", features = [ "serde" ] }
 sqlx = { version = "0.7.2", features = [ "chrono", "macros", "regexp", "runtime-async-std", "runtime-tokio", "sqlite", "uuid" ] }
@@ -235,7 +235,7 @@ criterion = "0.5.1"
 
 # Controller integration
 account_sdk = { git = "https://github.com/cartridge-gg/controller", rev = "512ff89" }
-slot = { git = "https://github.com/cartridge-gg/slot", rev = "4c1165d" }
+slot = { git = "https://github.com/cartridge-gg/slot", tag = "v0.13.0" }
 
 alloy-contract = { version = "0.2", default-features = false }
 alloy-json-rpc = { version = "0.2", default-features = false }
@@ -250,5 +250,5 @@ alloy-transport = { version = "0.2", default-features = false }
 #
 # To enable std feature on `starknet-types-core`.
 # To re-export the entire `felt` module from `starknet-types-core`.
-starknet-core = { git = "https://github.com/kariy/starknet-rs", branch = "dojo-patch" }
+starknet = { git = "https://github.com/xJonathanLEI/starknet-rs", rev = "2ddc694" }
 starknet-types-core = { git = "https://github.com/dojoengine/types-rs", rev = "289e2f0" }

crates/dojo-world/src/contracts/abi/model.rs

@@ -323,7 +323,8 @@ abigen!(
     "variants": []
   }
 ]"#,
+derives(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize),
 type_aliases {
 dojo::world::config::Config::Event as DojoConfigEvent;
-}
+},
 );

crates/dojo-world/src/migration/mod.rs

@@ -7,10 +7,10 @@ use async_trait::async_trait;
 use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use cairo_lang_starknet_classes::contract_class::ContractClass;
 use dojo_utils::{TransactionExt, TransactionWaiter, TransactionWaitingError, TxnConfig};
-use starknet::accounts::{Account, AccountError, Call, ConnectedAccount};
+use starknet::accounts::{Account, AccountError, ConnectedAccount};
 use starknet::core::types::contract::{CompiledClass, SierraClass};
 use starknet::core::types::{
-    BlockId, BlockTag, DeclareTransactionResult, Felt, FlattenedSierraClass,
+    BlockId, BlockTag, Call, DeclareTransactionResult, Felt, FlattenedSierraClass,
     InvokeTransactionResult, ReceiptBlock, StarknetError, TransactionReceiptWithBlockInfo,
 };
 use starknet::core::utils::{get_contract_address, CairoShortStringToFeltError};

crates/katana/executor/Cargo.toml

@@ -24,6 +24,7 @@ anyhow.workspace = true
 katana-cairo.workspace = true
 katana-provider = { workspace = true, features = [ "test-utils" ] }
 katana-rpc-types.workspace = true
+num-traits.workspace = true
 rstest.workspace = true
 rstest_reuse.workspace = true
 serde_json.workspace = true

crates/katana/executor/tests/fixtures/transaction.rs

@@ -5,13 +5,17 @@ use katana_primitives::genesis::allocation::GenesisAllocation;
 use katana_primitives::genesis::constant::DEFAULT_FEE_TOKEN_ADDRESS;
 use katana_primitives::genesis::Genesis;
 use katana_primitives::transaction::ExecutableTxWithHash;
+use katana_primitives::utils::transaction::compute_invoke_v1_tx_hash;
 use katana_primitives::FieldElement;
-use starknet::accounts::{Account, Call, ExecutionEncoding, SingleOwnerAccount};
-use starknet::core::types::{BlockId, BlockTag, BroadcastedInvokeTransaction};
+use num_traits::ToPrimitive;
+use starknet::accounts::{Account, ExecutionEncoder, ExecutionEncoding, SingleOwnerAccount};
+use starknet::core::types::{
+    BlockId, BlockTag, BroadcastedInvokeTransaction, BroadcastedInvokeTransactionV1, Call,
+};
 use starknet::macros::{felt, selector};
 use starknet::providers::jsonrpc::HttpTransport;
 use starknet::providers::{JsonRpcClient, Url};
-use starknet::signers::{LocalWallet, SigningKey};
+use starknet::signers::{LocalWallet, Signer, SigningKey};
 
 use super::{cfg, genesis};
 
@@ -29,8 +33,8 @@ pub fn invoke_executable_tx(
     let signer = LocalWallet::from_signing_key(SigningKey::from_secret_scalar(private_key));
 
     let mut account = SingleOwnerAccount::new(
-        provider,
-        signer,
+        &provider,
+        &signer,
         address.into(),
         chain_id.into(),
         ExecutionEncoding::New,
@@ -44,21 +48,44 @@ pub fn invoke_executable_tx(
         calldata: vec![felt!("0x1"), felt!("0x99"), felt!("0x0")],
     }];
 
-    let tx = account.execute_v1(calls).nonce(nonce).max_fee(max_fee).prepared().unwrap();
+    let calldata = account.encode_calls(&calls);
+    let hash = compute_invoke_v1_tx_hash(
+        account.address(),
+        &calldata,
+        max_fee.to_u128().unwrap(),
+        chain_id.into(),
+        nonce,
+        false,
+    );
 
-    let mut broadcasted_tx = tokio::runtime::Builder::new_current_thread()
-        .enable_all()
-        .build()
-        .unwrap()
-        .block_on(tx.get_invoke_request(false))
-        .unwrap();
+    let signature = if signed {
+        let signature = tokio::runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .unwrap()
+            .block_on(signer.sign_hash(&hash))
+            .unwrap();
+
+        vec![signature.r, signature.s]
+    } else {
+        vec![]
+    };
+
+    let mut starknet_rs_broadcasted_tx = BroadcastedInvokeTransactionV1 {
+        nonce,
+        max_fee,
+        calldata,
+        signature,
+        is_query: false,
+        sender_address: account.address(),
+    };
 
     if !signed {
-        broadcasted_tx.signature = vec![]
+        starknet_rs_broadcasted_tx.signature = vec![]
     }
 
     let tx = katana_rpc_types::transaction::BroadcastedInvokeTx(BroadcastedInvokeTransaction::V1(
-        broadcasted_tx,
+        starknet_rs_broadcasted_tx,
     ))
     .into_tx_with_chain_id(chain_id);
 

crates/katana/rpc/rpc/tests/common/mod.rs

@@ -5,9 +5,8 @@ use anyhow::{anyhow, Result};
 use katana_cairo::lang::starknet_classes::casm_contract_class::CasmContractClass;
 use katana_cairo::lang::starknet_classes::contract_class::ContractClass;
 use katana_primitives::conversion::rpc::CompiledClass;
-use starknet::accounts::Call;
 use starknet::core::types::contract::SierraClass;
-use starknet::core::types::{Felt, FlattenedSierraClass};
+use starknet::core::types::{Call, Felt, FlattenedSierraClass};
 use starknet::core::utils::get_selector_from_name;
 
 pub fn prepare_contract_declaration_params(

crates/katana/rpc/rpc/tests/starknet.rs

@@ -19,13 +19,13 @@ use katana_primitives::genesis::constant::{
 };
 use katana_rpc_api::dev::DevApiClient;
 use starknet::accounts::{
-    Account, AccountError, AccountFactory, Call, ConnectedAccount, ExecutionEncoding,
+    Account, AccountError, AccountFactory, ConnectedAccount, ExecutionEncoding,
     OpenZeppelinAccountFactory, SingleOwnerAccount,
 };
 use starknet::core::types::contract::legacy::LegacyContractClass;
 use starknet::core::types::{
-    BlockId, BlockTag, DeclareTransactionReceipt, DeployAccountTransactionReceipt, EventFilter,
-    EventsPage, ExecutionResult, Felt, StarknetError, TransactionFinalityStatus,
+    BlockId, BlockTag, Call, DeclareTransactionReceipt, DeployAccountTransactionReceipt,
+    EventFilter, EventsPage, ExecutionResult, Felt, StarknetError, TransactionFinalityStatus,
     TransactionReceipt,
 };
 use starknet::core::utils::get_contract_address;
@@ -202,7 +202,7 @@ async fn deploy_account(
     Ok(())
 }
 
-abigen_legacy!(Erc20Contract, "crates/katana/rpc/rpc/tests/test_data/erc20.json");
+abigen_legacy!(Erc20Contract, "crates/katana/rpc/rpc/tests/test_data/erc20.json", derives(Clone));
 
 #[tokio::test]
 async fn estimate_fee() -> Result<()> {

crates/katana/rpc/rpc/tests/torii.rs

@@ -12,8 +12,8 @@ use katana_rpc_api::dev::DevApiClient;
 use katana_rpc_api::starknet::StarknetApiClient;
 use katana_rpc_api::torii::ToriiApiClient;
 use katana_rpc_types::transaction::{TransactionsPage, TransactionsPageCursor};
-use starknet::accounts::{Account, Call, ConnectedAccount};
-use starknet::core::types::{Felt, TransactionStatus};
+use starknet::accounts::{Account, ConnectedAccount};
+use starknet::core::types::{Call, Felt, TransactionStatus};
 use starknet::core::utils::get_selector_from_name;
 use tokio::time::sleep;
 

crates/saya/core/src/dojo_os/mod.rs

@@ -14,9 +14,9 @@ use anyhow::{bail, Context};
 use dojo_utils::{TransactionExt, TxnConfig};
 use itertools::chain;
 use once_cell::sync::OnceCell;
-use starknet::accounts::{Account, Call, ConnectedAccount, ExecutionEncoding, SingleOwnerAccount};
+use starknet::accounts::{Account, ConnectedAccount, ExecutionEncoding, SingleOwnerAccount};
 use starknet::core::types::{
-    BlockId, BlockTag, Felt, TransactionExecutionStatus, TransactionStatus,
+    BlockId, BlockTag, Call, Felt, TransactionExecutionStatus, TransactionStatus,
 };
 use starknet::core::utils::get_selector_from_name;
 use starknet::providers::jsonrpc::HttpTransport;

crates/saya/core/src/verifier/starknet.rs

@@ -2,8 +2,8 @@ use std::time::Duration;
 
 use anyhow::Context;
 use dojo_utils::{TransactionExt, TxnConfig};
-use starknet::accounts::{Account, Call, ConnectedAccount};
-use starknet::core::types::{Felt, TransactionExecutionStatus, TransactionStatus};
+use starknet::accounts::{Account, ConnectedAccount};
+use starknet::core::types::{Call, Felt, TransactionExecutionStatus, TransactionStatus};
 use starknet::core::utils::get_selector_from_name;
 use starknet::providers::Provider;
 use tokio::time::sleep;

crates/sozo/ops/src/execute.rs

@@ -4,8 +4,8 @@ use dojo_world::contracts::world::WorldContract;
 use scarb_ui::Ui;
 #[cfg(feature = "walnut")]
 use sozo_walnut::WalnutDebugger;
-use starknet::accounts::{Call, ConnectedAccount};
-use starknet::core::types::Felt;
+use starknet::accounts::ConnectedAccount;
+use starknet::core::types::{Call, Felt};
 use starknet::core::utils::get_selector_from_name;
 
 use crate::utils;

crates/sozo/ops/src/migration/mod.rs

@@ -12,8 +12,8 @@ use dojo_world::migration::{DeployOutput, UpgradeOutput};
 use scarb::core::Workspace;
 #[cfg(feature = "walnut")]
 use sozo_walnut::WalnutDebugger;
-use starknet::accounts::{Call, ConnectedAccount, ExecutionEncoding, SingleOwnerAccount};
-use starknet::core::types::{BlockId, BlockTag, Felt, InvokeTransactionResult};
+use starknet::accounts::{ConnectedAccount, ExecutionEncoding, SingleOwnerAccount};
+use starknet::core::types::{BlockId, BlockTag, Call, Felt, InvokeTransactionResult};
 use starknet::core::utils::{cairo_short_string_to_felt, get_contract_address};
 use starknet::macros::selector;
 use starknet::providers::jsonrpc::HttpTransport;

crates/torii/core/src/sql_test.rs

@@ -10,8 +10,8 @@ use dojo_world::contracts::world::{WorldContract, WorldContractReader};
 use katana_runner::{KatanaRunner, KatanaRunnerConfig};
 use scarb::compiler::Profile;
 use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
-use starknet::accounts::{Account, Call, ConnectedAccount};
-use starknet::core::types::Felt;
+use starknet::accounts::{Account, ConnectedAccount};
+use starknet::core::types::{Call, Felt};
 use starknet::core::utils::{get_contract_address, get_selector_from_name};
 use starknet::providers::Provider;
 use starknet_crypto::poseidon_hash_many;

crates/torii/graphql/src/tests/mod.rs

@@ -18,8 +18,8 @@ use serde::Deserialize;
 use serde_json::Value;
 use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
 use sqlx::SqlitePool;
-use starknet::accounts::{Account, Call, ConnectedAccount};
-use starknet::core::types::{Felt, InvokeTransactionResult};
+use starknet::accounts::{Account, ConnectedAccount};
+use starknet::core::types::{Call, Felt, InvokeTransactionResult};
 use starknet::macros::selector;
 use starknet::providers::Provider;
 use tokio::sync::broadcast;

crates/torii/grpc/src/server/tests/entities_test.rs

@@ -12,7 +12,8 @@ use katana_runner::{KatanaRunner, KatanaRunnerConfig};
 use scarb::compiler::Profile;
 use scarb::ops;
 use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
-use starknet::accounts::{Account, Call};
+use starknet::accounts::Account;
+use starknet::core::types::Call;
 use starknet::core::utils::{get_contract_address, get_selector_from_name};
 use starknet::providers::jsonrpc::HttpTransport;
 use starknet::providers::{JsonRpcClient, Provider};