@0xsequence/wallet-wdk 3.0.7 → 3.0.9

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
 
-> @0xsequence/wallet-wdk@3.0.7 build /home/taylan/development/sequence/sequence.js/packages/wallet/wdk
+> @0xsequence/wallet-wdk@3.0.9 build /home/taylan/development/sequence/sequence.js/packages/wallet/wdk
 > tsc
 

package/.turbo/turbo-lint.log

@@ -1,4 +1,4 @@
 
-> @0xsequence/wallet-wdk@3.0.7 lint /home/taylan/development/sequence/sequence.js/packages/wallet/wdk
+> @0xsequence/wallet-wdk@3.0.9 lint /home/taylan/development/sequence/sequence.js/packages/wallet/wdk
 > eslint . --max-warnings 0
 

package/.turbo/turbo-typecheck.log

@@ -1,4 +1,4 @@
 
-> @0xsequence/wallet-wdk@3.0.7 typecheck /home/taylan/development/sequence/sequence.js/packages/wallet/wdk
+> @0xsequence/wallet-wdk@3.0.9 typecheck /home/taylan/development/sequence/sequence.js/packages/wallet/wdk
 > tsc --noEmit
 

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @0xsequence/wallet-wdk
 
+## 3.0.9
+
+### Patch Changes
+
+- Fee options fixes
+- Updated dependencies
+  - @0xsequence/guard@3.0.9
+  - @0xsequence/identity-instrument@3.0.9
+  - @0xsequence/relayer@3.0.9
+  - @0xsequence/wallet-core@3.0.9
+  - @0xsequence/wallet-primitives@3.0.9
+
+## 3.0.8
+
+### Patch Changes
+
+- Bug fix for relayer fee options handling
+- Updated dependencies
+  - @0xsequence/guard@3.0.8
+  - @0xsequence/identity-instrument@3.0.8
+  - @0xsequence/relayer@3.0.8
+  - @0xsequence/wallet-core@3.0.8
+  - @0xsequence/wallet-primitives@3.0.8
+
 ## 3.0.7
 
 ### Patch Changes

package/dist/sequence/transactions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactions.d.ts","sourceRoot":"","sources":["../../src/sequence/transactions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transactions.d.ts","sourceRoot":"","sources":["../../src/sequence/transactions.ts"],"names":[],"mappings":"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"}

package/dist/sequence/transactions.js

