Skip to content

Commit

Permalink
fix: greater or equal (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
Schlagonia authored Apr 5, 2024
1 parent 326da13 commit bbc3c48
Show file tree
Hide file tree
Showing 54 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion script/DeployAprOracle.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import "forge-std/Script.sol";

Expand Down
2 changes: 1 addition & 1 deletion script/DeployAuctionFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import "forge-std/Script.sol";

Expand Down
2 changes: 1 addition & 1 deletion script/DeployCommonTrigger.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import "forge-std/Script.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/AprOracle/AprOracle.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Governance} from "../utils/Governance.sol";
import {IVault} from "@yearn-vaults/interfaces/IVault.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/AprOracle/AprOracleBase.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Governance} from "../utils/Governance.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/Auctions/Auction.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Maths} from "../libraries/Maths.sol";
import {Governance} from "../utils/Governance.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/Auctions/AuctionFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Auction} from "./Auction.sol";
import {Clonable} from "../utils/Clonable.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/Bases/4626Compounder/Base4626Compounder.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

// We use the Tokenized Strategy interface.
import {IStrategy} from "@tokenized-strategy/interfaces/IStrategy.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/Bases/4626Compounder/IBase4626Compounder.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {IBaseHealthCheck} from "../HealthCheck/IBaseHealthCheck.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/Bases/HealthCheck/BaseHealthCheck.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {BaseStrategy, ERC20} from "@tokenized-strategy/BaseStrategy.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/Bases/HealthCheck/IBaseHealthCheck.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {IStrategy} from "@tokenized-strategy/interfaces/IStrategy.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/Bases/Hooks/BaseHooks.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Hooks} from "./Hooks.sol";
import {BaseHealthCheck, ERC20} from "../HealthCheck/BaseHealthCheck.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/Bases/Hooks/Hooks.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

contract DepositHooks {
function _preDepositHook(
Expand Down
2 changes: 1 addition & 1 deletion src/ReportTrigger/CommonReportTrigger.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Governance} from "../utils/Governance.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/ReportTrigger/CustomStrategyTriggerBase.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

/**
* @title Custom Strategy Trigger Base.
Expand Down
2 changes: 1 addition & 1 deletion src/ReportTrigger/CustomVaultTriggerBase.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

/**
* @title Custom Vault Trigger Base.
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/ITaker.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

interface ITaker {
function auctionTakeCallback(
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/Solidly/ISolidly.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

interface ISolidly {
struct route {
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/TradeFactory/ITradeFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

interface ITradeFactory {
function enable(address, address) external;
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Maths.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

// Math library from https://github.com/ajna-finance/ajna-core/blob/master/src/libraries/internal/Maths.sol

Expand Down
2 changes: 1 addition & 1 deletion src/swappers/AuctionSwapper.sol
Original file line number Diff line number Diff line change
@@ -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 {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/SolidlySwapper.sol
Original file line number Diff line number Diff line change
@@ -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 {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/TradeFactorySwapper.sol
Original file line number Diff line number Diff line change
@@ -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 {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/UniswapV2Swapper.sol
Original file line number Diff line number Diff line change
@@ -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 {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/UniswapV3Swapper.sol
Original file line number Diff line number Diff line change
@@ -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 {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/interfaces/IAuctionSwapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

interface IAuctionSwapper {
function auctionFactory() external view returns (address);
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/interfaces/ISolidlySwapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

interface ISolidlySwapper {
function minAmountToSell() external view returns (uint256);
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/interfaces/ITradeFactorySwapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

interface ITradeFactorySwapper {
function tradeFactory() external view returns (address);
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/interfaces/IUniswapV2Swapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

interface IUniswapV2Swapper {
function minAmountToSell() external view returns (uint256);
Expand Down
2 changes: 1 addition & 1 deletion src/swappers/interfaces/IUniswapV3Swapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

interface IUniswapV3Swapper {
function minAmountToSell() external view returns (uint256);
Expand Down
2 changes: 1 addition & 1 deletion src/test/Auction.t.sol
Original file line number Diff line number Diff line change
@@ -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 {Setup, IStrategy, SafeERC20, ERC20} from "./utils/Setup.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/AuctionSwapper.t.sol
Original file line number Diff line number Diff line change
@@ -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 {Setup, IStrategy, SafeERC20, ERC20} from "./utils/Setup.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/Base4626.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.18;
pragma solidity >=0.8.18;

import "forge-std/console.sol";
import {Setup, ERC20, IStrategy} from "./utils/Setup.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/BaseHook.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Setup, IStrategy, SafeERC20, ERC20} from "./utils/Setup.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/CommonTrigger.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import "forge-std/Script.sol";
import {Setup, IStrategy, console} from "./utils/Setup.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/HealthCheck.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Setup, IStrategy, SafeERC20, ERC20} from "./utils/Setup.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/SolidlySwapper.t.sol
Original file line number Diff line number Diff line change
@@ -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 {Setup, ERC20, IStrategy} from "./utils/Setup.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/UniV2Swapper.t.sol
Original file line number Diff line number Diff line change
@@ -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 {Setup, ERC20, IStrategy} from "./utils/Setup.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/UniV3Swapper.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Setup, ERC20, IStrategy} from "./utils/Setup.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockAuctionSwapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {AuctionSwapper, SafeERC20} from "../../swappers/AuctionSwapper.sol";
import {BaseStrategy, ERC20} from "@tokenized-strategy/BaseStrategy.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockCustomStrategyTrigger.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {CustomStrategyTriggerBase} from "../../ReportTrigger/CustomStrategyTriggerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockCustomVaultTrigger.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {CustomVaultTriggerBase} from "../../ReportTrigger/CustomVaultTriggerBase.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockHealthCheck.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {BaseHealthCheck, ERC20} from "../../Bases/HealthCheck/BaseHealthCheck.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockHooks.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {BaseHooks, ERC20} from "../../Bases/Hooks/BaseHooks.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockSolidlySwapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {SolidlySwapper} from "../../swappers/SolidlySwapper.sol";
import {BaseStrategy, ERC20} from "@tokenized-strategy/BaseStrategy.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockStrategy.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {BaseStrategy, ERC20} from "@tokenized-strategy/BaseStrategy.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockUniswapV2Swapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {UniswapV2Swapper} from "../../swappers/UniswapV2Swapper.sol";
import {BaseStrategy, ERC20} from "@tokenized-strategy/BaseStrategy.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/MockUniswapV3Swapper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {UniswapV3Swapper} from "../../swappers/UniswapV3Swapper.sol";
import {BaseStrategy, ERC20} from "@tokenized-strategy/BaseStrategy.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/utils/ExtendedTest.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Test} from "forge-std/Test.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/test/utils/Setup.sol
Original file line number Diff line number Diff line change
@@ -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 {ExtendedTest} from "./ExtendedTest.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/utils/VyperDeployer.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

///@notice This cheat codes interface is named _CheatCodes so you can use the CheatCodes interface in other testing files without errors
interface _CheatCodes {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Clonable.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

contract Clonable {
/// @notice Set to the address to auto clone from.
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Governance.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

contract Governance {
/// @notice Emitted when the governance address is updated.
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Governance2Step.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPL-3.0
pragma solidity 0.8.18;
pragma solidity >=0.8.18;

import {Governance} from "./Governance.sol";

Expand Down

0 comments on commit bbc3c48

Please sign in to comment.