merging in yearn commits

term-finance · Aug 7, 2024 · 823368f · 823368f
1 parent 3de4406
commit 823368f
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/lib/tokenized-strategy b/lib/tokenized-strategy
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();