From 3d5276f18adb81160dfe3e5e88924467940e9791 Mon Sep 17 00:00:00 2001 From: wshino Date: Thu, 24 Oct 2024 13:44:32 +0700 Subject: [PATCH 1/2] Add package.json --- packages/contracts/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 56ff997..d6dba5c 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -10,10 +10,11 @@ "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" ] -} \ No newline at end of file +} From 5c146288b64cbc3d5be7fc6f9d659049e27f557b Mon Sep 17 00:00:00 2001 From: wshino Date: Thu, 24 Oct 2024 14:16:14 +0700 Subject: [PATCH 2/2] Add unsafeSkipAllChecks --- packages/contracts/package.json | 2 +- packages/contracts/script/DeploySimpleWallet.s.sol | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/contracts/package.json b/packages/contracts/package.json index d6dba5c..ceaec28 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -5,7 +5,7 @@ "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'" }, diff --git a/packages/contracts/script/DeploySimpleWallet.s.sol b/packages/contracts/script/DeploySimpleWallet.s.sol index bc1f2cb..27ba0b3 100644 --- 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");