fix: update default calldata issue with viem (#139)

cpb8010 · web-flow · commit c87218eda8c6 · 2025-05-21T14:56:50.000+03:00
* fix: update default calldata issue with viem

Updates viem everywhere

* chore: another lockfile update

Install 3 times is the trick I guess:

1. in the workspace root
2. in the packages/contracts
3. again in the workspace root

* feat: update wallet client functions

what a mess to copy this 4x, but trying to abstract these types is a
huge pain!

Also the ecdsa client was using the zksync specific sign transaction
before, but again it has a type difference which fails the build

* fix: pin anvil zksync to 0.6.1

0.6.2 has some breaking changes for contract deployment

* fix: rebase contract changes to existing branch

Don't pull in latest main
diff --git a/.github/workflows/deploy-auth-server.yml b/.github/workflows/deploy-auth-server.yml
@@ -43,6 +43,8 @@ jobs:
       # Local node to have target for deploy
       - name: Era Test Node Action
         uses: dutterbutter/anvil-zksync-action@v1.1.0
+        with:
+          releaseTag: 'v0.6.1'
 
       - name: Deploy contracts
         run: pnpm run deploy --file ../auth-server/stores/local-node.json
diff --git a/.github/workflows/deploy-nft-quest.yml b/.github/workflows/deploy-nft-quest.yml
@@ -46,6 +46,8 @@ jobs:
       # Local node to have target for deploy
       - name: Era Test Node Action
         uses: dutterbutter/anvil-zksync-action@v1.1.0
+        with:
+          releaseTag: 'v0.6.1'
 
       - name: Deploy contracts
         run: pnpm run deploy --file ../auth-server/stores/local-node.json
diff --git a/.github/workflows/deploy-package.yml b/.github/workflows/deploy-package.yml
@@ -43,6 +43,8 @@ jobs:
       # Local node to have target for deploy
       - name: Era Test Node Action
         uses: dutterbutter/anvil-zksync-action@v1.1.0
+        with:
+          releaseTag: 'v0.6.1'
 
       - name: Deploy contracts
         run: pnpm run deploy --file ../auth-server/stores/local-node.json
diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml
@@ -44,6 +44,8 @@ jobs:
       # Local node to have target for deploy
       - name: Era Test Node Action
         uses: dutterbutter/anvil-zksync-action@v1.1.0
+        with:
+          releaseTag: 'v0.6.1'
 
       - name: Deploy contracts
         run: pnpm run deploy --file ../auth-server/stores/local-node.json
diff --git a/examples/bank-demo/package.json b/examples/bank-demo/package.json
@@ -20,7 +20,7 @@
     "pinia": "^2.1.7",
     "radix-vue": "^1.9.7",
     "tailwind-merge": "^2.5.3",
-    "viem": "^2.21.14",
+    "viem": "^2.30.0",
     "vue": "latest",
     "vue-router": "latest",
     "zksync-sso": "workspace:*"
diff --git a/examples/demo-app/package.json b/examples/demo-app/package.json
@@ -16,7 +16,7 @@
     "@web3modal/wagmi": "^5.1.11",
     "ethers": "^6.13.2",
     "nuxt": "^3.12.3",
-    "viem": "2.21.14",
+    "viem": "2.30.0",
     "vue": "^3.4.21",
     "wagmi": "^2.12.17",
     "zksync-ethers": "^6.15.0",
diff --git a/examples/nft-quest/package.json b/examples/nft-quest/package.json
@@ -31,7 +31,7 @@
     "sass": "^1.77.6",
     "tailwind-merge": "^2.5.2",
     "ts-node": "^10.9.2",
-    "viem": "2.21.14",
+    "viem": "2.30.0",
     "vue": "latest",
     "vue-load-image": "^1.1.0",
     "vue-router": "latest",
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "prettier": "3.3.3",
     "typescript": "5.6.2",
     "typescript-eslint": "8.7.0",
-    "viem": "^2.21.14",
+    "viem": "^2.30.0",
     "zksync-sso": "workspace:*"
   },
   "nx": {
diff --git a/packages/auth-server/package.json b/packages/auth-server/package.json
@@ -32,7 +32,7 @@
     "radix-vue": "^1.9.6",
     "sass": "^1.77.6",
     "tailwind-merge": "^2.5.2",
-    "viem": "2.21.14",
+    "viem": "2.30.0",
     "vue": "latest",
     "wagmi": "^2.12.17",
     "web3-avatar-vue": "^1.0.4",
diff --git a/packages/contracts b/packages/contracts
@@ -1 +1 @@
-Subproject commit a640263d040ee56e8eba5433821769ab2a72bad3
+Subproject commit b0ffad0513aabdf05fd4ddb9f44dbc155113b59b
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -37,7 +37,7 @@
     "@types/ms": "^0.7.34",
     "@types/node": "^22.1.0",
     "eventemitter3": "^5.0.1",
-    "viem": "2.21.14",
+    "viem": "2.30.0",
     "vitest": "^2.1.8"
   },
   "files": [
diff --git a/packages/sdk/src/client/ecdsa/decorators/wallet.ts b/packages/sdk/src/client/ecdsa/decorators/wallet.ts
@@ -1,6 +1,6 @@
 import { type Account, bytesToHex, type Chain, type ExactPartial, formatTransaction, type RpcTransaction, type Transport, type WalletActions } from "viem";
-import { deployContract, getAddresses, getChainId, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
-import { signTransaction, type TransactionRequestEIP712, type ZksyncEip712Meta } from "viem/zksync";
+import { deployContract, getAddresses, getCallsStatus, getCapabilities, getChainId, prepareAuthorization, sendCalls, sendRawTransaction, showCallsStatus, signAuthorization, signMessage, signTransaction, signTypedData, waitForCallsStatus, writeContract } from "viem/actions";
+import { type TransactionRequestEIP712, type ZksyncEip712Meta } from "viem/zksync";
 
 import { getTransactionWithPaymasterData } from "../../../paymaster/index.js";
 import { sendEip712Transaction } from "../../session/actions/sendEip712Transaction.js";
@@ -65,9 +65,16 @@ export function zksyncSsoEcdsaWalletActions<
       return signTransaction(client, {
         ...args,
         unformattedTxWithPaymaster,
-      } as any);
+      });
     },
     signTypedData: (args) => signTypedData(client, args),
     writeContract: (args) => writeContract(client, args),
