Wait for the grant/renounce role transactions to complete

zksync-association · Jul 29, 2024 · 054c6f4 · 054c6f4
1 parent 0c705cd
commit 054c6f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/script/DeployZkGovOpsGovernor.ts b/script/DeployZkGovOpsGovernor.ts
@@ -56,11 +56,11 @@ async function main() {
   const theToken = await govOpsGovernor.token();
   console.log(`The Token is set to: ${theToken}`);
 
-  await timelock.grantRole(await timelock.PROPOSER_ROLE(), contractAddress);
-  await timelock.grantRole(await timelock.CANCELLER_ROLE(), contractAddress);
-  await timelock.grantRole(await timelock.EXECUTOR_ROLE(), contractAddress);
+  (await timelock.grantRole(await timelock.PROPOSER_ROLE(), contractAddress)).wait();
+  (await timelock.grantRole(await timelock.CANCELLER_ROLE(), contractAddress)).wait();
+  (await timelock.grantRole(await timelock.EXECUTOR_ROLE(), contractAddress)).wait();
   console.log(`Timelock PROPOSER, CANCELLER, and EXECUTOR roles granted to ${contractName} contract`);
-  await timelock.renounceRole(await timelock.TIMELOCK_ADMIN_ROLE(), adminAddress);
+  (await timelock.renounceRole(await timelock.TIMELOCK_ADMIN_ROLE(), adminAddress)).wait();
   console.log(`ADMIN Role renounced for ${contractName} TimelockController contract (now self-administered)`);
 }
 

diff --git a/script/DeployZkProtocolGovernor.ts b/script/DeployZkProtocolGovernor.ts
@@ -46,11 +46,11 @@ async function main() {
   const theToken = await protocolGovernor.token();
   console.log(`The ${contractName} Token is set to: ${theToken}`);
 
-  await timelock.grantRole(await timelock.PROPOSER_ROLE(), contractAddress);
-  await timelock.grantRole(await timelock.CANCELLER_ROLE(), contractAddress);
-  await timelock.grantRole(await timelock.EXECUTOR_ROLE(), contractAddress);
+  (await timelock.grantRole(await timelock.PROPOSER_ROLE(), contractAddress)).wait();
+  (await timelock.grantRole(await timelock.CANCELLER_ROLE(), contractAddress)).wait();
+  (await timelock.grantRole(await timelock.EXECUTOR_ROLE(), contractAddress)).wait();
   console.log(`Timelock PROPOSER, CANCELLER, and EXECUTOR roles granted to ${contractName} contract`);
-  await timelock.renounceRole(await timelock.TIMELOCK_ADMIN_ROLE(), adminAddress);
+  (await timelock.renounceRole(await timelock.TIMELOCK_ADMIN_ROLE(), adminAddress)).wait();
   console.log(`ADMIN Role renounced for ${contractName} TimelockController contract (now self-administered)`);
 }
 

diff --git a/script/DeployZkTokenGovernor.ts b/script/DeployZkTokenGovernor.ts
@@ -61,11 +61,11 @@ async function main() {
   const theToken = await tokenGovernor.token();
   console.log(`The Token is set to: ${theToken}`);
 
-  await timelock.grantRole(await timelock.PROPOSER_ROLE(), contractAddress);
-  await timelock.grantRole(await timelock.CANCELLER_ROLE(), contractAddress);
-  await timelock.grantRole(await timelock.EXECUTOR_ROLE(), contractAddress);
+  (await timelock.grantRole(await timelock.PROPOSER_ROLE(), contractAddress)).wait();
+  (await timelock.grantRole(await timelock.CANCELLER_ROLE(), contractAddress)).wait();
+  (await timelock.grantRole(await timelock.EXECUTOR_ROLE(), contractAddress)).wait();
   console.log(`Timelock PROPOSER, CANCELLER, and EXECUTOR roles granted to ${contractName} contract`);
-  await timelock.renounceRole(await timelock.TIMELOCK_ADMIN_ROLE(), adminAddress);
+  (await timelock.renounceRole(await timelock.TIMELOCK_ADMIN_ROLE(), adminAddress)).wait();
   console.log(`ADMIN Role renounced for ${contractName} TimelockController contract (now self-administered)`);
 }