@chainlink/ccip-cli 0.90.2 → 0.91.1

package/src/providers/solana.ts

@@ -1,8 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs'
 import util from 'node:util'
 
-import { SolanaChain } from '@chainlink/ccip-sdk/src/index.ts'
-import { Wallet as SolanaWallet } from '@coral-xyz/anchor'
+import { Wallet as AnchorWallet } from '@coral-xyz/anchor'
 import SolanaLedger from '@ledgerhq/hw-app-solana'
 import HIDTransport from '@ledgerhq/hw-transport-node-hid'
 import {
@@ -16,17 +15,27 @@ import {
 import bs58 from 'bs58'
 import { getBytes, hexlify } from 'ethers'
 
+/** Ledger hardware wallet signer for Solana. */
 export class LedgerSolanaWallet {
   publicKey: PublicKey
   wallet: SolanaLedger.default
   path: string
 
+  /**
+   * Private constructor - use static `create` method instead.
+   * @internal
+   */
   private constructor(solanaLW: SolanaLedger.default, pubKey: PublicKey, path: string) {
     this.wallet = solanaLW
     this.publicKey = pubKey
     this.path = path
   }
 
+  /**
+   * Creates a new LedgerSolanaWallet instance.
+   * @param path - BIP44 derivation path.
+   * @returns A new LedgerSolanaWallet instance.
+   */
   static async create(path: string) {
     try {
       const transport = await HIDTransport.default.create()
@@ -41,6 +50,11 @@ export class LedgerSolanaWallet {
     }
   }
 
+  /**
+   * Signs a transaction with the Ledger device.
+   * @param tx - Transaction to sign.
+   * @returns Signed transaction.
+   */
   async signTransaction<T extends Transaction | VersionedTransaction>(tx: T) {
     console.debug('Ledger: Request to sign message from', this.publicKey.toBase58())
     // serializeMessage on v0, serialize on v1
@@ -56,6 +70,11 @@ export class LedgerSolanaWallet {
     return tx
   }
 
+  /**
+   * Signs multiple transactions with the Ledger device.
+   * @param txs - Transactions to sign.
+   * @returns Signed transactions.
+   */
   async signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[]) {
     console.info('Signing multiple transactions with Ledger')
     const signedTxs: T[] = []
@@ -65,14 +84,20 @@ export class LedgerSolanaWallet {
     return signedTxs
   }
 
+  /** Payer property - not available on Ledger. */
   get payer(): Keypair {
     throw new Error('Payer method not available on Ledger')
   }
 }
 
-SolanaChain.getWallet = async function loadSolanaWallet({
+/**
+ * Loads a Solana wallet from a file or Ledger device.
+ * @param wallet - wallet options (as passed to yargs argv)
+ * @returns Promise to Anchor Wallet instance
+ */
+export async function loadSolanaWallet({
   wallet: walletOpt,
-}: { wallet?: unknown } = {}): Promise<SolanaWallet> {
+}: { wallet?: unknown } = {}): Promise<AnchorWallet> {
   if (!walletOpt)
     walletOpt = process.env['USER_KEY'] || process.env['OWNER_KEY'] || '~/.config/solana/id.json'
   let wallet: string
@@ -83,11 +108,11 @@ SolanaChain.getWallet = async function loadSolanaWallet({
     let derivationPath = walletOpt.split(':')[1]
     if (!derivationPath) derivationPath = "44'/501'/0'"
     else if (!isNaN(Number(derivationPath))) derivationPath = `44'/501'/${derivationPath}'`
-    return (await LedgerSolanaWallet.create(derivationPath)) as SolanaWallet
+    return (await LedgerSolanaWallet.create(derivationPath)) as AnchorWallet
   } else if (existsSync(walletOpt)) {
     wallet = hexlify(new Uint8Array(JSON.parse(readFileSync(walletOpt, 'utf8'))))
   }
-  return new SolanaWallet(
+  return new AnchorWallet(
     Keypair.fromSecretKey(wallet.startsWith('0x') ? getBytes(wallet) : bs58.decode(wallet)),
   )
 }

package/tsconfig.json

@@ -13,6 +13,7 @@
     "rewriteRelativeImportExtensions": true,
     "verbatimModuleSyntax": true,
     "erasableSyntaxOnly": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "noImplicitOverride": true
   }
 }