Fixing the local test

aragon · Feb 28, 2025 · 35015b4 · 35015b4
1 parent 0d4af0e
commit 35015b4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -198,6 +198,8 @@ You can find more details about [our deployment checklist here](https://github.c
 
 Follow [our update checklist here](https://github.com/aragon/osx/blob/develop/UPDATE_CHECKLIST.md).
 
+Also check the [README](./packages/contracts/scripts/management-dao-proposal/README.md) of the Management DAO proposal generation flow.
+
 ## Pull request commands
 
 Certain actions can be triggered via a command to a pull request. To issue a command just comment on a pull request with one of these commands.

diff --git a/packages/contracts/deploy/update/to_v1.4.0/01_Info.ts b/packages/contracts/deploy/update/to_v1.4.0/01_Info.ts
@@ -16,7 +16,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     ],
     // Adjust this values
     proposalStartDate: 0,
-    proposalEndDate: 1741370400, // Date and time (GMT): Friday, 7 March 2025 18:00:00
+    proposalEndDate: Math.ceil(Date.now() / 1000),
   };
 };
 export default func;

diff --git a/packages/contracts/test/deploy/deployment-1.4.0.ts b/packages/contracts/test/deploy/deployment-1.4.0.ts
@@ -12,6 +12,8 @@ import * as fs from 'fs';
 import hre, {ethers} from 'hardhat';
 import * as path from 'path';
 
+const FORK_BLOCK_NUMBER = 7805006;
+
 // change to test on a different network
 const NETWORK = 'sepolia';
 
@@ -64,7 +66,7 @@ async function forkNetwork(network: string) {
 
   await initForkForOsxVersion(network, {
     version: '1.3.0',
-    forkBlockNumber: 7685985, // todo adjust to latest block
+    forkBlockNumber: FORK_BLOCK_NUMBER,
     activeContracts: [],
   });
 }
@@ -77,7 +79,7 @@ function getCalldataJson() {
 }
 
 function getAddressFromDescription(description: string): string {
-  const address = description.split("at '")[1].split("' \n")[0];
+  const address = description.split("at **'")[1].split("'**")[0];
   return address;
 }
 

diff --git a/packages/contracts/test/deploy/update-1.4.0.ts b/packages/contracts/test/deploy/update-1.4.0.ts
@@ -24,6 +24,8 @@ import {expect} from 'chai';
 import {defaultAbiCoder} from 'ethers/lib/utils';
 import hre, {ethers, deployments} from 'hardhat';
 
+const FORK_BLOCK_NUMBER = 7805006;
+
 const IMPLEMENTATION_ADDRESS_SLOT =
   '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc';
 
@@ -45,7 +47,7 @@ async function forkSepolia() {
   // console.log(hre);
   await initForkForOsxVersion('sepolia', {
     version: '1.3.0',
-    forkBlockNumber: 7296100,
+    forkBlockNumber: FORK_BLOCK_NUMBER,
     activeContracts: [],
   });
 }