@dynamic-labs-wallet/svm 1.1.34 → 1.1.35

package/index.cjs

@@ -168,6 +168,59 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             throw error;
         }
     }
+    /**
+   * Signs a Solana transaction for Dynamic to broadcast.
+   *
+   * @param params.senderAddress - The wallet's address.
+   * @param params.transaction - The transaction message as hex, the same bytes `signTransaction` signs.
+   * @param params.chainId - The Solana network id (e.g. `101`). Dynamic checks it against the wallet's network.
+   * @param params.skipPreflight - Skip the network's pre-send dry run. Faster, but a doomed transaction still costs a fee.
+   * @param params.requestedCertainty - How sure to be before calling it confirmed: `fast`, `safe` or `final`, or `chain:` plus a chain-specific value. Defaults to `safe`.
+   * @param params.externalReference - Your own label, returned on every event. Not unique.
+   * @param params.idempotencyKey - Makes a retry safe: the same key replays the stored answer instead of sending twice. A new one is made when omitted.
+   * @param params.password - The wallet's backup password, if it has one.
+   * @param params.signedSessionId - The signed-in session, used to unlock the wallet's key share.
+   * @param params.mfaToken - Proof of the user's multi-factor check, when the wallet needs one.
+   * @param params.elevatedAccessToken - Proof of a recent re-login, when the wallet needs one.
+   * @param params.approvalQuorum - Approvers' consent for a governed wallet, sent on the retry after `intent_required`.
+   * @param params.onError - Called with the failure's message, never the raw error.
+   * @param params.traceContext - Ties this call's logs to the server's, across retries. Created when omitted.
+   * @returns The transaction record.
+   * @throws Error when `chainId` is missing.
+   */ async signAndBroadcastTransaction({ senderAddress, transaction, chainId, skipPreflight, password = undefined, signedSessionId, mfaToken, elevatedAccessToken, approvalQuorum, requestedCertainty, externalReference, idempotencyKey, onError, traceContext }) {
+        if (!chainId) {
+            throw new Error('Sign and broadcast on Solana needs the network id as `chainId`');
+        }
+        const base58SerializedTransaction = this.prepareTransactionForSigning(transaction);
+        return await this.signAndBroadcast({
+            accountAddress: senderAddress,
+            chainName: this.chainName,
+            contexts: [
+                {
+                    svmTransaction: this.buildSvmTransactionContext({
+                        chainId,
+                        base58SerializedTransaction
+                    })
+                }
+            ],
+            broadcastOptions: skipPreflight === undefined ? undefined : {
+                skipPreflight
+            },
+            messages: [
+                transaction
+            ],
+            password,
+            signedSessionId,
+            mfaToken,
+            elevatedAccessToken,
+            approvalQuorum,
+            requestedCertainty,
+            externalReference,
+            idempotencyKey,
+            onError,
+            traceContext
+        });
+    }
     prepareTransactionForSigning(transaction) {
         const transactionBytes = new Uint8Array(Buffer.from(transaction, 'hex'));
         const deserializedTransaction = web3_js.VersionedMessage.deserialize(transactionBytes);
@@ -175,6 +228,20 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
         const serializedTransaction = versionedTransaction.serialize();
         return bs58.encode(serializedTransaction);
     }
+    /**
+   * The Solana part of a signing context: which network, how it is sent, and the transaction in base58. Shared by sign and sign-and-broadcast so both describe it the same way.
+   *
+   * @param params.chainId - The Solana network id.
+   * @param params.base58SerializedTransaction - The transaction, base58-encoded.
+   */ buildSvmTransactionContext({ chainId, base58SerializedTransaction }) {
+        return {
+            chainId,
+            method: 'signAndSendTransaction',
+            serializedTransactions: [
+                base58SerializedTransaction
+            ]
+        };
+    }
     buildSignParams({ transaction, senderAddress, password, signedSessionId, mfaToken, elevatedAccessToken, chainId, base58SerializedTransaction, context, approvalQuorum }) {
         const signParams = {
             message: transaction,
@@ -188,13 +255,10 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
         };
         if (chainId !== undefined) {
             signParams.context = _extends({}, context, {
-                svmTransaction: {
+                svmTransaction: this.buildSvmTransactionContext({
                     chainId,
-                    method: 'signAndSendTransaction',
-                    serializedTransactions: [
-                        base58SerializedTransaction
-                    ]
-                }
+                    base58SerializedTransaction
+                })
             });
         }
         return signParams;

package/index.esm.js

@@ -166,6 +166,59 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             throw error;
         }
     }
