Merge branch 'main' into dl/#336

OffchainLabs · Oct 18, 2023 · 3ba5b8d · 3ba5b8d
2 parents 14cc399 + def0478
commit 3ba5b8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -114,7 +114,6 @@ jobs:
         uses: OffchainLabs/actions/run-nitro-test-node@main
         with:
           no-token-bridge: true
-          nitro-testnode-ref: '520f2589411d76bf2ce740c65658ee81bea433df'
 
       - name: Copy .env
         run: cp ./.env-sample ./.env

diff --git a/tests/integration/standarderc20.test.ts b/tests/integration/standarderc20.test.ts
@@ -210,13 +210,9 @@ describe('standard ERC20', () => {
       ])
     )
 
-    // supply just enough gas to cover l1 costs - this also covers l2 costs since the
-    // that estimate returns some margin
-    await redeemAndTest(
-      waitRes.message,
-      0,
-      gasComponents.gasEstimateForL1.sub(200000)
-    )
+    // force the redeem to fail by submitted just a bit under the required gas
+    // so it is enough to pay for L1 + L2 intrinsic gas costs
+    await redeemAndTest(waitRes.message, 0, gasComponents.gasEstimate.sub(1000))
     await redeemAndTest(waitRes.message, 1)
   })