+    signAuthorization: (args) => signAuthorization(client, args),
+    getCallsStatus: (args) => getCallsStatus(client, args),
+    getCapabilities: (args) => getCapabilities(client, args),
+    prepareAuthorization: (args) => prepareAuthorization(client, args),
+    sendCalls: (args) => sendCalls(client, args),
+    showCallsStatus: (args) => showCallsStatus(client, args),
+    waitForCallsStatus: (args) => waitForCallsStatus(client, args),
   };
 }
diff --git a/packages/sdk/src/client/passkey/decorators/wallet.ts b/packages/sdk/src/client/passkey/decorators/wallet.ts
@@ -1,5 +1,5 @@
 import { type Account, bytesToHex, type Chain, type ExactPartial, formatTransaction, type RpcTransaction, type Transport, type WalletActions } from "viem";
-import { deployContract, getAddresses, getChainId, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
+import { deployContract, getAddresses, getCallsStatus, getCapabilities, getChainId, prepareAuthorization, sendCalls, sendRawTransaction, showCallsStatus, signAuthorization, signMessage, signTypedData, waitForCallsStatus, writeContract } from "viem/actions";
 import { signTransaction, type TransactionRequestEIP712, type ZksyncEip712Meta } from "viem/zksync";
 
 import { getTransactionWithPaymasterData } from "../../../paymaster/index.js";
@@ -69,5 +69,12 @@ export function zksyncSsoPasskeyWalletActions<
     },
     signTypedData: (args) => signTypedData(client, args),
     writeContract: (args) => writeContract(client, args),
+    signAuthorization: (args) => signAuthorization(client, args),
+    getCallsStatus: (args) => getCallsStatus(client, args),
+    getCapabilities: (args) => getCapabilities(client, args),
+    prepareAuthorization: (args) => prepareAuthorization(client, args),
+    sendCalls: (args) => sendCalls(client, args),
+    showCallsStatus: (args) => showCallsStatus(client, args),
+    waitForCallsStatus: (args) => waitForCallsStatus(client, args),
   };
 }
