@drift-labs/vaults-sdk 0.1.487 → 0.1.489

package/cli/ledgerWallet.test.ts

@@ -0,0 +1,49 @@
+import assert from 'assert';
+
+import { parseKeypairUrl } from './ledgerWallet';
+
+assert.deepStrictEqual(parseKeypairUrl(''), {
+  walletId: undefined,
+  account: undefined,
+  change: undefined,
+});
+
+assert.deepStrictEqual(parseKeypairUrl('usb://ledger'), {
+  walletId: undefined,
+  account: undefined,
+  change: undefined,
+});
+
+assert.deepStrictEqual(parseKeypairUrl('usb://ledger?key=1'), {
+  walletId: undefined,
+  account: 1,
+  change: undefined,
+});
+
+assert.deepStrictEqual(parseKeypairUrl('usb://ledger?key=1/2'), {
+  walletId: undefined,
+  account: 1,
+  change: 2,
+});
+
+assert.deepStrictEqual(
+  parseKeypairUrl(
+    'usb://ledger/BsNsvfXqQTtJnagwFWdBS7FBXgnsK8VZ5CmuznN85swK?key=0'
+  ),
+  {
+    walletId: 'BsNsvfXqQTtJnagwFWdBS7FBXgnsK8VZ5CmuznN85swK',
+    account: 0,
+    change: undefined,
+  }
+);
+
+assert.deepStrictEqual(
+  parseKeypairUrl(
+    'usb://ledger/BsNsvfXqQTtJnagwFWdBS7FBXgnsK8VZ5CmuznN85swK?key=0/0'
+  ),
+  {
+    walletId: 'BsNsvfXqQTtJnagwFWdBS7FBXgnsK8VZ5CmuznN85swK',
+    account: 0,
+    change: 0,
+  }
+);

package/cli/ledgerWallet.ts

@@ -0,0 +1,111 @@
+import Solana from '@ledgerhq/hw-app-solana';
+import type { default as Transport } from '@ledgerhq/hw-transport';
+import TransportNodeHid from '@ledgerhq/hw-transport-node-hid';
+import { getDevices } from '@ledgerhq/hw-transport-node-hid-noevents';
+import {
+  LedgerWalletAdapter,
+  getDerivationPath,
+} from '@solana/wallet-adapter-ledger';
+import { PublicKey, Keypair } from '@solana/web3.js';
+import type { Wallet } from '@drift-labs/sdk';
+
+// Follows solana cli url format
+// usb://<MANUFACTURER>[/<WALLET_ID>][?key=<ACCOUNT>[/<CHANGE>]]
+// See: https://docs.solanalabs.com/cli/intro#hardware-wallet
+export const parseKeypairUrl = (
+  url = ''
+): {
+  walletId?: string;
+  account?: number;
+  change?: number;
+} => {
+  const walletId = url.match(/(?<=usb:\/\/ledger\/)(\w+)?/)?.[0];
+  const [account, change] = (url.split('?key=')[1]?.split('/') ?? []).map(
+    Number
+  );
+  return {
+    walletId,
+    account,
+    change,
+  };
+};
+
+async function getPublicKey(
+  transport: Transport,
+  account?: number,
+  change?: number
+): Promise<PublicKey> {
+  const path =
+    "44'/501'" + // Following BIP44 standard
+    (account !== undefined ? `/${account}` : '') +
+    (change !== undefined ? `/${change}` : '');
+
+  const { address } = await new Solana(transport).getAddress(path);
+  return new PublicKey(new Uint8Array(address));
+}
+
+/*
+ * Returns a Drift compatible wallet backed by ledger hardware device
+ * This only works in an nodejs environment, based on the transport used
+ *
+ * Key derivation path is set based on:
+ * See: https://docs.solanalabs.com/cli/intro#hardware-wallet
+ */
+export async function getLedgerWallet(url = ''): Promise<Wallet> {
+  const { account, change, walletId } = parseKeypairUrl(url);
+
+  const derivationPath = getDerivationPath(account, change);
+
+  // Load the first device
+  let transport = await TransportNodeHid.open('');
+
+  // If walletId is specified, we need to loop and correct device.
+  if (walletId) {
+    const devices = getDevices();
+    let correctDeviceFound = false;
+
+    for (const device of devices) {
+      // Wallet id is the public key of the device (with no account or change)
+      const connectedWalletId = await getPublicKey(
+        transport,
+        undefined,
+        undefined
+      );
+
+      if (connectedWalletId.toString() === walletId) {
+        correctDeviceFound = true;
+        break;
+      }
+
+      transport.close();
+      transport = await TransportNodeHid.open(device.path);
+    }
+
+    if (!correctDeviceFound) {
+      throw new Error('Wallet not found');
+    }
+  }
+
+  const publicKey = await getPublicKey(transport, account, change);
+
+  // We can reuse the existing ledger wallet adapter
+  // But we need to inject/hack in our own transport (as we not a browser)
+  const wallet = new LedgerWalletAdapter({ derivationPath });
+
+  // Do some hacky things to get the wallet to work
+  // These are all done in the `connect` of the ledger wallet adapter
+  wallet['_transport'] = transport;
+  wallet['_publicKey'] = publicKey;
+  transport.on('disconnect', wallet['_disconnected']);
+  wallet.emit('connect', publicKey);
+
+  // Return a Drift compatible wallet
+  return {
+    payer: undefined as unknown as Keypair, // Doesn't appear to break things
+    publicKey: publicKey,
+    signTransaction: wallet.signTransaction.bind(wallet),
+    signVersionedTransaction: wallet.signTransaction.bind(wallet),
+    signAllTransactions: wallet.signAllTransactions.bind(wallet),
+    signAllVersionedTransactions: wallet.signAllTransactions.bind(wallet),
+  };
+}