+    /**
+   * Signs a Solana transaction for Dynamic to broadcast.
+   *
+   * @param params.senderAddress - The wallet's address.
+   * @param params.transaction - The transaction message as hex, the same bytes `signTransaction` signs.
+   * @param params.chainId - The Solana network id (e.g. `101`). Dynamic checks it against the wallet's network.
+   * @param params.skipPreflight - Skip the network's pre-send dry run. Faster, but a doomed transaction still costs a fee.
+   * @param params.requestedCertainty - How sure to be before calling it confirmed: `fast`, `safe` or `final`, or `chain:` plus a chain-specific value. Defaults to `safe`.
+   * @param params.externalReference - Your own label, returned on every event. Not unique.
+   * @param params.idempotencyKey - Makes a retry safe: the same key replays the stored answer instead of sending twice. A new one is made when omitted.
+   * @param params.password - The wallet's backup password, if it has one.
+   * @param params.signedSessionId - The signed-in session, used to unlock the wallet's key share.
+   * @param params.mfaToken - Proof of the user's multi-factor check, when the wallet needs one.
+   * @param params.elevatedAccessToken - Proof of a recent re-login, when the wallet needs one.
+   * @param params.approvalQuorum - Approvers' consent for a governed wallet, sent on the retry after `intent_required`.
+   * @param params.onError - Called with the failure's message, never the raw error.
+   * @param params.traceContext - Ties this call's logs to the server's, across retries. Created when omitted.
+   * @returns The transaction record.
+   * @throws Error when `chainId` is missing.
+   */ async signAndBroadcastTransaction({ senderAddress, transaction, chainId, skipPreflight, password = undefined, signedSessionId, mfaToken, elevatedAccessToken, approvalQuorum, requestedCertainty, externalReference, idempotencyKey, onError, traceContext }) {
+        if (!chainId) {
+            throw new Error('Sign and broadcast on Solana needs the network id as `chainId`');
+        }
+        const base58SerializedTransaction = this.prepareTransactionForSigning(transaction);
+        return await this.signAndBroadcast({
+            accountAddress: senderAddress,
+            chainName: this.chainName,
+            contexts: [
+                {
+                    svmTransaction: this.buildSvmTransactionContext({
+                        chainId,
+                        base58SerializedTransaction
+                    })
+                }
+            ],
+            broadcastOptions: skipPreflight === undefined ? undefined : {
+                skipPreflight
+            },
+            messages: [
+                transaction
+            ],
+            password,
+            signedSessionId,
+            mfaToken,
+            elevatedAccessToken,
+            approvalQuorum,
+            requestedCertainty,
+            externalReference,
+            idempotencyKey,
+            onError,
+            traceContext
+        });
+    }
     prepareTransactionForSigning(transaction) {
         const transactionBytes = new Uint8Array(Buffer.from(transaction, 'hex'));
         const deserializedTransaction = VersionedMessage.deserialize(transactionBytes);
@@ -173,6 +226,20 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
         const serializedTransaction = versionedTransaction.serialize();
         return bs58.encode(serializedTransaction);
     }
