From 5b77f1a65eba8b3952ab6bf1491020656d7f33bb Mon Sep 17 00:00:00 2001 From: Mathias Scherer Date: Wed, 20 Dec 2023 16:14:14 +0100 Subject: [PATCH 1/3] deploy(contracts): fixes update proposal readability --- .../verification/99_conclude/01_managing_dao_proposal.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/contracts/deploy/verification/99_conclude/01_managing_dao_proposal.ts b/packages/contracts/deploy/verification/99_conclude/01_managing_dao_proposal.ts index 55e09602a..608e8689c 100644 --- a/packages/contracts/deploy/verification/99_conclude/01_managing_dao_proposal.ts +++ b/packages/contracts/deploy/verification/99_conclude/01_managing_dao_proposal.ts @@ -23,8 +23,8 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { await managingDAOMultisig.callStatic.multisigSettings(); const proposalDescription = hre.managingDAOActions - .map(action => action.description) - .join('\n'); + .map(action => `

${action.description}

`) + .join(''); const cid = await uploadToIPFS( JSON.stringify({ title: 'Framework Upgrade 1.3.0', From 200d2b128469b277d1eb547b149f0e2698de52de Mon Sep 17 00:00:00 2001 From: Mathias Scherer Date: Wed, 20 Dec 2023 16:14:37 +0100 Subject: [PATCH 2/3] deploy(contracts): don't try to execute update proposal --- .../deploy/verification/99_conclude/01_managing_dao_proposal.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts/deploy/verification/99_conclude/01_managing_dao_proposal.ts b/packages/contracts/deploy/verification/99_conclude/01_managing_dao_proposal.ts index 608e8689c..f9861612d 100644 --- a/packages/contracts/deploy/verification/99_conclude/01_managing_dao_proposal.ts +++ b/packages/contracts/deploy/verification/99_conclude/01_managing_dao_proposal.ts @@ -44,7 +44,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { hre.managingDAOActions, 0, true, - true, + false, 0, Math.round(Date.now() / 1000) + 30 * 24 * 60 * 60 // Lets the proposal end in 30 days ); From 6b4c005fa826cb56bd620242e5bda51b6994f912 Mon Sep 17 00:00:00 2001 From: Mathias Scherer Date: Wed, 20 Dec 2023 16:15:37 +0100 Subject: [PATCH 3/3] deploy(contracts): fixes address in admin-repo update in v1.3.0 --- .../contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts b/packages/contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts index f0688147c..70ce104e0 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts @@ -37,7 +37,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { to: upgradeTX.to, data: upgradeTX.data, value: 0, - description: `Upgrade the "admin-repo" PluginRepo (${adminPluginRepo}) to the new implementation (${newPluginRepoImplementation})`, + description: `Upgrade the "admin-repo" PluginRepo (${adminPluginRepoAddress}) to the new implementation (${newPluginRepoImplementation})`, }); }; export default func;