From e7d3f75fcb0ada180ec9c1166dff5a4aff56b221 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 01:23:28 +0530 Subject: [PATCH 01/13] 0.3.5 --- .github/workflows/slither.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 73a3f3650..218d018d8 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -34,7 +34,7 @@ jobs: version: nightly - name: Run Slither - uses: crytic/slither-action@v0.3.0 + uses: crytic/slither-action@v0.3.5 continue-on-error: true id: slither with: From 52f86a749a24e9a92c3bcf6e47d122860fba3929 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 01:25:37 +0530 Subject: [PATCH 02/13] 0.3.0 --- .github/workflows/slither.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 218d018d8..73a3f3650 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -34,7 +34,7 @@ jobs: version: nightly - name: Run Slither - uses: crytic/slither-action@v0.3.5 + uses: crytic/slither-action@v0.3.0 continue-on-error: true id: slither with: From dce51308467280ffbfc05efde60365daa91f69b4 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 01:42:31 +0530 Subject: [PATCH 03/13] fail on none --- .github/workflows/slither.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 73a3f3650..ecb0e0a7b 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -39,6 +39,7 @@ jobs: id: slither with: sarif: results.sarif + fail-on: none - name: Upload SARIF file uses: github/codeql-action/upload-sarif@v2 From 22d3b6926a8ec42f4beec5596f19b78f74380dfb Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 01:53:02 +0530 Subject: [PATCH 04/13] london --- foundry.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry.toml b/foundry.toml index 8a646b446..406a17df9 100644 --- a/foundry.toml +++ b/foundry.toml @@ -2,7 +2,7 @@ solc-version = "0.8.12" #auto_detect_solc = false cache = true -evm_version = 'shanghai' +evm_version = 'london' force = false gas_reports = [ "DropERC721Benchmark", From 69482e71192341ed273635c6ca52f4927150ec99 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 01:58:54 +0530 Subject: [PATCH 05/13] node 18.16 --- .github/workflows/slither.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index ecb0e0a7b..2c9c2d5d2 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -23,7 +23,7 @@ jobs: with: submodules: recursive fetch-depth: 25 - node-version: 18 + node-version: 18.16 - name: Setup Project uses: ./.github/composite-actions/setup @@ -39,7 +39,6 @@ jobs: id: slither with: sarif: results.sarif - fail-on: none - name: Upload SARIF file uses: github/codeql-action/upload-sarif@v2 From f4350539170ac42a8dd5abf93f9d364044637949 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 02:20:28 +0530 Subject: [PATCH 06/13] node --- .github/workflows/slither.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 2c9c2d5d2..525c02179 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -23,7 +23,6 @@ jobs: with: submodules: recursive fetch-depth: 25 - node-version: 18.16 - name: Setup Project uses: ./.github/composite-actions/setup @@ -38,6 +37,7 @@ jobs: continue-on-error: true id: slither with: + node-version: 18 sarif: results.sarif - name: Upload SARIF file From d227d55d0ab765bcb3e8b8982657c5a33772bf28 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 02:34:12 +0530 Subject: [PATCH 07/13] use slither v0.9.6 --- .github/workflows/slither.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 525c02179..59a7b298e 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -23,6 +23,7 @@ jobs: with: submodules: recursive fetch-depth: 25 + node-version: 18 - name: Setup Project uses: ./.github/composite-actions/setup @@ -37,8 +38,8 @@ jobs: continue-on-error: true id: slither with: - node-version: 18 sarif: results.sarif + slither-analyzer: "0.9.6" - name: Upload SARIF file uses: github/codeql-action/upload-sarif@v2 From 00801f0ec40ddcc7ba5a46d894371bcfe21000bd Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 02:42:55 +0530 Subject: [PATCH 08/13] slither args --- .github/workflows/slither.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 59a7b298e..9695f4137 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -39,7 +39,7 @@ jobs: id: slither with: sarif: results.sarif - slither-analyzer: "0.9.6" + slither-args: --foundry-compile-all - name: Upload SARIF file uses: github/codeql-action/upload-sarif@v2 From d09111413c8691799e51913129721ba2f52f9f7b Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 02:54:58 +0530 Subject: [PATCH 09/13] foundry out directory --- .github/workflows/slither.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 9695f4137..5f3174a67 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -39,7 +39,7 @@ jobs: id: slither with: sarif: results.sarif - slither-args: --foundry-compile-all + slither-args: --foundry-compile-all --foundry-out-directory artifacts_forge - name: Upload SARIF file uses: github/codeql-action/upload-sarif@v2 From e82fc0d0dad2daab126684fd292a39015eed78fb Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 03:05:30 +0530 Subject: [PATCH 10/13] args --- .github/workflows/slither.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 5f3174a67..040cea832 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -39,7 +39,7 @@ jobs: id: slither with: sarif: results.sarif - slither-args: --foundry-compile-all --foundry-out-directory artifacts_forge + slither-args: --foundry-out-directory artifacts_forge --foundry-compile-all - name: Upload SARIF file uses: github/codeql-action/upload-sarif@v2 From 72d70390a0332afa92c580019a69b2bbcb0da9df Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 03:17:27 +0530 Subject: [PATCH 11/13] forge install: sstore2 --- .gitmodules | 3 +++ lib/sstore2 | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/sstore2 diff --git a/.gitmodules b/.gitmodules index 6e01eb969..6606e595e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,3 +24,6 @@ [submodule "lib/dynamic-contracts"] path = lib/dynamic-contracts url = https://github.com/thirdweb-dev/dynamic-contracts +[submodule "lib/sstore2"] + path = lib/sstore2 + url = https://github.com/0xsequence/sstore2 diff --git a/lib/sstore2 b/lib/sstore2 new file mode 160000 index 000000000..0a28fe61b --- /dev/null +++ b/lib/sstore2 @@ -0,0 +1 @@ +Subproject commit 0a28fe61b6e81de9a05b462a24b9f4ba8c70d5b7 From 2440f6971b7540215cc927ee43b445f77f0c00d4 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 04:32:58 +0530 Subject: [PATCH 12/13] remappings --- .gitmodules | 3 --- foundry.toml | 1 + lib/sstore2 | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 160000 lib/sstore2 diff --git a/.gitmodules b/.gitmodules index 6606e595e..6e01eb969 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,6 +24,3 @@ [submodule "lib/dynamic-contracts"] path = lib/dynamic-contracts url = https://github.com/thirdweb-dev/dynamic-contracts -[submodule "lib/sstore2"] - path = lib/sstore2 - url = https://github.com/0xsequence/sstore2 diff --git a/foundry.toml b/foundry.toml index 406a17df9..7989a4a6d 100644 --- a/foundry.toml +++ b/foundry.toml @@ -37,6 +37,7 @@ remappings = [ 'erc721a-upgradeable/=lib/ERC721A-Upgradeable/', 'erc721a/=lib/ERC721A/', '@thirdweb-dev/dynamic-contracts/=lib/dynamic-contracts/', + 'lib/sstore2=lib/dynamic-contracts/lib/sstore2/' ] src = 'contracts' test = 'src/test' diff --git a/lib/sstore2 b/lib/sstore2 deleted file mode 160000 index 0a28fe61b..000000000 --- a/lib/sstore2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0a28fe61b6e81de9a05b462a24b9f4ba8c70d5b7 From 6ae93d2884ddc88b04fdcd511a51c1cdbb054e53 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 19 Oct 2023 04:44:31 +0530 Subject: [PATCH 13/13] don't compile all --- .github/workflows/slither.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 040cea832..139eef493 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -39,7 +39,7 @@ jobs: id: slither with: sarif: results.sarif - slither-args: --foundry-out-directory artifacts_forge --foundry-compile-all + slither-args: --foundry-out-directory artifacts_forge - name: Upload SARIF file uses: github/codeql-action/upload-sarif@v2