Skip to content
This repository has been archived by the owner on Jan 9, 2024. It is now read-only.

Commit

Permalink
Update solc to 0.8.18 (#832)
Browse files Browse the repository at this point in the history
  • Loading branch information
grandizzy authored May 19, 2023
1 parent 62e5e63 commit 87ed792
Show file tree
Hide file tree
Showing 179 changed files with 180 additions and 180 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ETH_FROM=
ETH_GAS=15000000

## Solidity Compiler Version ##
SOLC_VERSION=0.8.14
SOLC_VERSION=0.8.18

## AJNA token address for target chain ##
AJNA_TOKEN=0xaadebCF61AA7Da0573b524DE57c67aDa797D46c5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slither.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

- name: Install and set solc version
run: |
pip install solc-select && solc-select install 0.8.14 && solc-select use 0.8.14
pip install solc-select && solc-select install 0.8.18 && solc-select use 0.8.18
id: solc

- name: Install Slither
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ bash ./check-code-coverage.sh
```bash
pip install slither-analyzer
```
- Make sure the default `solc` version is set to the same version as contracts (currently 0.8.14). This can be done by installing and using `solc-select`:
- Make sure the default `solc` version is set to the same version as contracts (currently 0.8.18). This can be done by installing and using `solc-select`:
```bash
pip install solc-select && solc-select install 0.8.14 && solc-select use 0.8.14
pip install solc-select && solc-select install 0.8.18 && solc-select use 0.8.18
```
- Run `analyze`

Expand Down
2 changes: 1 addition & 1 deletion brownie-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ autofetch_sources: True
# path remapping to support imports from GitHub/NPM
compiler:
solc:
version: 0.8.14
version: 0.8.18
optimizer:
enabled: true
runs: 200
Expand Down
2 changes: 1 addition & 1 deletion script/deploy.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { Script } from "forge-std/Script.sol";
import "forge-std/console.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/ERC20Pool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/ERC20PoolFactory.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { ClonesWithImmutableArgs } from '@clones/ClonesWithImmutableArgs.sol';

Expand Down
2 changes: 1 addition & 1 deletion src/ERC721Pool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import {
IERC721Token,
Expand Down
2 changes: 1 addition & 1 deletion src/ERC721PoolFactory.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { ClonesWithImmutableArgs } from '@clones/ClonesWithImmutableArgs.sol';
import { IERC165 } from '@openzeppelin/contracts/utils/introspection/IERC165.sol';
Expand Down
2 changes: 1 addition & 1 deletion src/PoolInfoUtils.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IPool, IERC20Token } from './interfaces/pool/IPool.sol';

Expand Down
2 changes: 1 addition & 1 deletion src/PositionManager.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { ERC20 } from '@openzeppelin/contracts/token/ERC20/ERC20.sol';
import { IERC20 } from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
Expand Down
2 changes: 1 addition & 1 deletion src/RewardsManager.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IERC20 } from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
import { IERC721 } from '@openzeppelin/contracts/token/ERC721/IERC721.sol';
Expand Down
2 changes: 1 addition & 1 deletion src/base/FlashloanablePool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/base/PermitERC721.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IERC1271 } from '@openzeppelin/contracts/interfaces/IERC1271.sol';
import { ERC721 } from '@openzeppelin/contracts/token/ERC721/ERC721.sol';
Expand Down
2 changes: 1 addition & 1 deletion src/base/Pool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { Clone } from '@clones/Clone.sol';
import { ReentrancyGuard } from '@openzeppelin/contracts/security/ReentrancyGuard.sol';
Expand Down
2 changes: 1 addition & 1 deletion src/base/PoolDeployer.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IPoolFactory } from '../interfaces/pool/IPoolFactory.sol';

Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/IERC3156FlashBorrower.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

interface IERC3156FlashBorrower {

Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/IERC3156FlashLender.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;
import { IERC3156FlashBorrower } from "./IERC3156FlashBorrower.sol";


Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/IPool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IPoolBorrowerActions } from './commons/IPoolBorrowerActions.sol';
import { IPoolLPActions } from './commons/IPoolLPActions.sol';
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/IPoolFactory.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Factory Interface.
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolBorrowerActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Borrower Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolDerivedState.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Derived State
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolErrors.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Errors.
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolEvents.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Events
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolImmutables.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Immutables
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolInternals.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Internal structs used by the pool / libraries
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolKickerActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Kicker Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolLPActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool `LP` Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolLenderActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Lender Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolSettlerActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Settler Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolState.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool State
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/commons/IPoolTakerActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title Pool Taker Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc20/IERC20Pool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IPool } from '../IPool.sol';
import { IERC20PoolBorrowerActions } from './IERC20PoolBorrowerActions.sol';
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc20/IERC20PoolBorrowerActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC20 Pool Borrower Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc20/IERC20PoolEvents.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC20 Pool Events
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc20/IERC20PoolFactory.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IPoolFactory } from '../IPoolFactory.sol';

Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc20/IERC20PoolImmutables.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC20 Pool Immutables
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc20/IERC20PoolLenderActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC20 Pool Lender Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc20/IERC20Taker.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

interface IERC20Taker {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721Pool.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IPool } from '../IPool.sol';

Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721PoolBorrowerActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC721 Pool Borrower Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721PoolErrors.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC721 Pool Errors
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721PoolEvents.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC721 Pool Events
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721PoolFactory.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IPoolFactory } from '../IPoolFactory.sol';

Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721PoolImmutables.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC721 Pool Immutables
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721PoolLenderActions.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC721 Pool Lender Actions
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721PoolState.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

/**
* @title ERC721 Pool State
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/pool/erc721/IERC721Taker.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

interface IERC721Taker {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/position/IPositionManager.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.14;
pragma solidity 0.8.18;

import { IPositionManagerOwnerActions } from './IPositionManagerOwnerActions.sol';
import { IPositionManagerState } from './IPositionManagerState.sol';
Expand Down
Loading

0 comments on commit 87ed792

Please sign in to comment.