From 823368f1ebab72748a781c705be833edf626cc99 Mon Sep 17 00:00:00 2001 From: 0xddong Date: Tue, 6 Aug 2024 17:56:10 -0700 Subject: [PATCH] merging in yearn commits --- lib/tokenized-strategy | 2 +- src/RepoTokenList.sol | 2 +- src/RepoTokenUtils.sol | 2 +- src/TermAuctionList.sol | 2 +- src/interfaces/term/ITermAuction.sol | 2 +- src/interfaces/term/ITermAuctionOfferLocker.sol | 2 +- src/interfaces/term/ITermController.sol | 2 +- src/interfaces/term/ITermRepoCollateralManager.sol | 2 +- src/interfaces/term/ITermRepoServicer.sol | 2 +- src/interfaces/term/ITermRepoToken.sol | 2 +- src/interfaces/term/ITermVaultEvents.sol | 2 +- src/test/mocks/MockTermAuction.sol | 2 +- src/test/mocks/MockTermAuctionOfferLocker.sol | 2 +- src/test/mocks/MockTermController.sol | 2 +- src/test/mocks/MockTermRepoCollateralManager.sol | 2 +- src/test/mocks/MockTermRepoLocker.sol | 2 +- src/test/mocks/MockTermRepoServicer.sol | 2 +- src/test/mocks/MockTermRepoToken.sol | 2 +- src/test/utils/Setup.sol | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/tokenized-strategy b/lib/tokenized-strategy index 7bf18701..cf791a6f 160000 --- a/lib/tokenized-strategy +++ b/lib/tokenized-strategy @@ -1 +1 @@ -Subproject commit 7bf187015f5f7159276f80cd52204431ab1b3b8b +Subproject commit cf791a6f2d360e5c33866c9f0de10e83085920e9 diff --git a/src/RepoTokenList.sol b/src/RepoTokenList.sol index 41e2a7cd..29bff868 100644 --- a/src/RepoTokenList.sol +++ b/src/RepoTokenList.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import "forge-std/console.sol"; import {ITermRepoToken} from "./interfaces/term/ITermRepoToken.sol"; diff --git a/src/RepoTokenUtils.sol b/src/RepoTokenUtils.sol index 37653209..52dcf76d 100644 --- a/src/RepoTokenUtils.sol +++ b/src/RepoTokenUtils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {ITermRepoToken} from "./interfaces/term/ITermRepoToken.sol"; diff --git a/src/TermAuctionList.sol b/src/TermAuctionList.sol index 0a87d899..2a43d592 100644 --- a/src/TermAuctionList.sol +++ b/src/TermAuctionList.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {ITermAuction} from "./interfaces/term/ITermAuction.sol"; import {ITermAuctionOfferLocker} from "./interfaces/term/ITermAuctionOfferLocker.sol"; diff --git a/src/interfaces/term/ITermAuction.sol b/src/interfaces/term/ITermAuction.sol index 84ed42a5..875a614a 100644 --- a/src/interfaces/term/ITermAuction.sol +++ b/src/interfaces/term/ITermAuction.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; interface ITermAuction { function termAuctionOfferLocker() external view returns (address); diff --git a/src/interfaces/term/ITermAuctionOfferLocker.sol b/src/interfaces/term/ITermAuctionOfferLocker.sol index f7777f38..64343d3c 100644 --- a/src/interfaces/term/ITermAuctionOfferLocker.sol +++ b/src/interfaces/term/ITermAuctionOfferLocker.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; interface ITermAuctionOfferLocker { /// @dev TermAuctionOfferSubmission represents an offer submission to offeror an amount of money for a specific interest rate diff --git a/src/interfaces/term/ITermController.sol b/src/interfaces/term/ITermController.sol index 7077cfaa..c8f3d2d7 100644 --- a/src/interfaces/term/ITermController.sol +++ b/src/interfaces/term/ITermController.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; struct AuctionMetadata { bytes32 termAuctionId; diff --git a/src/interfaces/term/ITermRepoCollateralManager.sol b/src/interfaces/term/ITermRepoCollateralManager.sol index a1fd1583..63af88a3 100644 --- a/src/interfaces/term/ITermRepoCollateralManager.sol +++ b/src/interfaces/term/ITermRepoCollateralManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; interface ITermRepoCollateralManager { function maintenanceCollateralRatios( diff --git a/src/interfaces/term/ITermRepoServicer.sol b/src/interfaces/term/ITermRepoServicer.sol index 2b2e9427..99c25804 100644 --- a/src/interfaces/term/ITermRepoServicer.sol +++ b/src/interfaces/term/ITermRepoServicer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; interface ITermRepoServicer { function redeemTermRepoTokens( diff --git a/src/interfaces/term/ITermRepoToken.sol b/src/interfaces/term/ITermRepoToken.sol index 84951298..531c995a 100644 --- a/src/interfaces/term/ITermRepoToken.sol +++ b/src/interfaces/term/ITermRepoToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; diff --git a/src/interfaces/term/ITermVaultEvents.sol b/src/interfaces/term/ITermVaultEvents.sol index 29fe4682..181b0d61 100644 --- a/src/interfaces/term/ITermVaultEvents.sol +++ b/src/interfaces/term/ITermVaultEvents.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; interface ITermVaultEvents { event TermControllerUpdated(address oldController, address newController); diff --git a/src/test/mocks/MockTermAuction.sol b/src/test/mocks/MockTermAuction.sol index 3f17afda..96adbc4e 100644 --- a/src/test/mocks/MockTermAuction.sol +++ b/src/test/mocks/MockTermAuction.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {ITermAuction} from "../../interfaces/term/ITermAuction.sol"; import {ITermRepoToken} from "../../interfaces/term/ITermRepoToken.sol"; diff --git a/src/test/mocks/MockTermAuctionOfferLocker.sol b/src/test/mocks/MockTermAuctionOfferLocker.sol index ff7e9f93..2c69173d 100644 --- a/src/test/mocks/MockTermAuctionOfferLocker.sol +++ b/src/test/mocks/MockTermAuctionOfferLocker.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {ITermAuctionOfferLocker} from "../../interfaces/term/ITermAuctionOfferLocker.sol"; import {ITermAuction} from "../../interfaces/term/ITermAuction.sol"; diff --git a/src/test/mocks/MockTermController.sol b/src/test/mocks/MockTermController.sol index c1afd406..08fa6ed5 100644 --- a/src/test/mocks/MockTermController.sol +++ b/src/test/mocks/MockTermController.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {ITermController, AuctionMetadata} from "../../interfaces/term/ITermController.sol"; diff --git a/src/test/mocks/MockTermRepoCollateralManager.sol b/src/test/mocks/MockTermRepoCollateralManager.sol index 376d985a..95d83c0f 100644 --- a/src/test/mocks/MockTermRepoCollateralManager.sol +++ b/src/test/mocks/MockTermRepoCollateralManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {ITermRepoCollateralManager} from "../../interfaces/term/ITermRepoCollateralManager.sol"; import {ITermRepoToken} from "../../interfaces/term/ITermRepoToken.sol"; diff --git a/src/test/mocks/MockTermRepoLocker.sol b/src/test/mocks/MockTermRepoLocker.sol index c88ddbcf..9b4dabba 100644 --- a/src/test/mocks/MockTermRepoLocker.sol +++ b/src/test/mocks/MockTermRepoLocker.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {IERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; diff --git a/src/test/mocks/MockTermRepoServicer.sol b/src/test/mocks/MockTermRepoServicer.sol index 0e68ff54..123c567f 100644 --- a/src/test/mocks/MockTermRepoServicer.sol +++ b/src/test/mocks/MockTermRepoServicer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {ITermRepoServicer} from "../../interfaces/term/ITermRepoServicer.sol"; import {ITermRepoToken} from "../../interfaces/term/ITermRepoToken.sol"; diff --git a/src/test/mocks/MockTermRepoToken.sol b/src/test/mocks/MockTermRepoToken.sol index 31689c7f..f5b3994d 100644 --- a/src/test/mocks/MockTermRepoToken.sol +++ b/src/test/mocks/MockTermRepoToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0 -pragma solidity 0.8.18; +pragma solidity ^0.8.18; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {ITermRepoToken} from "../../interfaces/term/ITermRepoToken.sol"; diff --git a/src/test/utils/Setup.sol b/src/test/utils/Setup.sol index d6cd2b59..ac4f8a75 100644 --- a/src/test/utils/Setup.sol +++ b/src/test/utils/Setup.sol @@ -90,7 +90,7 @@ contract Setup is ExtendedTest, IEvents { // Factory from mainnet, tokenized strategy needs to be hardcoded to 0xBB51273D6c746910C7C06fe718f30c936170feD0 tokenizedStrategy = new TokenizedStrategy(address(mockFactory)); - vm.etch(0xBB51273D6c746910C7C06fe718f30c936170feD0, address(tokenizedStrategy).code); + vm.etch(0x2e234DAe75C793f67A35089C9d99245E1C58470b, address(tokenizedStrategy).code); termController = new MockTermController(); termVaultEventEmitterImpl = new TermVaultEventEmitter();