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.

Sign up for GitHub

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

Jump to bottom

build(lib): checkout post-cantina #22

Merged
merged 2 commits into from
Dec 26, 2023
Merged

build(lib): checkout post-cantina #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b477289
build(lib): checkout post-cantina
Rubilmax Dec 20, 2023
1235bf4
fix(goerli): make verification easier
Rubilmax Dec 20, 2023
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
39 changes: 39 additions & 0 deletions broadcast/DeployMetaMorphoFactory.sol/5/run-1703079420.json
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions broadcast/DeployMetaMorphoFactory.sol/5/run-1703079861.json
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions broadcast/DeployMetaMorphoFactory.sol/5/run-1703080024.json
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

291 changes: 291 additions & 0 deletions broadcast/DeployMorpho.sol/5/run-1703079341.json
View file
Open in desktop

Large diffs are not rendered by default.

657 changes: 657 additions & 0 deletions broadcast/DeployMorpho.sol/5/run-1703079367.json
View file
Open in desktop

Large diffs are not rendered by default.

657 changes: 657 additions & 0 deletions broadcast/DeployMorpho.sol/5/run-latest.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/morpho-blue
Open in desktop
Submodule morpho-blue updated 19 files
+2 −0 certora/confs/AccrueInterest.conf
+1 −0 certora/confs/AssetsAccounting.conf
+1 −0 certora/confs/ConsistentState.conf
+1 −0 certora/confs/ExactMath.conf
+1 −0 certora/confs/Health.conf
+1 −0 certora/confs/LibSummary.conf
+1 −0 certora/confs/Liveness.conf
+1 −0 certora/confs/RatioMath.conf
+1 −0 certora/confs/Reentrancy.conf
+1 −0 certora/confs/Reverts.conf
+1 −0 certora/confs/Transfer.conf
+1 −1 foundry.toml
+6 −7 src/Morpho.sol
+3 −3 src/interfaces/IMorpho.sol
+4 −4 test/forge/BaseTest.sol
+0 −16 test/forge/integration/AuthorizationIntegrationTest.sol
+1 −1 test/forge/integration/BorrowIntegrationTest.sol
+3 −21 test/forge/integration/CreateMarketIntegrationTest.sol
+0 −288 test/morpho_tests.tree
2 changes: 1 addition & 1 deletion lib/morpho-blue-irm
Open in desktop
Submodule morpho-blue-irm updated 17 files
+42 −0 .github/workflows/hardhat.yml
+10 −0 .gitignore
+5 −0 .husky/post-checkout
+5 −0 .husky/post-merge
+4 −0 .husky/pre-commit
+4 −0 .husky/prepare-commit-msg
+1 −0 foundry.toml
+55 −0 hardhat.config.ts
+94 −0 package.json
+4 −0 src/interfaces/IAdaptiveCurveIrm.sol
+12 −6 src/libraries/adaptive-curve/ConstantsLib.sol
+2 −2 test/forge/AdaptiveCurveIrmTest.sol
+6 −6 test/forge/ExpLibTest.sol
+2 −2 test/forge/UtilsLibTest.sol
+89 −0 test/hardhat/irm/Irm.spec.ts
+15 −0 tsconfig.json
+6,226 −0 yarn.lock
2 changes: 1 addition & 1 deletion lib/morpho-blue-oracles
Open in desktop
Submodule morpho-blue-oracles updated 1 files
+1 −1 src/interfaces/AggregatorV3Interface.sol
8 changes: 5 additions & 3 deletions script/ConfiguredScript.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,21 @@ abstract contract ConfiguredScript is Script {
}

function _logDeployment(string memory submodule, string memory what, bytes memory args, address addr) internal {
string memory scriptDir = _scriptDir();

console2.log("Deployed %s at: %s", what, addr);
console2.log("Verify %s using: > yarn verify:%s", _scriptDir());
console2.log("Verify %s using: > yarn verify:%s", scriptDir, scriptDir);

if (!SAVE_VERIFY) return;

string memory verifyPath = string.concat("script/", _scriptDir(), "/verify.sh");
string memory verifyPath = string.concat("script/", scriptDir, "/verify.sh");
vm.writeLine(verifyPath, "");
vm.writeLine(verifyPath, string.concat("if cd lib/", submodule, "/;"));
vm.writeLine(verifyPath, "then");
vm.writeLine(
verifyPath,
string.concat(
" forge verify-contract --chain-id ",
"FOUNDRY_PROFILE=build forge verify-contract --watch --chain-id ",
vm.toString(block.chainid),
" --constructor-args ",
vm.toString(args),
Expand Down
2 changes: 1 addition & 1 deletion script/metamorpho-factory/config/goerli.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"salt": "0x0000000000000000000000000000000000000000000000000000000000000001"
"salt": "0x0000000000000000000000000000000000000000000000000000000000000004"
}
4 changes: 2 additions & 2 deletions script/morpho/config/goerli.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"owner": "0x50d0dE2207989017398e33919A3ed6558eBc6644",
"salt": {
"morpho": "0x0000000000000000000000000000000000000000000000000000000000000002",
"irm": "0x0000000000000000000000000000000000000000000000000000000000000000"
"morpho": "0x0000000000000000000000000000000000000000000000000000000000000004",
"irm": "0x0000000000000000000000000000000000000000000000000000000000000002"
},
"lltvs": [
0,
Expand Down