feat(solana): deposit command

.github/workflows/build.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "21"
           registry-url: "https://registry.npmjs.org"
 
       - name: Install Dependencies

.github/workflows/lint.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "21"
           registry-url: "https://registry.npmjs.org"
 
       - name: Install Dependencies

.github/workflows/test.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "21"
           registry-url: "https://registry.npmjs.org"
 
       - name: Install Dependencies

package.json

@@ -118,7 +118,7 @@
     "@zetachain/faucet-cli": "^4.1.1",
     "@zetachain/networks": "14.0.0-rc1",
     "@zetachain/protocol-contracts": "^12.0.0",
-    "@zetachain/protocol-contracts-solana": "2.0.0-rc1",
+    "@zetachain/protocol-contracts-solana": "3.0.2-rc2",
     "axios": "^1.4.0",
     "bech32": "^2.0.0",
     "bip39": "^3.1.0",

packages/client/src/solanaDeposit.ts

@@ -1,11 +1,12 @@
 import * as anchor from "@coral-xyz/anchor";
 import {
+  Connection,
   Transaction,
   TransactionMessage,
   VersionedTransaction,
 } from "@solana/web3.js";
 import { getEndpoints } from "@zetachain/networks";
-import Gateway_IDL from "@zetachain/protocol-contracts-solana/idl/gateway.json";
+import Gateway_IDL from "@zetachain/protocol-contracts-solana/dev/idl/gateway.json";
 import { ethers } from "ethers";
 
 import { handleError } from "../../../utils/handleError";
