chore: clean repo

AngleProtocol · Jan 15, 2024 · 59656d4 · 59656d4
1 parent 56c548d
commit 59656d4
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 349 deletions.
diff --git a/foundry.toml b/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.json"}]
+fs_permissions = [{ access = "read-write", path = "./scripts/proposals/payload.json"}]
 
 [fuzz]
 runs = 10000

diff --git a/scripts/BasicScript.s.sol b/scripts/BasicScript.s.sol
diff --git a/scripts/Utils.s.sol b/scripts/Utils.s.sol
@@ -153,7 +153,7 @@ contract Utils is Script {
         else if (name == ContractType.TransmuterAgEUR) cmd[3] = "transmuterAgEUR";
         else if (name == ContractType.CoreBorrow) cmd[3] = "coreBorrow";
         else if (name == ContractType.GovernorMultisig) cmd[3] = "governorMultisig";
-        else if (name == ContractType.GuardianMultisig) cmd[3] = "guardianMultisig";
+        else if (name == ContractType.GuardianMultisig) cmd[3] = "guardian";
         else if (name == ContractType.ProxyAdmin) cmd[3] = "proxyAdmin";
         else if (name == ContractType.Angle) cmd[3] = "angle";
         else if (name == ContractType.veANGLE) cmd[3] = "veANGLE";

diff --git a/scripts/DeployOnChainGovernance.s.sol → .../deployment/DeployOnChainGovernance.s.sol b/scripts/DeployOnChainGovernance.s.sol → .../deployment/DeployOnChainGovernance.s.sol
@@ -4,14 +4,14 @@ pragma solidity ^0.8.19;
 import { console } from "forge-std/console.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import "stringutils/strings.sol";
-import "./Utils.s.sol";
+import "../Utils.s.sol";
 import "oz/interfaces/IERC20.sol";
 
 import { IveANGLEVotingDelegation } from "contracts/interfaces/IveANGLEVotingDelegation.sol";
-import { deployMockANGLE, deployVeANGLE } from "./test/DeployANGLE.s.sol";
+import { deployMockANGLE, deployVeANGLE } from "../test/DeployANGLE.s.sol";
 import { ERC20 } from "oz/token/ERC20/ERC20.sol";
 import "contracts/interfaces/IveANGLE.sol";
-import "../test/external/VyperDeployer.sol";
+import "../../test/external/VyperDeployer.sol";
 
 import { AngleGovernor } from "contracts/AngleGovernor.sol";
 import { ProposalReceiver } from "contracts/ProposalReceiver.sol";

diff --git a/scripts/DeploySideChainGovernance.s.sol → ...eployment/DeploySideChainGovernance.s.sol b/scripts/DeploySideChainGovernance.s.sol → ...eployment/DeploySideChainGovernance.s.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
 import { console } from "forge-std/console.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import "stringutils/strings.sol";
-import "./Utils.s.sol";
+import "../Utils.s.sol";
 import "oz/interfaces/IERC20.sol";
 
 import { TimelockControllerWithCounter } from "contracts/TimelockControllerWithCounter.sol";

diff --git a/scripts/interaction/Helpers.s.sol b/scripts/interaction/Helpers.s.sol
diff --git a/scripts/interaction/Propose.s.sol → scripts/proposals/Propose.s.sol b/scripts/interaction/Propose.s.sol → scripts/proposals/Propose.s.sol
diff --git a/scripts/Wrapper.s.sol → scripts/proposals/Wrapper.s.sol b/scripts/Wrapper.s.sol → scripts/proposals/Wrapper.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.20;
 
-import "./Utils.s.sol";
+import "../Utils.s.sol";
 
 contract Wrapper is Utils {
     function wrapTimelock(

diff --git a/scripts/borrow/PauseVaultManagers.s.sol → ...proposals/borrow/PauseVaultManagers.s.sol b/scripts/borrow/PauseVaultManagers.s.sol → ...proposals/borrow/PauseVaultManagers.s.sol
@@ -5,7 +5,7 @@ import { console } from "forge-std/console.sol";
 import { IVaultManagerFunctions } from "borrow/interfaces/IVaultManager.sol";
 import { IERC721Metadata } from "oz/token/ERC721/extensions/IERC721Metadata.sol";
 import { ITreasury, Wrapper } from "../Wrapper.s.sol";
-import "../Constants.s.sol";
+import "../../Constants.s.sol";
 
 /** This script suppose that the state of all the vaultManager on the chain are identical (all paused or unpause) 
 /** Otherwise behaviour is chaotic

diff --git a/scripts/borrow/SetRateVaultManager.s.sol → ...roposals/borrow/SetRateVaultManager.s.sol b/scripts/borrow/SetRateVaultManager.s.sol → ...roposals/borrow/SetRateVaultManager.s.sol
@@ -5,7 +5,7 @@ import { console } from "forge-std/console.sol";
 import { IERC721Metadata } from "oz/token/ERC721/extensions/IERC721Metadata.sol";
 import { ITreasury, Wrapper } from "../Wrapper.s.sol";
 import { IVaultManagerGovernance } from "scripts/Interfaces.s.sol";
-import "../Constants.s.sol";
+import "../../Constants.s.sol";
 
 contract SetRateVaultManager is Wrapper {
     SubCall[] private subCalls;

diff --git a/scripts/governance/SetMinDelayTimelock.s.sol → ...sals/governance/SetMinDelayTimelock.s.sol b/scripts/governance/SetMinDelayTimelock.s.sol → ...sals/governance/SetMinDelayTimelock.s.sol
@@ -6,7 +6,7 @@ import { IVaultManagerFunctions } from "borrow/interfaces/IVaultManager.sol";
 import { IERC721Metadata } from "oz/token/ERC721/extensions/IERC721Metadata.sol";
 
 import { Wrapper } from "../Wrapper.s.sol";
-import "../Constants.s.sol";
+import "../../Constants.s.sol";
 
 contract SetMinDelayTimelock is Wrapper {
     SubCall[] private subCalls;

diff --git a/scripts/proposals.json → scripts/proposals/payload.json b/scripts/proposals.json → scripts/proposals/payload.json
diff --git a/scripts/savings/SavingsSetRate.s.sol → ...ts/proposals/savings/SavingsSetRate.s.sol b/scripts/savings/SavingsSetRate.s.sol → ...ts/proposals/savings/SavingsSetRate.s.sol
@@ -6,7 +6,7 @@ import { IVaultManagerFunctions } from "borrow/interfaces/IVaultManager.sol";
 import { IERC721Metadata } from "oz/token/ERC721/extensions/IERC721Metadata.sol";
 
 import { Wrapper } from "../Wrapper.s.sol";
-import "../Constants.s.sol";
+import "../../Constants.s.sol";
 
 contract SavingsSetRate is Wrapper {
     SubCall[] private subCalls;

diff --git a/scripts/transmuter/TransmuterPause.s.sol b/scripts/transmuter/TransmuterPause.s.sol