cli: add payer to the push solana (#486)

* add payer to the ntt push command

* testing adjustments

* Update cli/src/index.ts

* add payer path to pushDeployment method

---------

Co-authored-by: Csongor Kiss <cs@wormholelabs.xyz>

Author: evgeniko

cli/src/getSigner.ts

@@ -1,6 +1,9 @@
 import solana from "@wormhole-foundation/sdk/platforms/solana";
 import * as myEvmSigner from "./evmsigner.js";
 import { ChainContext, Wormhole, chainToPlatform, type Chain, type ChainAddress, type Network, type Signer } from "@wormhole-foundation/sdk";
+import { Keypair } from "@solana/web3.js";
+import fs from "fs";
+import { encoding } from '@wormhole-foundation/sdk-connect';
 
 export type SignerType = "privateKey" | "ledger";
 
@@ -38,23 +41,34 @@ export function forgeSignerArgs(
 export async function getSigner<N extends Network, C extends Chain>(
     chain: ChainContext<N, C>,
     type: SignerType,
-    source?: string
+    source?: string,
+    filePath?: string
 ): Promise<SignerStuff<N, C>> {
     let signer: Signer;
     const platform = chainToPlatform(chain.chain);
     switch (platform) {
         case "Solana":
             switch (type) {
                 case "privateKey":
-                    source = source ?? process.env.SOLANA_PRIVATE_KEY;
-                    if (source === undefined) {
-                        throw new Error("SOLANA_PRIVATE_KEY env var not set");
-                    }
+                    let privateKey: string;
+                    if (filePath) {
+                        // Read the private key from the file if filePath is provided
+                        const keyPair = Keypair.fromSecretKey(new Uint8Array(JSON.parse(fs.readFileSync(filePath, 'utf8'))));
+                        privateKey = encoding.b58.encode(keyPair.secretKey);
+                    } else {
+                        const privateKeySource = source ?? process.env.SOLANA_PRIVATE_KEY;
+                        if (privateKeySource === undefined) {
+                            throw new Error("Private key not provided and SOLANA_PRIVATE_KEY env var not set");
+                        }
+                        privateKey = privateKeySource;
+                    } 
+                    console.log(privateKey);
                     signer = await solana.getSigner(
                         await chain.getRpc(),
-                        source,
+                        privateKey,
                         { debug: false }
                     );
+                    console.log(signer);
                     break;
                 case "ledger":
                     throw new Error("Ledger not yet supported on Solana");

cli/src/index.ts

@@ -158,7 +158,11 @@ const options = {
         describe: "Skip contract verification",
         type: "boolean",
         default: false,
-    }
+    },
+    payer: {
+        describe: "Path to the payer json file (Solana)",
+        type: "string",
+    },
 } as const;
 
 
@@ -573,23 +577,26 @@ yargs(hideBin(process.argv))
             .option("signer-type", options.signerType)
             .option("verbose", options.verbose)
             .option("skip-verify", options.skipVerify)
+            .option("payer", options.payer)
             .example("$0 push", "Push local configuration changes to the blockchain")
             .example("$0 push --signer-type ledger", "Push changes using a Ledger hardware wallet for signing")
-            .example("$0 push --skip-verify", "Push changes without verifying contracts on EVM chains"),
+            .example("$0 push --skip-verify", "Push changes without verifying contracts on EVM chains")
+            .example("$0 push --payer <SOLANA_KEYPAIR_PATH>", "Path to the payer json file (Solana), instead of setting SOLANA_PRIVATE_KEY env variable"),
         async (argv) => {
             const deployments: Config = loadConfig(argv["path"]);
             const verbose = argv["verbose"];
             const network = deployments.network as Network;
             const deps: Partial<{ [C in Chain]: Deployment<Chain> }> = await pullDeployments(deployments, network, verbose);
             const signerType = argv["signer-type"] as SignerType;
+            const payerPath = argv["payer"];
 
             const missing = await missingConfigs(deps, verbose);
 
             for (const [chain, missingConfig] of Object.entries(missing)) {
                 assertChain(chain);
                 const ntt = deps[chain]!.ntt;
                 const ctx = deps[chain]!.ctx;
-                const signer = await getSigner(ctx, signerType)
+                const signer = await getSigner(ctx, signerType, undefined, payerPath);
                 for (const manager of missingConfig.managerPeers) {
                     const tx = ntt.setPeer(manager.address, manager.tokenDecimals, manager.inboundLimit, signer.address.address)
                     await signSendWait(ctx, tx, signer.signer)
@@ -613,7 +620,7 @@ yargs(hideBin(process.argv))
 
             for (const [chain, deployment] of Object.entries(depsAfterRegistrations)) {
                 assertChain(chain);
-                await pushDeployment(deployment as any, signerType, !argv["skip-verify"], argv["yes"]);
+                await pushDeployment(deployment as any, signerType, !argv["skip-verify"], argv["yes"], payerPath);
             }
         })
     .command("status",
@@ -1129,6 +1136,7 @@ async function deploySolana<N extends Network, C extends SolanaChains>(
             binary = `${pwd}/solana/target/deploy/example_native_token_transfers.so`;
         }
 
+
         await checkSolanaBinary(binary, wormhole, providedProgramId)
 
         // do the actual deployment
@@ -1254,7 +1262,7 @@ async function missingConfigs(
     return missingConfigs;
 }
 
-async function pushDeployment<C extends Chain>(deployment: Deployment<C>, signerType: SignerType, evmVerify: boolean, yes: boolean): Promise<void> {
+async function pushDeployment<C extends Chain>(deployment: Deployment<C>, signerType: SignerType, evmVerify: boolean, yes: boolean, filePath?: string): Promise<void> {
     const diff = diffObjects(deployment.config.local!, deployment.config.remote!);
     if (Object.keys(diff).length === 0) {
         return;
@@ -1270,7 +1278,7 @@ async function pushDeployment<C extends Chain>(deployment: Deployment<C>, signer
 
     const ctx = deployment.ctx;
 
-    const signer = await getSigner(ctx, signerType);
+    const signer = await getSigner(ctx, signerType, undefined, filePath);
 
     let txs = [];
     // we perform this last to make sure we don't accidentally lock ourselves out