@dynamic-labs-wallet/evm 1.1.21 → 1.1.22

package/index.cjs

@@ -63,13 +63,14 @@ const formatTypedData = (typedData)=>{
         });
     }
 };
+const serializeEcdsaSignature = (signature)=>viem.serializeSignature({
+        r: `0x${Buffer.from(signature.r).toString('hex')}`,
+        s: `0x${Buffer.from(signature.s).toString('hex')}`,
+        v: BigInt(signature.v)
+    });
 const serializeECDSASignature = (signature, logger)=>{
     try {
-        return viem.serializeSignature({
-            r: `0x${Buffer.from(signature.r).toString('hex')}`,
-            s: `0x${Buffer.from(signature.s).toString('hex')}`,
-            v: BigInt(signature.v)
-        });
+        return serializeEcdsaSignature(signature);
     } catch (error) {
         logger.error('[DynamicWaasWalletClient]: Error serializing ECDSA signature:', error);
         throw error;
@@ -478,7 +479,7 @@ const prepareEvmTransactionSigningOperation = ({ transaction, accountAddress, re
         maxTotalFee: decimal(gas * maxFeePerGas)
     };
     const parsedLimits = parseLimits(limits);
-    if (parsedLimits.maxGas < gas || parsedLimits.maxFeePerGas < maxFeePerGas || parsedLimits.maxPriorityFeePerGas < maxPriorityFeePerGas || parsedLimits.maxPriorityFeePerGas > parsedLimits.maxFeePerGas || parsedLimits.maxGas * parsedLimits.maxFeePerGas > parsedLimits.maxTotalFee) {
+    if (parsedLimits.maxGas < gas || parsedLimits.maxFeePerGas < maxFeePerGas || parsedLimits.maxPriorityFeePerGas < maxPriorityFeePerGas || parsedLimits.maxPriorityFeePerGas > parsedLimits.maxFeePerGas || gas * maxFeePerGas > parsedLimits.maxTotalFee) {
         throw new Error('Transaction exceeds signing intent limits');
     }
     var _parsed_value, _parsed_data;
@@ -496,6 +497,54 @@ const prepareEvmTransactionSigningOperation = ({ transaction, accountAddress, re
         limits
     };
 };
+const safeNumber = (value, name)=>{
+    const parsed = parseLimit(value, name);
+    if (parsed > BigInt(Number.MAX_SAFE_INTEGER)) throw new Error(`Invalid ${name} signing value`);
+    return Number(parsed);
+};
+/**
+ * Reconstructs an unsigned EIP-1559 transaction from an approved intent.
+ * Only gas and fee values may change, within the approved limits.
+ */ const resumeEvmTransactionSigningIntent = ({ intent })=>{
+    if (intent.operation.kind !== 'transaction' || intent.operation.chainName !== 'EVM' || !intent.limits) {
+        throw new Error('Stored signing intent is not an EVM transaction');
+    }
+    const { operation, limits } = intent;
+    const parsedLimits = parseLimits(limits);
+    if (parsedLimits.maxGas === 0n || parsedLimits.maxFeePerGas === 0n) {
+        throw new Error('Stored EVM transaction intent has unusable fee limits');
+    }
+    const gas = parsedLimits.maxGas;
+    // The signed total-fee ceiling can be tighter than the independent gas and
+    // fee ceilings, so derive the largest fee cap that satisfies all three.
+    const maxFeePerGas = parsedLimits.maxTotalFee / gas < parsedLimits.maxFeePerGas ? parsedLimits.maxTotalFee / gas : parsedLimits.maxFeePerGas;
+    if (maxFeePerGas === 0n) {
+        throw new Error('Stored EVM transaction intent has unusable fee limits');
+    }
+    const maxPriorityFeePerGas = parsedLimits.maxPriorityFeePerGas < maxFeePerGas ? parsedLimits.maxPriorityFeePerGas : maxFeePerGas;
+    const transaction = viem.serializeTransaction({
+        chainId: safeNumber(operation.chainId, 'chainId'),
+        data: operation.data,
+        gas,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        nonce: safeNumber(operation.nonce, 'nonce'),
+        to: operation.to ? viem.getAddress(operation.to) : undefined,
+        type: 'eip1559',
+        value: parseLimit(operation.value, 'value')
+    });
+    const reconstructed = prepareEvmTransactionSigningOperation({
+        accountAddress: intent.accountAddress,
+        refreshLimits: limits,
+        transaction
+    });
+    if (reconstructed.operation.chainId !== operation.chainId || reconstructed.operation.from !== operation.from || reconstructed.operation.to !== operation.to || reconstructed.operation.value !== operation.value || reconstructed.operation.data !== operation.data || reconstructed.operation.nonce !== operation.nonce) {
+        throw new Error('Stored EVM transaction intent is malformed');
+    }
+    return transaction;
+};
 
 exports.DynamicEvmWalletClient = DynamicEvmWalletClient;
 exports.prepareEvmTransactionSigningOperation = prepareEvmTransactionSigningOperation;
+exports.resumeEvmTransactionSigningIntent = resumeEvmTransactionSigningIntent;
+exports.serializeEcdsaSignature = serializeEcdsaSignature;

package/index.esm.js

@@ -61,13 +61,14 @@ const formatTypedData = (typedData)=>{
         });
     }
 };
+const serializeEcdsaSignature = (signature)=>serializeSignature({
+        r: `0x${Buffer.from(signature.r).toString('hex')}`,
+        s: `0x${Buffer.from(signature.s).toString('hex')}`,
+        v: BigInt(signature.v)
+    });
 const serializeECDSASignature = (signature, logger)=>{
     try {
-        return serializeSignature({
-            r: `0x${Buffer.from(signature.r).toString('hex')}`,
-            s: `0x${Buffer.from(signature.s).toString('hex')}`,
-            v: BigInt(signature.v)
-        });
+        return serializeEcdsaSignature(signature);
     } catch (error) {
         logger.error('[DynamicWaasWalletClient]: Error serializing ECDSA signature:', error);
         throw error;
@@ -476,7 +477,7 @@ const prepareEvmTransactionSigningOperation = ({ transaction, accountAddress, re
         maxTotalFee: decimal(gas * maxFeePerGas)
     };
     const parsedLimits = parseLimits(limits);
-    if (parsedLimits.maxGas < gas || parsedLimits.maxFeePerGas < maxFeePerGas || parsedLimits.maxPriorityFeePerGas < maxPriorityFeePerGas || parsedLimits.maxPriorityFeePerGas > parsedLimits.maxFeePerGas || parsedLimits.maxGas * parsedLimits.maxFeePerGas > parsedLimits.maxTotalFee) {
+    if (parsedLimits.maxGas < gas || parsedLimits.maxFeePerGas < maxFeePerGas || parsedLimits.maxPriorityFeePerGas < maxPriorityFeePerGas || parsedLimits.maxPriorityFeePerGas > parsedLimits.maxFeePerGas || gas * maxFeePerGas > parsedLimits.maxTotalFee) {
         throw new Error('Transaction exceeds signing intent limits');
     }
     var _parsed_value, _parsed_data;
@@ -494,5 +495,51 @@ const prepareEvmTransactionSigningOperation = ({ transaction, accountAddress, re
         limits
     };
 };
+const safeNumber = (value, name)=>{
+    const parsed = parseLimit(value, name);
+    if (parsed > BigInt(Number.MAX_SAFE_INTEGER)) throw new Error(`Invalid ${name} signing value`);
+    return Number(parsed);
+};
+/**
+ * Reconstructs an unsigned EIP-1559 transaction from an approved intent.
+ * Only gas and fee values may change, within the approved limits.
+ */ const resumeEvmTransactionSigningIntent = ({ intent })=>{
+    if (intent.operation.kind !== 'transaction' || intent.operation.chainName !== 'EVM' || !intent.limits) {
+        throw new Error('Stored signing intent is not an EVM transaction');
+    }
+    const { operation, limits } = intent;
+    const parsedLimits = parseLimits(limits);
+    if (parsedLimits.maxGas === 0n || parsedLimits.maxFeePerGas === 0n) {
+        throw new Error('Stored EVM transaction intent has unusable fee limits');
+    }
+    const gas = parsedLimits.maxGas;
+    // The signed total-fee ceiling can be tighter than the independent gas and
+    // fee ceilings, so derive the largest fee cap that satisfies all three.
+    const maxFeePerGas = parsedLimits.maxTotalFee / gas < parsedLimits.maxFeePerGas ? parsedLimits.maxTotalFee / gas : parsedLimits.maxFeePerGas;
+    if (maxFeePerGas === 0n) {
+        throw new Error('Stored EVM transaction intent has unusable fee limits');
+    }
+    const maxPriorityFeePerGas = parsedLimits.maxPriorityFeePerGas < maxFeePerGas ? parsedLimits.maxPriorityFeePerGas : maxFeePerGas;
+    const transaction = serializeTransaction({
+        chainId: safeNumber(operation.chainId, 'chainId'),
+        data: operation.data,
+        gas,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        nonce: safeNumber(operation.nonce, 'nonce'),
+        to: operation.to ? getAddress(operation.to) : undefined,
+        type: 'eip1559',
+        value: parseLimit(operation.value, 'value')
+    });
+    const reconstructed = prepareEvmTransactionSigningOperation({
+        accountAddress: intent.accountAddress,
+        refreshLimits: limits,
+        transaction
+    });
+    if (reconstructed.operation.chainId !== operation.chainId || reconstructed.operation.from !== operation.from || reconstructed.operation.to !== operation.to || reconstructed.operation.value !== operation.value || reconstructed.operation.data !== operation.data || reconstructed.operation.nonce !== operation.nonce) {
+        throw new Error('Stored EVM transaction intent is malformed');
+    }
+    return transaction;
+};
 
-export { DynamicEvmWalletClient, prepareEvmTransactionSigningOperation };
+export { DynamicEvmWalletClient, prepareEvmTransactionSigningOperation, resumeEvmTransactionSigningIntent, serializeEcdsaSignature };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dynamic-labs-wallet/evm",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@dynamic-labs-wallet/browser": "1.1.21",
-    "@dynamic-labs-wallet/core": "1.1.21",
+    "@dynamic-labs-wallet/browser": "1.1.22",
+    "@dynamic-labs-wallet/core": "1.1.22",
     "@dynamic-labs/sdk-api-core": "0.50.0"
   },
   "peerDependencies": {

package/src/index.d.ts

@@ -1,3 +1,4 @@
 export * from './client/index.js';
-export { prepareEvmTransactionSigningOperation } from './signingIntent.js';
+export { prepareEvmTransactionSigningOperation, resumeEvmTransactionSigningIntent } from './signingIntent.js';
+export { serializeEcdsaSignature } from './utils.js';
 //# sourceMappingURL=index.d.ts.map

package/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,qCAAqC,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,qCAAqC,EAAE,iCAAiC,EAAE,MAAM,oBAAoB,CAAC;AAC9G,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC"}

package/src/signingIntent.d.ts

@@ -1,7 +1,14 @@
-import type { EvmSigningIntentLimits, PreparedTransactionSigningIntent } from '@dynamic-labs-wallet/core';
+import type { EvmSigningIntentLimits, PreparedTransactionSigningIntent, SigningIntent } from '@dynamic-labs-wallet/core';
 export declare const prepareEvmTransactionSigningOperation: ({ transaction, accountAddress, refreshLimits, }: {
     transaction: string;
     accountAddress: string;
     refreshLimits?: EvmSigningIntentLimits;
 }) => PreparedTransactionSigningIntent;
+/**
+ * Reconstructs an unsigned EIP-1559 transaction from an approved intent.
+ * Only gas and fee values may change, within the approved limits.
+ */
+export declare const resumeEvmTransactionSigningIntent: ({ intent }: {
+    intent: SigningIntent;
+}) => string;
 //# sourceMappingURL=signingIntent.d.ts.map

package/src/signingIntent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signingIntent.d.ts","sourceRoot":"","sources":["../../packages/src/signingIntent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,gCAAgC,EAAE,MAAM,2BAA2B,CAAC;AAiB1G,eAAO,MAAM,qCAAqC,oDAI/C;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,sBAAsB,CAAC;CACxC,KAAG,gCAmDH,CAAC"}
+{"version":3,"file":"signingIntent.d.ts","sourceRoot":"","sources":["../../packages/src/signingIntent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,gCAAgC,EAChC,aAAa,EACd,MAAM,2BAA2B,CAAC;AAiBnC,eAAO,MAAM,qCAAqC,oDAI/C;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,sBAAsB,CAAC;CACxC,KAAG,gCAmDH,CAAC;AAQF;;;GAGG;AACH,eAAO,MAAM,iCAAiC,eAAgB;IAAE,MAAM,EAAE,aAAa,CAAA;CAAE,KAAG,MAmDzF,CAAC"}

package/src/utils.d.ts

@@ -7,5 +7,6 @@ export declare const formatEVMMessage: (message_: string | {
 export declare const formatTypedData: (typedData: TypedData | {
     [key: string]: unknown;
 }) => string;
+export declare const serializeEcdsaSignature: (signature: EcdsaSignature) => `0x${string}`;
 export declare const serializeECDSASignature: (signature: EcdsaSignature, logger: ILogger) => `0x${string}`;
 //# sourceMappingURL=utils.d.ts.map

package/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../packages/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAA2B,SAAS,EAAE,MAAM,MAAM,CAAC;AAI/D,eAAO,MAAM,gBAAgB,aAAc,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,UAAU,OAAO,kBAahG,CAAC;AAEF,eAAO,MAAM,eAAe,cAAe,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,WA6BhF,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,cAAc,UAAU,OAAO,kBAWjF,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../packages/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAA2B,SAAS,EAAE,MAAM,MAAM,CAAC;AAI/D,eAAO,MAAM,gBAAgB,aAAc,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,UAAU,OAAO,kBAahG,CAAC;AAEF,eAAO,MAAM,eAAe,cAAe,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,WA6BhF,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,cAAc,kBAK7D,CAAC;AAEL,eAAO,MAAM,uBAAuB,cAAe,cAAc,UAAU,OAAO,kBAOjF,CAAC"}