Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Mainnet deployments #36

Merged
merged 9 commits into from
Jan 10, 2024
Merged

Mainnet deployments #36

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
edac102
build: blue salt update + gitmodules
MerlinEgalite Dec 28, 2023
0a69fe5
build: submodule update + remove useless markets for now
MerlinEgalite Dec 29, 2023
9c6f851
Merge branch 'main' of github.com:morpho-org/morpho-blue-deployment i…
MerlinEgalite Dec 29, 2023
6dddeff
build: save logs
MerlinEgalite Dec 29, 2023
9ddeb8c
build: deploy bundlers
MerlinEgalite Jan 2, 2024
ad45c0d
build: mm factory logs
MerlinEgalite Jan 3, 2024
e90bb45
build: redeploy bundlers
MerlinEgalite Jan 3, 2024
5dcea36
chore(log): add lost runs
Rubilmax Jan 10, 2024
bef9db4
chore(log): delete unused logs
Rubilmax Jan 10, 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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "lib/morpho-blue"]
path = lib/morpho-blue
url = https://github.com/morpho-org/morpho-blue
Expand All @@ -7,9 +10,6 @@
[submodule "lib/morpho-blue-oracles"]
path = lib/morpho-blue-oracles
url = https://github.com/morpho-org/morpho-blue-oracles
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "lib/metamorpho"]
path = lib/metamorpho
url = https://github.com/morpho-org/metamorpho
Expand Down
144 changes: 144 additions & 0 deletions broadcast/DeployBundlers.sol/1/run-1704189142.json
View file
Open in desktop

Large diffs are not rendered by default.

266 changes: 266 additions & 0 deletions broadcast/DeployBundlers.sol/1/run-1704189149.json
View file
Open in desktop

Large diffs are not rendered by default.

266 changes: 266 additions & 0 deletions broadcast/DeployBundlers.sol/1/run-latest.json
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 54 additions & 0 deletions broadcast/DeployMetaMorphoFactory.sol/1/run-1704269731.json
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 54 additions & 0 deletions broadcast/DeployMetaMorphoFactory.sol/1/run-latest.json
View file
Open in desktop

Large diffs are not rendered by default.

81 changes: 81 additions & 0 deletions broadcast/DeployOracles.sol/1/run-1703870006.json
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 126 additions & 0 deletions broadcast/DeployOracles.sol/1/run-1703870018.json
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 126 additions & 0 deletions broadcast/DeployOracles.sol/1/run-latest.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/metamorpho
Open in desktop
Submodule metamorpho updated 21 files
+1 −1 .github/workflows/foundry.yml
+0 −1 .gitmodules
+14 −11 README.md
+1 −0 foundry.toml
+1 −1 lib/morpho-blue
+1 −1 lib/universal-rewards-distributor
+5 −5 package.json
+58 −47 src/MetaMorpho.sol
+34 −16 src/interfaces/IMetaMorpho.sol
+0 −3 src/libraries/ConstantsLib.sol
+12 −3 src/libraries/ErrorsLib.sol
+49 −11 test/forge/ERC4626Test.sol
+6 −16 test/forge/FeeTest.sol
+1 −1 test/forge/GuardianTest.sol
+110 −9 test/forge/MarketTest.sol
+4 −6 test/forge/MetaMorphoInternalTest.sol
+2 −2 test/forge/ReallocateWithdrawTest.sol
+0 −20 test/forge/RevokeTest.sol
+8 −9 test/forge/TimelockTest.sol
+14 −1 test/forge/helpers/IntegrationTest.sol
+3 −3 test/hardhat/MetaMorpho.spec.ts
2 changes: 1 addition & 1 deletion lib/morpho-blue-bundlers
Open in desktop
Submodule morpho-blue-bundlers updated 5 files
+2 −2 foundry.toml
+2 −2 hardhat.config.ts
+7 −4 src/ERC20WrapperBundler.sol
+6 −0 src/libraries/ErrorsLib.sol
+26 −1 test/forge/ERC20WrapperBundlerLocalTest.sol
9 changes: 4 additions & 5 deletions script/ConfiguredScript.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ abstract contract ConfiguredScript is Script {
function _loadConfig(string memory network, bool requireMorpho) internal returns (bytes memory) {
configPath = string.concat("script/", _scriptDir(), "/config/", network, ".json");

string memory latestRunPath =
string.concat("broadcast/DeployMorpho.sol/", vm.toString(block.chainid), "/run-latest.json");
string memory morphoAddressPath = string.concat("script/", _scriptDir(), "/config/", network, "-morpho.json");

if (vm.exists(latestRunPath)) {
string memory latestRun = vm.readFile(latestRunPath);
if (vm.exists(morphoAddressPath)) {
string memory file = vm.readFile(morphoAddressPath);

morpho = IMorpho(latestRun.readAddress("$.transactions[0].contractAddress"));
Rubilmax marked this conversation as resolved.
Show resolved Hide resolved
morpho = IMorpho(file.readAddress("$.contractAddress"));
} else {
require(!requireMorpho, "missing Morpho deployment");
}
Expand Down
3 changes: 3 additions & 0 deletions script/bundlers/config/ethereum-morpho.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"contractAddress": "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"
}
3 changes: 3 additions & 0 deletions script/metamorpho-factory/config/ethereum-morpho.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"contractAddress": "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"
}
2 changes: 1 addition & 1 deletion script/morpho/config/ethereum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"owner": "0x6ABfd6139c7C3CC270ee2Ce132E309F59cAaF6a2",
"salt": {
"morpho": "0x0000000000000000000000000000000000000000000000000000000000000000",
"morpho": "0x53250663af6ea95a743b47dffc09be983b46e2e9d44287cb0f852258ce8d1455",
"irm": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
"lltvs": [
Expand Down
28 changes: 1 addition & 27 deletions script/oracles/config/ethereum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,7 @@
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
{
"name": "WETH (cbETH)",
"collateralToken": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704",
"loanToken": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
"baseFeed1": "0xF017fcB346A1885194689bA23Eff2fE6fA5C483b",
"baseFeed2": "0x0000000000000000000000000000000000000000",
"quoteFeed1": "0x0000000000000000000000000000000000000000",
"quoteFeed2": "0x0000000000000000000000000000000000000000",
"vaultConversionSample": 1,
"minPrice": 100000000000000000000000000000000000,
"maxPrice": 1500000000000000000000000000000000000,
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
{
"name": "USDC (sDAI)",
"collateralToken": "0x83F20F44975D03b1b09e64809B757c47f942BEeA",
"loanToken": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
"baseFeed1": "0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9",
"baseFeed2": "0x0000000000000000000000000000000000000000",
"quoteFeed1": "0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6",
"quoteFeed2": "0x0000000000000000000000000000000000000000",
"vaultConversionSample": 1000000000000000000,
"minPrice": 990000000000000000000000,
"maxPrice": 1500000000000000000000000,
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
{
"name": "USDC (kyc-bIB01)",
"name": "USDC (wbIB01)",
"collateralToken": "0xABC56186c2Df63C338E04C9C9B9814E27983a5a9",
"loanToken": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
"baseFeed1": "0x32d1463EB53b73C095625719Afa544D5426354cB",
Expand Down