feat: Solana Vault Swaps Elections

.cargo/config.toml

@@ -2,7 +2,7 @@
 CF_ETH_CONTRACT_ABI_ROOT = { value = "contract-interfaces/eth-contract-abis", relative = true }
 CF_ETH_CONTRACT_ABI_TAG = "v1.1.2"
 CF_SOL_PROGRAM_IDL_ROOT = { value = "contract-interfaces/sol-program-idls", relative = true }
-CF_SOL_PROGRAM_IDL_TAG = "v1.0.0"
+CF_SOL_PROGRAM_IDL_TAG = "v1.0.0-swap-endpoint"
 CF_ARB_CONTRACT_ABI_ROOT = { value = "contract-interfaces/arb-contract-abis", relative = true }
 CF_TEST_CONFIG_ROOT = { value = "engine/config/testing", relative = true }
 

.github/workflows/upgrade-test.yml

@@ -23,6 +23,7 @@ on:
 env:
   FORCE_COLOR: 1
   SOLANA_VERSION: v1.18.17
+  SOLANA_PROGRAMS_VERSION: v1.0.0-swap-endpoint
   NODE_COUNT: "1-node"
 
 permissions:
@@ -172,7 +173,20 @@ jobs:
           echo "/usr/lib after copy of .so files"
           ls -l /usr/lib
           touch ./localnet/.setup_complete
+          # TODO: This is a temporary fix to allow the localnet docker-compose.yml from an older commit to run the latest solana programs version. Remove after 1.8 is released.
+          sed -i 's|ghcr.io/chainflip-io/solana-localnet-ledger:v[0-9.]*|ghcr.io/chainflip-io/solana-localnet-ledger:${{ env.SOLANA_PROGRAMS_VERSION }}|g' localnet/docker-compose.yml
           ./localnet/manage.sh
+          git reset --hard
+
+      # TODO: This is a temporary workaround to insert the 1.8 image nonces. Remove after 1.8 is released.
+      - name: Nonce workaround
+        if: inputs.run-job
+        run: |
+          git checkout ${{ github.sha }}
+          git rev-parse HEAD
+          cd bouncer
+          pnpm install --frozen-lockfile
+          ./shared/force_sol_nonces.ts
 
       - name: Run bouncer on upgrade-from version 🙅‍♂️
         if: inputs.run-job
@@ -183,8 +197,6 @@ jobs:
           cd bouncer
           pnpm install --frozen-lockfile
           ./run.sh
-          # TODO: Temporary to discard the fixes above
-          git reset --hard
 
       - name: Upgrade network 🚀
         if: inputs.run-job
@@ -229,13 +241,13 @@ jobs:
         # In the case of a compatible upgrade, we don't expect any logs here
         continue-on-error: true
         run: |
-          cat /tmp/chainflip/*/start-all-engines-pre-upgrade.*log
+          cat /tmp/chainflip/*/chainflip-engine-pre-upgrade.*log
 
       - name: Print new post-upgrade chainflip-engine logs 🚗
         if: always()
         continue-on-error: true
         run: |
-          cat /tmp/chainflip/*/start-all-engines-post-upgrade.*log
+          cat /tmp/chainflip/*/chainflip-engine-post-upgrade.*log
 
       - name: Print chainflip-node logs 📡
         if: always()

bouncer/shared/contract_interfaces.ts

@@ -13,7 +13,7 @@ function loadContractCached(abiPath: string) {
   };
 }
 const CF_ETH_CONTRACT_ABI_TAG = 'v1.1.2';
-const CF_SOL_PROGRAM_IDL_TAG = 'v1.0.0';
+const CF_SOL_PROGRAM_IDL_TAG = 'v1.0.0-swap-endpoint';
 export const getErc20abi = loadContractCached(
   '../contract-interfaces/eth-contract-abis/IERC20.json',
 );

bouncer/shared/evm_vault_swap.ts

