Feature/rd 1193 add openzeppelin foundry upgrades to the repo

.gitignore

@@ -8,6 +8,7 @@
 # Foundry
 cache/
 out/
+ref_builds/
 broadcast/
 
 # JS

.gitmodules

@@ -22,3 +22,9 @@ branch = v4.9.2
 [submodule "lib/ens-contracts"]
 	path = lib/ens-contracts
 	url = https://github.com/ensdomains/ens-contracts
+[submodule "lib/openzeppelin-foundry-upgrades"]
+	path = lib/openzeppelin-foundry-upgrades
+	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
+[submodule "lib/ve-governance/v101"]
+	path = lib/ve-governance/v101
+	url = https://github.com/aragon/ve-governance

foundry.toml

@@ -18,6 +18,11 @@ test = "test"
 verbosity = 3
 evm_version = "shanghai"
 
+ffi = true
+ast = true
+build_info = true
+extra_output = ["storageLayout"]
+
 [profile.ci]
 fuzz = { runs = 10_000 }
 verbosity = 4

package.json

@@ -1,6 +1,14 @@
 {
+  "name": "ve-governance",
+  "version": "1.0.0",
   "devDependencies": {
     "prettier": "^3.3.3",
     "prettier-plugin-solidity": "^1.4.1"
+  },
+  "scripts": {
+    "build": "forge build",
+    "build-clean": "forge build --force",
+    "build-refs": "bash script/build-reference-builds.sh",
+    "build-all": "bun run build-refs && bun run build-clean"
   }
 }

remappings.txt

@@ -5,6 +5,7 @@ utils/=test/utils/
 @aragon/osx/=lib/osx/packages/contracts/src/
 @aragon/admin/=lib/osx/packages/contracts/src/plugins/governance/admin/
 @aragon/multisig/=lib/osx/packages/contracts/src/plugins/governance/multisig/
+@aragon/ve-governance-v100=lib/ve-governance/v100/src/
 
 @interfaces/=src/interfaces/
 @mocks/=test/mocks/
@@ -25,5 +26,6 @@ ens-contracts/=lib/ens-contracts/contracts/
 openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/
 openzeppelin-contracts/=lib/openzeppelin-contracts/
 erc4626-tests/=lib/openzeppelin-contracts-upgradeable/lib/erc4626-tests/
+openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src
 
 @solmate/=lib/solmate/src/

script/build-reference-builds.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+rm -rf ref_builds
+mkdir -p ref_builds
+
+for file in lib/ve-governance/*;
+do
+    echo "Processing $file"
+    filename=$(echo $file | sed 's/\//-/g')
+    filename=$(echo $filename | sed 's/lib-ve-governance-//g')
+    mkdir -p ref_builds/build-info-$filename
+    forge build --force --root=$file
+    mv $file/out/build-info/*.json ref_builds/build-info-$filename
+done

src/clock/Clock.sol

@@ -29,6 +29,7 @@ contract Clock is IClock, DaoAuthorizable, UUPSUpgradeable {
                             Initialization
     //////////////////////////////////////////////////////////////*/
 
+    /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
         _disableInitializers();
     }

test/integration/GaugesDaoFactory.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
+import {MockERC20} from "@solmate/test/utils/mocks/MockERC20.sol";
 import {GaugesDaoFactory, Deployment, DeploymentParameters, TokenParameters} from "../../src/factory/GaugesDaoFactory.sol";
 import {MockPluginSetupProcessor} from "@mocks/osx/MockPSP.sol";
 import {MockPluginSetupProcessorMulti} from "@mocks/osx/MockPSPMulti.sol";
@@ -382,12 +383,12 @@ contract GaugesDaoFactoryTest is Test {
 
         TokenParameters[] memory tokenParameters = new TokenParameters[](2);
         tokenParameters[0] = TokenParameters({
-            token: address(deployMockERC20("T1", "T1", 18)),
+            token: address(new MockERC20("T1", "T1", 18)),
             veTokenName: "Name 1",
             veTokenSymbol: "TK1"
         });
         tokenParameters[1] = TokenParameters({
-            token: address(deployMockERC20("T2", "T2", 18)),
+            token: address(new MockERC20("T2", "T2", 18)),
             veTokenName: "Name 2",
             veTokenSymbol: "TK2"
         });
@@ -767,17 +768,17 @@ contract GaugesDaoFactoryTest is Test {
 
         TokenParameters[] memory tokenParameters = new TokenParameters[](3);
         tokenParameters[0] = TokenParameters({
-            token: address(deployMockERC20("T3", "T3", 18)),
+            token: address(new MockERC20("T3", "T3", 18)),
             veTokenName: "Name 3",
             veTokenSymbol: "TK3"
         });
         tokenParameters[1] = TokenParameters({
-            token: address(deployMockERC20("T4", "T4", 18)),
+            token: address(new MockERC20("T4", "T4", 18)),
             veTokenName: "Name 4",
             veTokenSymbol: "TK4"
         });
         tokenParameters[2] = TokenParameters({
-            token: address(deployMockERC20("T5", "T5", 18)),
+            token: address(new MockERC20("T5", "T5", 18)),
             veTokenName: "Name 5",
             veTokenSymbol: "TK5"
         });
@@ -1261,17 +1262,17 @@ contract GaugesDaoFactoryTest is Test {
 
         TokenParameters[] memory tokenParameters = new TokenParameters[](3);
         tokenParameters[0] = TokenParameters({
-            token: address(deployMockERC20("T3", "T3", 18)),
+            token: address(new MockERC20("T3", "T3", 18)),
             veTokenName: "Name 3",
             veTokenSymbol: "TK3"
         });
         tokenParameters[1] = TokenParameters({
-            token: address(deployMockERC20("T4", "T4", 18)),
+            token: address(new MockERC20("T4", "T4", 18)),
             veTokenName: "Name 4",
             veTokenSymbol: "TK4"
         });
         tokenParameters[2] = TokenParameters({
-            token: address(deployMockERC20("T5", "T5", 18)),
+            token: address(new MockERC20("T5", "T5", 18)),
             veTokenName: "Name 5",
             veTokenSymbol: "TK5"
         });

test/upgrades/TestUpgrades.t.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+import {Upgrades} from "openzeppelin-foundry-upgrades/LegacyUpgrades.sol";
+import {Test} from "forge-std/Test.sol";
+//import {Clock} from '@aragon/ve-governance-v101/clock/Clock.sol';
+//import {Clock as ClockV2} from '@clock/Clock.sol';
+
+import { Options } from "openzeppelin-foundry-upgrades/Options.sol";
+
+contract AragonTest is Test {
+    function testUpgrades() public {
+        //Clock clock = new Clock();
+
+        Options memory options;
+        options.referenceBuildInfoDir = "ref_builds/build-info-v101";
+        options.referenceContract = "build-info-v101:Clock";
+
+        Upgrades.validateUpgrade("Clock.sol", options);
+    }
+}