diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..99dd94e2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,8 @@ +The MIT License (MIT) +Copyright © 2023 Wonderland + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 40be0e44..064ef1a1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@
Deployment scripts
Sample scripts to deploy contracts on both mainnet and testnet.
-
Sample Integraion & Unit tests
+
Sample Integration & Unit tests
Example tests showcasing mocking, assertions and configuration for mainnet forking. As well it includes everything needed in order to check code coverage.
Linter
@@ -140,3 +140,6 @@ Also, remember to update the `package_name` param to your package name: ``` You can take a look at our [solidity-exporter-action](https://github.com/defi-wonderland/solidity-exporter-action) repository for more information and usage examples. + +## Licensing +The primary license for the boilerplate is MIT, see [`LICENSE`](https://github.com/defi-wonderland/solidity-foundry-boilerplate/blob/main/LICENSE) \ No newline at end of file diff --git a/foundry.toml b/foundry.toml index d3d0bd20..4529d0bb 100644 --- a/foundry.toml +++ b/foundry.toml @@ -9,7 +9,7 @@ multiline_func_header = 'params_first' sort_imports = true [profile.default] -solc_version = '0.8.19' +solc_version = '0.8.23' src = 'solidity' test = 'solidity/test' out = 'out' diff --git a/solidity/contracts/Greeter.sol b/solidity/contracts/Greeter.sol index 3c517ae1..d2a8137c 100644 --- a/solidity/contracts/Greeter.sol +++ b/solidity/contracts/Greeter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity =0.8.23; import {IGreeter} from 'interfaces/IGreeter.sol'; import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol'; diff --git a/solidity/interfaces/IGreeter.sol b/solidity/interfaces/IGreeter.sol index 10877023..50565cc3 100644 --- a/solidity/interfaces/IGreeter.sol +++ b/solidity/interfaces/IGreeter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity =0.8.23; import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol'; diff --git a/solidity/scripts/Deploy.sol b/solidity/scripts/Deploy.sol index e0658c68..d45dd549 100644 --- a/solidity/scripts/Deploy.sol +++ b/solidity/scripts/Deploy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity =0.8.23; import {Greeter} from 'contracts/Greeter.sol'; import {Script} from 'forge-std/Script.sol'; @@ -13,14 +13,6 @@ abstract contract DeployHelper is Script { } } -contract DeployMainnet is Deploy { - function run() external { - IERC20 weth = IERC20(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); - - _deploy('some real greeting', weth); - } -} - contract Deploy is DeployHelper { function run(address _weth) external { IERC20 weth = IERC20(_weth); @@ -28,3 +20,11 @@ contract Deploy is DeployHelper { _deploy('some test greeting', weth); } } + +contract DeployMainnet is Deploy { + function run() external { + IERC20 weth = IERC20(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); + + _deploy('some real greeting', weth); + } +} diff --git a/solidity/test/integration/Greeter.t.sol b/solidity/test/integration/Greeter.t.sol index 674b07d1..6793c8aa 100644 --- a/solidity/test/integration/Greeter.t.sol +++ b/solidity/test/integration/Greeter.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity =0.8.23; import {IntegrationBase} from 'test/integration/IntegrationBase.sol'; diff --git a/solidity/test/integration/IntegrationBase.sol b/solidity/test/integration/IntegrationBase.sol index 656d1e0b..e5c26e87 100644 --- a/solidity/test/integration/IntegrationBase.sol +++ b/solidity/test/integration/IntegrationBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity =0.8.23; import {Greeter, IGreeter} from 'contracts/Greeter.sol'; import {Test} from 'forge-std/Test.sol'; diff --git a/solidity/test/unit/Greeter.t.sol b/solidity/test/unit/Greeter.t.sol index c2f51b29..7714bf4d 100644 --- a/solidity/test/unit/Greeter.t.sol +++ b/solidity/test/unit/Greeter.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity =0.8.23; import {Greeter, IGreeter} from 'contracts/Greeter.sol'; import {Test} from 'forge-std/Test.sol';