@@ -1,6 +1,3 @@
-import * as anchor from '@coral-xyz/anchor';
-// import NodeWallet from '@coral-xyz/anchor/dist/cjs/nodewallet';
-
 import {
   InternalAsset as Asset,
   executeSwap,
@@ -12,40 +9,22 @@ import {
 } from '@chainflip/cli';
 import { HDNodeWallet } from 'ethers';
 import { randomBytes } from 'crypto';
-import { PublicKey, sendAndConfirmTransaction, Keypair } from '@solana/web3.js';
-import { getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import Keyring from '../polkadot/keyring';
 import {
-  observeBalanceIncrease,
   getContractAddress,
-  observeCcmReceived,
   amountToFineAmount,
   defaultAssetAmounts,
   chainFromAsset,
   assetDecimals,
   stateChainAssetFromAsset,
   createEvmWalletAndFund,
   newAddress,
-  evmChains,
-  getSolWhaleKeyPair,
-  getSolConnection,
 } from './utils';
-import { getBalance } from './get_balance';
 import { CcmDepositMetadata, DcaParams, FillOrKillParamsX128 } from './new_swap';
-import { SwapContext, SwapStatus } from './swap_context';
-
-import VaultIdl from '../../contract-interfaces/sol-program-idls/v1.0.0/vault.json';
-import SwapEndpointIdl from '../../contract-interfaces/sol-program-idls/v1.0.0/swap_endpoint.json';
-
-import { SwapEndpoint } from '../../contract-interfaces/sol-program-idls/v1.0.0/types/swap_endpoint';
-import { Vault } from '../../contract-interfaces/sol-program-idls/v1.0.0/types/vault';
-
-// Workaround because of anchor issue
-const { BN } = anchor;
 
 const erc20Assets: Asset[] = ['Flip', 'Usdc', 'Usdt', 'ArbUsdc'];
 
-export async function executeVaultSwap(
+export async function executeEvmVaultSwap(
   sourceAsset: Asset,
   destAsset: Asset,
   destAddress: string,
@@ -81,7 +60,7 @@ export async function executeVaultSwap(
   if (erc20Assets.includes(sourceAsset)) {
     // Doing effectively infinite approvals to make sure it doesn't fail.
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    await approveTokenVault(
+    await approveEvmTokenVault(
       sourceAsset,
       (BigInt(amountToFineAmount(amountToSwap, assetDecimals(sourceAsset))) * 100n).toString(),
       evmWallet,
@@ -128,218 +107,12 @@ export async function executeVaultSwap(
 
   return receipt;
 }
-// Temporary before the SDK implements this.
-export async function executeSolContractSwap(
-  srcAsset: Asset,
-  destAsset: Asset,
-  destAddress: string,
-  messageMetadata?: CcmDepositMetadata,
-) {
-  const destChain = chainFromAsset(destAsset);
-
-  // const solanaSwapEndpointId = new PublicKey(getContractAddress('Solana', 'SWAP_ENDPOINT'));
-  const solanaVaultDataAccount = new PublicKey(getContractAddress('Solana', 'DATA_ACCOUNT'));
-  const swapEndpointDataAccount = new PublicKey(
-    getContractAddress('Solana', 'SWAP_ENDPOINT_DATA_ACCOUNT'),
-  );
-  const whaleKeypair = getSolWhaleKeyPair();
-
-  // We should just be able to do this instead but it's not working...
-  // const wallet = new NodeWallet(whaleKeypair);
-  // const provider = new anchor.AnchorProvider(connection, wallet, {
-  //   commitment: 'processed',
-  // });
-  // const cfSwapEndpointProgram = new anchor.Program<SwapEndpoint>(SwapEndpointIdl, provider);
-  // const vaultProgram = new anchor.Program<Vault>(VaultIdl, provider);
-
-  // The current workaround requires having the wallet in a id.json and then set the ANCHOR_WALLET env.
-  // TODO: Depending on how the SDK is implemented we can remove this.
-  process.env.ANCHOR_WALLET = 'shared/solana_keypair.json';
-
-  const connection = getSolConnection();
-  const cfSwapEndpointProgram = new anchor.Program<SwapEndpoint>(SwapEndpointIdl as SwapEndpoint);
-  const vaultProgram = new anchor.Program<Vault>(VaultIdl as Vault);
-
-  const newEventAccountKeypair = Keypair.generate();
-  const fetchedDataAccount = await vaultProgram.account.dataAccount.fetch(solanaVaultDataAccount);
-  const aggKey = fetchedDataAccount.aggKey;
-
-  const tx =
-    srcAsset === 'Sol'
-      ? await cfSwapEndpointProgram.methods
-          .xSwapNative({
-            amount: new BN(
-              amountToFineAmount(defaultAssetAmounts(srcAsset), assetDecimals(srcAsset)),
-            ),
-            dstChain: Number(destChain),
-            dstAddress: Buffer.from(destAddress),
-            dstToken: Number(stateChainAssetFromAsset(destAsset)),
-            ccmParameters: messageMetadata
-              ? {
-                  message: Buffer.from(messageMetadata.message.slice(2), 'hex'),
-                  gasAmount: new BN(messageMetadata.gasBudget),
-                }
-              : null,
-            // TODO: Encode cfParameters from ccmAdditionalData and other vault swap parameters
-            cfParameters: Buffer.from(messageMetadata?.ccmAdditionalData?.slice(2) ?? '', 'hex'),
-          })
-          .accountsPartial({
-            dataAccount: solanaVaultDataAccount,
-            aggKey,
-            from: whaleKeypair.publicKey,
-            eventDataAccount: newEventAccountKeypair.publicKey,
-            swapEndpointDataAccount,
-            systemProgram: anchor.web3.SystemProgram.programId,
-          })
-          .signers([whaleKeypair, newEventAccountKeypair])
-          .transaction()
-      : await cfSwapEndpointProgram.methods
-          .xSwapToken({
-            amount: new BN(
-              amountToFineAmount(defaultAssetAmounts(srcAsset), assetDecimals(srcAsset)),
-            ),
-            dstChain: Number(destChain),
-            dstAddress: Buffer.from(destAddress),
-            dstToken: Number(stateChainAssetFromAsset(destAsset)),
-            ccmParameters: messageMetadata
-              ? {
-                  message: Buffer.from(messageMetadata.message.slice(2), 'hex'),
-                  gasAmount: new BN(messageMetadata.gasBudget),
-                }
-              : null,
-            // TODO: Encode cfParameters from ccmAdditionalData and other vault swap parameters
-            cfParameters: Buffer.from(messageMetadata?.ccmAdditionalData?.slice(2) ?? '', 'hex'),
-            decimals: assetDecimals(srcAsset),
-          })
-          .accountsPartial({
-            dataAccount: solanaVaultDataAccount,
-            tokenVaultAssociatedTokenAccount: new PublicKey(
-              getContractAddress('Solana', 'TOKEN_VAULT_ATA'),
-            ),
-            from: whaleKeypair.publicKey,
-            fromTokenAccount: getAssociatedTokenAddressSync(
-              new PublicKey(getContractAddress('Solana', 'SolUsdc')),
-              whaleKeypair.publicKey,
-              false,
-            ),
-            eventDataAccount: newEventAccountKeypair.publicKey,
-            swapEndpointDataAccount,
-            tokenSupportedAccount: new PublicKey(
-              getContractAddress('Solana', 'SolUsdcTokenSupport'),
-            ),
-            tokenProgram: TOKEN_PROGRAM_ID,
-            mint: new PublicKey(getContractAddress('Solana', 'SolUsdc')),
-            systemProgram: anchor.web3.SystemProgram.programId,
-          })
-          .signers([whaleKeypair, newEventAccountKeypair])
-          .transaction();
-  const txHash = await sendAndConfirmTransaction(connection, tx, [
-    whaleKeypair,
-    newEventAccountKeypair,
-  ]);
-
-  console.log('tx', txHash);
-  return txHash;
-}
 
-export type VaultSwapParams = {
-  sourceAsset: Asset;
-  destAsset: Asset;
-  destAddress: string;
-  txHash: string;
-};
-
-export async function performVaultSwap(
+export async function approveEvmTokenVault(
   sourceAsset: Asset,
-  destAsset: Asset,
-  destAddress: string,
-  swapTag = '',
-  messageMetadata?: CcmDepositMetadata,
-  swapContext?: SwapContext,
-  log = true,
-  amount?: string,
-  boostFeeBps?: number,
-  fillOrKillParams?: FillOrKillParamsX128,
-  dcaParams?: DcaParams,
-): Promise<VaultSwapParams> {
-  const tag = swapTag ?? '';
-  const amountToSwap = amount ?? defaultAssetAmounts(sourceAsset);
-  const srcChain = chainFromAsset(sourceAsset);
-
-  try {
-    let wallet;
-    let txHash: string;
-    let sourceAddress: string;
-
-    if (evmChains.includes(srcChain)) {
-      // Generate a new wallet for each vault swap to prevent nonce issues when running in parallel
-      // with other swaps via deposit channels.
-      wallet = await createEvmWalletAndFund(sourceAsset);
-      sourceAddress = wallet!.address.toLowerCase();
-    } else {
-      sourceAddress = getSolWhaleKeyPair().publicKey.toBase58();
-    }
-
-    const oldBalance = await getBalance(destAsset, destAddress);
-    if (log) {
-      console.log(`${tag} Old balance: ${oldBalance}`);
-      console.log(
-        `${tag} Executing (${sourceAsset}) vault swap to(${destAsset}) ${destAddress}. Current balance: ${oldBalance}`,
-      );
-    }
-
-    // TODO: Temporary before the SDK implements this.
-    if (evmChains.includes(srcChain)) {
-      // To uniquely identify the VaultSwap, we need to use the TX hash. This is only known
-      // after sending the transaction, so we send it first and observe the events afterwards.
-      // There are still multiple blocks of safety margin inbetween before the event is emitted
-      const receipt = await executeVaultSwap(
-        sourceAsset,
-        destAsset,
-        destAddress,
-        messageMetadata,
-        amountToSwap,
-        boostFeeBps,
-        fillOrKillParams,
-        dcaParams,
-        wallet,
-      );
-      txHash = receipt.hash;
-      sourceAddress = wallet!.address.toLowerCase();
-    } else {
-      txHash = await executeSolContractSwap(sourceAsset, destAsset, destAddress, messageMetadata);
-      sourceAddress = getSolWhaleKeyPair().publicKey.toBase58();
-    }
-    swapContext?.updateStatus(swapTag, SwapStatus.VaultContractExecuted);
-
-    const ccmEventEmitted = messageMetadata
-      ? observeCcmReceived(sourceAsset, destAsset, destAddress, messageMetadata, sourceAddress)
-      : Promise.resolve();
-
-    const [newBalance] = await Promise.all([
-      observeBalanceIncrease(destAsset, destAddress, oldBalance),
-      ccmEventEmitted,
-    ]);
-    if (log) {
-      console.log(`${tag} Swap success! New balance: ${newBalance}!`);
-    }
-    swapContext?.updateStatus(swapTag, SwapStatus.Success);
-    return {
-      sourceAsset,
-      destAsset,
-      destAddress,
-      txHash,
-    };
-  } catch (err) {
-    console.error('err:', err);
-    swapContext?.updateStatus(swapTag, SwapStatus.Failure);
-    if (err instanceof Error) {
-      console.log(err.stack);
-    }
-    throw new Error(`${tag} ${err}`);
-  }
-}
-export async function approveTokenVault(sourceAsset: Asset, amount: string, wallet: HDNodeWallet) {
+  amount: string,
+  wallet: HDNodeWallet,
+) {
   if (!erc20Assets.includes(sourceAsset)) {
     throw new Error(`Unsupported asset, not an ERC20: ${sourceAsset}`);
   }