chore: rebase and update

Author: albert-llimos

.github/workflows/ci-development.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
       - "release/*"
-      - "feat/solana-versioned-transaction-base-branch"
+      - "feat/solana-versioned-transaction-*"
 concurrency:
   group: ${{ github.ref }}-release-development
   cancel-in-progress: true

foreign-chains/solana/sol-prim/src/alt.rs

@@ -26,7 +26,9 @@ pub struct MessageAddressTableLookup {
 /// The definition of address lookup table accounts.
 ///
 /// As used by the `crate::message::v0` message format.
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(
+	Debug, PartialEq, Eq, Clone, Encode, Decode, Serialize, Deserialize, TypeInfo, Default,
+)]
 pub struct AddressLookupTableAccount {
 	pub key: Pubkey,
 	pub addresses: Vec<Pubkey>,

state-chain/chains/src/sol.rs

@@ -37,9 +37,10 @@ pub use sol_prim::{
 		VersionedTransaction as SolVersionedTransaction,
 	},
 	Address as SolAddress, AddressLookupTableAccount as SolAddressLookupTableAccount,
-	Amount as SolAmount, ComputeLimit as SolComputeLimit, Digest as SolHash, Hash as RawSolHash,
-	Instruction as SolInstruction, InstructionRpc as SolInstructionRpc, Pubkey as SolPubkey,
-	Signature as SolSignature, SlotNumber as SolBlockNumber,
+	AddressLookupTableAccount, Amount as SolAmount, ComputeLimit as SolComputeLimit,
+	Digest as SolHash, Hash as RawSolHash, Instruction as SolInstruction,
+	InstructionRpc as SolInstructionRpc, Pubkey as SolPubkey, Signature as SolSignature,
+	SlotNumber as SolBlockNumber,
 };
 pub use sol_tx_core::{
 	rpc_types, AccountMeta as SolAccountMeta, CcmAccounts as SolCcmAccounts,
@@ -469,7 +470,7 @@ pub struct SolApiEnvironment {
 	pub swap_endpoint_program: SolAddress,
 	pub swap_endpoint_program_data_account: SolAddress,
 	pub alt_manager_program: SolAddress,
-	pub address_lookup_table_account: (SolAddress, Vec<SolAddress>),
+	pub address_lookup_table_account: AddressLookupTableAccount,
 }
 
 impl DepositDetailsToTransactionInId<SolanaCrypto> for () {}

state-chain/chains/src/sol/api.rs

@@ -44,8 +44,6 @@ pub struct CurrentAggKey;
 pub struct CurrentOnChainKey;
 #[derive(Clone, Encode, Decode, PartialEq, Debug, TypeInfo)]
 pub struct SolanaAddressLookupTables(pub SwapRequestId);
-#[derive(Clone, Encode, Decode, PartialEq, Debug, TypeInfo)]
-pub struct ChainflipAddressLookupTable;
 
 pub type DurableNonceAndAccount = (SolAddress, SolHash);
 
@@ -78,7 +76,6 @@ pub trait SolanaEnvironment:
 	+ ChainEnvironment<DurableNonce, DurableNonceAndAccount>
 	+ ChainEnvironment<AllNonceAccounts, Vec<DurableNonceAndAccount>>
 	+ ChainEnvironment<SolanaAddressLookupTables, Vec<SolAddressLookupTableAccount>>
-	+ ChainEnvironment<ChainflipAddressLookupTable, SolAddressLookupTableAccount>
 	+ RecoverDurableNonce
 {
 	fn compute_price() -> Result<SolAmount, SolanaTransactionBuildingError> {
@@ -110,18 +107,9 @@ pub trait SolanaEnvironment:
 			.ok_or(SolanaTransactionBuildingError::NoNonceAccountsSet)
 	}
 
-	/// Get all relevant Address lookup tables from the Environment.
-	/// Returns Chainflip's ALT proceeded with user's ALTs.
-	fn get_address_lookup_tables(id: Option<SwapRequestId>) -> Vec<SolAddressLookupTableAccount> {
-		let mut alts = Self::get_cf_address_lookup_table().map(|alt| vec![alt]).unwrap_or_default();
-		if let Some(id) = id {
-			alts.extend(Self::lookup(SolanaAddressLookupTables(id)).unwrap_or_default());
-		}
-		alts
-	}
-
-	fn get_cf_address_lookup_table() -> Option<SolAddressLookupTableAccount> {
-		Self::lookup(ChainflipAddressLookupTable)
+	/// Get any relevant Address lookup tables from the Environment. Those are user-defined.
+	fn get_address_lookup_tables(id: SwapRequestId) -> Vec<SolAddressLookupTableAccount> {
+		Self::lookup(SolanaAddressLookupTables(id)).unwrap_or_default()
 	}
 }
 
@@ -329,7 +317,6 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 		let nonce_accounts = Environment::all_nonce_accounts()?;
 		let compute_price = Environment::compute_price()?;
 		let durable_nonce = Environment::nonce_account()?;
-		let address_lookup_tables = Environment::get_address_lookup_tables(None);
 
 		// Build the transaction
 		let transaction = SolanaTransactionBuilder::rotate_agg_key(
@@ -341,7 +328,7 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 			sol_api_environment.alt_manager_program,
 			durable_nonce,
 			compute_price,
-			address_lookup_tables,
+			vec![sol_api_environment.address_lookup_table_account],
 		)
 		.inspect_err(|e| {
 			// Vault Rotation call building NOT transactional - meaning when this fails,
@@ -409,7 +396,10 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 		let sol_api_environment = Environment::api_environment()?;
 		let agg_key = Environment::current_agg_key()?;
 		// TODO roy: Coordinate with Ramiz on the interface for getting ALTS
-		let address_lookup_tables = Environment::get_address_lookup_tables(Some(swap_request_id));
+		let user_address_lookup_tables = Environment::get_address_lookup_tables(swap_request_id);
+
+		let mut address_lookup_tables = vec![sol_api_environment.address_lookup_table_account];
+		address_lookup_tables.extend(user_address_lookup_tables);
 
 		// Ensure the CCM parameters do not contain blacklisted accounts.
 		check_ccm_for_blacklisted_accounts(
@@ -507,7 +497,6 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 		let sol_api_environment = Environment::api_environment()?;
 		let compute_price = Environment::compute_price()?;
 		let durable_nonce = Environment::nonce_account()?;
-		let address_lookup_tables = Environment::get_address_lookup_tables(None);
 
 		// Build the transaction
 		let transaction = SolanaTransactionBuilder::fetch_and_close_vault_swap_accounts(
@@ -518,7 +507,7 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 			agg_key,
 			durable_nonce,
 			compute_price,
-			address_lookup_tables,
+			vec![sol_api_environment.address_lookup_table_account],
 		)?;
 
 		Ok(Self {
@@ -541,7 +530,6 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 		let sol_api_environment = Environment::api_environment()?;
 		let compute_price = Environment::compute_price()?;
 		let durable_nonce = Environment::nonce_account()?;
-		let address_lookup_tables = Environment::get_address_lookup_tables(None);
 
 		// Build the transaction
 		let transaction = SolanaTransactionBuilder::set_program_swaps_parameters(
@@ -557,7 +545,7 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 			agg_key,
 			durable_nonce,
 			compute_price,
-			address_lookup_tables,
+			vec![sol_api_environment.address_lookup_table_account],
 		)?;
 
 		Ok(Self {
@@ -576,7 +564,6 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 		let sol_api_environment = Environment::api_environment()?;
 		let compute_price = Environment::compute_price()?;
 		let durable_nonce = Environment::nonce_account()?;
-		let address_lookup_tables = Environment::get_address_lookup_tables(None);
 
 		// Build the transaction
 		let transaction = SolanaTransactionBuilder::enable_token_support(
@@ -589,7 +576,7 @@ impl<Environment: SolanaEnvironment> SolanaApi<Environment> {
 			agg_key,
 			durable_nonce,
 			compute_price,
-			address_lookup_tables,
+			vec![sol_api_environment.address_lookup_table_account],
 		)?;
 
 		Ok(Self {

state-chain/node/src/chain_spec.rs

@@ -4,7 +4,10 @@ use cf_chains::{
 	btc::{BitcoinFeeInfo, BitcoinTrackedData, BITCOIN_DUST_LIMIT},
 	dot::{PolkadotAccountId, PolkadotHash, PolkadotTrackedData, RuntimeVersion},
 	eth::EthereumTrackedData,
-	sol::{api::DurableNonceAndAccount, SolAddress, SolApiEnvironment, SolHash, SolTrackedData},
+	sol::{
+		api::DurableNonceAndAccount, AddressLookupTableAccount, SolAddress, SolApiEnvironment,
+		SolHash, SolTrackedData,
+	},
 	Arbitrum, Bitcoin, ChainState, Ethereum, Polkadot,
 };
 use cf_primitives::{
@@ -347,10 +350,14 @@ pub fn inner_cf_development_config(
 					swap_endpoint_program: sol_swap_endpoint_program,
 					swap_endpoint_program_data_account: sol_swap_endpoint_program_data_account,
 					alt_manager_program: sol_alt_manager_program,
-					address_lookup_table_account: (
-						sol_address_lookup_table_account.0,
-						sol_address_lookup_table_account.1.to_vec(),
-					),
+					address_lookup_table_account: AddressLookupTableAccount {
+						key: sol_address_lookup_table_account.0.into(),
+						addresses: sol_address_lookup_table_account
+							.1
+							.into_iter()
+							.map(|addr| addr.into())
+							.collect(),
+					},
 				},
 				sol_durable_nonces_and_accounts: sol_durable_nonces_and_accounts.to_vec(),
 				network_environment: NetworkEnvironment::Development,
@@ -517,10 +524,14 @@ macro_rules! network_spec {
 								swap_endpoint_program_data_account:
 									sol_swap_endpoint_program_data_account,
 								alt_manager_program: sol_alt_manager_program,
-								address_lookup_table_account: (
-									sol_address_lookup_table_account.0,
-									sol_address_lookup_table_account.1.to_vec(),
-								),
+								address_lookup_table_account: AddressLookupTableAccount {
+									key: sol_address_lookup_table_account.0.into(),
+									addresses: sol_address_lookup_table_account
+										.1
+										.into_iter()
+										.map(|addr| addr.into())
+										.collect(),
+								},
 							},
 							network_environment: NETWORK_ENVIRONMENT,
 							..Default::default()