chore: deploy v0.8.6 (#261)

ethersphere · May 27, 2024 · 98afc35 · 98afc35
1 parent c8fd670
commit 98afc35
Show file tree

Hide file tree

Showing 8 changed files with 236 additions and 99 deletions.
diff --git a/deploy/main/005_deploy_roles_postage.ts b/deploy/main/005_deploy_roles_postage.ts
@@ -5,20 +5,18 @@ const func: DeployFunction = async function ({ deployments, getNamedAccounts })
   const { deployer } = await getNamedAccounts();
 
   log('Setting PostageStamps roles');
+  const adminRole = await read('StakeRegistry', 'DEFAULT_ADMIN_ROLE');
 
-  const priceOracleRole = await read('PostageStamp', 'PRICE_ORACLE_ROLE');
-  await execute('PostageStamp', { from: deployer }, 'grantRole', priceOracleRole, (await get('PriceOracle')).address);
+  if (await read('PostageStamp', { from: deployer }, 'hasRole', adminRole)) {
+    const priceOracleRole = await read('PostageStamp', 'PRICE_ORACLE_ROLE');
+    await execute('PostageStamp', { from: deployer }, 'grantRole', priceOracleRole, (await get('PriceOracle')).address);
 
-  const redistributorRole = await read('PostageStamp', 'REDISTRIBUTOR_ROLE');
-  await execute(
-    'PostageStamp',
-    { from: deployer },
-    'grantRole',
-    redistributorRole,
-    (
-      await get('Redistribution')
-    ).address
-  );
+    const redisRole = await read('PostageStamp', 'REDISTRIBUTOR_ROLE');
+    const redisAddress = (await get('Redistribution')).address;
+    await execute('PostageStamp', { from: deployer }, 'grantRole', redisRole, redisAddress);
+  } else {
+    log('DEPLOYER NEEDS TO HAVE ADMIN ROLE TO ASSIGN THE REDISTRIBUTION ROLE, PLEASE ASSIGN IT OR GRANT ROLE MANUALLY');
+  }
 
   log('----------------------------------------------------');
 };

diff --git a/deploy/main/007_deploy_roles_staking.ts b/deploy/main/007_deploy_roles_staking.ts
@@ -8,16 +8,14 @@ const func: DeployFunction = async function ({ deployments, getNamedAccounts })
   // As currently we are reusing staking, and there is multisig wallet as ADMIN
   // we either need to add deployer temporarly as ADMIN or do this manually over multisig
 
-  const redisAddress = (await get('Redistribution')).address;
   const adminRole = await read('StakeRegistry', 'DEFAULT_ADMIN_ROLE');
 
   if (await read('StakeRegistry', { from: deployer }, 'hasRole', adminRole)) {
     const redisRole = await read('StakeRegistry', 'REDISTRIBUTOR_ROLE');
+    const redisAddress = (await get('Redistribution')).address;
     await execute('StakeRegistry', { from: deployer }, 'grantRole', redisRole, redisAddress);
   } else {
-    log(
-      'DEPLOYER NEEDS TO HAVE ADMIN ROLE TO ASSIGN THE REDISTRIBUTION ROLE, PLEASE ASSIGN IT AND/OR GRANT ROLE MANUALLY'
-    );
+    log('DEPLOYER NEEDS TO HAVE ADMIN ROLE TO ASSIGN THE REDISTRIBUTION ROLE, PLEASE ASSIGN IT OR GRANT ROLE MANUALLY');
   }
 
   log('----------------------------------------------------');

diff --git a/deploy/main/008_deploy_roles_oracle.ts b/deploy/main/008_deploy_roles_oracle.ts
@@ -6,10 +6,16 @@ const func: DeployFunction = async function ({ deployments, getNamedAccounts })
 
   log('Setting Oracles roles');
 
-  const redisAddress = (await get('Redistribution')).address;
+  const adminRole = await read('StakeRegistry', 'DEFAULT_ADMIN_ROLE');
+
+  if (await read('StakeRegistry', { from: deployer }, 'hasRole', adminRole)) {
+    const redisAddress = (await get('Redistribution')).address;
+    const updaterRole = await read('PriceOracle', 'PRICE_UPDATER_ROLE');
+    await execute('PriceOracle', { from: deployer }, 'grantRole', updaterRole, redisAddress);
+  } else {
+    log('DEPLOYER NEEDS TO HAVE ADMIN ROLE TO ASSIGN THE REDISTRIBUTION ROLE, PLEASE ASSIGN IT OR GRANT ROLE MANUALLY');
+  }
 
-  const updaterRole = await read('PriceOracle', 'PRICE_UPDATER_ROLE');
-  await execute('PriceOracle', { from: deployer }, 'grantRole', updaterRole, redisAddress);
   log('----------------------------------------------------');
 };
 

diff --git a/deploy/main/011_deploy_multisig.ts b/deploy/main/011_deploy_multisig.ts
@@ -11,16 +11,16 @@ const func: DeployFunction = async function ({ deployments, getNamedAccounts, ne
 
     // ADD Roles to Multisig
     const adminRole = await read('PostageStamp', 'DEFAULT_ADMIN_ROLE');
-    await execute('PostageStamp', { from: deployer }, 'grantRole', adminRole, networkConfig['mainnet'].multisig);
-    await execute('PriceOracle', { from: deployer }, 'grantRole', adminRole, networkConfig['mainnet'].multisig);
-    await execute('StakeRegistry', { from: deployer }, 'grantRole', adminRole, networkConfig['mainnet'].multisig);
+    // await execute('PostageStamp', { from: deployer }, 'grantRole', adminRole, networkConfig['mainnet'].multisig);
+    // await execute('PriceOracle', { from: deployer }, 'grantRole', adminRole, networkConfig['mainnet'].multisig);
+    // await execute('StakeRegistry', { from: deployer }, 'grantRole', adminRole, networkConfig['mainnet'].multisig);
     await execute('Redistribution', { from: deployer }, 'grantRole', adminRole, networkConfig['mainnet'].multisig);
 
     // REMOVE Roles from deployer
     // await execute('PostageStamp', { from: deployer }, 'renounceRole', adminRole, deployer);
     // await execute('PriceOracle', { from: deployer }, 'renounceRole', adminRole, deployer);
     // await execute('StakeRegistry', { from: deployer }, 'renounceRole', adminRole, deployer);
-    // await execute('Redistribution', { from: deployer }, 'renounceRole', adminRole, deployer);
+    await execute('Redistribution', { from: deployer }, 'renounceRole', adminRole, deployer);
 
     log('----------------------------------------------------');
   }

diff --git a/deployments/mainnet/Redistribution.json b/deployments/mainnet/Redistribution.json