Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat--update-transmuter-facets #32

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a6a7350
rename imports to not conflict with older versions
GuillaumeNervoXS Mar 6, 2024
9efae99
uninstalled oz upgradeable
GuillaumeNervoXS Mar 6, 2024
c686ae5
forge install: openzeppelin-contracts-upgradeable
GuillaumeNervoXS Mar 6, 2024
df9d838
chore: remove oz lib
GuillaumeNervoXS Mar 6, 2024
4ef918e
forge install: openzeppelin-contracts
GuillaumeNervoXS Mar 6, 2024
ca978bb
specify version for submodules
GuillaumeNervoXS Mar 6, 2024
c119c24
forge install: old-oz
GuillaumeNervoXS Mar 6, 2024
4749cce
install an older version of OZ
GuillaumeNervoXS Mar 6, 2024
f98f810
forge install: old-oz-upgradeable
GuillaumeNervoXS Mar 6, 2024
8cf995d
install old oz upgradeable library
GuillaumeNervoXS Mar 6, 2024
795dc77
feat: update-transmuter-facets
GuillaumeNervoXS Mar 6, 2024
5550f53
fix: no Oracle facet movred to Setters
GuillaumeNervoXS Mar 14, 2024
c4334de
update with new oracle protections
GuillaumeNervoXS Mar 14, 2024
70622a1
fix tests
GuillaumeNervoXS Mar 14, 2024
afad6a6
chore: prettier
GuillaumeNervoXS Mar 22, 2024
16a817c
feat: update transmuter facets
GuillaumeNervoXS Apr 29, 2024
260ab48
remove comment
GuillaumeNervoXS Apr 29, 2024
297b122
remove temporarily angle-transmuter lib
GuillaumeNervoXS Apr 29, 2024
f2b9e81
lint revert
GuillaumeNervoXS Apr 29, 2024
430f6c7
forge install: angle-transmuter
GuillaumeNervoXS Apr 29, 2024
a118790
fix stack too deep
GuillaumeNervoXS Apr 29, 2024
c02e4cd
fix lint
GuillaumeNervoXS Apr 29, 2024
2551503
feat: proposal to increase quorums
GuillaumeNervoXS May 2, 2024
30759f9
rm checkRoles scripts
GuillaumeNervoXS Jul 12, 2024
7c61b8d
fix: compilation
GuillaumeNervoXS Jul 16, 2024
221afe1
fix compilation script
GuillaumeNervoXS Jul 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
7 changes: 5 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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,
}
15 changes: 8 additions & 7 deletions contracts/AngleGovernor.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions contracts/ProposalReceiver.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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]);
Expand Down
14 changes: 7 additions & 7 deletions contracts/ProposalSender.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -47,7 +47,7 @@ contract ProposalSender is Ownable, ReentrancyGuard {
uint16 indexed remoteChainId,
bytes payload,
bytes adapterParams,
uint value,
uint256 value,
bytes reason
);

