From 6941be55835311758aed11651bf9aa9545aac941 Mon Sep 17 00:00:00 2001 From: Adrien Husson Date: Mon, 12 Feb 2024 12:59:20 +0100 Subject: [PATCH 1/6] WIP 0.8.24 not working yet --- src/PublicAllocator.sol | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/PublicAllocator.sol b/src/PublicAllocator.sol index f7c251c..75c6b78 100644 --- a/src/PublicAllocator.sol +++ b/src/PublicAllocator.sol @@ -1,19 +1,20 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.21; +pragma solidity ^0.8.24; import { Id, IMorpho, IMetaMorpho, MarketAllocation, MarketParams } from "../lib/metamorpho/src/interfaces/IMetaMorpho.sol"; -import { - MarketParamsLib, - MorphoLib, - MorphoBalancesLib, - SharesMathLib, - Market, - UtilsLib -} from "../lib/metamorpho/src/MetaMorpho.sol"; -import {Ownable2Step, Ownable} from "../lib/metamorpho/lib/openzeppelin-contracts/contracts/access/Ownable2Step.sol"; -import {Multicall} from "../lib/metamorpho/lib/openzeppelin-contracts/contracts/utils/Multicall.sol"; + +import {MarketParamsLib} from "../lib/metamorpho/lib/morpho-blue/src/libraries/MarketParamsLib.sol"; + +import {MorphoLib} from "../lib/metamorpho/lib/morpho-blue/src/libraries/periphery/MorphoLib.sol"; + +import {MorphoBalancesLib} from "../lib/metamorpho/lib/morpho-blue/src/libraries/periphery/MorphoBalancesLib.sol"; + +import {SharesMathLib} from "../lib/metamorpho/lib/morpho-blue/src/libraries/SharesMathLib.sol"; + +import {Market} from "../lib/metamorpho/lib/morpho-blue/src/interfaces/IMorpho.sol"; +import {Ownable2Step, Ownable} from "../lib/openzeppelin-contracts/contracts/access/Ownable2Step.sol"; import {ErrorsLib} from "./libraries/ErrorsLib.sol"; import {FlowCaps, FlowConfig, IPublicAllocatorStaticTyping} from "./interfaces/IPublicAllocator.sol"; From 253594d6ce4e1e779cb5683fece1ef65c6cef38b Mon Sep 17 00:00:00 2001 From: Adrien Husson Date: Mon, 12 Feb 2024 13:04:59 +0100 Subject: [PATCH 2/6] fix: add MetaMorpho import file --- src/mocks/MetaMorphoImport.sol | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/mocks/MetaMorphoImport.sol diff --git a/src/mocks/MetaMorphoImport.sol b/src/mocks/MetaMorphoImport.sol new file mode 100644 index 0000000..b0d32e0 --- /dev/null +++ b/src/mocks/MetaMorphoImport.sol @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +pragma solidity 0.8.21; +// Force foundry to compile Morpho Blue even though it's not imported by Metamorpho or by the tests. +// Morpho Blue will be compiled with its own solidity version. +// The resulting bytecode is then loaded by BaseTest.sol. + +import "../../lib/metamorpho/src/MetaMorpho.sol"; From 0e54bc6651f6c20d7f082d12121793be7c311ab4 Mon Sep 17 00:00:00 2001 From: Adrien Husson Date: Tue, 13 Feb 2024 14:45:25 +0100 Subject: [PATCH 3/6] strict 0.8.24 --- src/PublicAllocator.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PublicAllocator.sol b/src/PublicAllocator.sol index 75c6b78..d28f715 100644 --- a/src/PublicAllocator.sol +++ b/src/PublicAllocator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.24; +pragma solidity 0.8.24; import { Id, IMorpho, IMetaMorpho, MarketAllocation, MarketParams From 839c04192693e013313fa15999e51f83dd831c1f Mon Sep 17 00:00:00 2001 From: Adrien Husson Date: Tue, 13 Feb 2024 14:47:50 +0100 Subject: [PATCH 4/6] fix: imports --- src/PublicAllocator.sol | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PublicAllocator.sol b/src/PublicAllocator.sol index d28f715..ca1a950 100644 --- a/src/PublicAllocator.sol +++ b/src/PublicAllocator.sol @@ -14,7 +14,10 @@ import {MorphoBalancesLib} from "../lib/metamorpho/lib/morpho-blue/src/libraries import {SharesMathLib} from "../lib/metamorpho/lib/morpho-blue/src/libraries/SharesMathLib.sol"; import {Market} from "../lib/metamorpho/lib/morpho-blue/src/interfaces/IMorpho.sol"; -import {Ownable2Step, Ownable} from "../lib/openzeppelin-contracts/contracts/access/Ownable2Step.sol"; +import {UtilsLib} from "../lib/metamorpho/lib/morpho-blue/src/libraries/UtilsLib.sol"; +import {Ownable2Step, Ownable} from "../lib/metamorpho/lib/openzeppelin-contracts/contracts/access/Ownable2Step.sol"; + +import {Multicall} from "../lib/metamorpho/lib/openzeppelin-contracts/contracts/utils/Multicall.sol"; import {ErrorsLib} from "./libraries/ErrorsLib.sol"; import {FlowCaps, FlowConfig, IPublicAllocatorStaticTyping} from "./interfaces/IPublicAllocator.sol"; From 317b3e9812c882c5e17dd1eb6401ceb029d921ab Mon Sep 17 00:00:00 2001 From: Adrien Husson Date: Tue, 13 Feb 2024 14:49:46 +0100 Subject: [PATCH 5/6] update mm to main --- lib/metamorpho | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/metamorpho b/lib/metamorpho index 4ca254a..15941c1 160000 --- a/lib/metamorpho +++ b/lib/metamorpho @@ -1 +1 @@ -Subproject commit 4ca254a2f6ba74437ff35a012ed3814056123644 +Subproject commit 15941c19a244b9986512f08e76abd9c2a55690dc From c46639c212bbcc3bdd35e3ecd85ce23fd46a6153 Mon Sep 17 00:00:00 2001 From: Adrien Husson Date: Tue, 13 Feb 2024 14:52:32 +0100 Subject: [PATCH 6/6] doc: improve MetaMorphoImport file --- src/mocks/MetaMorphoImport.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mocks/MetaMorphoImport.sol b/src/mocks/MetaMorphoImport.sol index b0d32e0..1bc0bbe 100644 --- a/src/mocks/MetaMorphoImport.sol +++ b/src/mocks/MetaMorphoImport.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later pragma solidity 0.8.21; -// Force foundry to compile Morpho Blue even though it's not imported by Metamorpho or by the tests. -// Morpho Blue will be compiled with its own solidity version. -// The resulting bytecode is then loaded by BaseTest.sol. +// Force foundry to compile MetaMorpho even though it's not imported by the public allocator or by the tests. +// MetaMorpho will be compiled with its own solidity version. +// The resulting bytecode is then loaded by the tests. import "../../lib/metamorpho/src/MetaMorpho.sol";