feat: new passkey signature format

.github/workflows/ci.yml

@@ -41,17 +41,17 @@ jobs:
       run: pnpm install -r --frozen-lockfile
       working-directory: packages/contracts
 
-    - name: Build SDK
-      run: pnpm nx build sdk
-
     - name: Build contracts
       run: pnpm build
       working-directory: packages/contracts
 
     - name: Deploy contracts
-      run: pnpm run deploy
+      run: pnpm run deploy --file ../auth-server/stores/local-node.json
       working-directory: packages/contracts
 
+    - name: Build SDK
+      run: pnpm nx build sdk
+
     - name: Install zksync-foundry
       run: |
         wget -qc https://github.com/matter-labs/foundry-zksync/releases/download/nightly/foundry_nightly_linux_amd64.tar.gz -O - | tar -xz
@@ -115,17 +115,17 @@ jobs:
       run: pnpm install -r --frozen-lockfile
       working-directory: packages/contracts
 
-    - name: Build SDK
-      run: pnpm nx build sdk
-
     - name: Build contracts
       run: pnpm build
       working-directory: packages/contracts
 
     - name: Deploy contracts
-      run: pnpm run deploy
+      run: pnpm run deploy --file ../auth-server/stores/local-node.json 
       working-directory: packages/contracts
 
+    - name: Build SDK
+      run: pnpm nx build sdk
+
     - name: Deploy NFT contracts
       run: pnpm nx deploy:local nft-quest-contracts
 

.github/workflows/deploy-auth-server.yml

@@ -17,6 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4 # v4
+        with:
+          submodules: recursive
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -29,6 +31,23 @@ jobs:
           node-version: lts/Iron
           cache: 'pnpm'
 
+      # SDK depends on contracts
+      - name: Install contract dependencies
+        run: pnpm install -r --frozen-lockfile
+        working-directory: packages/contracts
+
+      - name: Build contracts
+        run: pnpm run build
+        working-directory: packages/contracts
+
+      # Local node to have target for deploy
+      - name: Era Test Node Action
+        uses: dutterbutter/anvil-zksync-action@v1.1.0
+
+      - name: Deploy contracts
+        run: pnpm run deploy --file ../auth-server/stores/local-node.json
+        working-directory: packages/contracts
+
       - name: Install dependencies
         run: pnpm install -r --frozen-lockfile
 

.github/workflows/deploy-nft-quest.yml

@@ -17,6 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4 # v4
+        with:
+          submodules: recursive
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -32,6 +34,23 @@ jobs:
       - name: Install dependencies
         run: pnpm install -r --frozen-lockfile
 
+      # SDK depends on contracts
+      - name: Install contract dependencies
+        run: pnpm install -r --frozen-lockfile
+        working-directory: packages/contracts
+
+      - name: Build contracts
+        run: pnpm build
+        working-directory: packages/contracts
+
+      # Local node to have target for deploy
+      - name: Era Test Node Action
+        uses: dutterbutter/anvil-zksync-action@v1.1.0
+
+      - name: Deploy contracts
+        run: pnpm run deploy --file ../auth-server/stores/local-node.json
+        working-directory: packages/contracts
+
       - name: Build apps
         run: pnpm nx build nft-quest
 

.github/workflows/deploy-package.yml

@@ -14,6 +14,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -29,6 +31,23 @@ jobs:
       - name: Install dependencies
         run: pnpm install -r --frozen-lockfile
 
+      # SDK depends on contracts
+      - name: Install contract dependencies
+        run: pnpm install -r --frozen-lockfile
+        working-directory: packages/contracts
+
+      - name: Build contracts
+        run: pnpm build
+        working-directory: packages/contracts
+
+      # Local node to have target for deploy
+      - name: Era Test Node Action
+        uses: dutterbutter/anvil-zksync-action@v1.1.0
+
+      - name: Deploy contracts
+        run: pnpm run deploy --file ../auth-server/stores/local-node.json
+        working-directory: packages/contracts
+
       - name: Build the package
         run: pnpm nx build sdk
 

.github/workflows/deploy-preview.yml

@@ -18,6 +18,8 @@ jobs:
       output_urls: "${{ steps.preview_deploy.outputs.urls }}"
     steps:
       - uses: actions/checkout@v4 # v4
+        with:
+          submodules: recursive
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -30,6 +32,23 @@ jobs:
           node-version: lts/Iron
           cache: 'pnpm'
 
