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.

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

⬆️ upgrade solidity range for unaudited contracts #685

Merged
merged 5 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
432 changes: 216 additions & 216 deletions .gas-snapshot

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- uses: foundry-rs/foundry-toolchain@v1
- run: yarn
- run: yarn lint
- run: forge build
- run: yarn coverage
- uses: codecov/codecov-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"plugins": ["prettier"],
"rules": {
"max-line-length": ["error", 120],
"compiler-version": ["error", "0.8.17"],
"compiler-version": ["error", "^0.8.17"],
"func-visibility": ["error", { "ignoreConstructors": true }],
"func-param-name-mixedcase": "error",
"modifier-name-mixedcase": "error",
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/FixedPoolHarness.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

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

Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/MarketHarness.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Auditor, ERC20, InterestRateModel, Market } from "../Market.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/MockBalancerVault.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { ERC20 } from "solmate/src/tokens/ERC20.sol";
import { ReentrancyGuard } from "solmate/src/utils/ReentrancyGuard.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/MockInterestRateModel.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

contract MockInterestRateModel {
uint256 public borrowRate;
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/MockPriceFeed.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { MockERC20 } from "solmate/src/test/utils/mocks/MockERC20.sol";
import { IPriceFeed } from "../utils/IPriceFeed.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/MockStETH.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { ERC20 } from "solmate/src/tokens/ERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/utils/IPriceFeed.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

interface IPriceFeed {
function decimals() external view returns (uint8);
Expand Down
2 changes: 1 addition & 1 deletion contracts/utils/import.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { TimelockController } from "@openzeppelin/contracts/governance/TimelockController.sol";
Expand Down
6 changes: 5 additions & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[profile.default]
solc = "0.8.17"
optimizer = true
optimizer_runs = 200
revert_strings = "strip"
Expand All @@ -12,6 +11,11 @@ cache_path = "cache/foundry"
fs_permissions = [{ access = "read", path = "./deployments" }]
verbosity = 3

[fmt]
tab_width = 2
bracket_spacing = true
number_underscore = "thousands"

[profile.production.fuzz]
runs = 66_666

Expand Down
2 changes: 1 addition & 1 deletion scripts/Base.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { ForkTest } from "../test/Fork.t.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/Airdrop.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { MockERC20 } from "solmate/src/test/utils/mocks/MockERC20.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/Auditor.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Vm } from "forge-std/Vm.sol";
import { Test } from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/DebtManager.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { ForkTest, stdJson, stdError } from "./Fork.t.sol";
import { FixedPointMathLib } from "solmate/src/utils/FixedPointMathLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/DebtPreviewer.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { ForkTest, stdError } from "./Fork.t.sol";
import { FixedPointMathLib } from "solmate/src/utils/FixedPointMathLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/EscrowedEXA.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { FixedPointMathLib } from "solmate/src/utils/FixedPointMathLib.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/FixedLib.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Vm } from "forge-std/Vm.sol";
import { Test, stdError } from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/Fork.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Test, stdError, stdJson } from "forge-std/Test.sol";
import { ProxyAdmin, ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/InterestRateModel.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Test } from "forge-std/Test.sol";
import { FixedPointMathLib } from "solmate/src/utils/FixedPointMathLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/Market.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { MockERC20 } from "solmate/src/test/utils/mocks/MockERC20.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/Previewer.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Vm } from "forge-std/Vm.sol";
import { Test } from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/PriceFeedDouble.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Vm } from "forge-std/Vm.sol";
import { Test, stdError } from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/PriceFeedPool.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { MockERC20 } from "solmate/src/test/utils/mocks/MockERC20.sol";
import { Test, stdError } from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/PriceFeedWrapper.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Vm } from "forge-std/Vm.sol";
import { Test, stdError } from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/Protocol.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Vm } from "forge-std/Vm.sol";
import { LibString } from "solmate/src/utils/LibString.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/RewardsController.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { Vm } from "forge-std/Vm.sol";
import { MockERC20 } from "solmate/src/test/utils/mocks/MockERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/Swapper.t.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;
pragma solidity ^0.8.17;

import { ForkTest } from "./Fork.t.sol";
import { FixedPointMathLib } from "solmate/src/utils/FixedPointMathLib.sol";
Expand Down