refact: adjusting to latest zodiac-core version

gnosisguild · Aug 8, 2024 · b9feb9f · b9feb9f
1 parent 84b367b
commit b9feb9f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/packages/contracts/tasks/mastercopy-extract.ts b/packages/contracts/tasks/mastercopy-extract.ts
@@ -1,6 +1,6 @@
 import { task } from "hardhat/config";
 
-import { storeMastercopyArtifact } from "zodiac-core";
+import { writeMastercopyArtifact } from "zodiac-core";
 
 import packageJson from "../package.json";
 
@@ -10,7 +10,7 @@ task(
   "mastercopy:extract",
   "Extracts and persists current mastercopy build artifacts"
 ).setAction(async (_, hre) => {
-  storeMastercopyArtifact({
+  writeMastercopyArtifact({
     contractVersion: packageJson.version,
     contractName: "ExitERC20",
     compilerInput: await hre.run("verify:etherscan-get-minimal-input", {
@@ -23,7 +23,7 @@ task(
     salt: "0x0000000000000000000000000000000000000000000000000000000000000000",
   });
 
-  storeMastercopyArtifact({
+  writeMastercopyArtifact({
     contractVersion: packageJson.version,
     contractName: "ExitERC721",
     compilerInput: await hre.run("verify:etherscan-get-minimal-input", {

diff --git a/packages/contracts/tasks/mastercopy-verify.ts b/packages/contracts/tasks/mastercopy-verify.ts
@@ -12,7 +12,7 @@ task(
   }
 
   await verifyMastercopiesFromArtifact({
-    apiUrl: String((await hre.ethers.provider.getNetwork()).chainId),
+    apiUrlOrChainId: String((await hre.ethers.provider.getNetwork()).chainId),
     apiKey: ETHERSCAN_API_KEY,
   });
 });
diff --git a/packages/contracts/yarn.lock b/packages/contracts/yarn.lock
@@ -5082,7 +5082,7 @@ semver@^7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.7, semver@^7.5.2, semver@^7.6.0:
+semver@^7.3.7, semver@^7.5.2, semver@^7.6.0, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
@@ -6029,9 +6029,10 @@ zksync-ethers@^5.0.0:
     ethers "~5.7.0"
 
 "zodiac-core@file:../../../zodiac-core":
-  version "4.0.3"
+  version "1.0.0"
   dependencies:
     "@gnosis.pm/safe-contracts" "1.3.0"
     "@openzeppelin/contracts" "5.0.2"
     "@openzeppelin/contracts-upgradeable" "5.0.2"
     ethers "^6.13.2"
+    semver "^7.6.3"