From 8797e4a7741224988cecefc6a568861a0e350fc6 Mon Sep 17 00:00:00 2001 From: Tyler Wanner Date: Fri, 17 Nov 2023 09:19:35 -0500 Subject: [PATCH 1/8] add slither action --- .github/dependabot.yaml | 6 ++++++ .github/workflows/pr.yaml | 14 ++++++++++++++ .github/workflows/slither.yaml | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 .github/dependabot.yaml create mode 100644 .github/workflows/pr.yaml create mode 100644 .github/workflows/slither.yaml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..9096371 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" \ No newline at end of file diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml new file mode 100644 index 0000000..ffb1234 --- /dev/null +++ b/.github/workflows/pr.yaml @@ -0,0 +1,14 @@ +name: pull_request + +on: + pull_request: + branches: + - main + +jobs: + checkout: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + test: + uses: ./.github/workflows/slither.yaml diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml new file mode 100644 index 0000000..85aa5ea --- /dev/null +++ b/.github/workflows/slither.yaml @@ -0,0 +1,20 @@ +name: Slither Analysis +on: [push] +jobs: + analyze: + runs-on: ubuntu-latest + permissions: + contents: read + security-events: write + steps: + - uses: actions/checkout@v3 + - uses: crytic/slither-action@v0.3.0 + id: slither + with: + sarif: results.sarif + fail-on: none + + - name: Upload SARIF file + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: ${{ steps.slither.outputs.sarif }} \ No newline at end of file From ccd8b204f7f8483442d2d38dbb7878d4f86729c2 Mon Sep 17 00:00:00 2001 From: Tyler Wanner Date: Fri, 17 Nov 2023 09:20:40 -0500 Subject: [PATCH 2/8] fix --- .github/workflows/slither.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml index 85aa5ea..5543ca4 100644 --- a/.github/workflows/slither.yaml +++ b/.github/workflows/slither.yaml @@ -1,11 +1,13 @@ name: Slither Analysis -on: [push] + +permissions: + contents: read + security-events: write + +on: [workflow_call] jobs: analyze: runs-on: ubuntu-latest - permissions: - contents: read - security-events: write steps: - uses: actions/checkout@v3 - uses: crytic/slither-action@v0.3.0 From 147e2c8cd6ef1d5516c1520706d401caf30194dc Mon Sep 17 00:00:00 2001 From: Tyler Wanner Date: Fri, 17 Nov 2023 09:24:15 -0500 Subject: [PATCH 3/8] add target fee-collectors --- .github/workflows/slither.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml index 5543ca4..f0a8809 100644 --- a/.github/workflows/slither.yaml +++ b/.github/workflows/slither.yaml @@ -15,6 +15,7 @@ jobs: with: sarif: results.sarif fail-on: none + target: fee-collectors - name: Upload SARIF file uses: github/codeql-action/upload-sarif@v2 From 831f6f2e10d10f07a1dec34dd23bc69ab40a855c Mon Sep 17 00:00:00 2001 From: Tyler Wanner Date: Fri, 17 Nov 2023 10:04:32 -0500 Subject: [PATCH 4/8] remove forge-std --- .gitmodules | 3 --- fee-collectors/lib/forge-std | 1 - 2 files changed, 4 deletions(-) delete mode 160000 fee-collectors/lib/forge-std diff --git a/.gitmodules b/.gitmodules index fbba063..4d21d97 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,6 +22,3 @@ [submodule "fee-collectors/lib/earlybird-evm-interfaces"] path = fee-collectors/lib/earlybird-evm-interfaces url = https://github.com/orb-labs/earlybird-evm-interfaces -[submodule "fee-collectors/lib/forge-std"] - path = fee-collectors/lib/forge-std - url = https://github.com/foundry-rs/forge-std diff --git a/fee-collectors/lib/forge-std b/fee-collectors/lib/forge-std deleted file mode 160000 index 74cfb77..0000000 --- a/fee-collectors/lib/forge-std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 74cfb77e308dd188d2f58864aaf44963ae6b88b1 From 023698b138230d1dae683f3fc533b83fa6f90b96 Mon Sep 17 00:00:00 2001 From: Tyler Wanner Date: Fri, 17 Nov 2023 10:06:42 -0500 Subject: [PATCH 5/8] forge install: fee-collectors/lib/forge-std v1.7.2 --- .gitmodules | 3 +++ lib/fee-collectors/lib/forge-std | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/fee-collectors/lib/forge-std diff --git a/.gitmodules b/.gitmodules index 4d21d97..9323757 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "fee-collectors/lib/earlybird-evm-interfaces"] path = fee-collectors/lib/earlybird-evm-interfaces url = https://github.com/orb-labs/earlybird-evm-interfaces +[submodule "lib/fee-collectors/lib/forge-std"] + path = lib/fee-collectors/lib/forge-std + url = https://github.com/foundry-rs/forge-std diff --git a/lib/fee-collectors/lib/forge-std b/lib/fee-collectors/lib/forge-std new file mode 160000 index 0000000..bdea49f --- /dev/null +++ b/lib/fee-collectors/lib/forge-std @@ -0,0 +1 @@ +Subproject commit bdea49f9bb3c58c8c35850c3bdc17eaeea756e9a From d9883f0a98f587a3f455b618bb45f14136c8d951 Mon Sep 17 00:00:00 2001 From: Tyler Wanner Date: Fri, 17 Nov 2023 10:09:29 -0500 Subject: [PATCH 6/8] remove fee collectors forge std --- .gitmodules | 3 --- lib/fee-collectors/lib/forge-std | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/fee-collectors/lib/forge-std diff --git a/.gitmodules b/.gitmodules index 9323757..4d21d97 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,6 +22,3 @@ [submodule "fee-collectors/lib/earlybird-evm-interfaces"] path = fee-collectors/lib/earlybird-evm-interfaces url = https://github.com/orb-labs/earlybird-evm-interfaces -[submodule "lib/fee-collectors/lib/forge-std"] - path = lib/fee-collectors/lib/forge-std - url = https://github.com/foundry-rs/forge-std diff --git a/lib/fee-collectors/lib/forge-std b/lib/fee-collectors/lib/forge-std deleted file mode 160000 index bdea49f..0000000 --- a/lib/fee-collectors/lib/forge-std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bdea49f9bb3c58c8c35850c3bdc17eaeea756e9a From 661c5fce479e99c038bf9e44b75cac61293bafab Mon Sep 17 00:00:00 2001 From: Tyler Wanner Date: Fri, 17 Nov 2023 10:11:17 -0500 Subject: [PATCH 7/8] change gitmodules --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 4d21d97..5ee7f3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "fee-collectors/lib/earlybird-evm-interfaces"] path = fee-collectors/lib/earlybird-evm-interfaces url = https://github.com/orb-labs/earlybird-evm-interfaces +[submodule "fee-collectors/lib/fee-collectors/lib/forge-std"] + path = fee-collectors/lib/fee-collectors/lib/forge-std + url = https://github.com/foundry-rs/forge-std From 31dff1bb53d48b72755390d1456b2fa7c5a86484 Mon Sep 17 00:00:00 2001 From: Tyler Wanner Date: Fri, 17 Nov 2023 10:11:58 -0500 Subject: [PATCH 8/8] add gitmodules --- fee-collectors/.gitmodules | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fee-collectors/.gitmodules diff --git a/fee-collectors/.gitmodules b/fee-collectors/.gitmodules new file mode 100644 index 0000000..e69de29