update scripts

Author: Krishang Nadgauda

scripts/deploy/byocSetup.ts

@@ -27,19 +27,22 @@ async function verify(address: string, args: any[]) {
 }
 
 async function main() {
-  const registryAddress: string = "0x3F17972CB27506eb4a6a3D59659e0B57a43fd16C";
 
   const [deployer]: SignerWithAddress[] = await ethers.getSigners();
   console.log("Deployer address:", deployer.address);
 
-  const trustedForwarders: string[] = ["0xc82BbE41f2cF04e3a8efA18F7032BDD7f6d98a81"];
+  const trustedForwarder: string = "0xc82BbE41f2cF04e3a8efA18F7032BDD7f6d98a81";
 
-  const registry: TWRegistry = await ethers.getContractAt("TWRegistry", registryAddress);
-  console.log("TWRegistry at: ", registry.address);
+  // const registryAddress: string = ethers.constants.AddressZero; // replace
+  // const registry: TWRegistry = await ethers.getContractAt("TWRegistry", registryAddress);
+  const registry: TWRegistry = await ethers.getContractFactory("TWRegistry").then(f => f.deploy(trustedForwarder));
+  console.log("\nDeploying new TWRegistry \ntx: ", registry.deployTransaction.hash, "\naddress: ", registry.address);
+
+  await registry.deployTransaction.wait();
 
   const byocRegsitry: ByocRegistry = await ethers
     .getContractFactory("ByocRegistry")
-    .then(f => f.deploy(trustedForwarders));
+    .then(f => f.deploy(trustedForwarder));
   console.log(
     "Deploying ByocRegistry at tx: ",
     byocRegsitry.deployTransaction.hash,
@@ -51,20 +54,19 @@ async function main() {
 
   const byocFactory: ByocFactory = await ethers
     .getContractFactory("ByocFactory")
-    .then(f => f.deploy(registryAddress, trustedForwarders));
-  console.log("Deploying ByocFactory at tx: ", byocFactory.deployTransaction.hash, " address: ", byocFactory.address);
+    .then(f => f.deploy(registry.address, trustedForwarder));
+  console.log("\nDeploying ByocFactory \ntx: ", byocFactory.deployTransaction.hash, "\naddress: ", byocFactory.address);
   await byocFactory.deployTransaction.wait();
-  console.log("Deployed ByocFactory");
 
   const tx = await registry.grantRole(await registry.OPERATOR_ROLE(), byocFactory.address);
-  console.log("Granting operator role to ByocFactory: ", tx.hash);
+  console.log("\nGranting operator role to ByocFactory: ", tx.hash);
 
   await tx.wait();
 
-  console.log("Done. Now verifying contracts:");
+  console.log("\nDone. Now verifying contracts:");
 
-  await verify(byocRegsitry.address, [trustedForwarders]);
-  await verify(byocFactory.address, [registryAddress, trustedForwarders]);
+  // await verify(byocRegsitry.address, [trustedForwarders]);
+  await verify(byocFactory.address, [registry.address, trustedForwarder]);
 }
 
 main()

scripts/grantAdminRoleTwRegistry.ts renamed to scripts/grantRoleTwRegistry.ts

@@ -1,6 +1,7 @@
 import { ethers } from "hardhat";
 
 import { Wallet } from "@ethersproject/wallet";
+import { BytesLike } from "@ethersproject/bytes";
 
 import { TWRegistry } from "typechain";
 
@@ -13,6 +14,7 @@ async function main() {
   const currentAdmin: Wallet = new ethers.Wallet(currentAdminPkey, ethers.provider);
 
   const receiverOfRole: string = ethers.constants.AddressZero;
+  const role: BytesLike = ""; // replace
 
   const isAdminOnRegistry: boolean = await twRegistry.hasRole(
     await twRegistry.DEFAULT_ADMIN_ROLE(),
@@ -24,7 +26,7 @@ async function main() {
 
   const grantRoleTx = await twRegistry
     .connect(currentAdmin)
-    .grantRole(await twRegistry.DEFAULT_ADMIN_ROLE(), receiverOfRole);
+    .grantRole(role, receiverOfRole);
 
   console.log(`\nGranting admin role to ${receiverOfRole} at tx: ${grantRoleTx.hash}`);
 

scripts/revokeAdminRoleTwRegistry.ts renamed to scripts/revokeRoleTwRegistry.ts

@@ -1,6 +1,7 @@
 import { ethers } from "hardhat";
 
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { BytesLike } from "@ethersproject/bytes";
 
 import { TWRegistry } from "typechain";
 
@@ -20,9 +21,11 @@ async function main() {
     console.log("Caller provided is admin on registry. Revoking role now.");
   }
 
+  const role: BytesLike = ""; // replace
+
   const revokeRoleTx = await twRegistry
     .connect(roleHolder)
-    .revokeRole(await twRegistry.DEFAULT_ADMIN_ROLE(), roleHolder.address);
+    .revokeRole(role, roleHolder.address);
 
   console.log(`\nRevoking admin role from ${roleHolder.address} at tx: ${revokeRoleTx.hash}`);