Merge pull request #57 from lidofinance/feature/devnet-command

Devnet with DG support and Fusaka fork

Author: mkurayan

contracts/csm.ts

@@ -11,6 +11,9 @@ import { getVersion } from './initializable';
 export const csModuleAddress = getOptionalDeployedAddress('csm.module.address');
 export const csModuleContract = new Contract(csModuleAddress, moduleAbi, wallet);
 
+export const csPermissionlessGateAddress = getOptionalDeployedAddress('csm.permissionlessGate.address');
+export const csPermissionlessGateContract = new Contract(csPermissionlessGateAddress, permissionlessGateAbi, wallet);
+
 export const csAccountingAddress = getOptionalDeployedAddress('csm.accounting.address');
 export const csAccountingContract = new Contract(csAccountingAddress, accountingAbi, wallet);
 

programs/devnet.ts

@@ -1,5 +1,5 @@
 import { program } from '@command';
-import { votingNewVote } from '@scripts';
+import { agentForward, encodeFromAgent, votingNewVote } from '@scripts';
 import {
   CallScriptActionWithDescription,
   encodeCallScript,
@@ -80,8 +80,13 @@ devnet
     logger.log();
 
     // Voting calls
+    const forwardedLidoResumeScripts = lidoResumeScripts.map((call) => {
+      const [, agentCall] = encodeFromAgent(call);
+      return agentCall;
+    });
+
     const votingCalls: CallScriptActionWithDescription[] = [
-      ...lidoResumeScripts,
+      ...forwardedLidoResumeScripts,
       ...wqResumeScripts,
       ...veboScripts,
       ...aoScripts,
@@ -126,7 +131,6 @@ devnet
 
     const newLocatorDeployTx = {
       data: newLocatorDeploymentData,
-      gasLimit: 5000000,
     };
 
     const txResponse = await wallet.sendTransaction(newLocatorDeployTx);

programs/omnibus-scripts/generators/aragon.ts

@@ -1,9 +1,10 @@
-import { encodeCallScript, getRoleHash, logger } from '@utils';
+import { getRoleHash, logger } from '@utils';
 import { confirmRoleGranting, printRoles } from './roles-auxiliary';
 import { Contract } from 'ethers';
 import { aclContract } from '@contracts';
+import { encodeFromAgent } from '@scripts';
 
-export const encodeFromVotingGrantRolesAragonWithConfirm = async (
+export const encodeFromAgentGrantRolesAragonWithConfirm = async (
   contractName: string,
   rolesToGrant: string[],
   contract: Contract,
@@ -13,27 +14,27 @@ export const encodeFromVotingGrantRolesAragonWithConfirm = async (
 
   if (await confirmRoleGranting()) {
     logger.log();
-    return await encodeFromVotingGrantRolesAragon(contractName, rolesToGrant, contract, rolesBeneficiary);
+    return await encodeFromAgentGrantRolesAragon(contractName, rolesToGrant, contract, rolesBeneficiary);
   }
 
   return [];
 };
 
-export const encodeFromVotingGrantRolesAragon = async (
+export const encodeFromAgentGrantRolesAragon = async (
   contractName: string,
   rolesToGrant: string[],
   contract: Contract,
   rolesBeneficiary: string,
 ) => {
   return await Promise.all(
     rolesToGrant.map(async (role) => {
-      const [, grantRoleCall] = await encodeFromVotingGrantRoleAragon(contractName, contract, role, rolesBeneficiary);
+      const [, grantRoleCall] = await encodeFromAgentGrantRoleAragon(contractName, contract, role, rolesBeneficiary);
       return grantRoleCall;
     }),
   );
 };
 
-export const encodeFromVotingGrantRoleAragon = async (
+export const encodeFromAgentGrantRoleAragon = async (
   contractName: string,
   contract: Contract,
   role: string,
@@ -49,6 +50,5 @@ export const encodeFromVotingGrantRoleAragon = async (
     desc: `${contractName}: Grant '${role}' role to ${account}`,
   };
 
-  const encoded = encodeCallScript([grantPermissionCall]);
-  return [encoded, grantPermissionCall] as const;
+  return encodeFromAgent(grantPermissionCall);
 };

programs/omnibus-scripts/generators/lido.ts

@@ -41,6 +41,6 @@ export const encodeScriptsLidoResumeIfStopped = async (stakingLimit: number) =>
 
 export const encodeScriptsLidoResume = async (stakingLimit: number | string) => {
   const parsedLimit = parseEther(String(stakingLimit));
-  const [, resumeProtocolCall, resumeStakingCall, setStakingLimitCall] = resumeLidoAndSetStakingLimit(parsedLimit);
-  return [resumeProtocolCall, resumeStakingCall, setStakingLimitCall];
+  const [, resumeProtocolCall, setStakingLimitCall] = resumeLidoAndSetStakingLimit(parsedLimit);
+  return [resumeProtocolCall, setStakingLimitCall];
 };

programs/omnibus-scripts/generators/roles-auxiliary.ts

@@ -6,7 +6,6 @@ import {
   encodeFromAgentGrantRolesAccessControl,
   encodeFromAgentGrantRolesAccessControlWithConfirm,
 } from './access-control';
-import { encodeFromVotingGrantRolesAragon, encodeFromVotingGrantRolesAragonWithConfirm } from './aragon';
 import {
   consensusForAccountingContract,
   consensusForCSMContract,
@@ -17,6 +16,7 @@ import {
   stakingRouterContract,
 } from '@contracts';
 import { DEFAULT_DEVNET_CONFIG } from './devnet';
+import { encodeFromAgentGrantRolesAragon, encodeFromAgentGrantRolesAragonWithConfirm } from './aragon';
 
 const NOR_ROLES = [
   'STAKING_ROUTER_ROLE',
@@ -49,7 +49,7 @@ export const promptScriptsRolesWithConfirm = async (beneficiary: string) => {
     stakingRouterContract,
     beneficiary,
   );
-  const norScripts = await encodeFromVotingGrantRolesAragonWithConfirm('NOR', NOR_ROLES, norContract, beneficiary);
+  const norScripts = await encodeFromAgentGrantRolesAragonWithConfirm('NOR', NOR_ROLES, norContract, beneficiary);
   const aoScripts = await encodeFromAgentGrantRolesAccessControlWithConfirm(
     'AO consensus',
     HASH_CONSENSUS_ROLES,
@@ -89,7 +89,7 @@ export const promptScriptsCurateModulesRolesWithConfirm = async (moduleIds: numb
   for (const moduleId of moduleIds) {
     const { stakingModuleAddress } = await stakingRouterContract.getStakingModule(moduleId);
     const moduleContract = norContract.attach(stakingModuleAddress) as Contract;
-    const moduleScripts = await encodeFromVotingGrantRolesAragonWithConfirm(
+    const moduleScripts = await encodeFromAgentGrantRolesAragonWithConfirm(
       `Module ${moduleId}`,
       NOR_ROLES,
       moduleContract,
@@ -137,7 +137,7 @@ export const encodeScriptsRoles = async (beneficiary: string) => {
     stakingRouterContract,
     beneficiary,
   );
-  const norScripts = await encodeFromVotingGrantRolesAragon('NOR', NOR_ROLES, norContract, beneficiary);
+  const norScripts = await encodeFromAgentGrantRolesAragon('NOR', NOR_ROLES, norContract, beneficiary);
   const aoScripts = await encodeFromAgentGrantRolesAccessControl(
     'AO consensus',
     HASH_CONSENSUS_ROLES,

scripts/lido.ts

@@ -1,5 +1,5 @@
 import { lidoAddress, lidoContract } from '@contracts';
-import { encodeCallScript, calcStakeLimitIncreasePerBlock } from '@utils';
+import { calcStakeLimitIncreasePerBlock, encodeCallScript } from '@utils';
 import { formatEther } from 'ethers';
 
 export const resumeProtocol = () => {
@@ -39,9 +39,8 @@ export const setStakingLimit = (dailyStakingLimit: bigint) => {
 
 export const resumeLidoAndSetStakingLimit = (dailyStakingLimit: bigint) => {
   const [, resumeProtocolCall] = resumeProtocol();
-  const [, resumeStakingCall] = resumeStaking();
   const [, setStakingLimitCall] = setStakingLimit(dailyStakingLimit);
-  const calls = [resumeProtocolCall, resumeStakingCall, setStakingLimitCall];
+  const calls = [resumeProtocolCall, setStakingLimitCall];
 
   const encoded = encodeCallScript(calls);
   return [encoded, ...calls] as const;