From 56ce34cf9b88254012145980123b77dccc7a67b8 Mon Sep 17 00:00:00 2001 From: gzeon Date: Thu, 15 Aug 2024 13:31:13 +0900 Subject: [PATCH 1/8] ci: upload 4bytes --- .github/workflows/contract-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml index 22a89750..77bf3e55 100644 --- a/.github/workflows/contract-tests.yml +++ b/.github/workflows/contract-tests.yml @@ -85,6 +85,9 @@ jobs: - name: Forge build run: forge build + - name: Upload 4bytes + run: find ./out -type f -name "*.json" -exec cast upload-signature {} + + - name: Test size run: yarn contract:size From 8b6032e742deff6ae152c593605ae37f8b26b128 Mon Sep 17 00:00:00 2001 From: gzeon Date: Thu, 15 Aug 2024 13:34:04 +0900 Subject: [PATCH 2/8] ci: move upload 4bytes to later step --- .github/workflows/contract-tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml index 77bf3e55..73e4562b 100644 --- a/.github/workflows/contract-tests.yml +++ b/.github/workflows/contract-tests.yml @@ -85,9 +85,6 @@ jobs: - name: Forge build run: forge build - - name: Upload 4bytes - run: find ./out -type f -name "*.json" -exec cast upload-signature {} + - - name: Test size run: yarn contract:size @@ -113,6 +110,10 @@ jobs: files: ./contracts/coverage.json verbose: false token: ${{ secrets.CODECOV_TOKEN }} + + - name: Upload 4bytes + run: find ./out -type f -name "*.json" -exec cast upload-signature {} + + test-4844: name: 4844 tests runs-on: ubuntu-latest From d07e24ef2a2ed34c783d9d34f0852d663c10ceb3 Mon Sep 17 00:00:00 2001 From: gzeon Date: Thu, 15 Aug 2024 13:35:43 +0900 Subject: [PATCH 3/8] ci: only show non dupe 4bytes uploaded --- .github/workflows/contract-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml index 73e4562b..9c584eeb 100644 --- a/.github/workflows/contract-tests.yml +++ b/.github/workflows/contract-tests.yml @@ -112,7 +112,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Upload 4bytes - run: find ./out -type f -name "*.json" -exec cast upload-signature {} + + run: find ./out -type f -name "*.json" -exec cast upload-signature {} + | grep -v Duplicated: test-4844: name: 4844 tests From 609f418ed4c699bf8866287442b4493931066c78 Mon Sep 17 00:00:00 2001 From: gzeon Date: Thu, 15 Aug 2024 13:44:29 +0900 Subject: [PATCH 4/8] chore: make upload-4bytes yarn action --- .github/workflows/contract-tests.yml | 2 +- package.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml index 9c584eeb..093da312 100644 --- a/.github/workflows/contract-tests.yml +++ b/.github/workflows/contract-tests.yml @@ -112,7 +112,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Upload 4bytes - run: find ./out -type f -name "*.json" -exec cast upload-signature {} + | grep -v Duplicated: + run: yarn upload-4bytes test-4844: name: 4844 tests diff --git a/package.json b/package.json index ef489de8..4974c8e4 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,8 @@ "test:storage": "./test/storage/test.bash", "test:signatures": "./test/signatures/test-sigs.bash", "test:e2e": "hardhat test test/e2e/*.ts", + "test:fix": "yarn run test:signatures || yarn run test:storage", + "upload-4bytes": "forge build && find ./out -type f -name \"*.json\" -exec cast upload-signature {} + | grep -v Duplicated:", "postinstall": "patch-package", "deploy-factory": "hardhat run scripts/deployment.ts", "deploy-eth-rollup": "hardhat run scripts/createEthRollup.ts", From 60b390560ed3f9dd7000e9f6c2811ec4deb6c2ce Mon Sep 17 00:00:00 2001 From: gzeon Date: Thu, 15 Aug 2024 13:45:57 +0900 Subject: [PATCH 5/8] chore: rename to test:update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4974c8e4..d21372de 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "test:storage": "./test/storage/test.bash", "test:signatures": "./test/signatures/test-sigs.bash", "test:e2e": "hardhat test test/e2e/*.ts", - "test:fix": "yarn run test:signatures || yarn run test:storage", + "test:update": "yarn run test:signatures || yarn run test:storage", "upload-4bytes": "forge build && find ./out -type f -name \"*.json\" -exec cast upload-signature {} + | grep -v Duplicated:", "postinstall": "patch-package", "deploy-factory": "hardhat run scripts/deployment.ts", From 0529d2cd89a054e3b4d8cab18ab98e3bf21c2544 Mon Sep 17 00:00:00 2001 From: gzeon Date: Thu, 15 Aug 2024 14:00:58 +0900 Subject: [PATCH 6/8] chore: ignore axios audit issue --- audit-ci.jsonc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/audit-ci.jsonc b/audit-ci.jsonc index 6211c2c0..0e2ab97a 100644 --- a/audit-ci.jsonc +++ b/audit-ci.jsonc @@ -61,6 +61,8 @@ // Elliptic's EDDSA missing signature length check - only used in dev "GHSA-f7q4-pwc6-w24p", // Elliptic's ECDSA missing check for whether leading bit of r and s is zero - only used in dev - "GHSA-977x-g7h5-7qgw" + "GHSA-977x-g7h5-7qgw", + // Server-Side Request Forgery in axios + "GHSA-8hc4-vh64-cxmj" ] } From 1e8d6f559f1a0be958c20434af82b47907ae0f4e Mon Sep 17 00:00:00 2001 From: gzeon Date: Thu, 15 Aug 2024 15:16:05 +0900 Subject: [PATCH 7/8] ci: try fix 4844 test --- .github/workflows/contract-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml index 67e26d6f..879be46e 100644 --- a/.github/workflows/contract-tests.yml +++ b/.github/workflows/contract-tests.yml @@ -129,7 +129,7 @@ jobs: - uses: OffchainLabs/actions/run-nitro-test-node@main with: - nitro-testnode-ref: deneb-integration + nitro-testnode-ref: gzeoneth-patch-1 args: --pos no-token-bridge: true From 4c53cf508fa6809893db8b7248ab83f913831c21 Mon Sep 17 00:00:00 2001 From: gzeon Date: Thu, 15 Aug 2024 18:26:40 +0900 Subject: [PATCH 8/8] Revert "ci: try fix 4844 test" This reverts commit 1e8d6f559f1a0be958c20434af82b47907ae0f4e. --- .github/workflows/contract-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml index 879be46e..67e26d6f 100644 --- a/.github/workflows/contract-tests.yml +++ b/.github/workflows/contract-tests.yml @@ -129,7 +129,7 @@ jobs: - uses: OffchainLabs/actions/run-nitro-test-node@main with: - nitro-testnode-ref: gzeoneth-patch-1 + nitro-testnode-ref: deneb-integration args: --pos no-token-bridge: true