Merge remote-tracking branch 'origin/develop' into bold-merge-lint

OffchainLabs · Sep 3, 2024 · 0c8bf83 · 0c8bf83
2 parents 49a705f + f677b58
commit 0c8bf83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml
@@ -132,7 +132,6 @@ jobs:
 
       - uses: OffchainLabs/actions/run-nitro-test-node@main
         with:
-          nitro-testnode-ref: deneb-integration
           args: --pos
           no-token-bridge: true
 

diff --git a/audit-ci.jsonc b/audit-ci.jsonc
@@ -63,6 +63,8 @@
     // Elliptic's ECDSA missing check for whether leading bit of r and s is zero - only used in dev
     "GHSA-977x-g7h5-7qgw",
     // Server-Side Request Forgery in axios
-    "GHSA-8hc4-vh64-cxmj"
+    "GHSA-8hc4-vh64-cxmj",
+    // Regular Expression Denial of Service (ReDoS) in micromatch
+    "GHSA-952p-6rrq-rcjv"
   ]
 }
diff --git a/test/contract/toolkit4844.ts b/test/contract/toolkit4844.ts
@@ -110,7 +110,7 @@ export class Toolkit4844 {
     data: string
   ) {
     const blobStr = blobs.reduce((acc, blob) => acc + ' -b ' + blob, '')
-    const blobCommand = `docker run --network=nitro-testnode_default ethpandaops/goomy-blob@sha256:8fd6dfe19bedf43f485f1d5ef3db0a0af569c1a08eacc117d5c5ba43656989f0 blob-sender -p ${privKey} -r http://geth:8545 -t ${to} -d ${data} --gaslimit 1000000${blobStr} 2>&1`
+    const blobCommand = `docker run --network=nitro-testnode_default ethpandaops/goomy-blob:master-91c1ad7 blob-sender -p ${privKey} -r http://geth:8545 -t ${to} -d ${data} --gaslimit 1000000${blobStr} 2>&1`
     const res = execSync(blobCommand).toString()
     const txHashRegex = /0x[a-fA-F0-9]{64}/
     const match = res.match(txHashRegex)