fix: Cap gas limit by balance in gas_params (#1192)

* zksync: cap gas limit by balance in gas_params; drop debug logs

* chore: update anvil-zksync repository URL and bump release tag to v0.6.10 in workflows

* chore: update zksync-telemetry repository URL from nbaztec to matter-labs

* chore: add RUSTSEC-2025-0098 to deny list for unmaintained unic-ucd-version

* chore: add RUSTSEC-2025-0104 to deny list for unmaintained unic-ucd-segment

* chore: update deny list with new RUSTSEC advisories for unmaintained unic crates

* fix(cli): update function names and improve logging in main.rs for test passing

* Debug

* bring back change after debug

* Fix tests

* Rust format

* fix(tests): remove ignore flag from osaka_can_run_p256_precompile test and update emit parameters

* Format

Author: Jrigada

.github/workflows/test.yml

@@ -130,7 +130,7 @@ jobs:
           log: info
           logFilePath: anvil_zksync.log
           target: x86_64-unknown-linux-gnu
-          releaseTag: v0.6.1
+          releaseTag: v0.6.10
 
       - name: Setup Git config
         run: |

.github/workflows/zk-aave-test.yml

@@ -36,7 +36,7 @@ jobs:
           log: info
           logFilePath: anvil_zksync.log
           target: x86_64-unknown-linux-gnu
-          releaseTag: v0.6.1
+          releaseTag: v0.6.10
 
       - name: Setup Git config
         run: |

crates/cast/tests/cli/main.rs

@@ -3402,7 +3402,7 @@ Traces:
     │   ├─ [2553] 0x2Ce6311ddAE708829bc0784C967b7d77D19FD779::balanceOf(0xA12384c5E52fD646E7BC7F6B3b33A605651F566E) [delegatecall]
     │   │   └─ ← [Return] 0x000000000000000000000000000000000000000000000000000000000000f3b9
     │   └─ ← [Return] 0x000000000000000000000000000000000000000000000000000000000000f3b9
-    ├─ [65442] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::00000000(00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000a12384c5e52fd646e7bc7f6b3b33a605651f566e000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000000000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda02913000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000060f0000000000000000000000000000000000000000000000000000000000036cd000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000327a25ad5cfe5c4d4339c1a4267d4a83e8c93312000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000005a00000000000000000000000000b55b053230e4effb6609de652fca73fd1c2980400000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000221000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006cdd519280ec730727f07aa36550bde31a1d5f3097818f3425c2f083ed33a91f080fa2afac0071f6e1af9a0e9c09b851bf01e68bc8a1c1f89f686c48205762f92500000000000000000000000000000000000000000000000000000000000000244242424242424242424242424242424242424242424242424242424242424242010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000827b226368616c6c656e6765223a224b51704d51446e7841757a726f68522d483878472d5a536b625249702d76515f5f5f4a714259357a655038222c2263726f73734f726967696e223a66616c73652c226f726967696e223a2268747470732f2f6974686163612e78797a222c2274797065223a22776562617574686e2e676574227d0000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)
+    ├─ [65442] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::fulfillBasicOrder_efficient_6GL6yc()
     │   ├─ [25070] 0xA12384c5E52fD646E7BC7F6B3b33A605651F566E::unwrapAndValidateSignature(0x290a4c4039f102eceba2147e1fcc46f994a46d1229faf43ffff26a058e7378ff, 0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006cdd519280ec730727f07aa36550bde31a1d5f3097818f3425c2f083ed33a91f080fa2afac0071f6e1af9a0e9c09b851bf01e68bc8a1c1f89f686c48205762f92500000000000000000000000000000000000000000000000000000000000000244242424242424242424242424242424242424242424242424242424242424242010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000827b226368616c6c656e6765223a224b51704d51446e7841757a726f68522d483878472d5a536b625249702d76515f5f5f4a714259357a655038222c2263726f73734f726967696e223a66616c73652c226f726967696e223a2268747470732f2f6974686163612e78797a222c2274797065223a22776562617574686e2e676574227d0000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b00) [staticcall]
     │   │   ├─ [22067] 0x0B55b053230E4EFFb6609de652fCa73Fd1C29804::unwrapAndValidateSignature(0x290a4c4039f102eceba2147e1fcc46f994a46d1229faf43ffff26a058e7378ff, 0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006cdd519280ec730727f07aa36550bde31a1d5f3097818f3425c2f083ed33a91f080fa2afac0071f6e1af9a0e9c09b851bf01e68bc8a1c1f89f686c48205762f92500000000000000000000000000000000000000000000000000000000000000244242424242424242424242424242424242424242424242424242424242424242010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000827b226368616c6c656e6765223a224b51704d51446e7841757a726f68522d483878472d5a536b625249702d76515f5f5f4a714259357a655038222c2263726f73734f726967696e223a66616c73652c226f726967696e223a2268747470732f2f6974686163612e78797a222c2274797065223a22776562617574686e2e676574227d0000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b00) [delegatecall]
     │   │   │   ├─ [2369] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::pauseFlag() [staticcall]
@@ -3436,7 +3436,7 @@ Traces:
     │   │   ├─ [553] 0x2Ce6311ddAE708829bc0784C967b7d77D19FD779::balanceOf(0x327a25aD5Cfe5c4D4339C1A4267D4a83E8c93312) [delegatecall]
     │   │   │   └─ ← [Return] 0x0000000000000000000000000000000000000000000000000000000000009c9a
     │   │   └─ ← [Return] 0x0000000000000000000000000000000000000000000000000000000000009c9a
-    │   ├─ [5675] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::00000001(00000000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b290a4c4039f102eceba2147e1fcc46f994a46d1229faf43ffff26a058e7378ff0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000a12384c5e52fd646e7bc7f6b3b33a605651f566e000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000000000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda02913000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000060f0000000000000000000000000000000000000000000000000000000000036cd000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000327a25ad5cfe5c4d4339c1a4267d4a83e8c93312000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000005a00000000000000000000000000b55b053230e4effb6609de652fca73fd1c2980400000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000221000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006cdd519280ec730727f07aa36550bde31a1d5f3097818f3425c2f083ed33a91f080fa2afac0071f6e1af9a0e9c09b851bf01e68bc8a1c1f89f686c48205762f92500000000000000000000000000000000000000000000000000000000000000244242424242424242424242424242424242424242424242424242424242424242010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000827b226368616c6c656e6765223a224b51704d51446e7841757a726f68522d483878472d5a536b625249702d76515f5f5f4a714259357a655038222c2263726f73734f726967696e223a66616c73652c226f726967696e223a2268747470732f2f6974686163612e78797a222c2274797065223a22776562617574686e2e676574227d0000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)
+    │   ├─ [5675] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::multicallN2M_001Taw5z()
     │   │   ├─ [4148] 0xA12384c5E52fD646E7BC7F6B3b33A605651F566E::execute(0x0100000000007821000100000000000000000000000000000000000000000000, 0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000201bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b)
     │   │   │   ├─ [3693] 0x0B55b053230E4EFFb6609de652fCa73Fd1C29804::execute(0x0100000000007821000100000000000000000000000000000000000000000000, 0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000201bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b) [delegatecall]
     │   │   │   │   ├─ [435] 0xA12384c5E52fD646E7BC7F6B3b33A605651F566E::fallback()
@@ -4035,18 +4035,23 @@ casttest!(cast_mktx_negative_numbers, |_prj, cmd| {
 });
 
 // Test cast access-list with negative numbers
-casttest!(cast_access_list_negative_numbers, |_prj, cmd| {
-    let rpc = next_rpc_endpoint(NamedChain::Sepolia);
-    cmd.args([
-        "access-list",
-        "0x9999999999999999999999999999999999999999",
-        "adjustPosition(int128)",
-        "-33333",
-        "--rpc-url",
-        rpc.as_str(),
-    ])
-    .assert_success();
-});
+// Note(zk): Ignored - this test is also failing in upstream
+casttest!(
+    #[ignore]
+    cast_access_list_negative_numbers,
+    |_prj, cmd| {
+        let rpc = next_rpc_endpoint(NamedChain::Sepolia);
+        cmd.args([
+            "access-list",
+            "0x9999999999999999999999999999999999999999",
+            "adjustPosition(int128)",
+            "-33333",
+            "--rpc-url",
+            rpc.as_str(),
+        ])
+        .assert_success();
+    }
+);
 
 // tests that cast call properly applies multiple state diff overrides
 // <https://github.com/foundry-rs/foundry/issues/11551>

crates/forge/tests/cli/cmd.rs

@@ -2984,6 +2984,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
 });
 
 // <https://github.com/foundry-rs/foundry/issues/9300>
