Skip to content
This repository was archived by the owner on Jan 16, 2025. It is now read-only.

refactor: Refactor and optimize governance.ts for better maintainability #25

Open
tiendn wants to merge 1 commit into
base: mainL2
Choose a base branch
from
Open

refactor: Refactor and optimize governance.ts for better maintainability #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 17 additions & 33 deletions misc/libs/governance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,44 +45,29 @@ export interface GovernanceResolution {
timelockCall: TimelockCalls
}

export async function opsResolution (addrs: CrocAddrs, cmd: CrocProtocolCmd,
delay: number, tag:string): Promise<GovernanceResolution> {
const timelock = await refContract("TimelockAccepts", addrs.govern.timelockOps) as TimelockAccepts
const policy = await refContract("CrocPolicy", addrs.policy) as CrocPolicy

let policyCall = await policy.populateTransaction.opsResolution(addrs.dex,
cmd.callpath, cmd.protocolCmd)
let timelockCalls = await populateTimelockCalls(timelock, addrs.policy,
policyCall.data as string, delay)

async function resolutionHelper(type: "ops" | "treasury", addrs: CrocAddrs, cmd: CrocProtocolCmd, delay: number, tag: string): Promise<GovernanceResolution> {
const timelock = await refContract("TimelockAccepts", type === "ops" ? addrs.govern.timelockOps : addrs.govern.timelockTreasury) as TimelockAccepts;
const policy = await refContract("CrocPolicy", addrs.policy) as CrocPolicy;
const policyCall = await policy.populateTransaction[type + "Resolution"](addrs.dex, cmd.callpath, cmd.protocolCmd, cmd.sudo ? cmd.sudo : false);
const timelockCalls = await populateTimelockCalls(timelock, addrs.policy, policyCall.data as string, delay);
return printResolution({
resolutionType: "ops",
resolutionType: type,
protocolCmd: cmd,
policyContract: addrs.policy,
dexContract: addrs.dex,
multisigOrigin: addrs.govern.multisigOps,
multisigOrigin: type === "ops" ? addrs.govern.multisigOps : addrs.govern.multisigTreasury,
timelockCall: await timelockCalls,
}, tag)
}, tag);
}

export async function opsResolution (addrs: CrocAddrs, cmd: CrocProtocolCmd,
delay: number, tag:string): Promise<GovernanceResolution> {
return await resolutionHelper("ops", addrs, cmd, delay, tag);
}

export async function treasuryResolution (addrs: CrocAddrs, cmd: CrocProtocolCmd,
delay: number, tag: string): Promise<GovernanceResolution> {
const timelock = await refContract("TimelockAccepts", addrs.govern.timelockTreasury) as TimelockAccepts
const policy = await refContract("CrocPolicy", addrs.policy) as CrocPolicy

let policyCall = await policy.populateTransaction.treasuryResolution(addrs.dex,
cmd.callpath, cmd.protocolCmd, cmd.sudo ? cmd.sudo : false)
let timelockCalls = await populateTimelockCalls(timelock, addrs.policy,
policyCall.data as string, delay)

return printResolution({
resolutionType: "treasury",
protocolCmd: cmd,
policyContract: addrs.policy,
dexContract: addrs.dex,
multisigOrigin: addrs.govern.multisigTreasury,
timelockCall: await timelockCalls,
}, tag)
return await resolutionHelper("treasury", addrs, cmd, delay, tag);
}

export async function opsTimelockSet (addrs: CrocAddrs, newDelay: number, oldDelay: number) {
Expand All @@ -97,12 +82,11 @@ export async function treasuryTimelockSet (addrs: CrocAddrs, newDelay: number, o

async function timelockDelaySet (multisigAddr: string,
timelockAddr: string, newDelay: number, oldDelay: number, tag: string) {
const timelock = await refContract("TimelockAccepts", timelockAddr) as TimelockAccepts
let delayCall = await timelock.populateTransaction.updateDelay(newDelay)

if (newDelay > 7 * 3600 * 24) {
throw new Error("Timelock delay exceeds seven days")
throw new Error("Timelock delay exceeds seven days");
}
const timelock = await refContract("TimelockAccepts", timelockAddr) as TimelockAccepts
let delayCall = await timelock.populateTransaction.updateDelay(newDelay)

let timelockCalls = await populateTimelockCalls(timelock, timelockAddr, delayCall.data as string,
oldDelay)
Expand Down