Feat--Scale-Gauntlet-AMO

.gitmodules

@@ -2,12 +2,6 @@
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 	ignore = dirty
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/openzeppelin-contracts-upgradeable"]
-	path = lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
 [submodule "lib/solidity-examples"]
 	path = lib/solidity-examples
 	url = https://github.com/LayerZero-Labs/solidity-examples
@@ -17,9 +11,6 @@
 	path = lib/solidity-stringutils
 	url = https://github.com/Arachnid/solidity-stringutils
 	ignore = dirty
-[submodule "lib/angle-transmuter"]
-	path = lib/angle-transmuter
-	url = https://github.com/AngleProtocol/angle-transmuter
 [submodule "lib/borrow-contracts"]
 	path = lib/borrow-contracts
 	url = https://github.com/AngleProtocol/borrow-contracts
@@ -38,3 +29,22 @@
 [submodule "lib/utils"]
 	path = lib/utils
 	url = https://github.com/AngleProtocol/utils
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+	version = v4.7.3
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	version = v4.7.3
+[submodule "lib/old-oz"]
+	path = lib/old-oz
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	version = cffb2f1ddcd87efd68effc92cfd336c5145acabd
+[submodule "lib/old-oz-upgradeable"]
+	path = lib/old-oz-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+	version = ebf264cc4b812e6557ed7d539e947211acd5670c
+[submodule "lib/angle-transmuter"]
+	path = lib/angle-transmuter
+	url = https://github.com/AngleProtocol/angle-transmuter

.vscode/settings.json

@@ -1,7 +1,10 @@
 {
   "solidity.compileUsingRemoteVersion": "0.8.20",
+  "[typescript]": {
+    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
+  },
   "[solidity]": {
-    "editor.defaultFormatter": "JuanBlanco.solidity",
-    "editor.formatOnSave": true
+    "editor.defaultFormatter": "JuanBlanco.solidity"
   },
+  "editor.formatOnSave": true,
 }

contracts/AngleGovernor.sol

@@ -2,13 +2,14 @@
 
 pragma solidity ^0.8.20;
 
-import { IVotes } from "oz/governance/utils/IVotes.sol";
-
-import { Governor } from "oz/governance/Governor.sol";
-import { GovernorPreventLateQuorum } from "oz/governance/extensions/GovernorPreventLateQuorum.sol";
-import { GovernorVotesQuorumFraction, GovernorVotes } from "oz/governance/extensions/GovernorVotesQuorumFraction.sol";
-import { GovernorSettings } from "oz/governance/extensions/GovernorSettings.sol";
-import { IERC5805 } from "oz/interfaces/IERC5805.sol";
+import { IVotes } from "oz-v5/governance/utils/IVotes.sol";
+
+import { Governor } from "oz-v5/governance/Governor.sol";
+import { GovernorPreventLateQuorum } from "oz-v5/governance/extensions/GovernorPreventLateQuorum.sol";
+import { GovernorVotes } from "oz-v5/governance/extensions/GovernorVotesQuorumFraction.sol";
+import { GovernorVotesQuorumFraction } from "oz-v5/governance/extensions/GovernorVotesQuorumFraction.sol";
+import { GovernorSettings } from "oz-v5/governance/extensions/GovernorSettings.sol";
+import { IERC5805 } from "oz-v5/interfaces/IERC5805.sol";
 
 import { GovernorCountingFractional } from "./external/GovernorCountingFractional.sol";
 import { GovernorShortCircuit } from "./external/GovernorShortCircuit.sol";

contracts/ProposalReceiver.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.20;
 
-import "oz/utils/ReentrancyGuard.sol";
+import "oz-v5/utils/ReentrancyGuard.sol";
 import "lz/lzApp/NonblockingLzApp.sol";
 import "./utils/Errors.sol";
 