+// NOTE(zk): gas values differ slightly from upstream due to fork-specific differences
 forgetest_init!(gas_report_size_for_nested_create, |prj, cmd| {
     prj.add_test(
         "NestedDeployTest.sol",
@@ -3053,7 +3054,7 @@ contract NestedDeploy is Test {
 +============================================================================================+
 | Deployment Cost                           | Deployment Size |     |        |     |         |
 |-------------------------------------------+-----------------+-----+--------+-----+---------|
-| 328949                                    | 1163            |     |        |     |         |
+| 328961                                    | 1163            |     |        |     |         |
 |-------------------------------------------+-----------------+-----+--------+-----+---------|
 |                                           |                 |     |        |     |         |
 |-------------------------------------------+-----------------+-----+--------+-----+---------|
@@ -3108,7 +3109,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
   {
     "contract": "test/NestedDeployTest.sol:Parent",
     "deployment": {
-      "gas": 328949,
+      "gas": 328961,
       "size": 1163
     },
     "functions": {

crates/forge/tests/it/invariant.rs

@@ -762,6 +762,7 @@ contract AssumeTest is Test {
 
 // Test too many inputs rejected for `assumePrecompile`/`assumeForgeAddress`.
 // <https://github.com/foundry-rs/foundry/issues/9054>
+// NOTE(zk): runs and calls values differ from upstream due to gas limit being capped by balance
 forgetest_init!(should_revert_with_assume_code, |prj, cmd| {
     prj.update_config(|config| {
         config.invariant.fail_on_revert = true;
@@ -806,7 +807,7 @@ contract BalanceAssumeTest is Test {
 
     cmd.args(["test", "--mt", "invariant_balance"]).assert_failure().stdout_eq(str![[r#"
 ...
-[FAIL: `vm.assume` rejected too many inputs (10 allowed)] invariant_balance() (runs: 5, calls: 2500, reverts: 0)
+[FAIL: `vm.assume` rejected too many inputs (10 allowed)] invariant_balance() (runs: 2, calls: 1000, reverts: 0)
 ...
 "#]]);
 });

crates/zksync/core/src/vm/inspect.rs

@@ -46,7 +46,7 @@ use zksync_types::{
 use zksync_vm_interface::storage::{ReadStorage, StoragePtr, WriteStorage};
 
 use crate::{
-    DEFAULT_PROTOCOL_VERSION, MAX_L2_GAS_LIMIT,
+    DEFAULT_PROTOCOL_VERSION,
     convert::{ConvertAddress, ConvertH160, ConvertH256, ConvertRU256},
     fix_l2_gas_limit, fix_l2_gas_price, increment_tx_nonce, is_system_address,
     state::{FullNonce, new_full_nonce, parse_full_nonce},
@@ -413,27 +413,17 @@ where
     let value = ecx.tx.value.to_u256();
     let gas_price = U256::from(ecx.tx.gas_price);
     let gas_limit = U256::from(ecx.tx.gas_limit);
-
-    let dev_mode = gas_price.is_zero();
-    if !dev_mode {
-        // return the original gas limit (subject to max tx gas limit in zkEVM) and gas price. If
-        // not limited, causes not enough funds error in bootloader.
-        let gas_limit = gas_limit.min(MAX_L2_GAS_LIMIT.into());
-        return (gas_limit, gas_price);
-    }
-
     let use_paymaster = !paymaster_params.paymaster.is_zero();
     let payer = if use_paymaster {
         Address::from_slice(paymaster_params.paymaster.as_bytes())
     } else {
         caller
     };
     let balance = ZKVMData::new(ecx).get_balance(payer);
-
-    let max_fee_per_gas = fix_l2_gas_price(gas_price);
-    let gas_limit = fix_l2_gas_limit(gas_limit, max_fee_per_gas, value, balance);
-
-    (gas_limit, max_fee_per_gas)
+    let dev_mode = gas_price.is_zero();
+    let effective_gas_price = if dev_mode { fix_l2_gas_price(gas_price) } else { gas_price };
+    let gas_limit = fix_l2_gas_limit(gas_limit, effective_gas_price, value, balance);
+    (gas_limit, effective_gas_price)
 }
 
 #[allow(dead_code)]

deny.toml

@@ -12,12 +12,21 @@ ignore = [
     "RUSTSEC-2024-0436",
     # protobuf in trezor_client
     "RUSTSEC-2024-0437",
-    # https://rustsec.org/advisories/RUSTSEC-2025-0055 logging user input may result in poisoning logs with ANSI escape sequences
-    "RUSTSEC-2025-0055",
-    # https://rustsec.org/advisories/RUSTSEC-2025-0021 gitoxide uses SHA-1 hash implementations without any collision detection, leaving it vulnerable to hash collision attacks.
-    "RUSTSEC-2025-0021",
-    # https://rustsec.org/advisories/RUSTSEC-2025-0047 Out-of-bounds access in `get_disjoint_mut` due to incorrect bounds check
-    "RUSTSEC-2025-0047",
+    # https://rustsec.org/advisories/RUSTSEC-2025-0073 DoS vulnerability on alloy_dyn_abi::TypedData hashing
+    "RUSTSEC-2025-0073",
+    # All unic-* crates are unmaintained (from anvil-zksync -> zksync-error -> tera)
+    # https://rustsec.org/advisories/RUSTSEC-2025-0074 unic-segment
+    "RUSTSEC-2025-0074",
+    # https://rustsec.org/advisories/RUSTSEC-2025-0075 unic-char-range
+    "RUSTSEC-2025-0075",
+    # https://rustsec.org/advisories/RUSTSEC-2025-0080 unic-common
+    "RUSTSEC-2025-0080",
+    # https://rustsec.org/advisories/RUSTSEC-2025-0081 unic-char-property
+    "RUSTSEC-2025-0081",
+    # https://rustsec.org/advisories/RUSTSEC-2025-0098 unic-ucd-version
+    "RUSTSEC-2025-0098",
+    # https://rustsec.org/advisories/RUSTSEC-2025-0104 unic-ucd-segment
+    "RUSTSEC-2025-0104",
 ]
 
 # This section is considered when running `cargo deny check bans`.
@@ -126,8 +135,8 @@ allow-git = [
     "https://github.com/alloy-rs/alloy",
     "https://github.com/foundry-rs/compilers",
     "https://github.com/foundry-rs/foundry-fork-db",
-    "https://github.com/nbaztec/zksync-telemetry",
-    "https://github.com/nbaztec/anvil-zksync",
+    "https://github.com/matter-labs/zksync-telemetry",
+    "https://github.com/matter-labs/anvil-zksync",
     "https://github.com/Romsters/posthog-rs",
     "https://github.com/paradigmxyz/revm-inspectors",
     "https://github.com/paradigmxyz/solar",

testdata/forge-std-rev

@@ -1 +1 @@
-8bbcf6e3f8f62f419e5429a0bd89331c85c37824
+8e40513d678f392f398620b3ef2b418648b33e89