fix rebase issues

Author: remybar

Cargo.lock

@@ -44,7 +44,6 @@ members = [
 	"crates/sync/stage",
 	"crates/tasks",
 	"crates/tee",
-	"crates/test-utils",
 	"crates/tracing",
 	"crates/trie",
 	"crates/utils",
@@ -112,7 +111,6 @@ katana-stage = { path = "crates/sync/stage" }
 katana-starknet = { path = "crates/starknet" }
 katana-tasks = { path = "crates/tasks" }
 katana-tee = { path = "crates/tee" }
-katana-test-utils = { path = "crates/test-utils" }
 katana-tracing = { path = "crates/tracing" }
 katana-trie = { path = "crates/trie" }
 katana-utils = { path = "crates/utils" }

Cargo.toml

@@ -7,22 +7,21 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-katana-chain-spec.workspace = true
 katana-contracts.workspace = true
 katana-core.workspace = true
 katana-executor.workspace = true
-katana-gas-price-oracle.workspace = true
 katana-genesis.workspace = true
 katana-pool.workspace = true
 katana-pool-api.workspace = true
 katana-primitives.workspace = true
 katana-provider.workspace = true
 katana-rpc-api.workspace = true
-katana-rpc-client.workspace = true
 katana-rpc-server.workspace = true
 katana-rpc-types.workspace = true
 katana-tasks.workspace = true
 
+starknet-types-core.workspace = true
+
 anyhow.workspace = true
 ark-ec = "0.4"
 lazy_static.workspace = true
@@ -36,16 +35,18 @@ url.workspace = true
 # Use a specific revision of stark-vrf to avoid unwanted breaking changes.
 stark-vrf = { git = "https://github.com/dojoengine/stark-vrf.git", rev = "96d6d2a" }
 
+cainome.workspace = true
+cainome-cairo-serde.workspace = true
+futures.workspace = true
+jsonrpsee.workspace = true
 starknet.workspace = true
-starknet-crypto.workspace = true
 tokio.workspace = true
 tower.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
 katana-db.workspace = true
 katana-node.workspace = true
-katana-test-utils.workspace = true
 katana-utils.workspace = true
 mockito = "1.7.0"
 similar-asserts.workspace = true

crates/cartridge/Cargo.toml

@@ -3,6 +3,7 @@
 pub mod client;
 pub mod paymaster;
 pub mod rpc;
+pub mod utils;
 pub mod vrf;
 
 pub use client::Client;

crates/cartridge/src/lib.rs

@@ -5,11 +5,10 @@ use jsonrpsee::core::middleware::{Batch, Notification, RpcServiceT};
 use jsonrpsee::core::traits::ToRpcParams;
 use jsonrpsee::types::Request;
 use jsonrpsee::MethodResponse;
-use katana_core::backend::storage::ProviderRO;
 use katana_pool::TransactionPool;
 use katana_primitives::block::BlockIdOrTag;
 use katana_primitives::{ContractAddress, Felt};
-use katana_provider::ProviderFactory;
+use katana_provider::{ProviderFactory, ProviderRO};
 use katana_rpc_server::starknet::PendingBlockProvider;
 use katana_rpc_types::broadcasted::BroadcastedTx;
 use katana_rpc_types::FeeEstimate;

crates/cartridge/src/paymaster/layer.rs

@@ -41,24 +41,24 @@ use std::collections::HashSet;
 use std::iter::once;
 
 use cainome_cairo_serde::CairoSerde;
-use katana_core::backend::storage::ProviderRO;
 use katana_genesis::constant::DEFAULT_UDC_ADDRESS;
 use katana_pool::{TransactionPool, TxPool};
 use katana_pool_api::PoolError;
 use katana_primitives::chain::ChainId;
 use katana_primitives::contract::Nonce;
 use katana_primitives::fee::{AllResourceBoundsMapping, ResourceBoundsMapping};
+use katana_primitives::hash::{Poseidon, StarkHash};
 use katana_primitives::transaction::{ExecutableTx, ExecutableTxWithHash, InvokeTx, InvokeTxV3};
 use katana_primitives::{ContractAddress, Felt};
-use katana_provider::ProviderFactory;
+use katana_provider::{ProviderFactory, ProviderRO};
 use katana_rpc_api::error::starknet::StarknetApiError;
 use katana_rpc_server::starknet::{PendingBlockProvider, StarknetApi};
 use katana_rpc_types::broadcasted::BroadcastedTx;
 use katana_rpc_types::{BlockIdOrTag, BroadcastedInvokeTx};
 use layer::PaymasterLayer;
 use starknet::macros::selector;
 use starknet::signers::{LocalWallet, Signer, SigningKey};
-use starknet_crypto::pedersen_hash;
+use starknet_types_core::hash::Pedersen;
 use tracing::{debug, trace};
 
 use crate::utils::get_execute_from_outside_call;
@@ -425,7 +425,7 @@ where
 
                 let calldata = vec![
                     CARTRIDGE_VRF_CLASS_HASH,
-                    CARTRIDGE_VRF_SALT,
+                    CARTRIDGE_VRF_SALT.into(),
                     // from zero
                     Felt::ZERO,
                     // Calldata len
@@ -553,7 +553,7 @@ where
             let state =
                 self.starknet_api.state(&BlockIdOrTag::Latest).map_err(Error::StarknetApi)?;
 
-            let key = pedersen_hash(&selector!("VrfProvider_nonces"), &contract_address);
+            let key = Pedersen::hash(&selector!("VrfProvider_nonces"), &contract_address);
             state.storage(vrf_ctx.address(), key).unwrap_or_default().unwrap_or_default()
         } else if salt_or_nonce_selector == Felt::ONE {
             salt_or_nonce
@@ -564,7 +564,7 @@ where
             )));
         };
 
