fix: flex workflow

manudev97 · Jul 18, 2024 · 0468f45 · 0468f45
1 parent 09b01b3
commit 0468f45
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 27 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -31,13 +31,4 @@ jobs:
         run: yarn install --immutable
 
       - name: Run hardhat node, deploy contracts (& generate contracts typescript output)
-        run: yarn chain & yarn deploy
-
-      - name: Run hardhat lint
-        run: yarn hardhat:lint --max-warnings=0
-
-      - name: Run nextjs lint
-        run: yarn next:lint --max-warnings=0
-
-      - name: Check typings on nextjs
-        run: yarn next:check-types
+        run: yarn chain & yarn deploy
diff --git a/packages/hardhat/contracts/MerkleTree.sol b/packages/hardhat/contracts/MerkleTree.sol
@@ -25,7 +25,7 @@ contract MerkleTree {
 
     constructor(uint32 _levels, address _hasher) {
         require(_levels > 0, "_levels debe ser mayor que cero");
-        require(_levels < 3, "_levels debe ser menor que 3");
+        require(_levels < 6, "_levels debe ser menor que 6");
         levels = _levels;
         hasher = Hasher(_hasher);
 

diff --git a/packages/hardhat/deploy/02_deploy_atm.ts b/packages/hardhat/deploy/02_deploy_atm.ts
@@ -25,7 +25,7 @@ const deployATM: DeployFunction = async function (hre: HardhatRuntimeEnvironment
   await deploy("ATM", {
     from: deployer,
     // Contract constructor arguments
-    args: ["0x0918fe077e800b24E1D64c2FE9bb6a12E0255CA9", "0xCc735e52E393f125cAFc4E0aEbD80AEd81eA4B41", "5", "2", "0xDD8fA77500F94b2286AbE41c81B4a08EdD0429B9"],
+    args: ["0x0918fe077e800b24E1D64c2FE9bb6a12E0255CA9", "0xCc735e52E393f125cAFc4E0aEbD80AEd81eA4B41", "5", "5", "0xDD8fA77500F94b2286AbE41c81B4a08EdD0429B9"],
     log: true,
     // autoMine: can be passed to the deploy function to make the deployment process faster on local networks by
     // automatically mining the contract deployment transaction. There is no effect on live networks.

diff --git a/packages/hardhat/deployments/scrollSepolia/ATM.json b/packages/hardhat/deployments/scrollSepolia/ATM.json
diff --git a/packages/hardhat/deployments/scrollSepolia/solcInputs/6739f02d6c38ea8787642d43aa69a801.json b/packages/hardhat/deployments/scrollSepolia/solcInputs/6739f02d6c38ea8787642d43aa69a801.json
diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
@@ -7,7 +7,7 @@ import { GenericContractsDeclaration } from "~~/utils/scaffold-eth/contract";
 const deployedContracts = {
   534351: {
     ATM: {
-      address: "0x19671AB1B2F7BfC5254aC7C9036DC3e421E6feb0",
+      address: "0x2b912c55769B50ca71834774f808143513769969",
       abi: [
         {
           inputs: [