+    /**
+   * The Solana part of a signing context: which network, how it is sent, and the transaction in base58. Shared by sign and sign-and-broadcast so both describe it the same way.
+   *
+   * @param params.chainId - The Solana network id.
+   * @param params.base58SerializedTransaction - The transaction, base58-encoded.
+   */ buildSvmTransactionContext({ chainId, base58SerializedTransaction }) {
+        return {
+            chainId,
+            method: 'signAndSendTransaction',
+            serializedTransactions: [
+                base58SerializedTransaction
+            ]
+        };
+    }
     buildSignParams({ transaction, senderAddress, password, signedSessionId, mfaToken, elevatedAccessToken, chainId, base58SerializedTransaction, context, approvalQuorum }) {
         const signParams = {
             message: transaction,
@@ -186,13 +253,10 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
         };
         if (chainId !== undefined) {
             signParams.context = _extends({}, context, {
-                svmTransaction: {
+                svmTransaction: this.buildSvmTransactionContext({
                     chainId,
-                    method: 'signAndSendTransaction',
-                    serializedTransactions: [
-                        base58SerializedTransaction
-                    ]
-                }
+                    base58SerializedTransaction
+                })
             });
         }
         return signParams;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dynamic-labs-wallet/svm",
-  "version": "1.1.34",
+  "version": "1.1.35",
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@dynamic-labs-wallet/browser": "1.1.34",
+    "@dynamic-labs-wallet/browser": "1.1.35",
     "@solana/web3.js": "^1.98.2",
     "bs58": "^6.0.0",
     "@dynamic-labs/sdk-api-core": "0.50.0"

package/src/svm/client.d.ts

@@ -1,4 +1,4 @@
-import { DynamicWalletClient, type Ed25519KeygenResult, type ThresholdSignatureScheme, type TraceContext, type RequestWithElevatedAccessToken, type BaseSignParams } from '@dynamic-labs-wallet/browser';
+import { DynamicWalletClient, type Ed25519KeygenResult, type ThresholdSignatureScheme, type TraceContext, type RequestWithElevatedAccessToken, type BaseSignParams, type SignAndBroadcastResponse } from '@dynamic-labs-wallet/browser';
 export declare class DynamicSvmWalletClient extends DynamicWalletClient {
     readonly chainName = "SVM";
     accountAddress?: string;
@@ -37,7 +37,43 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
         transaction: string;
         chainId?: string;
     } & BaseSignParams): Promise<string>;
+    /**
+     * Signs a Solana transaction for Dynamic to broadcast.
+     *
+     * @param params.senderAddress - The wallet's address.
+     * @param params.transaction - The transaction message as hex, the same bytes `signTransaction` signs.
+     * @param params.chainId - The Solana network id (e.g. `101`). Dynamic checks it against the wallet's network.
+     * @param params.skipPreflight - Skip the network's pre-send dry run. Faster, but a doomed transaction still costs a fee.
+     * @param params.requestedCertainty - How sure to be before calling it confirmed: `fast`, `safe` or `final`, or `chain:` plus a chain-specific value. Defaults to `safe`.
+     * @param params.externalReference - Your own label, returned on every event. Not unique.
+     * @param params.idempotencyKey - Makes a retry safe: the same key replays the stored answer instead of sending twice. A new one is made when omitted.
+     * @param params.password - The wallet's backup password, if it has one.
+     * @param params.signedSessionId - The signed-in session, used to unlock the wallet's key share.
+     * @param params.mfaToken - Proof of the user's multi-factor check, when the wallet needs one.
+     * @param params.elevatedAccessToken - Proof of a recent re-login, when the wallet needs one.
+     * @param params.approvalQuorum - Approvers' consent for a governed wallet, sent on the retry after `intent_required`.
+     * @param params.onError - Called with the failure's message, never the raw error.
+     * @param params.traceContext - Ties this call's logs to the server's, across retries. Created when omitted.
+     * @returns The transaction record.
+     * @throws Error when `chainId` is missing.
+     */
+    signAndBroadcastTransaction({ senderAddress, transaction, chainId, skipPreflight, password, signedSessionId, mfaToken, elevatedAccessToken, approvalQuorum, requestedCertainty, externalReference, idempotencyKey, onError, traceContext, }: {
+        senderAddress: string;
+        transaction: string;
+        chainId: string;
+        skipPreflight?: boolean;
+        requestedCertainty?: string;
+        externalReference?: string;
+        idempotencyKey?: string;
+    } & Pick<BaseSignParams, 'password' | 'signedSessionId' | 'mfaToken' | 'elevatedAccessToken' | 'approvalQuorum' | 'onError' | 'traceContext'>): Promise<SignAndBroadcastResponse>;
     private prepareTransactionForSigning;