diff --git a/packages/sdk/src/client/recovery/decorators/wallet.ts b/packages/sdk/src/client/recovery/decorators/wallet.ts
@@ -1,5 +1,5 @@
 import { type Account, bytesToHex, type Chain, formatTransaction, type Transport, type WalletActions } from "viem";
-import { deployContract, getAddresses, getChainId, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
+import { deployContract, getAddresses, getCallsStatus, getCapabilities, getChainId, prepareAuthorization, sendCalls, sendRawTransaction, showCallsStatus, signAuthorization, signMessage, signTypedData, waitForCallsStatus, writeContract } from "viem/actions";
 import { signTransaction, type ZksyncEip712Meta } from "viem/zksync";
 
 import { sendEip712Transaction } from "../actions/sendEip712Transaction.js";
@@ -48,5 +48,12 @@ export function zksyncSsoWalletActions<
     signTransaction: (args) => signTransaction(client, args as any) as any,
     signTypedData: (args) => signTypedData(client, args),
     writeContract: (args) => writeContract(client, args),
+    signAuthorization: (args) => signAuthorization(client, args),
+    getCallsStatus: (args) => getCallsStatus(client, args),
+    getCapabilities: (args) => getCapabilities(client, args),
+    prepareAuthorization: (args) => prepareAuthorization(client, args),
+    sendCalls: (args) => sendCalls(client, args),
+    showCallsStatus: (args) => showCallsStatus(client, args),
+    waitForCallsStatus: (args) => waitForCallsStatus(client, args),
   };
 }
diff --git a/packages/sdk/src/client/session/decorators/wallet.ts b/packages/sdk/src/client/session/decorators/wallet.ts
@@ -3,8 +3,10 @@ import {
   type Chain, type ExactPartial, formatTransaction, type RpcTransaction,
   type Transport, type WalletActions } from "viem";
 import {
-  deployContract, getAddresses, getChainId, sendRawTransaction,
-  signMessage, signTypedData, writeContract,
+  deployContract, getAddresses, getCallsStatus, getCapabilities, getChainId, prepareAuthorization, sendCalls, sendRawTransaction,
+  showCallsStatus,
+  signAuthorization,
+  signMessage, signTypedData, waitForCallsStatus, writeContract,
 } from "viem/actions";
 import { signTransaction, type TransactionRequestEIP712, type ZksyncEip712Meta } from "viem/zksync";
 
@@ -74,135 +76,12 @@ export function zksyncSsoWalletActions<
     },
     signTypedData: (args) => signTypedData(client, args),
     writeContract: (args) => writeContract(client, args),
+    signAuthorization: (args) => signAuthorization(client, args),
+    getCallsStatus: (args) => getCallsStatus(client, args),
+    getCapabilities: (args) => getCapabilities(client, args),
+    prepareAuthorization: (args) => prepareAuthorization(client, args),
+    sendCalls: (args) => sendCalls(client, args),
+    showCallsStatus: (args) => showCallsStatus(client, args),
+    waitForCallsStatus: (args) => waitForCallsStatus(client, args),
   };
 }
