refactor(rpc): remove Backend from StarknetApi (#355)

Author: kariy

Cargo.lock

@@ -62,8 +62,8 @@ use anyhow::Context;
 use clap::builder::NonEmptyStringValueParser;
 use clap::{Args, Subcommand};
 use deployment::DeploymentOutcome;
-use katana_chain_spec::rollup::{ChainConfigDir, FeeContract};
-use katana_chain_spec::{rollup, SettlementLayer};
+use katana_chain_spec::rollup::{ChainConfigDir, DEFAULT_APPCHAIN_FEE_TOKEN_ADDRESS};
+use katana_chain_spec::{rollup, FeeContracts, SettlementLayer};
 use katana_genesis::allocation::DevAllocationsGenerator;
 use katana_genesis::constant::DEFAULT_PREFUNDED_ACCOUNT_BALANCE;
 use katana_genesis::Genesis;
@@ -246,8 +246,12 @@ impl RollupArgs {
         slot::add_paymasters_to_genesis(&mut genesis, &output.slot_paymasters.unwrap_or_default());
 
         // At the moment, the fee token is limited to a predefined token.
-        let fee_contract = FeeContract::default();
-        let chain_spec = rollup::ChainSpec { id, genesis, settlement, fee_contract };
+        let fee_contracts = FeeContracts {
+            eth: DEFAULT_APPCHAIN_FEE_TOKEN_ADDRESS,
+            strk: DEFAULT_APPCHAIN_FEE_TOKEN_ADDRESS,
+        };
+
+        let chain_spec = rollup::ChainSpec { id, genesis, settlement, fee_contracts };
 
         if let Some(path) = self.output_path {
             let dir = ChainConfigDir::create(path)?;
@@ -384,8 +388,13 @@ impl SovereignArgs {
         slot::add_paymasters_to_genesis(&mut genesis, &output.slot_paymasters.unwrap_or_default());
 
         // At the moment, the fee token is limited to a predefined token.
-        let fee_contract = FeeContract::default();
-        let chain_spec = rollup::ChainSpec { id, genesis, settlement, fee_contract };
+        // At the moment, the fee token is limited to a predefined token.
+        let fee_contracts = FeeContracts {
+            eth: DEFAULT_APPCHAIN_FEE_TOKEN_ADDRESS,
+            strk: DEFAULT_APPCHAIN_FEE_TOKEN_ADDRESS,
+        };
+
+        let chain_spec = rollup::ChainSpec { id, genesis, settlement, fee_contracts };
 
         if let Some(path) = self.output_path {
             let dir = ChainConfigDir::create(path)?;

bin/katana/src/cli/init/mod.rs

@@ -20,10 +20,9 @@ use katana_primitives::utils::split_u256;
 use katana_primitives::version::StarknetVersion;
 use katana_primitives::Felt;
 use lazy_static::lazy_static;
-use serde::{Deserialize, Serialize};
 use starknet::core::utils::cairo_short_string_to_felt;
 
-use crate::SettlementLayer;
+use crate::{FeeContracts, SettlementLayer};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ChainSpec {
@@ -106,17 +105,6 @@ impl ChainSpec {
     }
 }
 
-/// Tokens that can be used for transaction fee payments in the chain. As
-/// supported on Starknet.
-// TODO: include both l1 and l2 addresses
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-pub struct FeeContracts {
-    /// L2 ETH fee token address. Used for paying pre-V3 transactions.
-    pub eth: ContractAddress,
-    /// L2 STRK fee token address. Used for paying V3 transactions.
-    pub strk: ContractAddress,
-}
-
 impl Default for ChainSpec {
     fn default() -> Self {
         DEV.clone()

crates/chain-spec/src/dev.rs

@@ -44,6 +44,13 @@ impl ChainSpec {
             Self::Rollup(spec) => Some(&spec.settlement),
         }
     }
+
+    pub fn fee_contracts(&self) -> &FeeContracts {
+        match self {
+            Self::Dev(spec) => &spec.fee_contracts,
+            Self::Rollup(spec) => &spec.fee_contracts,
+        }
+    }
 }
 
 impl From<dev::ChainSpec> for ChainSpec {
@@ -106,3 +113,14 @@ pub enum SettlementLayer {
         // availability layer to the chain spec for Katana to sync from it.
     },
 }
+
+/// Tokens that can be used for transaction fee payments in the chain. As
+/// supported on Starknet.
+// TODO: include both l1 and l2 addresses
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
+pub struct FeeContracts {
+    /// L2 ETH fee token address. Used for paying pre-V3 transactions.
+    pub eth: ContractAddress,
+    /// L2 STRK fee token address. Used for paying V3 transactions.
+    pub strk: ContractAddress,
+}

crates/chain-spec/src/lib.rs

@@ -5,11 +5,11 @@ use std::path::{Path, PathBuf};
 use katana_genesis::json::GenesisJson;
 use katana_genesis::Genesis;
 use katana_primitives::chain::ChainId;
+use katana_primitives::ContractAddress;
 use serde::{Deserialize, Serialize};
 
-use super::FeeContract;
 use crate::rollup::ChainSpec;
-use crate::SettlementLayer;
+use crate::{FeeContracts, SettlementLayer};
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
@@ -86,7 +86,7 @@ pub fn read(dir: &ChainConfigDir) -> Result<ChainSpec, Error> {
         genesis,
         id: chain_spec.id,
         settlement: chain_spec.settlement,
-        fee_contract: chain_spec.fee_contract,
+        fee_contracts: chain_spec.fee_contract.into(),
     })
 }
 
@@ -95,7 +95,7 @@ pub fn write(dir: &ChainConfigDir, chain_spec: &ChainSpec) -> Result<(), Error>
         let cfg = ChainSpecFile {
             id: chain_spec.id,
             settlement: chain_spec.settlement.clone(),
-            fee_contract: chain_spec.fee_contract.clone(),
+            fee_contract: chain_spec.fee_contracts.clone().into(),
         };
 
         let content = toml::to_string_pretty(&cfg)?;
@@ -140,11 +140,28 @@ fn list_at<P: AsRef<Path>>(dir: P) -> Result<Vec<ChainId>, Error> {
     Ok(chains)
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct FileFeeContract {
+    pub strk: ContractAddress,
+}
+
+impl From<FileFeeContract> for FeeContracts {
+    fn from(fee_contract: FileFeeContract) -> Self {
+        Self { strk: fee_contract.strk, eth: fee_contract.strk }
+    }
+}
+
+impl From<FeeContracts> for FileFeeContract {
+    fn from(fee_contracts: FeeContracts) -> Self {
+        Self { strk: fee_contracts.strk }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 struct ChainSpecFile {
     id: ChainId,
-    fee_contract: FeeContract,
+    fee_contract: FileFeeContract,
     settlement: SettlementLayer,
 }
 
@@ -294,8 +311,8 @@ mod tests {
 
     use super::Error;
     use crate::rollup::file::{local_dir, ChainConfigDir, LocalChainConfigDir, KATANA_LOCAL_DIR};
-    use crate::rollup::{ChainSpec, FeeContract};
-    use crate::SettlementLayer;
+    use crate::rollup::ChainSpec;
+    use crate::{FeeContracts, SettlementLayer};
 
     static TEMPDIR: OnceLock<TempDir> = OnceLock::new();
 
@@ -333,7 +350,10 @@ mod tests {
         ChainSpec {
             id: ChainId::default(),
             genesis: Genesis::default(),
-            fee_contract: FeeContract { strk: ContractAddress::default() },
+            fee_contracts: FeeContracts {
+                eth: ContractAddress::default(),
+                strk: ContractAddress::default(),
+            },
             settlement: SettlementLayer::Starknet {
                 block: 0,
                 id: ChainId::default(),
@@ -353,7 +373,7 @@ mod tests {
         let read_spec = read(&id).unwrap();
 
         assert_eq!(chain_spec.id, read_spec.id);
-        assert_eq!(chain_spec.fee_contract, read_spec.fee_contract);
+        assert_eq!(chain_spec.fee_contracts, read_spec.fee_contracts);
         assert_eq!(chain_spec.settlement, read_spec.settlement);
     }