@dfns/lib-solana 0.1.2 → 0.1.3-rc.2

package/index.d.ts

@@ -1,19 +1,16 @@
-/// <reference types="node" />
 import { DfnsApiClient } from '@dfns/sdk';
 import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 export type DfnsWalletOptions = {
     walletId: string;
     dfnsClient: DfnsApiClient;
-    maxRetries?: number;
-    retryInterval?: number;
 };
 export declare class DfnsWallet {
+    private metadata;
     readonly publicKey: PublicKey;
-    private options;
+    private readonly dfnsClient;
     private constructor();
     static init(options: DfnsWalletOptions): Promise<DfnsWallet>;
     get address(): string;
-    waitForSignature(signatureId: string): Promise<Buffer>;
     signTransaction(transaction: Transaction): Promise<Transaction>;
     signVersionedTransaction(transaction: VersionedTransaction): Promise<VersionedTransaction>;
 }

package/index.js

@@ -1,70 +1,109 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DfnsWallet = void 0;
-const Wallets_1 = require("@dfns/sdk/codegen/datamodel/Wallets");
+const sdk_1 = require("@dfns/sdk");
 const web3_js_1 = require("@solana/web3.js");
-const sleep = (interval = 0) => new Promise((resolve) => setTimeout(resolve, interval));
+const hexToBuffer = (hex) => {
+    return Buffer.from(hex.replace(/^0x/, ''), 'hex');
+};
+const assertSigned = (res) => {
+    if (res.status === 'Failed') {
+        throw new sdk_1.DfnsError(-1, 'signing failed', res);
+    }
+    else if (res.status !== 'Signed') {
+        throw new sdk_1.DfnsError(-1, 'cannot complete signing synchronously because this wallet action requires policy approval', res);
+    }
+};
+const combineSignature = (res) => {
+    if (!res.signature) {
+        throw new sdk_1.DfnsError(-1, 'signature missing', res);
+    }
+    const { r, s } = res.signature;
+    return Buffer.concat([hexToBuffer(r), hexToBuffer(s)]);
+};
 class DfnsWallet {
-    constructor(publicKey, options) {
-        this.publicKey = publicKey;
-        this.options = {
-            ...options,
-            maxRetries: options.maxRetries ?? 3,
-            retryInterval: options.retryInterval ?? 1000,
-        };
+    constructor(metadata, options) {
+        this.metadata = metadata;
+        this.dfnsClient = options.dfnsClient;
+        this.publicKey = new web3_js_1.PublicKey(Buffer.from(metadata.signingKey.publicKey, 'hex'));
     }
     static async init(options) {
         const { walletId, dfnsClient } = options;
         const res = await dfnsClient.wallets.getWallet({ walletId });
-        if (!res.signingKey || res.signingKey.scheme !== Wallets_1.KeyScheme.EdDSA || res.signingKey.curve !== Wallets_1.KeyCurve.ed25519) {
-            throw new Error(`wallet ${walletId} has incompatible scheme (${res.signingKey?.scheme}) or curve (${res.signingKey?.curve})`);
+        if (res.status !== 'Active') {
+            throw new sdk_1.DfnsError(-1, 'wallet not active', { walletId, status: res.status });
         }
-        const publicKey = new web3_js_1.PublicKey(Buffer.from(res.signingKey.publicKey, 'hex'));
-        return new DfnsWallet(publicKey, options);
+        const { scheme, curve } = res.signingKey;
+        if (scheme !== 'EdDSA') {
+            throw new sdk_1.DfnsError(-1, 'key scheme is not EdDSA', { walletId, scheme });
+        }
+        if (curve !== 'ed25519') {
+            throw new sdk_1.DfnsError(-1, 'key curve is not ed25519', { walletId, curve });
+        }
+        const metadata = {
+            boundToSolanaNetwork: res.network === 'Solana' || res.network === 'SolanaDevnet',
+            ...res,
+        };
+        return new DfnsWallet(metadata, options);
     }
     get address() {
         return this.publicKey.toBase58();
     }
-    async waitForSignature(signatureId) {
-        const { walletId, dfnsClient, retryInterval } = this.options;
-        let maxRetries = this.options.maxRetries;
-        while (maxRetries > 0) {
-            await sleep(retryInterval);
-            const res = await dfnsClient.wallets.getSignature({ walletId, signatureId });
-            if (res.status === Wallets_1.SignatureStatus.Signed) {
-                if (!res.signature)
-                    break;
-                return Buffer.from(res.signature.r.substring(2).concat(res.signature.s.substring(2)), 'hex');
-            }
-            else if (res.status === Wallets_1.SignatureStatus.Failed) {
-                break;
+    async signTransaction(transaction) {
+        if (this.metadata.boundToSolanaNetwork) {
+            const res = await this.dfnsClient.wallets.generateSignature({
+                walletId: this.metadata.id,
+                body: {
+                    kind: 'Transaction',
+                    transaction: `0x${transaction.serialize({ verifySignatures: false }).toString('hex')}`,
+                },
+            });
+            assertSigned(res);
+            if (!res.signedData) {
+                throw new sdk_1.DfnsError(-1, 'signedData missing', res);
             }
-            maxRetries -= 1;
+            return web3_js_1.Transaction.from(hexToBuffer(res.signedData));
+        }
+        else {
+            const res = await this.dfnsClient.wallets.generateSignature({
+                walletId: this.metadata.id,
+                body: {
+                    kind: 'Message',
+                    message: `0x${transaction.serializeMessage().toString('hex')}`,
+                },
+            });
+            assertSigned(res);
+            transaction.addSignature(this.publicKey, combineSignature(res));
+            return transaction;
         }
-        const waitedSeconds = Math.floor((this.options.maxRetries * retryInterval) / 1000);
-        throw new Error(`Signature request ${signatureId} took more than ${waitedSeconds}s to complete, stopping polling. Please update options "maxRetries" or "retryIntervals" to wait longer.`);
-    }
-    async signTransaction(transaction) {
-        const message = transaction.serializeMessage();
-        const { walletId, dfnsClient } = this.options;
-        const res = await dfnsClient.wallets.generateSignature({
-            walletId,
-            body: { kind: Wallets_1.SignatureKind.Message, message: `0x${message.toString('hex')}` },
-        });
-        const signature = await this.waitForSignature(res.id);
-        transaction.addSignature(this.publicKey, signature);
-        return transaction;
     }
     async signVersionedTransaction(transaction) {
-        const message = transaction.message.serialize();
-        const { walletId, dfnsClient } = this.options;
-        const res = await dfnsClient.wallets.generateSignature({
-            walletId,
-            body: { kind: Wallets_1.SignatureKind.Message, message: `0x${message.toString('hex')}` },
-        });
-        const signature = await this.waitForSignature(res.id);
-        transaction.addSignature(this.publicKey, signature);
-        return transaction;
+        if (this.metadata.boundToSolanaNetwork) {
+            const res = await this.dfnsClient.wallets.generateSignature({
+                walletId: this.metadata.id,
+                body: {
+                    kind: 'Transaction',
+                    transaction: `0x${Buffer.from(transaction.serialize()).toString('hex')}`,
+                },
+            });
+            assertSigned(res);
+            if (!res.signedData) {
+                throw new sdk_1.DfnsError(-1, 'signedData missing', res);
+            }
+            return web3_js_1.VersionedTransaction.deserialize(hexToBuffer(res.signedData));
+        }
+        else {
+            const res = await this.dfnsClient.wallets.generateSignature({
+                walletId: this.metadata.id,
+                body: {
+                    kind: 'Message',
+                    message: `0x${Buffer.from(transaction.message.serialize()).toString('hex')}`,
+                },
+            });
+            assertSigned(res);
+            transaction.addSignature(this.publicKey, combineSignature(res));
+            return transaction;
+        }
     }
 }
 exports.DfnsWallet = DfnsWallet;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dfns/lib-solana",
-  "version": "0.1.2",
+  "version": "0.1.3-rc.2",
   "dependencies": {
-    "@solana/web3.js": "1.78.0",
+    "@solana/web3.js": "1.87.6",
     "buffer": "6.0.3",
     "cross-fetch": "3.1.6",
     "uuid": "9.0.0"
   },
   "peerDependencies": {
-    "@dfns/sdk": "0.1.2"
+    "@dfns/sdk": "0.1.3-rc.2"
   },
   "main": "./index.js",
   "type": "commonjs"