+      # SDK depends on contracts
+      - name: Install contract dependencies
+        run: pnpm install -r --frozen-lockfile
+        working-directory: packages/contracts
+
+      - name: Build contracts
+        run: pnpm run build
+        working-directory: packages/contracts
+
+      # Local node to have target for deploy
+      - name: Era Test Node Action
+        uses: dutterbutter/anvil-zksync-action@v1.1.0
+
+      - name: Deploy contracts
+        run: pnpm run deploy --file ../auth-server/stores/local-node.json
+        working-directory: packages/contracts
+
       - name: Install dependencies
         run: pnpm install -r --frozen-lockfile
 

README.md

@@ -143,7 +143,8 @@ This monorepo is comprised of the following packages, products, and examples:
    # Compile and deploy contracts
    cd packages/contracts
    pnpm build
-   pnpm run deploy
+   pnpm --dir packages/contracts run publish ../sdk/src/abi
+   pnpm --dir packages/contracts run deploy --file ../auth-server/stores/local-node.json
    ```
 
 6. Start the demo application:

examples/nft-quest-contracts/deploy/deploy.ts

@@ -17,6 +17,9 @@ export default async function (hre: HardhatRuntimeEnvironment) {
   console.log("PAYMASTER CONTRACT: ", await paymasterContract.getAddress());
 
   if (hre.network.config.ethNetwork.includes("localhost")) {
+    const nftQuestAddress = await nftContract.getAddress();
+    const paymasterContractAddress = await paymasterContract.getAddress();
+
     // Update the .env.local file with the contract addresses for NFT Quest app
     const envFilePath = path.join(__dirname, "../../nft-quest/.env.local");
 
@@ -25,10 +28,8 @@ export default async function (hre: HardhatRuntimeEnvironment) {
       fs.writeFileSync(envFilePath, "", { encoding: "utf8" });
       console.log(`.env.local file has been created at ${envFilePath}`);
     }
-    const nftContractAddress = await nftContract.getAddress();
-    const paymasterContractAddress = await paymasterContract.getAddress();
 
-    const envContent = `NUXT_PUBLIC_CONTRACTS_NFT=${nftContractAddress}\nNUXT_PUBLIC_CONTRACTS_PAYMASTER=${paymasterContractAddress}\n`;
+    const envContent = `NUXT_PUBLIC_CONTRACTS_NFT=${nftQuestAddress}\nNUXT_PUBLIC_CONTRACTS_PAYMASTER=${paymasterContractAddress}\n`;
 
     fs.writeFileSync(envFilePath, envContent, { encoding: "utf8" });
     console.log(`.env.local file has been updated at ${envFilePath}`);

examples/nft-quest-contracts/deploy/utils.ts

@@ -5,7 +5,7 @@ import { Deployer } from "@matterlabs/hardhat-zksync";
 import dotenv from "dotenv";
 import { ethers } from "ethers";
 import * as hre from "hardhat";
-import { Provider, Wallet } from "zksync-ethers";
+import { ContractFactory, Provider, utils, Wallet } from "zksync-ethers";
 
 // Load env file
 dotenv.config();
@@ -105,23 +105,33 @@ export const deployContract = async (contractArtifactName: string, constructorAr
   await verifyEnoughBalance(wallet, deploymentFee);
 
   // Deploy the contract to ZKsync
-  const contract = await deployer.deploy(artifact, constructorArguments);
+  const salt = ethers.hexlify("0x" + "0".repeat(64));
+  const create2Deployer = new ContractFactory(artifact.abi, artifact.bytecode, wallet, "create2");
+  const encodedArgs = create2Deployer.interface.encodeDeploy(constructorArguments);
+  const bytecodeHash = utils.hashBytecode(artifact.bytecode);
+  const standardCreate2Address = utils.create2Address(wallet.address, bytecodeHash, salt, constructorArguments ? encodedArgs : "0x");
+  const accountCode = await wallet.provider.getCode(standardCreate2Address);
+  if (accountCode != "0x") {
+    log(`Contract ${contractArtifactName} already exists!`);
+    return new ethers.Contract(standardCreate2Address, artifact.abi, wallet);
+  }
+
+  const contract = await (constructorArguments ? create2Deployer.deploy(...constructorArguments, { customData: { salt } }) : create2Deployer.deploy({ customData: { salt } }));
   const address = await contract.getAddress();
-  const constructorArgs = contract.interface.encodeDeploy(constructorArguments);
   const fullContractSource = `${artifact.sourceName}:${artifact.contractName}`;
 
   // Display contract deployment info
   log(`\n"${artifact.contractName}" was successfully deployed:`);
   log(` - Contract address: ${address}`);
   log(` - Contract source: ${fullContractSource}`);
-  log(` - Encoded constructor arguments: ${constructorArgs}\n`);
+  log(` - Encoded constructor arguments: ${encodedArgs}\n`);
 
   if (!options?.noVerify && hre.network.config.verifyURL) {
     log(`Requesting contract verification...`);
     await verifyContract({
       address,
       contract: fullContractSource,
-      constructorArguments: constructorArgs,
+      constructorArguments: encodedArgs,
       bytecode: artifact.bytecode,
     });
   }

packages/auth-server/components/session/row/Row.vue

@@ -55,7 +55,7 @@
 <script setup lang="ts">
 import { HandRaisedIcon } from "@heroicons/vue/24/outline";
 import type { Hash } from "viem";
-import { SessionKeyModuleAbi } from "zksync-sso/abi";
+import { SessionKeyValidatorAbi } from "zksync-sso/abi";
 import { type SessionConfig, type SessionState, SessionStatus } from "zksync-sso/utils";
 
 const props = defineProps<{
@@ -100,7 +100,7 @@ const {
   const client = getPublicClient({ chainId: defaultChain.id });
   const res = await client.readContract({
     address: contractsByChain[defaultChain.id].session,
-    abi: SessionKeyModuleAbi,
+    abi: SessionKeyValidatorAbi,
     functionName: "sessionState",
     args: [address.value!, props.session],
   });

packages/auth-server/composables/useAccountCreate.ts

@@ -35,6 +35,7 @@ export const useAccountCreate = (_chainId: MaybeRef<SupportedChainId>) => {
     const deployerClient = getThrowAwayClient({ chainId: chainId.value });
 
     const deployedAccount = await deployAccount(deployerClient, {
+      credentialId,
       credentialPublicKey,
       uniqueAccountId: credentialId,
       contracts: contractsByChain[chainId.value],

packages/auth-server/pages/dashboard/sessions.vue

@@ -84,7 +84,7 @@
 import { InformationCircleIcon } from "@heroicons/vue/20/solid";
 import type { Hex } from "viem";
 import { zksyncInMemoryNode } from "viem/chains";
-import { SessionKeyModuleAbi } from "zksync-sso/abi";
+import { SessionKeyValidatorAbi } from "zksync-sso/abi";
 import type { SessionConfig } from "zksync-sso/utils";
 
 const { defaultChain, getPublicClient } = useClientStore();
@@ -99,7 +99,7 @@ const {
   const contracts = contractsByChain[defaultChain.id];
   const publicClient = getPublicClient({ chainId: defaultChain.id });
   const logs = await publicClient.getContractEvents({
-    abi: SessionKeyModuleAbi,
+    abi: SessionKeyValidatorAbi,
     address: contracts.session,
     eventName: "SessionCreated",
     args: {

packages/auth-server/stores/client.ts

@@ -4,6 +4,8 @@ import { zksyncInMemoryNode, zksyncSepoliaTestnet } from "viem/chains";
 import { eip712WalletActions } from "viem/zksync";
 import { createZksyncPasskeyClient, type PasskeyRequiredContracts } from "zksync-sso/client/passkey";
 
+import localChainData from "./local-node.json";
+
 export const supportedChains = [zksyncSepoliaTestnet, zksyncInMemoryNode];
 export type SupportedChainId = (typeof supportedChains)[number]["id"];
 export const blockExplorerUrlByChain: Record<SupportedChainId, string> = {
@@ -26,12 +28,7 @@ export const contractsByChain: Record<SupportedChainId, ChainContracts> = {
     accountFactory: "0x73CFa70318FD25F2166d47Af9d93Cf72eED48724",
     accountPaymaster: "0xA46D949858335308859076FA605E773eB679e534",
   },
-  [zksyncInMemoryNode.id]: {
-    session: "0xD68963C76ab7FFACbF53B1750325254F40eDe765",
-    passkey: "0x21b8397BeF5128662564b8491676baa6754AFD47",
-    accountFactory: "0x26711A4A572a5BBdF967b6385636Bd968e6E883C",
-    accountPaymaster: "0x61C2F9736eC60C9175Cdc02DB81D730cf06eF0Ee",
-  },
+  [zksyncInMemoryNode.id]: localChainData,
 };
 
 export const useClientStore = defineStore("client", () => {

packages/auth-server/stores/local-node.json

@@ -0,0 +1,6 @@
+{
+  "session": "0x530b3d86dF715ab70817B0b199C70a1D344db642",
+  "passkey": "0x3dbA0387Ba8643aD6F29eFbAb73389C4E587B02A",
+  "accountFactory": "0xf7158210d5CCB6978E736EFcA4A4A1cFE60cB230",
+  "accountPaymaster": "0x2F04b853f90E5d0B2e0c532d8D7b5bb6B18ab0ec"
+}