Merge pull request #74 from zkemail/feat/wataru-work

Feat/wataru work
zkemail · Oct 24, 2024 · 87d2ace · 87d2ace
2 parents b2bfa08 + 5c14628
commit 87d2ace
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -5,15 +5,16 @@
   "scripts": {
     "build": "forge build --skip '*ZKSync*'",
     "zkbuild": "forge build --zksync",
-    "test": "forge test --no-match-test \"testIntegration\" --no-match-contract \".*Script.*\" --skip '*ZKSync*'",
+    "test": "forge test --force --no-match-test \"testIntegration\" --no-match-contract \".*Script.*\" --skip '*ZKSync*'",
     "zktest": "forge test --no-match-test \"testIntegration\" --no-match-contract \".*Script.*\" --system-mode=true --zksync --gas-limit 1000000000 --chain 300",
     "lint": "solhint 'src/**/*.sol'"
   },
   "dependencies": {
+    "@matterlabs/zksync-contracts": "^0.6.1",
     "@openzeppelin/contracts": "^5.0.0",
     "@openzeppelin/contracts-upgradeable": "^5.0.0",
+    "@openzeppelin/upgrades-core": "^1.40.0",
     "@zk-email/contracts": "https://gitpkg.vercel.app/zkemail/zk-email-verify/packages/contracts?057b8e95b7bca2884d8da384379c15be9975b30d",
-    "@matterlabs/zksync-contracts": "^0.6.1",
     "solady": "^0.0.123"
   },
   "devDependencies": {
@@ -28,4 +29,4 @@
     "README.md",
     "remappings.txt"
   ]
-}
+}
diff --git a/packages/contracts/script/DeploySimpleWallet.s.sol b/packages/contracts/script/DeploySimpleWallet.s.sol
@@ -25,6 +25,7 @@ contract Deploy is Script {
 
         Options memory opts;
         opts.defender.useDefenderDeploy = true;
+        opts.unsafeSkipAllChecks = true;
 
         address initOwner = upgradeApprovalProcess.via;
         // address controller = vm.envAddress("CONTROLLER");