rename owner to admin in deployment scripts

masa-finance · Sep 27, 2022 · db67437 · db67437
1 parent 7f56975
commit db67437
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 32 deletions.
diff --git a/deploy/CORN.ts b/deploy/CORN.ts
@@ -3,7 +3,7 @@ import { getEnvParams } from "../src/utils/EnvParams";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 
-let owner: SignerWithAddress;
+let admin: SignerWithAddress;
 
 const func: DeployFunction = async ({
   // @ts-ignore
@@ -20,7 +20,7 @@ const func: DeployFunction = async ({
   // const currentNonce: number = await ethers.provider.getTransactionCount(deployer);
   // to solve REPLACEMENT_UNDERPRICED, when needed
 
-  [, owner] = await ethers.getSigners();
+  [, admin] = await ethers.getSigners();
   const env = getEnvParams(network.name);
 
   const cornDeploymentResult = await deploy("CORN", {
@@ -49,7 +49,7 @@ const func: DeployFunction = async ({
 
   const corn = await ethers.getContractAt("CORN", cornDeploymentResult.address);
   await corn.transfer(
-    env.OWNER || owner.address,
+    env.ADMIN || admin.address,
     ethers.utils.parseEther("1000")
   );
 };

diff --git a/deploy/SoulLinker.ts b/deploy/SoulLinker.ts
@@ -3,7 +3,7 @@ import { getEnvParams } from "../src/utils/EnvParams";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 
-let owner: SignerWithAddress;
+let admin: SignerWithAddress;
 
 const func: DeployFunction = async ({
   // @ts-ignore
@@ -20,12 +20,12 @@ const func: DeployFunction = async ({
   // const currentNonce: number = await ethers.provider.getTransactionCount(deployer);
   // to solve REPLACEMENT_UNDERPRICED, when needed
 
-  [, owner] = await ethers.getSigners();
+  [, admin] = await ethers.getSigners();
   const env = getEnvParams(network.name);
 
   const soulLinkerDeploymentResult = await deploy("SoulLinker", {
     from: deployer,
-    args: [env.OWNER || owner.address],
+    args: [env.ADMIN || admin.address],
     log: true
     // nonce: currentNonce + 1 // to solve REPLACEMENT_UNDERPRICED, when needed
   });
@@ -35,7 +35,7 @@ const func: DeployFunction = async ({
     try {
       await hre.run("verify:verify", {
         address: soulLinkerDeploymentResult.address,
-        constructorArguments: [env.OWNER || owner.address]
+        constructorArguments: [env.ADMIN || admin.address]
       });
     } catch (error) {
       if (

diff --git a/deploy/SoulName.ts b/deploy/SoulName.ts
@@ -3,7 +3,7 @@ import { getEnvParams, getPrivateKey } from "../src/utils/EnvParams";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 
-let owner: SignerWithAddress;
+let admin: SignerWithAddress;
 
 const func: DeployFunction = async ({
   // @ts-ignore
@@ -17,7 +17,7 @@ const func: DeployFunction = async ({
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
-  [, owner] = await ethers.getSigners();
+  [, admin] = await ethers.getSigners();
   const env = getEnvParams(network.name);
   const baseUri = `${env.BASE_URI}/name/`;
 
@@ -26,7 +26,7 @@ const func: DeployFunction = async ({
   const soulNameDeploymentResult = await deploy("SoulName", {
     from: deployer,
     args: [
-      env.OWNER || owner.address,
+      env.ADMIN || admin.address,
       soulboundIdentityDeployed.address,
       ".soul",
       baseUri
@@ -40,7 +40,7 @@ const func: DeployFunction = async ({
       await hre.run("verify:verify", {
         address: soulNameDeploymentResult.address,
         constructorArguments: [
-          env.OWNER || owner.address,
+          env.ADMIN || admin.address,
           soulboundIdentityDeployed.address,
           ".soul",
           ""
@@ -66,12 +66,12 @@ const func: DeployFunction = async ({
   );
 
   // we set the soulName contract in soulboundIdentity and we add soulboundIdentity as soulName minter
-  const signer = env.OWNER
+  const signer = env.ADMIN
     ? new ethers.Wallet(
         getPrivateKey(network.name),
         ethers.getDefaultProvider(network.name)
       )
-    : owner;
+    : admin;
 
   const MINTER_ROLE = await soulName.MINTER_ROLE();
   await soulboundIdentity

diff --git a/deploy/SoulStore.ts b/deploy/SoulStore.ts
@@ -9,7 +9,7 @@ import {
   WETH_GOERLI
 } from "../src/constants";
 
-let owner: SignerWithAddress;
+let admin: SignerWithAddress;
 
 const func: DeployFunction = async ({
   // @ts-ignore
@@ -23,7 +23,7 @@ const func: DeployFunction = async ({
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
-  [, owner] = await ethers.getSigners();
+  [, admin] = await ethers.getSigners();
   const env = getEnvParams(network.name);
 
   const corn = await deployments.get("CORN");
@@ -61,7 +61,7 @@ const func: DeployFunction = async ({
   const soulStoreDeploymentResult = await deploy("SoulStore", {
     from: deployer,
     args: [
-      env.OWNER || owner.address,
+      env.ADMIN || admin.address,
       soulboundIdentityDeployed.address,
       "10000000", // 10 USDC, with 6 decimals
       network.name == "hardhat" || network.name == "goerli"
@@ -70,7 +70,7 @@ const func: DeployFunction = async ({
       stableCoin,
       wrappedNativeToken,
       swapRouter,
-      env.OWNER || owner.address
+      env.ADMIN || admin.address
     ],
     log: true
   });
@@ -81,14 +81,14 @@ const func: DeployFunction = async ({
       await hre.run("verify:verify", {
         address: soulStoreDeploymentResult.address,
         constructorArguments: [
-          env.OWNER || owner.address,
+          env.ADMIN || admin.address,
           soulboundIdentityDeployed.address,
           "10000000", // 10 USDC, with 6 decimals
           CORN_GOERLI, // CORN
           stableCoin,
           wrappedNativeToken,
           swapRouter,
-          env.OWNER || owner.address
+          env.ADMIN || admin.address
         ]
       });
     } catch (error) {
@@ -110,12 +110,12 @@ const func: DeployFunction = async ({
     soulNameDeployed.address
   );
 
-  const signer = env.OWNER
+  const signer = env.ADMIN
     ? new ethers.Wallet(
         getPrivateKey(network.name),
         ethers.getDefaultProvider(network.name)
       )
-    : owner;
+    : admin;
 
   // we set the registration prices per year and length of name
   const soulStore = await ethers.getContractAt(
@@ -131,9 +131,7 @@ const func: DeployFunction = async ({
   await soulStore
     .connect(signer)
     .setNameRegistrationPricePerYear(3, 1500000000); // 3 length, 1,500 USDC
-  await soulStore
-    .connect(signer)
-    .setNameRegistrationPricePerYear(4, 500000000); // 4 length, 500 USDC
+  await soulStore.connect(signer).setNameRegistrationPricePerYear(4, 500000000); // 4 length, 500 USDC
 
   // we add soulStore as soulboundIdentity and soulName minter
 

diff --git a/deploy/SoulboundCreditReport.ts b/deploy/SoulboundCreditReport.ts
@@ -3,7 +3,7 @@ import { getEnvParams } from "../src/utils/EnvParams";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 
-let owner: SignerWithAddress;
+let admin: SignerWithAddress;
 
 const func: DeployFunction = async ({
   // @ts-ignore
@@ -20,7 +20,7 @@ const func: DeployFunction = async ({
   // const currentNonce: number = await ethers.provider.getTransactionCount(deployer);
   // to solve REPLACEMENT_UNDERPRICED, when needed
 
-  [, owner] = await ethers.getSigners();
+  [, admin] = await ethers.getSigners();
   const env = getEnvParams(network.name);
   const baseUri = `${env.BASE_URI}/credit-report/`;
 
@@ -30,7 +30,7 @@ const func: DeployFunction = async ({
     "SoulboundCreditReport",
     {
       from: deployer,
-      args: [env.OWNER || owner.address, soulLinker.address, baseUri],
+      args: [env.ADMIN || admin.address, soulLinker.address, baseUri],
       log: true
       // nonce: currentNonce + 1 // to solve REPLACEMENT_UNDERPRICED, when needed
     }
@@ -42,7 +42,7 @@ const func: DeployFunction = async ({
       await hre.run("verify:verify", {
         address: soulboundCreditReportDeploymentResult.address,
         constructorArguments: [
-          env.OWNER || owner.address,
+          env.ADMIN || admin.address,
           soulLinker.address,
           baseUri
         ]

diff --git a/deploy/SoulboundIdentity.ts b/deploy/SoulboundIdentity.ts
@@ -3,7 +3,7 @@ import { getEnvParams } from "../src/utils/EnvParams";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 
-let owner: SignerWithAddress;
+let admin: SignerWithAddress;
 
 const func: DeployFunction = async ({
   // @ts-ignore
@@ -20,15 +20,15 @@ const func: DeployFunction = async ({
   // const currentNonce: number = await ethers.provider.getTransactionCount(deployer);
   // to solve REPLACEMENT_UNDERPRICED, when needed
 
-  [, owner] = await ethers.getSigners();
+  [, admin] = await ethers.getSigners();
   const env = getEnvParams(network.name);
   const baseUri = `${env.BASE_URI}/identity/`;
 
   const soulLinker = await deployments.get("SoulLinker");
 
   const soulboundIdentityDeploymentResult = await deploy("SoulboundIdentity", {
     from: deployer,
-    args: [env.OWNER || owner.address, soulLinker.address, baseUri],
+    args: [env.ADMIN || admin.address, soulLinker.address, baseUri],
     log: true
     // nonce: currentNonce + 1 // to solve REPLACEMENT_UNDERPRICED, when needed
   });
@@ -39,7 +39,7 @@ const func: DeployFunction = async ({
       await hre.run("verify:verify", {
         address: soulboundIdentityDeploymentResult.address,
         constructorArguments: [
-          env.OWNER || owner.address,
+          env.ADMIN || admin.address,
           soulLinker.address,
           baseUri
         ]