chore: add initial chain spec values

chainflip-io · Aug 24, 2024 · d490ddc · d490ddc
1 parent 8dc8528
commit d490ddc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 29 deletions.
diff --git a/state-chain/cf-integration-tests/src/mock_runtime.rs b/state-chain/cf-integration-tests/src/mock_runtime.rs
@@ -1,3 +1,11 @@
+use cf_chains::{
+	arb::ArbitrumTrackedData,
+	btc::{BitcoinFeeInfo, BitcoinTrackedData},
+	dot::{PolkadotTrackedData, RuntimeVersion},
+	eth::EthereumTrackedData,
+	sol::{sol_tx_core::sol_test_values, SolTrackedData},
+	Arbitrum, Bitcoin, ChainState, Ethereum, Polkadot, Solana,
+};
 use chainflip_node::{
 	chain_spec::testnet::{EXPIRY_SPAN_IN_SECONDS, REDEMPTION_TTL_SECS},
 	test_account_from_seed,
@@ -16,21 +24,10 @@ use state_chain_runtime::{
 	opaque::SessionKeys,
 	test_runner::*,
 	AccountId, AccountRolesConfig, ArbitrumChainTrackingConfig, ArbitrumVaultConfig,
-	EmissionsConfig, EthereumVaultConfig, EvmThresholdSignerConfig, FlipConfig, FundingConfig,
-	GovernanceConfig, ReputationConfig, SessionConfig, SolanaElectionsConfig, SolanaVaultConfig,
-	ValidatorConfig,
-};
-
-use cf_chains::{
-	arb::ArbitrumTrackedData,
-	btc::{BitcoinFeeInfo, BitcoinTrackedData},
-	dot::{PolkadotTrackedData, RuntimeVersion},
-	eth::EthereumTrackedData,
-	sol::sol_tx_core::sol_test_values,
-	Arbitrum, Bitcoin, ChainState, Ethereum, Polkadot,
-};
-use state_chain_runtime::{
-	BitcoinChainTrackingConfig, EthereumChainTrackingConfig, PolkadotChainTrackingConfig,
+	BitcoinChainTrackingConfig, EmissionsConfig, EthereumChainTrackingConfig, EthereumVaultConfig,
+	EvmThresholdSignerConfig, FlipConfig, FundingConfig, GovernanceConfig,
+	PolkadotChainTrackingConfig, ReputationConfig, SessionConfig, SolanaChainTrackingConfig,
+	SolanaElectionsConfig, SolanaVaultConfig, ValidatorConfig,
 };
 
 pub const CURRENT_AUTHORITY_EMISSION_INFLATION_PERBILL: u32 = 28;
@@ -265,7 +262,12 @@ impl ExtBuilder {
 					},
 				},
 			},
-			solana_chain_tracking: Default::default(),
+			solana_chain_tracking: SolanaChainTrackingConfig {
+				init_chain_state: ChainState::<Solana> {
+					block_height: 0,
+					tracked_data: SolTrackedData { priority_fee: COMPUTE_PRICE },
+				},
+			},
 			bitcoin_threshold_signer: Default::default(),
 			evm_threshold_signer: EvmThresholdSignerConfig {
 				key: Some(ethereum_vault_key),

diff --git a/state-chain/node/src/chain_spec.rs b/state-chain/node/src/chain_spec.rs
@@ -4,11 +4,12 @@ use cf_chains::{
 	btc::{BitcoinFeeInfo, BitcoinTrackedData, BITCOIN_DUST_LIMIT},
 	dot::{PolkadotAccountId, PolkadotHash, PolkadotTrackedData, RuntimeVersion},
 	eth::EthereumTrackedData,
-	sol::{api::DurableNonceAndAccount, SolAddress, SolApiEnvironment, SolHash},
+	sol::{api::DurableNonceAndAccount, SolAddress, SolApiEnvironment, SolHash, SolTrackedData},
 	Arbitrum, Bitcoin, ChainState, Ethereum, Polkadot,
 };
 use cf_primitives::{
-	AccountRole, AuthorityCount, NetworkEnvironment, DEFAULT_MAX_AUTHORITY_SET_CONTRACTION,
+	chains::Solana, AccountRole, AuthorityCount, NetworkEnvironment,
+	DEFAULT_MAX_AUTHORITY_SET_CONTRACTION,
 };
 use common::FLIPPERINOS_PER_FLIP;
 pub use sc_service::{ChainType, Properties};
@@ -792,7 +793,12 @@ fn testnet_genesis(
 				},
 			},
 		},
-		solana_chain_tracking: Default::default(),
+		solana_chain_tracking: state_chain_runtime::SolanaChainTrackingConfig {
+			init_chain_state: ChainState::<Solana> {
+				block_height: 0,
+				tracked_data: SolTrackedData { priority_fee: 100_000 },
+			},
+		},
 		// Channel lifetimes are set to ~2 hours at average block times.
 		bitcoin_ingress_egress: state_chain_runtime::BitcoinIngressEgressConfig {
 			deposit_channel_lifetime: bitcoin_deposit_channel_lifetime.into(),

diff --git a/state-chain/runtime/src/migrations/solana_integration.rs b/state-chain/runtime/src/migrations/solana_integration.rs
@@ -1,8 +1,8 @@
 use crate::{chainflip::solana_elections, Runtime};
 use cf_chains::{
 	instances::SolanaInstance,
-	ChainState,
 	sol::{SolApiEnvironment, SolHash, SolTrackedData},
+	ChainState,
 };
 use cf_utilities::bs58_array;
 use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};
@@ -11,7 +11,6 @@ use sol_prim::consts::{const_address, const_hash};
 use sp_runtime::DispatchError;
 use sp_std::vec;
 
-
 pub struct SolanaIntegration;
 
 impl OnRuntimeUpgrade for SolanaIntegration {
@@ -296,14 +295,10 @@ impl OnRuntimeUpgrade for SolanaIntegration {
 		pallet_cf_ingress_egress::DepositChannelLifetime::<Runtime, SolanaInstance>::put(
 			deposit_channel_lifetime,
 		);
-		pallet_cf_chain_tracking::CurrentChainState::<Runtime, SolanaInstance>::put(
-			ChainState {
-				block_height: 0,
-				tracked_data: SolTrackedData {
-					priority_fee: 100_000,
-				},
-			},
-		);
+		pallet_cf_chain_tracking::CurrentChainState::<Runtime, SolanaInstance>::put(ChainState {
+			block_height: 0,
+			tracked_data: SolTrackedData { priority_fee: 100_000 },
+		});
 		Weight::zero()
 	}