+    /**
+     * The Solana part of a signing context: which network, how it is sent, and the transaction in base58. Shared by sign and sign-and-broadcast so both describe it the same way.
+     *
+     * @param params.chainId - The Solana network id.
+     * @param params.base58SerializedTransaction - The transaction, base58-encoded.
+     */
+    private buildSvmTransactionContext;
     private buildSignParams;
     /**
      * Exports the private key for a given account address

package/src/svm/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/svm/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/svm/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EAUnB,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC7B,KAAK,YAAY,EACjB,KAAK,8BAA8B,EAEnC,KAAK,cAAc,EAEnB,KAAK,wBAAwB,EAC9B,MAAM,8BAA8B,CAAC;AAiBtC,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC7D,QAAQ,CAAC,SAAS,SAAS;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;OAKG;IACG,mBAAmB,CAAC,EACxB,wBAAwB,EACxB,QAAoB,EACpB,eAAe,EACf,YAAY,EACZ,iBAAiB,GAClB,EAAE;QACD,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,CAAC,EAAE,YAAY,CAAC;QAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,GAAG,MAAM,CAAC;KACnC,CAAC;IAyEI,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;;;IAU5D;;;;;;OAMG;IACG,WAAW,CAAC,EAChB,OAAO,EACP,cAAc,EACd,QAAoB,EACpB,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,cAAc,EACd,OAAO,EACP,YAAY,GACb,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,CAAC;KACxB,GAAG,cAAc;IAoCZ,eAAe,CAAC,EACpB,aAAa,EACb,WAAW,EACX,QAAoB,EACpB,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,OAAO,EACP,OAAO,EACP,cAAc,EACd,OAAO,EACP,YAAY,GACb,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;IA2CpC;;;;;;;;;;;;;;;;;;;OAmBG;IACG,2BAA2B,CAAC,EAChC,aAAa,EACb,WAAW,EACX,OAAO,EACP,aAAa,EACb,QAAoB,EACpB,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,YAAY,GACb,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GAAG,IAAI,CACN,cAAc,EACd,UAAU,GAAG,iBAAiB,GAAG,UAAU,GAAG,qBAAqB,GAAG,gBAAgB,GAAG,SAAS,GAAG,cAAc,CACpH,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA0BrC,OAAO,CAAC,4BAA4B;IAQpC;;;;;OAKG;IACH,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,eAAe;IA4CvB;;;;;;OAMG;IACG,gBAAgB,CAAC,EACrB,cAAc,EACd,QAAoB,EACpB,eAAe,EACf,QAAQ,EACR,mBAAmB,GACpB,EAAE,8BAA8B,CAAC;QAChC,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBpB;;;;;OAKG;IACG,uBAAuB,CAAC,EAC5B,SAAS,EACT,cAAc,GACf,EAAE;QACD,SAAS,EAAE,mBAAmB,EAAE,CAAC;QACjC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB;;;IAgBD;;;;;OAKG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM;IAM5C,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE;IAe/E,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM;IAI9C;;;;;;;;OAQG;IACG,gBAAgB,CAAC,EACrB,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,QAAoB,EACpB,OAAO,EACP,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,iBAAiB,GAClB,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;QACjC,eAAe,EAAE,MAAM,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,4DAA4D;QAC5D,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;;;;WAKG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC;KACtC,CAAC;IA8EI,aAAa;CAKpB"}