Expand All @@ -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);
}

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
}
}
2 changes: 1 addition & 1 deletion contracts/TimelockControllerWithCounter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions contracts/VeANGLEVotingDelegation.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
6 changes: 3 additions & 3 deletions contracts/external/GovernorCountingFractional.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
8 changes: 4 additions & 4 deletions contracts/external/GovernorShortCircuit.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions helpers/createProposal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -95,7 +97,7 @@ function main {
echo "Running on chains $chainIds"

export CHAIN_IDS=$chainIds
FOUNDRY_PROFILE=dev forge script $script
forge script $script -vvv

if [ $? -ne 0 ]; then
echo ""
Expand All @@ -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 ""
Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion lib/angle-transmuter
Submodule angle-transmuter updated 92 files
+35 −0 .github/actions/setup-repo/action.yml
+31 −1 .github/workflows/ci-deep.yml
+46 −1 .github/workflows/ci.yml
+1 −0 .gitignore
+5 −0 .gitmodules
+1 −0 .npmrc
+18 −5 .solhint.json
+19 −5 .vscode/settings.json
+10 −4 contracts/helpers/Rebalancer.sol
+100 −0 contracts/helpers/RebalancerFlashloan.sol
+2 −1 contracts/interfaces/IGetters.sol
+3 −0 contracts/interfaces/ISetters.sol
+3 −0 contracts/interfaces/ITransmuterOracle.sol
+9 −0 contracts/interfaces/external/morpho/IMorphoOracle.sol
+44 −42 contracts/transmuter/Storage.sol
+2 −1 contracts/transmuter/configs/FakeGnosis.sol
+72 −76 contracts/transmuter/configs/Production.sol
+24 −0 contracts/transmuter/configs/ProductionTypes.sol
+118 −0 contracts/transmuter/configs/ProductionUSD.sol
+21 −3 contracts/transmuter/configs/Test.sol
+0 −1 contracts/transmuter/facets/DiamondEtherscan.sol
+7 −1 contracts/transmuter/facets/Getters.sol
+7 −5 contracts/transmuter/facets/Redeemer.sol
+6 −0 contracts/transmuter/facets/SettersGovernor.sol
+104 −26 contracts/transmuter/libraries/LibOracle.sol
+1 −0 contracts/utils/Constants.sol
+1 −0 contracts/utils/Errors.sol
+17 −9 foundry.toml
+46 −0 helpers/fork.sh
+1 −0 lib/utils
+11 −17 package.json
+1 −0 remappings.txt
+54 −10 scripts/Constants.s.sol
+0 −14 scripts/ConstantsArbitrum.s.sol
+0 −9 scripts/ConstantsAvalanche.s.sol
+0 −9 scripts/ConstantsBSC.s.sol
+0 −9 scripts/ConstantsBase.s.sol
+0 −10 scripts/ConstantsCelo.s.sol
+0 −9 scripts/ConstantsGnosis.s.sol
+0 −10 scripts/ConstantsOptimism.s.sol
+0 −10 scripts/ConstantsPolygon.s.sol
+0 −9 scripts/ConstantsPolygonZkEVM.s.sol
+5 −2 scripts/DeployRebalancer.s.sol
+39 −0 scripts/DeployRebalancerFlashloan.s.sol
+1 −1 scripts/DeployRedeemer.s.sol
+15 −13 scripts/DeploySavings.s.sol
+11 −8 scripts/DeploySavingsNoCreate2.s.sol
+80 −0 scripts/DeploySavingsNoImplem.s.sol
+7 −2 scripts/DeployTransmuter.s.sol
+65 −0 scripts/DeployTransmuterWithoutFacets.s.sol
+60 −0 scripts/Helpers.s.sol
+211 −0 scripts/SetupDeployedTransmuter.s.sol
+60 −0 scripts/UpdateTransmuterFacets.s.sol
+1 −1 scripts/gnosis/DeploySavingsGnosis.s.sol
+3 −0 scripts/selectors.json
+6 −0 scripts/selectors_add.json
+75 −0 scripts/selectors_replace.json
+3 −3 scripts/test/CheckFakeTransmuter.s.sol
+10 −5 scripts/test/CheckTransmuter.s.sol
+144 −0 scripts/test/CheckTransmuterUSD.s.sol
+890 −0 scripts/test/UpdateTransmuterFacets.s.sol
+689 −0 scripts/test/UpdateTransmuterFacetsUSDATest.s.sol
+67 −5 scripts/utils/TransmuterDeploymentHelper.s.sol
+21 −50 scripts/utils/Utils.s.sol
+27 −44 scripts/utils/VanityAddress.s.sol
+2 −2 scripts/vanity.json
+4 −0 scripts/vanitySavingsAgEUR.json
+4 −0 scripts/vanitySavingsAgUSD.json
+19 −19 slither.config.json
+9 −12 test/Fixture.sol
+193 −2 test/fuzz/BurnTest.t.sol
+189 −14 test/fuzz/MintTest.t.sol
+507 −29 test/fuzz/OracleTest.t.sol
+89 −0 test/fuzz/RebalancerFlashloanTest.t.sol
+224 −153 test/fuzz/RedeemTest.t.sol
+65 −43 test/fuzz/SavingsTest.t.sol
+7 −3 test/fuzz/SavingsVestTest.t.sol
+69 −0 test/fuzz/SwapTest.t.sol
+1 −1 test/invariants/actors/TraderWithSplit.t.sol
+5 −0 test/mock/MockExternalOracle.sol
+21 −0 test/mock/MockMorphoOracle.sol
+15 −0 test/mock/MockTreasury.sol
+322 −0 test/scripts/RebalancerUSDATest.t.sol
+1 −1 test/units/DiamondCut.t.sol
+3 −3 test/units/DiamondLoupe.t.sol
+1 −1 test/units/Layout.t.sol
+1 −1 test/units/Libraries.t.sol
+4 −4 test/units/Transmuter.t.sol
+2 −44 test/utils/Helper.sol
+2 −2 test/utils/Transmuter.sol
+21 −0 utils/forwardUtils.js
+1,177 −7 yarn.lock
1 change: 1 addition & 0 deletions lib/old-oz
Submodule old-oz added at cffb2f
1 change: 1 addition & 0 deletions lib/old-oz-upgradeable
Submodule old-oz-upgradeable added at ebf264
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts-upgradeable
2 changes: 1 addition & 1 deletion lib/utils
Submodule utils updated 2 files
+106 −35 src/CommonUtils.sol
+1 −0 src/Constants.sol
10 changes: 6 additions & 4 deletions remappings.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions scripts/Constants.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion scripts/Interfaces.s.sol
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions scripts/deployment/DeployOnChainGovernance.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions scripts/deployment/DeploySideChainGovernance.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
11 changes: 11 additions & 0 deletions scripts/interfaces/ITransmuter.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.19;

import "transmuter/transmuter/Storage.sol" as Storage;

interface OldTransmuter {
function getOracle(
address
) external view returns (Storage.OracleReadType, Storage.OracleReadType, bytes memory, bytes memory);
}
5 changes: 2 additions & 3 deletions scripts/proposals/Propose.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ contract Propose is Utils {
uint256[] memory chainIds
) = _deserializeJson();

uint256 deployerPrivateKey = vm.deriveKey(vm.envString("MNEMONIC_MAINNET"), 0);
vm.rememberKey(deployerPrivateKey);

uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
address deployer = vm.addr(deployerPrivateKey);
vm.startBroadcast(deployerPrivateKey);

AngleGovernor governor = AngleGovernor(payable(_chainToContract(CHAIN_SOURCE, ContractType.Governor)));
Expand Down
Loading
Loading