From 529cf61e568c43180f083e78e1896946015e1073 Mon Sep 17 00:00:00 2001 From: Rookmate <14072042+rookmate@users.noreply.github.com> Date: Fri, 14 Feb 2025 16:58:08 +0000 Subject: [PATCH 1/6] Enforce checks on PRs to master --- .github/workflows/forge-test.yml | 63 ++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 .github/workflows/forge-test.yml diff --git a/.github/workflows/forge-test.yml b/.github/workflows/forge-test.yml new file mode 100644 index 00000000..9d11cd23 --- /dev/null +++ b/.github/workflows/forge-test.yml @@ -0,0 +1,63 @@ +name: PR Checks + +on: + pull_request: + branches: [ master ] + +env: + FOUNDRY_PROFILE: ci + +jobs: + check: + strategy: + fail-fast: true + + name: Build and Test + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '18' + cache: 'yarn' + + - name: Install dependencies + run: yarn install --frozen-lockfile + + - name: Install Foundry + uses: foundry-rs/foundry-toolchain@v1 + with: + version: nightly + + - name: Show Forge version + run: | + forge --version + + - name: Run Forge fmt + run: | + forge fmt --check + id: fmt + + - name: Run Forge build + run: | + forge build --sizes + id: build + + - name: Run Forge tests + run: | + forge test -vvv + id: test + + - name: Run coverage + run: | + forge coverage + id: coverage + + - name: Run snapshot + run: | + forge snapshot + id: snapshot From c2cbeb0d572c0eab52ca86e473f22ee43e3dad77 Mon Sep 17 00:00:00 2001 From: Rookmate <14072042+rookmate@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:19:14 +0000 Subject: [PATCH 2/6] Remove forge fmt from checks --- .github/workflows/forge-test.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/forge-test.yml b/.github/workflows/forge-test.yml index 9d11cd23..fb0ba844 100644 --- a/.github/workflows/forge-test.yml +++ b/.github/workflows/forge-test.yml @@ -37,11 +37,6 @@ jobs: run: | forge --version - - name: Run Forge fmt - run: | - forge fmt --check - id: fmt - - name: Run Forge build run: | forge build --sizes From 8acfba1e330a974753b92751989949b13f172025 Mon Sep 17 00:00:00 2001 From: Rookmate <14072042+rookmate@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:23:00 +0000 Subject: [PATCH 3/6] Fix dependency on PayFeesInArbitrumETH --- script/PayFeesInArbitrumETH.s.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/PayFeesInArbitrumETH.s.sol b/script/PayFeesInArbitrumETH.s.sol index e7bcc760..70858dc5 100644 --- a/script/PayFeesInArbitrumETH.s.sol +++ b/script/PayFeesInArbitrumETH.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; import {Script} from "forge-std/Script.sol"; -import {console} from "forge-std/Console.sol"; +import {console} from "forge-std/console.sol"; import {FeesPlug} from "../contracts/apps/payload-delivery/FeesPlug.sol"; import {Fees} from "../contracts/common/Structs.sol"; import {ETH_ADDRESS} from "../contracts/common/Constants.sol"; From 363e1c3aca7ece7ca5340d727f90f4f251fd6d2c Mon Sep 17 00:00:00 2001 From: Rookmate <14072042+rookmate@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:25:53 +0000 Subject: [PATCH 4/6] Fix dependency on WithdrawFeesArbitrumFeesPlug --- script/counter/WithdrawFeesArbitrumFeesPlug.s.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/counter/WithdrawFeesArbitrumFeesPlug.s.sol b/script/counter/WithdrawFeesArbitrumFeesPlug.s.sol index d9c49f1f..ff9af7bc 100644 --- a/script/counter/WithdrawFeesArbitrumFeesPlug.s.sol +++ b/script/counter/WithdrawFeesArbitrumFeesPlug.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; import {Script} from "forge-std/Script.sol"; -import {console} from "forge-std/Console.sol"; +import {console} from "forge-std/console.sol"; import {FeesPlug} from "../../contracts/apps/payload-delivery/FeesPlug.sol"; import {ETH_ADDRESS} from "../../contracts/common/Constants.sol"; import {CounterAppGateway} from "../../contracts/apps/counter/CounterAppGateway.sol"; From 3f8d07fd89179e72ddc72052465a0a679a1db726 Mon Sep 17 00:00:00 2001 From: Rookmate <14072042+rookmate@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:28:17 +0000 Subject: [PATCH 5/6] Fix Console to console --- script/super-token-lockable/DeployContracts.s.sol | 2 +- script/super-token-lockable/DeployGateway.s.sol | 2 +- script/super-token/DeployContracts.s.sol | 2 +- script/super-token/DeployGateway.s.sol | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script/super-token-lockable/DeployContracts.s.sol b/script/super-token-lockable/DeployContracts.s.sol index 9ab757b8..be463a84 100644 --- a/script/super-token-lockable/DeployContracts.s.sol +++ b/script/super-token-lockable/DeployContracts.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; import {Script} from "forge-std/Script.sol"; -import {console} from "forge-std/Console.sol"; +import {console} from "forge-std/console.sol"; import {SuperTokenLockableAppGateway} from "../../contracts/apps/super-token-lockable/SuperTokenLockableAppGateway.sol"; import {SuperTokenLockableDeployer} from "../../contracts/apps/super-token-lockable/SuperTokenLockableDeployer.sol"; import {SuperTokenLockable} from "../../contracts/apps/super-token-lockable/SuperTokenLockable.sol"; diff --git a/script/super-token-lockable/DeployGateway.s.sol b/script/super-token-lockable/DeployGateway.s.sol index 8389a937..8032264a 100644 --- a/script/super-token-lockable/DeployGateway.s.sol +++ b/script/super-token-lockable/DeployGateway.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; import {Script} from "forge-std/Script.sol"; -import {console} from "forge-std/Console.sol"; +import {console} from "forge-std/console.sol"; import {SuperTokenLockableAppGateway} from "../../contracts/apps/super-token-lockable/SuperTokenLockableAppGateway.sol"; import {SuperTokenLockableDeployer} from "../../contracts/apps/super-token-lockable/SuperTokenLockableDeployer.sol"; import {SuperTokenLockable} from "../../contracts/apps/super-token-lockable/SuperTokenLockable.sol"; diff --git a/script/super-token/DeployContracts.s.sol b/script/super-token/DeployContracts.s.sol index 79e37224..30ad5d88 100644 --- a/script/super-token/DeployContracts.s.sol +++ b/script/super-token/DeployContracts.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; import {Script} from "forge-std/Script.sol"; -import {console} from "forge-std/Console.sol"; +import {console} from "forge-std/console.sol"; import {SuperTokenAppGateway} from "../../contracts/apps/super-token/SuperTokenAppGateway.sol"; import {SuperTokenDeployer} from "../../contracts/apps/super-token/SuperTokenDeployer.sol"; import {SuperToken} from "../../contracts/apps/super-token/SuperToken.sol"; diff --git a/script/super-token/DeployGateway.s.sol b/script/super-token/DeployGateway.s.sol index 5f3fea2c..f57a841d 100644 --- a/script/super-token/DeployGateway.s.sol +++ b/script/super-token/DeployGateway.s.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.0; import {Script} from "forge-std/Script.sol"; -import {console} from "forge-std/Console.sol"; +import {console} from "forge-std/console.sol"; import {SuperTokenAppGateway} from "../../contracts/apps/super-token/SuperTokenAppGateway.sol"; import {SuperTokenDeployer} from "../../contracts/apps/super-token/SuperTokenDeployer.sol"; import {SuperToken} from "../../contracts/apps/super-token/SuperToken.sol"; From b7381b2b67e9c72983b42fbb8f8fd774ac9c2583 Mon Sep 17 00:00:00 2001 From: Rookmate <14072042+rookmate@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:40:39 +0000 Subject: [PATCH 6/6] forge install: solady v0.0.288 --- .gitmodules | 3 +++ lib/solady | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/solady diff --git a/.gitmodules b/.gitmodules index c59f396e..dbd0a97b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "lib/solmate"] path = lib/solmate url = https://github.com/transmissions11/solmate +[submodule "lib/solady"] + path = lib/solady + url = https://github.com/vectorized/solady diff --git a/lib/solady b/lib/solady new file mode 160000 index 00000000..6c2d0da6 --- /dev/null +++ b/lib/solady @@ -0,0 +1 @@ +Subproject commit 6c2d0da6397e3c016aabc3f298de1b92c6ce7405