@@ -116,19 +116,23 @@ export class Transactions {
         if (tx.status !== 'requested') {
             throw new Error(`Transaction ${transactionId} is not in the requested state`);
         }
+        if (!Payload.isCalls(tx.envelope.payload)) {
+            throw new Error(`Transaction ${transactionId} is not a calls payload`);
+        }
+        const payload = tx.envelope.payload;
         // Modify the envelope with the changes
         if (changes?.nonce) {
-            tx.envelope.payload.nonce = changes.nonce;
+            payload.nonce = changes.nonce;
         }
         if (changes?.space) {
-            tx.envelope.payload.space = changes.space;
+            payload.space = changes.space;
         }
         if (changes?.calls) {
-            if (changes.calls.length !== tx.envelope.payload.calls.length) {
+            if (changes.calls.length !== payload.calls.length) {
                 throw new Error(`Invalid number of calls for transaction ${transactionId}`);
             }
             for (let i = 0; i < changes.calls.length; i++) {
-                tx.envelope.payload.calls[i].gasLimit = changes.calls[i].gasLimit;
+                payload.calls[i].gasLimit = changes.calls[i].gasLimit;
             }
         }
         const wallet = new Wallet(tx.wallet, { stateProvider: this.shared.sequence.stateProvider });
@@ -137,6 +141,7 @@ export class Transactions {
             throw new Error(`Network not found for ${tx.envelope.chainId}`);
         }
         const provider = Provider.from(RpcTransport.fromHttp(network.rpcUrl));
+        const feeOptionsTransaction = await wallet.buildFeeOptionsTransaction(provider, payload);
         // Get relayer and relayer options
         const [allRelayerOptions, allBundlerOptions] = await Promise.all([
             Promise.all(this.shared.sequence.relayers
@@ -146,10 +151,7 @@ export class Transactions {
                 if (!ifAvailable) {
                     return [];
                 }
-                // Determine the to address for the built transaction
-                const walletStatus = await wallet.getStatus(provider);
-                const to = walletStatus.isDeployed ? wallet.address : wallet.guest;
-                const feeOptions = await relayer.feeOptions(tx.wallet, tx.envelope.chainId, to, tx.envelope.payload.calls);
+                const feeOptions = await relayer.feeOptions(tx.wallet, tx.envelope.chainId, feeOptionsTransaction.to, payload.calls, feeOptionsTransaction.data);
                 if (feeOptions.options.length === 0) {
                     const { name, icon } = relayer instanceof Relayer.EIP6963.EIP6963Relayer ? relayer.info : {};
                     return [
@@ -183,8 +185,8 @@ export class Transactions {
                         return [];
                     }
                     try {
-                        const erc4337Op = await wallet.prepare4337Transaction(provider, tx.envelope.payload.calls, {
-                            space: tx.envelope.payload.space,
+                        const erc4337Op = await wallet.prepare4337Transaction(provider, payload.calls, {
+                            space: payload.space,
                         });
                         const erc4337OpsWithEstimatedLimits = await bundler.estimateLimits(tx.wallet, erc4337Op.payload);
                         return erc4337OpsWithEstimatedLimits.map(({ speed, payload }) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/wallet-wdk",
-  "version": "3.0.7",
+  "version": "3.0.9",
   "license": "Apache-2.0",
   "type": "module",
   "publishConfig": {
@@ -30,11 +30,11 @@
     "jwt-decode": "^4.0.0",
     "ox": "^0.9.17",
     "uuid": "^14.0.0",
-    "@0xsequence/guard": "^3.0.7",
-    "@0xsequence/wallet-core": "^3.0.7",
-    "@0xsequence/identity-instrument": "^3.0.7",
-    "@0xsequence/wallet-primitives": "^3.0.7",
-    "@0xsequence/relayer": "^3.0.7"
+    "@0xsequence/guard": "^3.0.9",
+    "@0xsequence/identity-instrument": "^3.0.9",
+    "@0xsequence/relayer": "^3.0.9",
+    "@0xsequence/wallet-primitives": "^3.0.9",
+    "@0xsequence/wallet-core": "^3.0.9"
   },
   "scripts": {
     "build": "tsc",

package/src/sequence/transactions.ts

@@ -310,22 +310,28 @@ export class Transactions implements TransactionsInterface {
       throw new Error(`Transaction ${transactionId} is not in the requested state`)
     }
 
+    if (!Payload.isCalls(tx.envelope.payload)) {
+      throw new Error(`Transaction ${transactionId} is not a calls payload`)
+    }
+
+    const payload = tx.envelope.payload
+
     // Modify the envelope with the changes
     if (changes?.nonce) {
-      tx.envelope.payload.nonce = changes.nonce
+      payload.nonce = changes.nonce
     }
 
     if (changes?.space) {
-      tx.envelope.payload.space = changes.space
+      payload.space = changes.space
     }
 
     if (changes?.calls) {
-      if (changes.calls.length !== tx.envelope.payload.calls.length) {
+      if (changes.calls.length !== payload.calls.length) {
         throw new Error(`Invalid number of calls for transaction ${transactionId}`)
       }
 
       for (let i = 0; i < changes.calls.length; i++) {
-        tx.envelope.payload.calls[i]!.gasLimit = changes.calls[i]!.gasLimit
+        payload.calls[i]!.gasLimit = changes.calls[i]!.gasLimit
       }
     }
 
@@ -335,6 +341,7 @@ export class Transactions implements TransactionsInterface {
       throw new Error(`Network not found for ${tx.envelope.chainId}`)
     }
     const provider = Provider.from(RpcTransport.fromHttp(network.rpcUrl))
+    const feeOptionsTransaction = await wallet.buildFeeOptionsTransaction(provider, payload)
 
     // Get relayer and relayer options
     const [allRelayerOptions, allBundlerOptions] = await Promise.all([
@@ -347,11 +354,13 @@ export class Transactions implements TransactionsInterface {
               return []
             }
 
-            // Determine the to address for the built transaction
-            const walletStatus = await wallet.getStatus(provider)
-            const to = walletStatus.isDeployed ? wallet.address : wallet.guest
-
-            const feeOptions = await relayer.feeOptions(tx.wallet, tx.envelope.chainId, to, tx.envelope.payload.calls)
+            const feeOptions = await relayer.feeOptions(
+              tx.wallet,
+              tx.envelope.chainId,
+              feeOptionsTransaction.to,
+              payload.calls,
+              feeOptionsTransaction.data,
+            )
 
             if (feeOptions.options.length === 0) {
               const { name, icon } = relayer instanceof Relayer.EIP6963.EIP6963Relayer ? relayer.info : {}
@@ -392,8 +401,8 @@ export class Transactions implements TransactionsInterface {
             }
 
             try {
-              const erc4337Op = await wallet.prepare4337Transaction(provider, tx.envelope.payload.calls, {
-                space: tx.envelope.payload.space,
+              const erc4337Op = await wallet.prepare4337Transaction(provider, payload.calls, {
+                space: payload.space,
               })
 
               const erc4337OpsWithEstimatedLimits = await bundler.estimateLimits(tx.wallet, erc4337Op.payload)