fix deploy scripts

gnosisguild · Aug 28, 2023 · 5186a9c · 5186a9c
1 parent a39dc16
commit 5186a9c
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 8 deletions.
diff --git a/deploy/00_deploy_ERC6551Registry.ts b/deploy/00_deploy_ERC6551Registry.ts
@@ -0,0 +1,31 @@
+import { DeployFunction } from "hardhat-deploy/types"
+
+const deployERC6551Registry: DeployFunction = async (hre) => {
+  // const [signer] = await hre.ethers.getSigners()
+
+  const ERC6551Registry = await hre.ethers.getContractFactory("ERC6551Registry")
+  const erc6551Registry = await ERC6551Registry.deploy()
+
+  try {
+    await hre.run("verify:verify", {
+      address: await erc6551Registry.getAddress(),
+      constructorArguments: [],
+    })
+  } catch (e) {
+    if (
+      e instanceof Error &&
+      e.stack &&
+      (e.stack.indexOf("Reason: Already Verified") > -1 ||
+        e.stack.indexOf("Contract source code already verified") > -1)
+    ) {
+      console.log("  ✔ Contract is already verified")
+    } else {
+      console.log(
+        "  ✘ Verifying the contract failed. This is probably because Etherscan is still indexing the contract. Try running this same command again in a few seconds."
+      )
+      throw e
+    }
+  }
+}
+
+export default deployERC6551Registry
diff --git a/.../00_deploy_mastercopy_ERC721Tokenbound.ts → .../01_deploy_mastercopy_ERC721Tokenbound.ts b/.../00_deploy_mastercopy_ERC721Tokenbound.ts → .../01_deploy_mastercopy_ERC721Tokenbound.ts
@@ -1,15 +1,25 @@
 import { DeployFunction } from "hardhat-deploy/types"
+import { createWalletClient, custom as customTransport } from "viem"
 
 import {
   calculateERC721TokenboundMechMastercopyAddress,
   deployERC721TokenboundMechMastercopy,
-} from "../sdk/build/cjs/sdk/src"
+} from "../sdk"
 
 const deployMastercopyERC721Tokenbound: DeployFunction = async (hre) => {
   const [signer] = await hre.ethers.getSigners()
-  const deployer = hre.ethers.provider.getSigner(signer.address)
+  const deployer = await hre.ethers.provider.getSigner(signer.address)
 
-  await deployERC721TokenboundMechMastercopy(deployer)
+  const deployerClient = createWalletClient({
+    account: deployer.address as `0x${string}`,
+    transport: customTransport({
+      async request({ method, params }) {
+        return deployer.provider.send(method, params)
+      },
+    }),
+  })
+
+  await deployERC721TokenboundMechMastercopy(deployerClient)
   const address = calculateERC721TokenboundMechMastercopyAddress()
 
   try {

diff --git a/...01_deploy_mastercopy_ERC1155Tokenbound.ts → ...02_deploy_mastercopy_ERC1155Tokenbound.ts b/...01_deploy_mastercopy_ERC1155Tokenbound.ts → ...02_deploy_mastercopy_ERC1155Tokenbound.ts
@@ -1,4 +1,5 @@
 import { DeployFunction } from "hardhat-deploy/types"
+import { createWalletClient, custom as customTransport } from "viem"
 
 import {
   calculateERC1155TokenboundMechMastercopyAddress,
@@ -7,9 +8,18 @@ import {
 
 const deployMastercopyERC1155Tokenbound: DeployFunction = async (hre) => {
   const [signer] = await hre.ethers.getSigners()
-  const deployer = hre.ethers.provider.getSigner(signer.address)
+  const deployer = await hre.ethers.provider.getSigner(signer.address)
 
-  await deployERC1155TokenboundMechMastercopy(deployer)
+  const deployerClient = createWalletClient({
+    account: deployer.address as `0x${string}`,
+    transport: customTransport({
+      async request({ method, params }) {
+        return deployer.provider.send(method, params)
+      },
+    }),
+  })
+
+  await deployERC1155TokenboundMechMastercopy(deployerClient)
   const address = calculateERC1155TokenboundMechMastercopyAddress()
 
   try {

diff --git a/deploy/02_deploy_mastercopy_Zodiac.ts → deploy/03_deploy_mastercopy_Zodiac.ts b/deploy/02_deploy_mastercopy_Zodiac.ts → deploy/03_deploy_mastercopy_Zodiac.ts
@@ -1,9 +1,10 @@
 import { DeployFunction } from "hardhat-deploy/types"
+import { createWalletClient, custom as customTransport } from "viem"
 
 import {
   calculateZodiacMechMastercopyAddress,
   deployZodiacMechMastercopy,
-} from "../sdk"
+} from "../sdk/build/cjs/sdk/src"
 
 const deployMastercopyZodiac: DeployFunction = async (hre) => {
   // TODO disabled for now
@@ -12,7 +13,16 @@ const deployMastercopyZodiac: DeployFunction = async (hre) => {
   const [signer] = await hre.ethers.getSigners()
   const deployer = await hre.ethers.provider.getSigner(signer.address)
 
-  await deployZodiacMechMastercopy(deployer)
+  const deployerClient = createWalletClient({
+    account: deployer.address as `0x${string}`,
+    transport: customTransport({
+      async request({ method, params }) {
+        return deployer.provider.send(method, params)
+      },
+    }),
+  })
+
+  await deployZodiacMechMastercopy(deployerClient)
   const address = calculateZodiacMechMastercopyAddress()
 
   try {

diff --git a/test/utils.ts b/test/utils.ts
@@ -17,7 +17,7 @@ export async function deployFactories() {
 
   const ERC6551Registry = await ethers.getContractFactory("ERC6551Registry")
   const erc6551Registry = await ERC6551Registry.deploy()
-  deployer.populateTransaction
+
   const deployerClient = createTestClient({
     account: deployer.address as `0x${string}`,
     chain: hardhat,