Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,24 @@ where

let calldata = transaction.calldata();

// Validate block-level invariants
{
// Validate that the transaction's gas limit is not larger than
// the block's gas limit.
let block_gas_limit = system.get_gas_limit();
// First, check block gas limit can be represented as ergs.
require!(
block_gas_limit <= MAX_BLOCK_GAS_LIMIT,
InvalidTransaction::BlockGasLimitTooHigh,
system
)?;
require!(
tx_gas_limit <= block_gas_limit,
InvalidTransaction::CallerGasLimitMoreThanBlock,
system
)?;
// Validate block-level invariants (for non-service transactions)
if !transaction.is_service() {
{
// Validate that the transaction's gas limit is not larger than
// the block's gas limit.
let block_gas_limit = system.get_gas_limit();
// First, check block gas limit can be represented as ergs.
require!(
block_gas_limit <= MAX_BLOCK_GAS_LIMIT,
InvalidTransaction::BlockGasLimitTooHigh,
system
)?;
require!(
tx_gas_limit <= block_gas_limit,
InvalidTransaction::CallerGasLimitMoreThanBlock,
system
)?;
}
}

// EIP-7623
Expand Down
22 changes: 22 additions & 0 deletions tests/instances/transactions/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,28 @@ fn test_simple_service_transaction_whitelist() {
assert!(res0.as_ref().is_err(), "Tx should fail");
}

#[test]
fn test_service_tx_gas_limit_exceeds_block() {
let mut chain = Chain::empty(None);
let target_address = L2_INTEROP_ROOT_STORAGE_ADDRESS.to_be_bytes::<20>();

let tx = ZKsyncTxEnvelope::from(ZKsyncServiceTx {
to: alloy::primitives::Address::from_slice(&target_address),
input: Default::default(),
salt: 0,
})
.encode();

let block_context = BlockContext {
gas_limit: 30_000_000,
eip1559_basefee: U256::from(1000),
..Default::default()
};

let result = chain.run_block(vec![tx], Some(block_context), None, run_config());
assert!(result.tx_results[0].is_ok());
}

#[test]
fn test_service_block_invariants() {
let mut chain = Chain::empty(None);
Expand Down
Loading