-
-/* export class SpendLimitError extends Error {
-  public tokenAddress: Address;
-  public spendLimit: bigint;
-
-  constructor(message: string, info: { tokenAddress: Address, spendLimit: bigint }) {
-    super(message);
-    this.tokenAddress = info.tokenAddress;
-    this.spendLimit = info.spendLimit;
-  }
-}
-
-const l2BaseTokenAddress = getAddress('0x000000000000000000000000000000000000800a');
-
-const blockedMethods = [
-  "approve", // do not allow token approvals to prevent indirect token transfer
-];
-const isBlockedMethod = (method: string) => {
-  return blockedMethods.includes(method);
-}
-
-const decodeERC20TransactionData = (transactionData: Hash) => {
-  try {
-    const { functionName, args } = decodeFunctionData({
-      abi: erc20Abi,
-      data: transactionData,
-    });
-    return { functionName, args };
-  } catch {
-    return { functionName: undefined, args: [] };
-  }
-}
-
-const getTotalFee = (fee: {
-  gas?: bigint,
-  gasPrice?: bigint,
-  maxFeePerGas?: bigint,
-  maxPriorityFeePerGas?: bigint,
-}): bigint => {
-  if (!fee.gas) return 0n;
-
-  if (fee.gasPrice) {
-    return fee.gas * fee.gasPrice;
-  } else if (fee.maxFeePerGas && fee.maxPriorityFeePerGas) {
-    return fee.gas * (fee.maxFeePerGas + fee.maxPriorityFeePerGas);
-  } else if (fee.maxFeePerGas) {
-    return fee.gas * fee.maxFeePerGas;
-  } else if (fee.maxPriorityFeePerGas) {
-    return fee.gas * fee.maxPriorityFeePerGas;
-  }
-
-  return 0n;
-}
-
-const verifyTransactionData = async (
-  transaction: {
-    value?: bigint;
-    chain?: { id: number | undefined };
-    to?: Address;
-    data?: Hash;
-    gas?: bigint,
-    gasPrice?: bigint,
-    maxFeePerGas?: bigint,
-    maxPriorityFeePerGas?: bigint,
-  },
-  client: ClientWithZksyncSsoSessionData
-) => {
-  const spendLimitCache = new Map<Address, bigint>(); // Prevent multiple calls to getTokenSpendLimit (mostly for ETH)
-  const exceedsSpendLimit = async (tokenAddress: Address, amount: bigint): Promise<boolean> => {
-    if (!spendLimitCache.has(tokenAddress)) {
-      const spendLimit = await getTokenSpendLimit(client, { tokenAddress, sessionKey: client.sessionKey!, contracts: client.contracts });
-      spendLimitCache.set(tokenAddress, spendLimit);
-    }
-
-    const tokenSpendLimit = spendLimitCache.get(tokenAddress)!;
-    if (tokenSpendLimit < amount) {
-      return true;
-    }
-
-    return false;
-  }
-
-  // Verify transaction value
-  const value = transaction.value || 0n;
-  if (await exceedsSpendLimit(getAddress(l2BaseTokenAddress), value)) {
-    throw new SpendLimitError(`Transaction value ${value} exceeds account spend limit`, {
-      tokenAddress: getAddress(l2BaseTokenAddress),
-      spendLimit: spendLimitCache.get(getAddress(l2BaseTokenAddress))!,
-    });
-  }
-
-  // Verify total fee
-  const totalFee = getTotalFee({
-    gas: transaction.gas,
-    gasPrice: transaction.gasPrice,
-    maxFeePerGas: transaction.maxFeePerGas,
-    maxPriorityFeePerGas: transaction.maxPriorityFeePerGas,
-  });
-  if (await exceedsSpendLimit(getAddress(l2BaseTokenAddress), totalFee)) {
-    throw new SpendLimitError(`Total fee ${totalFee} exceeds account spend limit`, {
-      tokenAddress: getAddress(l2BaseTokenAddress),
-      spendLimit: spendLimitCache.get(getAddress(l2BaseTokenAddress))!,
-    });
-  }
-
-  if (!transaction.data || !transaction.to) return;
-
-  // Assuming transaction is an erc20 transaction
-  const { functionName, args } = decodeERC20TransactionData(transaction.data);
-  if (!functionName) return;
-
-  // Verify if method is not blocked
-  if (isBlockedMethod(functionName)) {
-    throw new Error(`Method "${functionName}" is not allowed for this account`);
-  }
-
-  const tokenAddress = getAddress(transaction.to.toLowerCase());
-
-  // Verify transfer amount
-  if (functionName === "transfer") {
-    const [_to, _amount] = args;
-    const amount = _amount ? BigInt(_amount) : 0n;
-    if (await exceedsSpendLimit(tokenAddress, amount)) {
-      throw new SpendLimitError(`Amount ${amount} exceeds account spend limit`, {
-        tokenAddress,
-        spendLimit: spendLimitCache.get(tokenAddress)!,
-      });
-    }
-  }
-} */
diff --git a/packages/sdk/src/client/utils/getEip712Domain.ts b/packages/sdk/src/client/utils/getEip712Domain.ts
@@ -77,7 +77,7 @@ function transactionToMessage(
     paymaster: paymaster ? BigInt(paymaster) : 0n,
     nonce: nonce ? BigInt(nonce) : 0n,
     value: value ?? 0n,
-    data: data ? data : "0x0",
+    data: data ? data : "0x",
     factoryDeps: factoryDeps?.map((dep) => toHex(hashBytecode(dep))) ?? [],
     paymasterInput: paymasterInput ? paymasterInput : "0x",
   };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
