Merge branch 'main' into feat/full-node-wip

Author: kariy

.github/workflows/custom-release.yml

@@ -0,0 +1,10 @@
+# Due to workflow limitation of github, this file is merely here
+# to support triggering the workflow on a dev branch, without having
+# to merge it into main.
+#
+# It is useful to make releases which publish a container to the github container registry.
+# CAUTION: it is recommended that you always enforce those custom releases to contain a preview tag, with `-custom.X` suffix where
+# custom is a descriptive name for the release and X is the version number.
+#
+# gh workflow run custom-release.yml --ref feat/your-branch -f preview=v1.7.0-custom.1
+#

.github/workflows/snos-release.yml

@@ -62,7 +62,7 @@ use anyhow::Context;
 use clap::builder::NonEmptyStringValueParser;
 use clap::{Args, Subcommand};
 use deployment::DeploymentOutcome;
-use katana_chain_spec::rollup::ChainConfigDir;
+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;
@@ -246,7 +246,11 @@ 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_contracts = FeeContracts::default();
+        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 {
@@ -384,7 +388,12 @@ 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_contracts = FeeContracts::default();
+        // 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 {

Cargo.lock

@@ -373,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);
     }
 

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

@@ -4,8 +4,8 @@ use katana_primitives::chain::ChainId;
 use katana_primitives::da::L1DataAvailabilityMode;
 use katana_primitives::version::CURRENT_STARKNET_VERSION;
 
-mod file;
-mod utils;
+pub mod file;
+pub mod utils;
 
 pub use file::*;
 pub use utils::DEFAULT_APPCHAIN_FEE_TOKEN_ADDRESS;
@@ -51,16 +51,3 @@ impl ChainSpec {
         ExecutableBlock { header, body: transactions }
     }
 }
-
-// /// Token that can be used for transaction fee payments on the chain.
-// #[derive(Debug, Clone, Serialize, Deserialize)]
-// #[cfg_attr(test, derive(PartialEq))]
-// pub struct FeeContract {
-//     pub strk: ContractAddress,
-// }
-
-// impl Default for FeeContract {
-//     fn default() -> Self {
-//         Self { strk: DEFAULT_APPCHAIN_FEE_TOKEN_ADDRESS }
-//     }
-// }