-        let seed = starknet_crypto::poseidon_hash_many(vec![&source, &caller, &chain_id.id()]);
+        let seed = Poseidon::hash_array(&[source, caller, chain_id.id()]);
         let proof = vrf_ctx.stark_vrf(seed).map_err(|e| Error::Vrf(e.to_string()))?;
 
         let submit_random_call = OutsideExecutionCall {

crates/cartridge/src/paymaster/mod.rs

@@ -2,11 +2,12 @@ use assert_matches::assert_matches;
 use futures::StreamExt;
 use katana_pool::TransactionPool;
 use katana_primitives::contract::ContractAddress;
+use katana_primitives::Felt;
 use katana_provider::api::state::{StateFactoryProvider, StateWriter};
 use katana_provider::{MutableProvider, ProviderFactory};
 use starknet::macros::{felt, selector};
 use starknet::signers::SigningKey;
-use starknet_crypto::{pedersen_hash, Felt};
+use starknet_types_core::hash::Pedersen;
 
 use super::utils::{
     assert_controller_deploy_tx, assert_mocks, assert_outside_execution_v2,
@@ -185,7 +186,7 @@ async fn test_cartridge_outside_execution_when_vrf_is_already_deployed() {
 
     // Set a non-zero nonce for the controller which calls the VRF provider
     let controller_nonce = Felt::TWO;
-    let key = pedersen_hash(&selector!("VrfProvider_nonces"), &controller_address);
+    let key = Pedersen::hash(&selector!("VrfProvider_nonces"), &controller_address);
 
     let provider = paymaster.starknet_api.storage().provider_mut();
     provider.set_storage(vrf_address, key, controller_nonce).expect("failed to set storage");

crates/cartridge/src/paymaster/tests/handle_add_outside_execution.rs

@@ -1,8 +1,7 @@
 use assert_matches::assert_matches;
-use katana_primitives::address;
 use katana_primitives::block::BlockIdOrTag;
 use katana_primitives::contract::ContractAddress;
-use starknet_crypto::Felt;
+use katana_primitives::{address, Felt};
 
 use super::utils::{
     assert_mocks, assert_tx, invoke_tx, setup_cartridge_server, setup_mocks,

crates/cartridge/src/paymaster/tests/handle_estimate_fees.rs

@@ -5,6 +5,7 @@ use katana_core::service::block_producer::BlockProducer;
 use katana_executor::implementation::blockifier::BlockifierFactory;
 use katana_executor::ExecutionFlags;
 use katana_gas_price_oracle::GasPriceOracle;
+use katana_gateway_client::Client as StarknetClient;
 use katana_genesis::constant::DEFAULT_UDC_ADDRESS;
 use katana_pool::ordering::FiFo;
 use katana_pool::TxPool;
@@ -16,7 +17,6 @@ use katana_primitives::fee::{
 };
 use katana_primitives::transaction::{ExecutableTx, InvokeTx};
 use katana_provider::DbProviderFactory;
-use katana_rpc_client::starknet::Client as StarknetClient;
 use katana_rpc_server::starknet::{StarknetApi, StarknetApiConfig};
 use katana_rpc_types::broadcasted::{BroadcastedInvokeTx, BroadcastedTx};
 use katana_tasks::TaskManager;
@@ -506,7 +506,7 @@ pub fn assert_vrf_provider_deploy_tx(
 
         assert_eq!(tx.calldata[3], Felt::from_hex("0x07").unwrap(), "bad calldata length");
         assert_eq!(tx.calldata[4], CARTRIDGE_VRF_CLASS_HASH, "bad VRF class hash");
-        assert_eq!(tx.calldata[5], CARTRIDGE_VRF_SALT, "bad VRF salt");
+        assert_eq!(tx.calldata[5], CARTRIDGE_VRF_SALT.into(), "bad VRF salt");
         assert_eq!(tx.calldata[6], Felt::ZERO, "bad from zero");
         assert_eq!(tx.calldata[7], Felt::THREE, "bad calldata length");
         assert_eq!(tx.calldata[8], paymaster_address.into(), "bad paymaster address");

crates/cartridge/src/paymaster/tests/utils.rs

@@ -3,7 +3,6 @@ use std::sync::Arc;
 
 use anyhow::anyhow;
 use jsonrpsee::core::{async_trait, RpcResult};
-use katana_core::backend::storage::ProviderRO;
 use katana_core::backend::Backend;
 use katana_core::service::block_producer::{BlockProducer, BlockProducerMode};
 use katana_executor::ExecutorFactory;
@@ -14,7 +13,7 @@ use katana_primitives::fee::{AllResourceBoundsMapping, ResourceBoundsMapping};
 use katana_primitives::transaction::{ExecutableTx, ExecutableTxWithHash, InvokeTx, InvokeTxV3};
 use katana_primitives::{ContractAddress, Felt};
 use katana_provider::api::state::{StateFactoryProvider, StateProvider};
-use katana_provider::ProviderFactory;
+use katana_provider::{ProviderFactory, ProviderRO};
 use katana_rpc_api::error::starknet::StarknetApiError;
 use katana_rpc_types::broadcasted::AddInvokeTransactionResponse;
 use katana_tasks::{Result as TaskResult, TaskSpawner};