@@ -111,7 +112,7 @@ export const solanaDeposit = async function (
 
       txSignature = await this.solanaAdapter.sendTransaction(
         versionedTransaction,
-        connection
+        connection as unknown as Connection
       );
     } else {
       txSignature = await anchor.web3.sendAndConfirmTransaction(

packages/client/src/solanaDepositAndCall.ts

@@ -1,11 +1,12 @@
 import * as anchor from "@coral-xyz/anchor";
 import {
+  Connection,
   Transaction,
   TransactionMessage,
   VersionedTransaction,
 } from "@solana/web3.js";
 import { getEndpoints } from "@zetachain/networks";
-import Gateway_IDL from "@zetachain/protocol-contracts-solana/idl/gateway.json";
+import Gateway_IDL from "@zetachain/protocol-contracts-solana/dev/idl/gateway.json";
 import { AbiCoder, ethers } from "ethers";
 
 import { ParseAbiValuesReturnType } from "../../../types/parseAbiValues.types";
@@ -126,7 +127,7 @@ export const solanaDepositAndCall = async function (
 
       txSignature = await this.solanaAdapter.sendTransaction(
         versionedTransaction,
-        connection
+        connection as unknown as Connection
       );
     } else {
       txSignature = await anchor.web3.sendAndConfirmTransaction(

packages/commands/src/bitcoin/inscription/call.ts

@@ -24,8 +24,8 @@ import {
   bitcoinEncode,
   EncodingFormat,
   OpCode,
-  trimOx,
 } from "../../../../../utils/bitcoinEncode";
+import { trim0x } from "../../../../../utils/trim0x";
 import { validateAndParseSchema } from "../../../../../utils/validateAndParseSchema";
 
 type CallOptions = z.infer<typeof inscriptionCallOptionsSchema>;
@@ -56,7 +56,7 @@ const main = async (options: CallOptions) => {
       data = Buffer.from(
         bitcoinEncode(
           options.receiver,
-          Buffer.from(trimOx(payload), "hex"),
+          Buffer.from(trim0x(payload), "hex"),
           options.revertAddress,
           OpCode.Call,
           EncodingFormat.EncodingFmtABI

packages/commands/src/bitcoin/inscription/depositAndCall.ts

@@ -25,8 +25,8 @@ import {
   bitcoinEncode,
   EncodingFormat,
   OpCode,
-  trimOx,
 } from "../../../../../utils/bitcoinEncode";
+import { trim0x } from "../../../../../utils/trim0x";
 import { validateAndParseSchema } from "../../../../../utils/validateAndParseSchema";
 
 type DepositAndCallOptions = z.infer<
@@ -59,7 +59,7 @@ const main = async (options: DepositAndCallOptions) => {
       data = Buffer.from(
         bitcoinEncode(
           options.receiver,
-          Buffer.from(trimOx(payload), "hex"),
+          Buffer.from(trim0x(payload), "hex"),
           options.revertAddress,
           OpCode.DepositAndCall,
           EncodingFormat.EncodingFmtABI

packages/commands/src/bitcoin/inscription/encode.ts

@@ -8,8 +8,8 @@ import {
   bitcoinEncode,
   EncodingFormat,
   OpCode,
-  trimOx,
 } from "../../../../../utils/bitcoinEncode";
+import { trim0x } from "../../../../../utils/trim0x";
 
 const encodeOptionsSchema = z
   .object({
@@ -39,7 +39,7 @@ const main = (options: EncodeOptions) => {
     payloadBuffer = Buffer.from([]);
   } else {
     const encodedPayload = new ethers.AbiCoder().encode(types, values);
-    payloadBuffer = Buffer.from(trimOx(encodedPayload), "hex");
+    payloadBuffer = Buffer.from(trim0x(encodedPayload), "hex");
   }
 
   // Encode the data

packages/commands/src/solana/deposit.ts

@@ -0,0 +1,185 @@
+import * as anchor from "@coral-xyz/anchor";
+import { Wallet } from "@coral-xyz/anchor";
+import {
+  AccountLayout,
+  ASSOCIATED_TOKEN_PROGRAM_ID,
+  TOKEN_PROGRAM_ID,
+} from "@solana/spl-token";
+import { clusterApiUrl, PublicKey } from "@solana/web3.js";
+import GATEWAY_DEV_IDL from "@zetachain/protocol-contracts-solana/dev/idl/gateway.json";
+import GATEWAY_PROD_IDL from "@zetachain/protocol-contracts-solana/prod/idl/gateway.json";
+import { ethers } from "ethers";
+import { z } from "zod";
+
+import { SolanaAccountData } from "../../../../types/accounts.types";
+import { SOLANA_TOKEN_PROGRAM } from "../../../../types/shared.constants";
+import { handleError, validateAndParseSchema } from "../../../../utils";
+import { getAccountData } from "../../../../utils/accounts";
+import {
+  createSolanaCommandWithCommonOptions,
+  keypairFromMnemonic,
+  keypairFromPrivateKey,
+  solanaDepositOptionsSchema,
+} from "../../../../utils/solana.commands.helpers";
+
+type DepositOptions = z.infer<typeof solanaDepositOptionsSchema>;
+
+const main = async (options: DepositOptions) => {
+  // Mainnet and devnet use the same IDL
+  const gatewayIDL =
+    options.network === "localnet" ? GATEWAY_DEV_IDL : GATEWAY_PROD_IDL;
+
+  let keypair: anchor.web3.Keypair;
+  if (options.privateKey) {
+    keypair = keypairFromPrivateKey(options.privateKey);
+  } else if (options.mnemonic) {
+    keypair = await keypairFromMnemonic(options.mnemonic);
+  } else if (options.name) {
+    const privateKey = getAccountData<SolanaAccountData>(
+      "solana",
+      options.name
+    )?.privateKey;
+    keypair = keypairFromPrivateKey(privateKey!);
+  } else {
+    throw new Error("No account provided");
+  }
+
+  let API = "http://localhost:8899";
+  if (options.network === "devnet") {
+    API = clusterApiUrl("devnet");
+  } else if (options.network === "mainnet") {
+    API = clusterApiUrl("mainnet-beta");
+  }
+
+  const connection = new anchor.web3.Connection(API);
+
+  const provider = new anchor.AnchorProvider(connection, new Wallet(keypair!));
+
+  const gatewayProgram = new anchor.Program(gatewayIDL as anchor.Idl, provider);
+
+  const receiverBytes = ethers.getBytes(options.recipient);
+
+  const tokenAccounts = await connection.getTokenAccountsByOwner(
+    provider.wallet.publicKey,
+    {
+      programId: TOKEN_PROGRAM_ID,
+    }
+  );
+
+  try {
+    if (options.mint) {
+      const mintInfo = await connection.getTokenSupply(
+        new PublicKey(options.mint)
+      );
+      const decimals = mintInfo.value.decimals;
+
+      // Find the token account that matches the mint
+      const matchingTokenAccount = tokenAccounts.value.find(({ account }) => {
+        const data = AccountLayout.decode(account.data);
+        return new PublicKey(data.mint).toBase58() === options.mint;
+      });
+
+      if (!matchingTokenAccount) {
+        throw new Error(`No token account found for mint ${options.mint}`);
+      }
+
+      // Check token balance
+      const accountInfo = await connection.getTokenAccountBalance(
+        matchingTokenAccount.pubkey
+      );
+      const balance = accountInfo.value.uiAmount;
+      const amountToSend = parseFloat(options.amount);
+      if (!balance || balance < amountToSend) {
+        throw new Error(
+          `Insufficient token balance. Available: ${
+            balance ?? 0
+          }, Required: ${amountToSend}`
+        );
+      }
+
+      const from = matchingTokenAccount.pubkey;
+
+      // Find the TSS PDA (meta)
+      const [tssPda] = PublicKey.findProgramAddressSync(
+        [Buffer.from("meta", "utf-8")],
+        gatewayProgram.programId
+      );
+
+      // Find the TSS's ATA for the mint
+      const tssAta = await PublicKey.findProgramAddress(
+        [
+          tssPda.toBuffer(),
+          TOKEN_PROGRAM_ID.toBuffer(),
+          new PublicKey(options.mint).toBuffer(),
+        ],
+        ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+
+      const to = tssAta[0].toBase58();
+
+      const tx = await gatewayProgram.methods
+        .depositSplToken(
+          new anchor.BN(ethers.parseUnits(options.amount, decimals).toString()),
+          receiverBytes,
+          null
+        )
+        .accounts({
+          from,
+          mintAccount: options.mint,
+          signer: keypair!.publicKey,
+          systemProgram: anchor.web3.SystemProgram.programId,
+          to,
+          tokenProgram: options.tokenProgram,
+        })
+        .rpc();
+      console.log("Transaction hash:", tx);
+    } else {
+      // Check SOL balance
+      const balance = await connection.getBalance(keypair!.publicKey);
+      const lamportsNeeded = ethers.parseUnits(options.amount, 9).toString();
+      if (balance < parseInt(lamportsNeeded)) {
+        throw new Error(
+          `Insufficient SOL balance. Available: ${balance / 1e9}, Required: ${
+            options.amount
+          }`
+        );
+      }
+      const tx = await gatewayProgram.methods
+        .deposit(
+          new anchor.BN(ethers.parseUnits(options.amount, 9).toString()),
+          receiverBytes,
+          null
+        )
+        .accounts({})
+        .rpc();
+      console.log("Transaction hash:", tx);
+    }
+  } catch (error) {
+    handleError({
+      context: "Error during deposit",
+      error,
+      shouldThrow: false,
+    });
+    process.exit(1);
+  }
+};
+
+export const depositCommand = createSolanaCommandWithCommonOptions("deposit")
+  .description("Deposit tokens from Solana")
+  .requiredOption("--amount <amount>", "Amount of tokens to deposit")
+  .option(
+    "--token-program <tokenProgram>",
+    "Token program",
+    SOLANA_TOKEN_PROGRAM
+  )
+  .option("--mint <mint>", "SPL token mint address")
+  .action(async (options) => {
+    const validatedOptions = validateAndParseSchema(
+      options,
+      solanaDepositOptionsSchema,
+      {
+        exitOnError: true,
+      }
+    );
+    await main(validatedOptions);
+  });

packages/commands/src/solana/index.ts

@@ -1,9 +1,10 @@
 import { Command } from "commander";
 
+import { depositCommand } from "./deposit";
 import { encodeCommand } from "./encode";
 
-export const solanaCommand = new Command("solana").description(
-  "Solana commands"
-);
-
-solanaCommand.addCommand(encodeCommand).helpCommand(false);
+export const solanaCommand = new Command("solana")
+  .description("Solana commands")
+  .addCommand(depositCommand)
+  .addCommand(encodeCommand)
+  .helpCommand(false);

packages/tasks/src/solanaDeposit.ts

@@ -1,5 +1,4 @@
-import { Wallet } from "@coral-xyz/anchor";
-import { Keypair } from "@solana/web3.js";
+import { Wallet, web3 } from "@coral-xyz/anchor";
 import { bech32 } from "bech32";
 import { ethers } from "ethers";
 import { task } from "hardhat/config";
@@ -81,7 +80,7 @@ export const getKeypairFromFile = async (filepath: string) => {
     throw new Error(`Invalid secret key file at '${filepath}'!`);
   }
 
-  return Keypair.fromSecretKey(parsedFileContents);
+  return web3.Keypair.fromSecretKey(parsedFileContents);
 };
 
 task("solana-deposit", "Solana deposit", solanaDeposit)

packages/tasks/src/solanaDepositAndCall.ts

@@ -1,5 +1,4 @@
-import { Wallet } from "@coral-xyz/anchor";
-import { Keypair } from "@solana/web3.js";
+import { Wallet, web3 } from "@coral-xyz/anchor";
 import { bech32 } from "bech32";
 import { ethers } from "ethers";
 import { task } from "hardhat/config";
@@ -105,7 +104,7 @@ export const getKeypairFromFile = async (filepath: string) => {
     throw new Error(`Invalid secret key file at '${filepath}'!`);
   }
 
-  return Keypair.fromSecretKey(parsedFileContents);
+  return web3.Keypair.fromSecretKey(parsedFileContents);
 };
 
 task("solana-deposit-and-call", "Solana deposit and call", solanaDepositAndCall)

test/bitcoinEncode.test.ts

@@ -1,11 +1,7 @@
 import { ethers } from "ethers";
 
-import {
-  Address,
-  bitcoinEncode,
-  BtcAddress,
-  trimOx,
-} from "../utils/bitcoinEncode";
+import { Address, bitcoinEncode, BtcAddress } from "../utils/bitcoinEncode";
+import { trim0x } from "../utils/trim0x";
 
 describe("bitcoinEncode", () => {
   const receiverAddress: Address = "0xEA9808f0Ac504d1F521B5BbdfC33e6f1953757a7";
@@ -40,7 +36,7 @@ describe("bitcoinEncode", () => {
       ["uint8", "bytes"],
       [mockOperation.test, params]
     );
-    const payload = Buffer.from(trimOx(message), "hex");
+    const payload = Buffer.from(trim0x(message), "hex");
     const result = bitcoinEncode(receiverAddress, payload, btcRevertAddress);
 
     expect(result).toMatch(