matter-labs
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 9 additions & 9 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎.github/workflows/deploy-auth-server.yml‎
Lines changed: 19 additions & 0 deletions b/‎.github/workflows/deploy-auth-server.yml‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎.github/workflows/deploy-nft-quest.yml‎
Lines changed: 19 additions & 0 deletions b/‎.github/workflows/deploy-nft-quest.yml‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎.github/workflows/deploy-package.yml‎
Lines changed: 19 additions & 0 deletions b/‎.github/workflows/deploy-package.yml‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎.github/workflows/deploy-preview.yml‎
Lines changed: 17 additions & 0 deletions b/‎.github/workflows/deploy-preview.yml‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 2 additions & 1 deletion b/‎README.md‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎cspell-config/cspell-misc.txt‎
Lines changed: 9 additions & 0 deletions b/‎cspell-config/cspell-misc.txt‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎examples/nft-quest-contracts/deploy/deploy.ts‎
Lines changed: 4 additions & 3 deletions b/‎examples/nft-quest-contracts/deploy/deploy.ts‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎examples/nft-quest-contracts/deploy/utils.ts‎
Lines changed: 15 additions & 5 deletions b/‎examples/nft-quest-contracts/deploy/utils.ts‎
Lines changed: 15 additions & 5 deletions
diff --git a/‎examples/nft-quest/nuxt.config.ts‎
Lines changed: 2 additions & 2 deletions b/‎examples/nft-quest/nuxt.config.ts‎
Lines changed: 2 additions & 2 deletions
@@ -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
@@ -63,7 +63,7 @@ jobs:
     - name: Deploy Demo-App contracts
       run: pnpm nx deploy-contracts demo-app
 
-	- name: Run tests
+    - name: Run tests
       run: pnpm test
       working-directory: packages/sdk
 
@@ -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
 
 
@@ -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
 
 
@@ -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
 
 
@@ -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
 
 
@@ -33,6 +33,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
 
 
@@ -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:
 
@@ -12,6 +12,7 @@ vueuse
 dockerized
 ethereum
 sepolia
+foundryup
 
 // examples/bank-demo
 ctap
@@ -42,3 +43,11 @@ groth
 zkey
 snark
 snarkjs
+
+// examples/demo-app
+zkout
+cancun
+EVMLA
+
+// paymasters
+zyfi
@@ -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}`);
 
@@ -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,
     });
   }
 
@@ -59,8 +59,8 @@ export default defineNuxtConfig({
     public: {
       chain: zksyncInMemoryNode,
       contracts: {
-        nft: "0x111C3E89Ce80e62EE88318C2804920D4c96f92bb",
-        paymaster: "0x4B5DF730c2e6b28E17013A1485E5d9BC41Efe021",
+        nft: "0xF4E1ee85f0645b5871B03bc40d151C174F0e86f6",
+        paymaster: "0x25B89fa6e157937f845ec0Fb41733B29bc20A4d3",
       },
       baseUrl: "http://localhost:3006",
       authServerUrl: "http://localhost:3002/confirm",