@@ -51,7 +51,7 @@ contract ProposalReceiver is NonblockingLzApp, ReentrancyGuard {
     /// @dev Called by LayerZero Endpoint when a message from the source is received
     function _nonblockingLzReceive(uint16, bytes memory, uint64, bytes memory _payload) internal virtual override {
         (address[] memory targets, uint256[] memory values, string[] memory signatures, bytes[] memory calldatas) = abi
-            .decode(_payload, (address[], uint[], string[], bytes[]));
+            .decode(_payload, (address[], uint256[], string[], bytes[]));
 
         for (uint256 i = 0; i < targets.length; i++) {
             _executeTransaction(targets[i], values[i], signatures[i], calldatas[i]);

contracts/ProposalSender.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import "oz/access/Ownable.sol";
-import "oz/utils/ReentrancyGuard.sol";
+import "oz-v5/access/Ownable.sol";
+import "oz-v5/utils/ReentrancyGuard.sol";
 import "lz/lzApp/interfaces/ILayerZeroEndpoint.sol";
 
 import "./utils/Errors.sol";
@@ -47,7 +47,7 @@ contract ProposalSender is Ownable, ReentrancyGuard {
         uint16 indexed remoteChainId,
         bytes payload,
         bytes adapterParams,
-        uint value,
+        uint256 value,
         bytes reason
     );
 
@@ -70,7 +70,7 @@ contract ProposalSender is Ownable, ReentrancyGuard {
         uint16 remoteChainId,
         bytes calldata payload,
         bytes calldata adapterParams
-    ) external view returns (uint nativeFee, uint zroFee) {
+    ) external view returns (uint256 nativeFee, uint256 zroFee) {
         return lzEndpoint.estimateFees(remoteChainId, address(this), payload, false, adapterParams);
     }
 
@@ -122,7 +122,7 @@ contract ProposalSender is Ownable, ReentrancyGuard {
         uint16 remoteChainId,
         bytes calldata payload,
         bytes calldata adapterParams,
-        uint originalValue
+        uint256 originalValue
     ) external payable nonReentrant {
         bytes32 hash = storedExecutionHashes[nonce];
         if (hash == bytes32(0)) revert OmnichainProposalSenderNoStoredPayload();
@@ -156,7 +156,7 @@ contract ProposalSender is Ownable, ReentrancyGuard {
     /// @param chainId The LayerZero chainId for the pending config change
     /// @param configType The type of configuration. Every messaging library has its own convention
     /// @param config The configuration in bytes. It can encode arbitrary content
-    function setConfig(uint16 version, uint16 chainId, uint configType, bytes calldata config) external onlyOwner {
+    function setConfig(uint16 version, uint16 chainId, uint256 configType, bytes calldata config) external onlyOwner {
         lzEndpoint.setConfig(version, chainId, configType, config);
     }
 
@@ -170,7 +170,7 @@ contract ProposalSender is Ownable, ReentrancyGuard {
     /// @param version Messaging library version
     /// @param chainId The LayerZero chainId
     /// @param configType Type of configuration. Every messaging library has its own convention.
-    function getConfig(uint16 version, uint16 chainId, uint configType) external view returns (bytes memory) {
+    function getConfig(uint16 version, uint16 chainId, uint256 configType) external view returns (bytes memory) {
         return lzEndpoint.getConfig(version, chainId, address(this), configType);
     }
 }

contracts/TimelockControllerWithCounter.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.20;
 
-import { TimelockController } from "oz/governance/TimelockController.sol";
+import { TimelockController } from "oz-v5/governance/TimelockController.sol";
 
 /// @title AngleGovernor
 /// @author Angle Labs, Inc

contracts/VeANGLEVotingDelegation.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: ISC
 pragma solidity ^0.8.20;
 
-import { ECDSA } from "oz/utils/cryptography/ECDSA.sol";
-import { EIP712 } from "oz/utils/cryptography/EIP712.sol";
-import { Math } from "oz/utils/math/Math.sol";
-import { SafeCast } from "oz/utils/math/SafeCast.sol";
-import { IERC5805 } from "oz/interfaces/IERC5805.sol";
+import { ECDSA } from "oz-v5/utils/cryptography/ECDSA.sol";
+import { EIP712 } from "oz-v5/utils/cryptography/EIP712.sol";
+import { Math } from "oz-v5/utils/math/Math.sol";
+import { SafeCast } from "oz-v5/utils/math/SafeCast.sol";
+import { IERC5805 } from "oz-v5/interfaces/IERC5805.sol";
 import { IveANGLE } from "./interfaces/IveANGLE.sol";
 import { IveANGLEVotingDelegation } from "./interfaces/IveANGLEVotingDelegation.sol";
 

contracts/external/GovernorCountingFractional.sol

@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.20;
 
-import { Governor } from "oz/governance/Governor.sol";
-import { GovernorCountingSimple } from "oz/governance/extensions/GovernorCountingSimple.sol";
-import { SafeCast } from "oz/utils/math/SafeCast.sol";
+import { Governor } from "oz-v5/governance/Governor.sol";
+import { GovernorCountingSimple } from "oz-v5/governance/extensions/GovernorCountingSimple.sol";
+import { SafeCast } from "oz-v5/utils/math/SafeCast.sol";
 
 import "../utils/Errors.sol";
 

contracts/external/GovernorShortCircuit.sol

@@ -2,10 +2,10 @@
 
 pragma solidity ^0.8.20;
 
-import { Checkpoints } from "oz/utils/structs/Checkpoints.sol";
-import { IERC5805 } from "oz/interfaces/IERC5805.sol";
-import { GovernorVotes } from "oz/governance/extensions/GovernorVotes.sol";
-import { GovernorVotesQuorumFraction } from "oz/governance/extensions/GovernorVotesQuorumFraction.sol";
+import { Checkpoints } from "oz-v5/utils/structs/Checkpoints.sol";
+import { IERC5805 } from "oz-v5/interfaces/IERC5805.sol";
+import { GovernorVotes } from "oz-v5/governance/extensions/GovernorVotes.sol";
+import { GovernorVotesQuorumFraction } from "oz-v5/governance/extensions/GovernorVotesQuorumFraction.sol";
 import { GovernorCountingFractional, SafeCast } from "./GovernorCountingFractional.sol";
 
 import "../utils/Errors.sol";

foundry.toml

@@ -12,7 +12,7 @@ optimizer = true
 optimizer_runs = 1000
 solc_version = "0.8.23"
 ffi = true
-fs_permissions = [{ access = "read-write", path = "./scripts/proposals/payload.json"}, { access = "read-write", path = "./scripts/roles.json"}]
+fs_permissions = [{ access = "read-write", path = "./scripts/proposals/payload.json"}, { access = "read-write", path = "./scripts/roles.json"}, { access = "read-write", path = "./scripts/proposals/transmuter/selectors.json"}, { access = "read-write", path = "./scripts/proposals/transmuter/selectors_replace.json"}, { access = "read-write", path = "./scripts/proposals/transmuter/selectors_add.json"}]
 
 [fuzz]
 runs = 10000

helpers/createProposal.sh

@@ -7,6 +7,7 @@ function usage {
   echo ""
   echo -e "script: path to the script to run"
   echo -e "chain: chain(s) to run the script on (separate with commas)"
+  echo -e "\t0: Fork"
   echo -e "\t1: Ethereum Mainnet"
   echo -e "\t2: Arbitrum"
   echo -e "\t3: Polygon"
@@ -53,6 +54,7 @@ function main {
         echo ""
 
         echo "Which chain(s) would you like to run the script on ? (separate with commas)"
+        echo "- 0: Fork"
         echo "- 1: Ethereum Mainnet"
         echo "- 2: Arbitrum"
         echo "- 3: Polygon"
@@ -95,7 +97,7 @@ function main {
     echo "Running on chains $chainIds"
 
     export CHAIN_IDS=$chainIds
-    FOUNDRY_PROFILE=dev forge script $script
+    forge script $script -vvvv
 
     if [ $? -ne 0 ]; then
         echo ""
@@ -106,7 +108,7 @@ function main {
     testContract="${script}Test"
     echo ""
     echo "Running test"
-    FOUNDRY_PROFILE=dev forge test --match-contract $testContract -vvv
+    forge test --match-contract $testContract -vvv
 
     if [ $? -ne 0 ]; then
         echo ""
@@ -118,7 +120,7 @@ function main {
     read execute
 
     if [[ $execute == "yes" ]]; then
-        FOUNDRY_PROFILE=dev forge script scripts/proposals/Propose.s.sol:Propose --fork-url $mainnet_uri --broadcast
+        forge script scripts/proposals/Propose.s.sol:Propose --fork-url $mainnet_uri --broadcast
     fi
 }
 

remappings.txt

@@ -1,15 +1,17 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
-oz/=lib/new-oz/contracts/
-oz-upgradeable/=lib/new-oz-upgradeable/contracts/
+oz-v5/=lib/new-oz/contracts/
+oz-upgradeable-v5/=lib/new-oz-upgradeable/contracts/
 lz/=lib/solidity-examples/contracts
 stringutils/=lib/solidity-stringutils
 borrow/=lib/borrow-contracts/contracts
 transmuter/=lib/angle-transmuter/contracts
 router/=lib/angle-router/contracts
 contracts/=contracts
 test/=test
-@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts
-@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts
+@openzeppelin/contracts-upgradeable/=lib/old-oz-upgradeable/contracts
+@openzeppelin/contracts/=lib/old-oz/contracts
+oz-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts
+oz/=lib/openzeppelin-contracts/contracts
 @chainlink/=lib/chainlink
 utils/=lib/utils

scripts/Constants.s.sol

@@ -3,14 +3,14 @@
 pragma solidity ^0.8.9;
 
 import { ILayerZeroEndpoint } from "lz/lzApp/interfaces/ILayerZeroEndpoint.sol";
-import { IVotes } from "oz/governance/extensions/GovernorVotes.sol";
+import { IVotes } from "oz-v5/governance/extensions/GovernorVotes.sol";
 import { ITransmuter } from "transmuter/interfaces/ITransmuter.sol";
 import { IAgToken } from "borrow/interfaces/IAgToken.sol";
-import { ProxyAdmin } from "oz/proxy/transparent/ProxyAdmin.sol";
-import { Ownable } from "oz/access/Ownable.sol";
+import { ProxyAdmin } from "oz-v5/proxy/transparent/ProxyAdmin.sol";
+import { Ownable } from "oz-v5/access/Ownable.sol";
 import { CoreBorrow } from "borrow/coreBorrow/CoreBorrow.sol";
 import { ITreasury } from "borrow/interfaces/ITreasury.sol";
-import { TimelockController } from "oz/governance/TimelockController.sol";
+import { TimelockController } from "oz-v5/governance/TimelockController.sol";
 import { AngleGovernor } from "contracts/AngleGovernor.sol";
 import "utils/src/Constants.sol";
 import "./Interfaces.s.sol";

scripts/Interfaces.s.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.8.19;
 
-import { IAccessControl } from "oz/access/IAccessControl.sol";
+import { IAccessControl } from "oz-v5/access/IAccessControl.sol";
 import { IAccessControlManager } from "interfaces/IAccessControlManager.sol";
 
 interface IAccessControlCore {

scripts/Utils.s.sol

@@ -14,6 +14,8 @@ import "./Constants.s.sol";
 /// @title Utils
 /// @author Angle Labs, Inc.
 contract Utils is Script, CommonUtils {
+    uint256 constant CHAIN_FORK = 0;
+
     mapping(uint256 => uint256) internal forkIdentifier;
     uint256 public arbitrumFork;
     uint256 public avalancheFork;
@@ -26,6 +28,7 @@ contract Utils is Script, CommonUtils {
     uint256 public polygonZkEVMFork;
     uint256 public baseFork;
     uint256 public lineaFork;
+    uint256 public localFork;
 
     bytes[] private calldatas;
     string private description;
@@ -45,6 +48,7 @@ contract Utils is Script, CommonUtils {
         polygonZkEVMFork = vm.createFork(vm.envString("ETH_NODE_URI_POLYGON_ZKEVM"));
         baseFork = vm.createFork(vm.envString("ETH_NODE_URI_BASE"));
         lineaFork = vm.createFork(vm.envString("ETH_NODE_URI_LINEA"));
+        // localFork = vm.createFork(vm.envString("ETH_NODE_URI_FORK"));
 
         forkIdentifier[CHAIN_ARBITRUM] = arbitrumFork;
         forkIdentifier[CHAIN_AVALANCHE] = avalancheFork;
@@ -57,6 +61,7 @@ contract Utils is Script, CommonUtils {
         forkIdentifier[CHAIN_POLYGONZKEVM] = polygonZkEVMFork;
         forkIdentifier[CHAIN_BASE] = baseFork;
         forkIdentifier[CHAIN_LINEA] = lineaFork;
+        // forkIdentifier[CHAIN_FORK] = localFork;
     }
 
     function _deserializeJson()

scripts/deployment/DeployOnChainGovernance.s.sol

@@ -5,11 +5,11 @@ import { console } from "forge-std/console.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import "stringutils/strings.sol";
 import "../Utils.s.sol";
-import "oz/interfaces/IERC20.sol";
+import "oz-v5/interfaces/IERC20.sol";
 
 import { IveANGLEVotingDelegation } from "contracts/interfaces/IveANGLEVotingDelegation.sol";
 import { deployMockANGLE, deployVeANGLE } from "../test/DeployANGLE.s.sol";
-import { ERC20 } from "oz/token/ERC20/ERC20.sol";
+import { ERC20 } from "oz-v5/token/ERC20/ERC20.sol";
 import "contracts/interfaces/IveANGLE.sol";
 import "../../test/external/VyperDeployer.sol";
 

scripts/deployment/DeploySideChainGovernance.s.sol

@@ -5,10 +5,10 @@ import { console } from "forge-std/console.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import "stringutils/strings.sol";
 import "../Utils.s.sol";
-import "oz/interfaces/IERC20.sol";
+import "oz-v5/interfaces/IERC20.sol";
 
 import { TimelockControllerWithCounter } from "contracts/TimelockControllerWithCounter.sol";
-import { ERC20 } from "oz/token/ERC20/ERC20.sol";
+import { ERC20 } from "oz-v5/token/ERC20/ERC20.sol";
 
 import { ProposalReceiver } from "contracts/ProposalReceiver.sol";
 import { ProposalSender } from "contracts/ProposalSender.sol";