From 769d339d90ba15860973d63447958f83719e79e6 Mon Sep 17 00:00:00 2001
From: 0xdeo <150629966+0xdeo@users.noreply.github.com>
Date: Thu, 18 Jan 2024 12:50:00 -0500
Subject: [PATCH 1/4] fix: typo in readme (#51)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 903f1fb7..5b73ac8f 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
From d627e72942a4c1237173860f5c14fbdf521596a7 Mon Sep 17 00:00:00 2001
From: 0xdeo <150629966+0xdeo@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:55:44 -0500
Subject: [PATCH 2/4] fix: goerli references changed to sepolia (#54)
---
.env.example | 4 ++--
.github/workflows/ci.yml | 2 +-
README.md | 4 ++--
package.json | 2 +-
solidity/scripts/Deploy.sol | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.env.example b/.env.example
index aa5efdc2..fe295b73 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,7 @@
MAINNET_RPC=
MAINNET_DEPLOYER_PK=
-GOERLI_RPC=
-GOERLI_DEPLOYER_PK=
+SEPOLIA_RPC=
+SEPOLIA_DEPLOYER_PK=
ETHERSCAN_API_KEY=
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d2f6a6c..24c3ea04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
run: |
touch .env
echo MAINNET_RPC="${{ secrets.MAINNET_RPC }}" >> .env
- echo GOERLI_RPC="${{ secrets.GOERLI_RPC }}" >> .env
+ echo SEPOLIA_RPC="${{ secrets.SEPOLIA_RPC }}" >> .env
cat .env
- name: Run tests
diff --git a/README.md b/README.md
index 5b73ac8f..1d189147 100644
--- a/README.md
+++ b/README.md
@@ -91,10 +91,10 @@ yarn coverage
Configure the `.env` variables.
-### Goerli
+### Sepolia
```bash
-yarn deploy:goerli
+yarn deploy:sepolia
```
### Mainnet
diff --git a/package.json b/package.json
index 62807761..eb361873 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"build": "forge build",
"build:optimized": "FOUNDRY_PROFILE=optimized forge build",
"coverage": "forge coverage --match-contract Unit",
- "deploy:goerli": "bash -c 'source .env && forge script DeployGoerli --rpc-url $GOERLI_RPC --broadcast --private-key $GOERLI_DEPLOYER_PK --verify --etherscan-api-key $ETHERSCAN_API_KEY'",
+ "deploy:sepolia": "bash -c 'source .env && forge script DeploySepolia --rpc-url $SEPOLIA_RPC --broadcast --private-key $SEPOLIA_DEPLOYER_PK --verify --etherscan-api-key $ETHERSCAN_API_KEY'",
"deploy:mainnet": "bash -c 'source .env && forge script DeployMainnet --rpc-url $MAINNET_RPC --broadcast --private-key $MAINNET_DEPLOYER_PK --verify --etherscan-api-key $ETHERSCAN_API_KEY'",
"lint:check": "yarn lint:sol-tests && yarn lint:sol-logic && forge fmt --check",
"lint:fix": "sort-package-json && forge fmt && yarn lint:sol-tests --fix && yarn lint:sol-logic --fix",
diff --git a/solidity/scripts/Deploy.sol b/solidity/scripts/Deploy.sol
index 629ac029..a8238308 100644
--- a/solidity/scripts/Deploy.sol
+++ b/solidity/scripts/Deploy.sol
@@ -21,7 +21,7 @@ contract DeployMainnet is Deploy {
}
}
-contract DeployGoerli is Deploy {
+contract DeploySepolia is Deploy {
function run() external {
IERC20 weth = IERC20(0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6);
From f7708e61cefdd4a5bf0ea24e03fad539a46a0cc1 Mon Sep 17 00:00:00 2001
From: 0xdeo <150629966+0xdeo@users.noreply.github.com>
Date: Tue, 23 Jan 2024 05:46:30 -0500
Subject: [PATCH 3/4] feat: added license (#52)
---
LICENSE | 8 ++++++++
README.md | 3 +++
2 files changed, 11 insertions(+)
create mode 100644 LICENSE
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 1d189147..064ef1a1 100644
--- a/README.md
+++ b/README.md
@@ -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
From 03c6e1a0ae5f10e2547ee7e57c08ebd8a66f1e3e Mon Sep 17 00:00:00 2001
From: dristpunk <107591874+dristpunk@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:04:56 +0300
Subject: [PATCH 4/4] fix: update solidity version (#57)
---
foundry.toml | 2 +-
solidity/contracts/Greeter.sol | 2 +-
solidity/interfaces/IGreeter.sol | 2 +-
solidity/scripts/Deploy.sol | 2 +-
solidity/test/integration/Greeter.t.sol | 2 +-
solidity/test/integration/IntegrationBase.sol | 2 +-
solidity/test/unit/Greeter.t.sol | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
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 a8238308..a9b697d5 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';
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';