feat(contracts): add AVNU paymaster contracts and consolidate class definitions

- Add avnu-labs/paymaster as git submodule at v1.0.0
- Update build.rs to build AVNU contracts with scarb via asdf
- Add avnu module with AvnuForwarder contract to katana-contracts
- Update controller and cartridge crates to use contracts from katana-contracts
  instead of include_str! with JSON files
- Remove classes/ directory from controller (all contract artifacts now
  come from katana-contracts crate)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: kariy

.gitmodules

@@ -18,3 +18,6 @@
 [submodule "crates/contracts/contracts/vrf"]
 	path = crates/contracts/contracts/vrf
 	url = https://github.com/cartridge-gg/vrf.git
+[submodule "crates/contracts/contracts/avnu"]
+	path = crates/contracts/contracts/avnu
+	url = https://github.com/avnu-labs/paymaster

Cargo.lock

@@ -9,7 +9,6 @@ build = "build.rs"
 [dependencies]
 katana-contracts.workspace = true
 katana-genesis.workspace = true
-katana-chain-spec.workspace = true
 katana-primitives.workspace = true
 katana-rpc-types = { path = "../rpc/rpc-types" }
 

crates/cartridge/Cargo.toml

@@ -12,8 +12,6 @@ use std::time::{Duration, Instant};
 
 use anyhow::{anyhow, Context, Result};
 use ark_ff::PrimeField;
-use katana_chain_spec::ChainSpec;
-use katana_genesis::allocation::GenesisAccountAlloc;
 use katana_genesis::constant::DEFAULT_STRK_FEE_TOKEN_ADDRESS;
 use katana_primitives::chain::ChainId;
 use katana_primitives::utils::get_contract_address;
@@ -241,20 +239,12 @@ pub async fn bootstrap_vrf(
 
 /// Get the class hash of the VRF account contract.
 pub fn vrf_account_class_hash() -> Result<Felt> {
-    let class = katana_primitives::utils::class::parse_sierra_class(include_str!(concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/../controller/classes/cartridge_vrf_VrfAccount.contract_class.json"
-    )))?;
-    class.class_hash().context("failed to compute vrf account class hash")
+    Ok(katana_contracts::vrf::CartridgeVrfAccount::HASH)
 }
 
 /// Get the class hash of the VRF consumer contract.
 pub fn vrf_consumer_class_hash() -> Result<Felt> {
-    let class = katana_primitives::utils::class::parse_sierra_class(include_str!(concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/../controller/classes/cartridge_vrf_VrfConsumer.contract_class.json"
-    )))?;
-    class.class_hash().context("failed to compute vrf consumer class hash")
+    Ok(katana_contracts::vrf::CartridgeVrfConsumer::HASH)
 }
 
 // ============================================================================

crates/cartridge/src/vrf/bootstrap.rs

@@ -11,6 +11,7 @@ fn main() {
     println!("cargo:rerun-if-changed=contracts/messaging");
     println!("cargo:rerun-if-changed=contracts/test-contracts");
     println!("cargo:rerun-if-changed=contracts/vrf");
+    println!("cargo:rerun-if-changed=contracts/avnu");
     println!("cargo:rerun-if-changed=build.rs");
 
     let contracts_dir = Path::new("contracts");
@@ -65,6 +66,10 @@ fn main() {
     let vrf_dir = contracts_dir.join("vrf");
     build_vrf_contracts(&vrf_dir);
 
+    // Build AVNU contracts (uses different scarb version via asdf)
+    let avnu_dir = contracts_dir.join("avnu/contracts");
+    build_avnu_contracts(&avnu_dir);
+
     // Create build directory if it doesn't exist
     if let Err(e) = fs::create_dir_all(build_dir) {
         panic!("Failed to create build directory: {e}");
@@ -90,6 +95,17 @@ fn main() {
     } else {
         println!("cargo:warning=No VRF contract artifacts found in vrf/target/dev");
     }
+
+    // Copy AVNU contract artifacts from avnu/contracts/target/dev to build directory
+    let avnu_target_dir = avnu_dir.join("target/dev");
+    if avnu_target_dir.exists() {
+        if let Err(e) = copy_dir_contents(&avnu_target_dir, build_dir) {
+            panic!("Failed to copy AVNU contract artifacts: {e}");
+        }
+        println!("cargo:warning=AVNU contract artifacts copied to build directory");
+    } else {
+        println!("cargo:warning=No AVNU contract artifacts found in avnu/contracts/target/dev");
+    }
 }
 
 fn copy_dir_contents(src: &Path, dst: &Path) -> std::io::Result<()> {
@@ -132,3 +148,31 @@ fn build_vrf_contracts(vrf_dir: &Path) {
         );
     }
 }
+
+fn build_avnu_contracts(avnu_dir: &Path) {
+    println!("cargo:warning=Building AVNU contracts with scarb...");
+
+    let output = Command::new("asdf")
+        .args(["exec", "scarb", "build"])
+        .current_dir(avnu_dir)
+        .output()
+        .expect("Failed to execute scarb build for AVNU contracts");
+
+    if !output.status.success() {
+        let logs = String::from_utf8_lossy(&output.stdout);
+        let last_n_lines = logs
+            .split('\n')
+            .rev()
+            .take(50)
+            .collect::<Vec<&str>>()
+            .into_iter()
+            .rev()
+            .collect::<Vec<&str>>()
+            .join("\n");
+
+        panic!(
+            "AVNU contracts compilation failed. Below are the last 50 lines of `scarb build` \
+             output:\n\n{last_n_lines}"
+        );
+    }
+}

crates/contracts/build.rs

@@ -25,3 +25,12 @@ pub mod vrf {
         "{CARGO_MANIFEST_DIR}/build/cartridge_vrf_VrfAccount.contract_class.json"
     );
 }
+
+pub mod avnu {
+    use katana_contracts_macro::contract;
+
+    contract!(
+        AvnuForwarder,
+        "{CARGO_MANIFEST_DIR}/build/avnu_Forwarder.contract_class.json"
+    );
+}

crates/contracts/contracts/avnu

@@ -8,5 +8,6 @@ version.workspace = true
 
 [dependencies]
 cartridge.workspace = true
+katana-contracts.workspace = true
 katana-genesis.workspace = true
 katana-primitives.workspace = true