wip

Author: kariy

Cargo.lock

@@ -5,12 +5,12 @@ pub mod vrf;
 
 pub use client::Client;
 pub use vrf::{
-    bootstrap_vrf, derive_vrf_accounts, resolve_executable, vrf_account_class_hash,
-    vrf_consumer_class_hash, vrf_secret_key_from_account_key, wait_for_http_ok, InfoResponse,
-    RequestContext, SignedOutsideExecution, VrfBootstrap, VrfBootstrapConfig, VrfBootstrapResult,
-    VrfClient, VrfClientError, VrfDerivedAccounts, VrfOutsideExecution, VrfService,
-    VrfServiceConfig, VrfServiceProcess, VrfSidecarError, VrfSidecarResult, BOOTSTRAP_TIMEOUT,
-    SIDECAR_TIMEOUT, VRF_ACCOUNT_SALT, VRF_CONSUMER_SALT, VRF_SERVER_PORT,
+    bootstrap_vrf, derive_vrf_accounts, resolve_executable, vrf_secret_key_from_account_key,
+    wait_for_http_ok, InfoResponse, RequestContext, SignedOutsideExecution, VrfBootstrap,
+    VrfBootstrapConfig, VrfBootstrapResult, VrfClient, VrfClientError, VrfDerivedAccounts,
+    VrfOutsideExecution, VrfService, VrfServiceConfig, VrfServiceProcess, VrfSidecarError,
+    VrfSidecarResult, BOOTSTRAP_TIMEOUT, SIDECAR_TIMEOUT, VRF_ACCOUNT_SALT, VRF_CONSUMER_SALT,
+    VRF_SERVER_PORT,
 };
 
 #[rustfmt::skip]

crates/cartridge/src/lib.rs

@@ -99,7 +99,7 @@ pub fn derive_vrf_accounts(
 
     let account_public_key =
         SigningKey::from_secret_scalar(source_private_key).verifying_key().scalar();
-    let vrf_account_class_hash = vrf_account_class_hash()?;
+    let vrf_account_class_hash = katana_contracts::vrf::CartridgeVrfAccount::HASH;
     // When using UDC with unique=0 (non-unique deployment), the deployer_address
     // used in address computation is 0, not the actual deployer or UDC address.
     let vrf_account_address = get_contract_address(
@@ -136,7 +136,7 @@ pub async fn bootstrap_vrf(
     let vrf_account_address = derived.vrf_account_address;
     let account_public_key =
         SigningKey::from_secret_scalar(bootstrapper_account_private_key).verifying_key().scalar();
-    let vrf_account_class_hash = vrf_account_class_hash()?;
+    let vrf_account_class_hash = katana_contracts::vrf::CartridgeVrfAccount::HASH;
 
     // Create the source account for transactions
     let signer =
@@ -204,7 +204,7 @@ pub async fn bootstrap_vrf(
         .map_err(|e| anyhow!("failed to set VRF public key: {e}"))?;
 
     // Deploy VRF consumer
-    let vrf_consumer_class_hash = vrf_consumer_class_hash()?;
+    let vrf_consumer_class_hash = katana_contracts::vrf::CartridgeVrfConsumer::HASH;
     // When using UDC with unique=0 (non-unique deployment), the deployer_address
     // used in address computation is 0, not the actual deployer or UDC address.
     let vrf_consumer_address = get_contract_address(
@@ -237,16 +237,6 @@ pub async fn bootstrap_vrf(
     })
 }
 
-/// Get the class hash of the VRF account contract.
-pub fn vrf_account_class_hash() -> Result<Felt> {
-    Ok(katana_contracts::vrf::CartridgeVrfAccount::HASH)
-}
-
-/// Get the class hash of the VRF consumer contract.
-pub fn vrf_consumer_class_hash() -> Result<Felt> {
-    Ok(katana_contracts::vrf::CartridgeVrfConsumer::HASH)
-}
-
 // ============================================================================
 // Internal helpers
 // ============================================================================

crates/cartridge/src/vrf/bootstrap.rs

@@ -11,9 +11,9 @@ pub mod bootstrap;
 pub mod sidecar;
 
 pub use bootstrap::{
-    bootstrap_vrf, derive_vrf_accounts, vrf_account_class_hash, vrf_consumer_class_hash,
-    vrf_secret_key_from_account_key, VrfBootstrap, VrfBootstrapConfig, VrfBootstrapResult,
-    VrfDerivedAccounts, BOOTSTRAP_TIMEOUT, VRF_ACCOUNT_SALT, VRF_CONSUMER_SALT,
+    bootstrap_vrf, derive_vrf_accounts, vrf_secret_key_from_account_key, VrfBootstrap,
+    VrfBootstrapConfig, VrfBootstrapResult, VrfDerivedAccounts, BOOTSTRAP_TIMEOUT,
+    VRF_ACCOUNT_SALT, VRF_CONSUMER_SALT,
 };
 pub use client::*;
 pub use sidecar::{

crates/cartridge/src/vrf/mod.rs

@@ -29,8 +29,5 @@ pub mod vrf {
 pub mod avnu {
     use katana_contracts_macro::contract;
 
-    contract!(
-        AvnuForwarder,
-        "{CARGO_MANIFEST_DIR}/build/avnu_Forwarder.contract_class.json"
-    );
+    contract!(AvnuForwarder, "{CARGO_MANIFEST_DIR}/build/avnu_Forwarder.contract_class.json");
 }

crates/contracts/src/lib.rs

@@ -7,6 +7,7 @@ version.workspace = true
 
 [dependencies]
 katana-primitives.workspace = true
+katana-contracts.workspace = true
 
 http.workspace = true
 jsonrpsee = { workspace = true, features = ["macros", "server", "client", "http-client"] }

crates/paymaster/Cargo.toml

@@ -496,7 +496,8 @@ impl PaymasterService {
             chain_id_felt
         };
 
-        let forwarder_class_hash = avnu_forwarder_class_hash()?;
+        let forwarder_class_hash = katana_contracts::avnu::AvnuForwarder::HASH;
+
         // When using UDC with unique=0 (non-unique deployment), the deployer_address
         // used in address computation is 0, not the actual deployer or UDC address.
         let forwarder_address = get_contract_address(
@@ -670,15 +671,6 @@ async fn wait_for_contract(
     }
 }
 
-fn avnu_forwarder_class_hash() -> Result<Felt> {
-    let class = katana_primitives::utils::class::parse_sierra_class(include_str!(concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/../controller/classes/avnu_Forwarder.contract_class.json"
-    )))
-    .map_err(Error::ClassParse)?;
-    class.class_hash().map_err(Error::ClassHash)
-}
-
 fn resolve_executable(path: &Path) -> Result<PathBuf> {
     if path.components().count() > 1 {
         return if path.is_file() {