package/cli/utils.ts

@@ -5,6 +5,9 @@ import { Connection, Keypair } from "@solana/web3.js";
 import { AnchorProvider, Wallet as AnchorWallet } from "@coral-xyz/anchor";
 import * as anchor from '@coral-xyz/anchor';
 import { IDL } from "../src/types/drift_vaults";
+import { getLedgerWallet } from "./ledgerWallet";
+import fs from 'fs';
+
 
 export async function printVault(slot: number, driftClient: DriftClient, vault: Vault, vaultEquity: BN, spotMarket: SpotMarketAccount, spotOracle: OraclePriceData) {
 
@@ -117,23 +120,35 @@ export async function getCommandContext(program: Command, needToSign: boolean):
 
     const opts = program.opts();
 
-    let keypair: Keypair;
-    if (needToSign) {
+    let wallet: Wallet;
+    const isLedgerUrl = opts.keypair.startsWith('usb://ledger');
+    console.log("isLedgerUrl:", isLedgerUrl);
+
+    if (isLedgerUrl || fs.existsSync(opts.keypair)) {
+        console.log("opts.keypair:", opts.keypair);
+    } else {
+        console.log("opts.keypair:", opts.keypair.replace(/./g, '*'));
+    }
+
+    wallet = new Wallet(Keypair.generate());
+
+    if (isLedgerUrl) {
+        wallet = await getLedgerWallet(opts.keypair) as unknown as Wallet;
+    } else if (opts.keypair) {
         try {
-            console.log(opts.keypair);
-            keypair = loadKeypair(opts.keypair as string);
+            const keypair = loadKeypair(opts.keypair as string);
+            wallet = new Wallet(keypair);
         } catch (e) {
             console.error(`Need to provide a valid keypair: ${e}`);
             process.exit(1);
         }
     } else {
-        keypair = Keypair.generate();
+        if (needToSign) {
+            throw new Error("Need to provide a keypair.");
+        }
     }
 
-    const wallet = new Wallet(keypair);
-    if (needToSign) {
-        console.log(`Signing wallet address: `, wallet.publicKey.toBase58());
-    }
+    console.log(`Loaded wallet address: ${wallet.publicKey.toBase58()}`);
 
     const connection = new Connection(opts.url, {
         commitment: opts.commitment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drift-labs/vaults-sdk",
-  "version": "0.1.487",
+  "version": "0.1.489",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "directories": {
@@ -10,6 +10,10 @@
     "@coral-xyz/anchor": "0.28.0",
     "@drift-labs/competitions-sdk": "0.2.386",
     "@drift-labs/sdk": "2.96.0-beta.28",
+    "@ledgerhq/hw-app-solana": "^7.1.1",
+    "@ledgerhq/hw-transport": "^6.30.1",
+    "@ledgerhq/hw-transport-node-hid": "^6.28.1",
+    "@solana/wallet-adapter-ledger": "^0.9.25",
     "@solana/web3.js": "1.92.3",
     "commander": "^11.0.0",
     "dotenv": "^16.3.1",