Migrate chain funcs to solana web3

Author: hernan-clich

packages/commands/src/solana/call.ts

@@ -3,20 +3,22 @@ import { z } from "zod";
 import { solanaCall } from "../../../../src/chains/solana/call";
 import { handleError, validateAndParseSchema } from "../../../../utils";
 import { parseAbiValues } from "../../../../utils/parseAbiValues";
+import {
+  getAPIbyChainId,
+  getBrowserSafeKeypair,
+} from "../../../../utils/solana.browser.helpers";
 import {
   confirmSolanaTx,
-  createRevertOptions,
+  createRevertOptions as createCliRevertOptions,
   createSolanaCommandWithCommonOptions,
-  getAPIbyChainId,
-  getKeypair,
   prepareRevertOptions,
   solanaCallOptionsSchema,
 } from "../../../../utils/solana.commands.helpers";
 
 type CallOptions = z.infer<typeof solanaCallOptionsSchema>;
 
 const main = async (options: CallOptions) => {
-  const keypair = await getKeypair({
+  const keypair = await getBrowserSafeKeypair({
     mnemonic: options.mnemonic,
     name: options.name,
     privateKey: options.privateKey,
@@ -29,11 +31,16 @@ const main = async (options: CallOptions) => {
 
   const revertOptions = prepareRevertOptions(options);
 
+  // Create an Anchor PublicKey for CLI confirmation (which expects Anchor types)
+  const anchorPublicKey = new (
+    await import("@coral-xyz/anchor")
+  ).web3.PublicKey(keypair.publicKey.toBase58());
+
   await confirmSolanaTx({
     api: API,
     message: values.join(", "),
     receiver: options.receiver,
-    revertOptions: createRevertOptions(revertOptions, keypair.publicKey),
+    revertOptions: createCliRevertOptions(revertOptions, anchorPublicKey),
     sender: keypair.publicKey.toBase58(),
   });
 

packages/commands/src/solana/deposit.ts

@@ -3,20 +3,22 @@ import { z } from "zod";
 import { solanaDeposit } from "../../../../src/chains/solana/deposit";
 import { SOLANA_TOKEN_PROGRAM } from "../../../../types/shared.constants";
 import { handleError, validateAndParseSchema } from "../../../../utils";
+import {
+  getAPIbyChainId,
+  getBrowserSafeKeypair,
+} from "../../../../utils/solana.browser.helpers";
 import {
   confirmSolanaTx,
   createRevertOptions,
   createSolanaCommandWithCommonOptions,
-  getAPIbyChainId,
-  getKeypair,
   prepareRevertOptions,
   solanaDepositOptionsSchema,
 } from "../../../../utils/solana.commands.helpers";
 
 type DepositOptions = z.infer<typeof solanaDepositOptionsSchema>;
 
 const main = async (options: DepositOptions) => {
-  const keypair = await getKeypair({
+  const keypair = await getBrowserSafeKeypair({
     mnemonic: options.mnemonic,
     name: options.name,
     privateKey: options.privateKey,
@@ -26,12 +28,17 @@ const main = async (options: DepositOptions) => {
 
   const revertOptions = prepareRevertOptions(options);
 
+  // Create an Anchor PublicKey for CLI confirmation (which expects Anchor types)
+  const anchorPublicKey = new (
+    await import("@coral-xyz/anchor")
+  ).web3.PublicKey(keypair.publicKey.toBase58());
+
   await confirmSolanaTx({
     amount: options.amount,
     api: API,
     mint: options.mint,
     receiver: options.receiver,
-    revertOptions: createRevertOptions(revertOptions, keypair.publicKey),
+    revertOptions: createRevertOptions(revertOptions, anchorPublicKey),
     sender: keypair.publicKey.toBase58(),
   });
 

packages/commands/src/solana/depositAndCall.ts

@@ -4,20 +4,22 @@ import { solanaDepositAndCall } from "../../../../src/chains/solana/depositAndCa
 import { SOLANA_TOKEN_PROGRAM } from "../../../../types/shared.constants";
 import { handleError, validateAndParseSchema } from "../../../../utils";
 import { parseAbiValues } from "../../../../utils/parseAbiValues";
+import {
+  getAPIbyChainId,
+  getBrowserSafeKeypair,
+} from "../../../../utils/solana.browser.helpers";
 import {
   confirmSolanaTx,
   createRevertOptions,
   createSolanaCommandWithCommonOptions,
-  getAPIbyChainId,
-  getKeypair,
   prepareRevertOptions,
   solanaDepositAndCallOptionsSchema,
 } from "../../../../utils/solana.commands.helpers";
 
 type DepositAndCallOptions = z.infer<typeof solanaDepositAndCallOptionsSchema>;
 
 const main = async (options: DepositAndCallOptions) => {
-  const keypair = await getKeypair({
+  const keypair = await getBrowserSafeKeypair({
     mnemonic: options.mnemonic,
     name: options.name,
     privateKey: options.privateKey,
@@ -30,13 +32,18 @@ const main = async (options: DepositAndCallOptions) => {
 
   const revertOptions = prepareRevertOptions(options);
 
+  // Create an Anchor PublicKey for CLI confirmation (which expects Anchor types)
+  const anchorPublicKey = new (
+    await import("@coral-xyz/anchor")
+  ).web3.PublicKey(keypair.publicKey.toBase58());
+
   await confirmSolanaTx({
     amount: options.amount,
     api: API,
     message: values.join(", "),
     mint: options.mint,
     receiver: options.receiver,
-    revertOptions: createRevertOptions(revertOptions, keypair.publicKey),
+    revertOptions: createRevertOptions(revertOptions, anchorPublicKey),
     sender: keypair.publicKey.toBase58(),
   });
 

src/chains/solana/call.ts

@@ -3,8 +3,8 @@ import { z } from "zod";
 
 import {
   createRevertOptions,
-  createSolanaGatewayProgram,
-} from "../../../utils/solana.commands.helpers";
+  executeBrowserSolanaCall,
+} from "../../../utils/solana.browser.helpers";
 import { validateAndParseSchema } from "../../../utils/validateAndParseSchema";
 import {
   solanaCallParamsSchema,
@@ -35,11 +35,6 @@ export const solanaCall = async (
   );
   const validatedOptions = validateAndParseSchema(options, solanaOptionsSchema);
 
-  const { gatewayProgram } = createSolanaGatewayProgram(
-    validatedOptions.chainId,
-    validatedOptions.signer
-  );
-
   const receiverBytes = ethers.getBytes(validatedParams.receiver);
   const abiCoder = ethers.AbiCoder.defaultAbiCoder();
   const encodedParameters = abiCoder.encode(
@@ -53,9 +48,13 @@ export const solanaCall = async (
     validatedOptions.signer.publicKey
   );
 
-  const tx = await gatewayProgram.methods
-    .call(receiverBytes, message, revertOptions)
-    .accounts({})
-    .rpc();
+  const tx = await executeBrowserSolanaCall(
+    validatedOptions.chainId,
+    validatedOptions.signer,
+    receiverBytes,
+    message,
+    revertOptions
+  );
+
   return tx;
 };