Use deployment address from defender

sci-domains · Apr 29, 2024 · dfcbfca · dfcbfca
1 parent 1ec61c5
commit dfcbfca
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/scripts/deploy/registry.ts b/scripts/deploy/registry.ts
@@ -4,6 +4,7 @@ import {
   CONTRACT_NAMES,
   deploy,
   getDeployedContractAddress,
+  getDeploymentAddress,
   logDeployment,
   saveDeployment,
 } from '../utils';
@@ -17,7 +18,7 @@ async function main() {
   await saveDeployment(registry, CONTRACT_NAMES.REGISTRY);
   await logDeployment(registry, CONTRACT_NAMES.REGISTRY, [nameHashAddress]);
 
-  await registry.grantRole(ADD_AUTHORIZER_ROLE, await ethers.provider.getSigner());
+  await registry.grantRole(ADD_AUTHORIZER_ROLE, await getDeploymentAddress());
   const sciAuthorizer = await getDeployedContractAddress('SciAuthorizer');
   await registry.setAuthorizer(1, sciAuthorizer);
 }

diff --git a/scripts/deploy/sciAuthorizer.ts b/scripts/deploy/sciAuthorizer.ts
@@ -1,12 +1,18 @@
 import { ethers } from 'hardhat';
-import { CONTRACT_NAMES, deploy, logDeployment, saveDeployment } from '../utils';
+import {
+  CONTRACT_NAMES,
+  deploy,
+  getDeploymentAddress,
+  logDeployment,
+  saveDeployment,
+} from '../utils';
 import { IS_AUTHORIZED } from '../../utils/roles';
 
 async function main() {
   const SCIAuthorizerFactory = await ethers.getContractFactory(CONTRACT_NAMES.SCI_AUTHORIZER);
   const sciAuthorizer = await deploy(SCIAuthorizerFactory);
 
-  await sciAuthorizer.grantRole(IS_AUTHORIZED, await ethers.provider.getSigner());
+  await sciAuthorizer.grantRole(IS_AUTHORIZED, await getDeploymentAddress());
 
   await saveDeployment(sciAuthorizer, CONTRACT_NAMES.SCI_AUTHORIZER);
   await logDeployment(sciAuthorizer, CONTRACT_NAMES.SCI_AUTHORIZER, []);

diff --git a/scripts/utils.ts b/scripts/utils.ts
@@ -22,9 +22,18 @@ export async function deploy(factory: ContractFactory, args?: unknown[]): Promis
     constructorArgs: args,
     salt: 'oGxABr7U4iCnq598aK5Ai25jcgXq6kbaAD859BJWJ2ytvJkzpy',
     verifySourceCode: true,
+    licenseType: 'GNU AGPLv3',
   });
 }
 
+export async function getDeploymentAddress(): Promise<string> {
+  const deploymentProcess = await defender.getDeployApprovalProcess();
+  const address = deploymentProcess.address;
+  if (!address) throw Error('Deployment Address undefined');
+
+  return address;
+}
+
 export async function saveDeployment(contract: BaseContract, contractName: string) {
   const filePath = await generateDeploymentPath();