From 1aa2fae0e741b3404d17e71aec04a2c07b29f118 Mon Sep 17 00:00:00 2001 From: aner-starkware <147302140+aner-starkware@users.noreply.github.com> Date: Tue, 3 Dec 2024 09:21:17 +0200 Subject: [PATCH] chore(blockifier): add global max_sierra_gas to versioned constants (#2330) --- crates/blockifier/resources/versioned_constants_0_13_0.json | 2 ++ crates/blockifier/resources/versioned_constants_0_13_1.json | 2 ++ crates/blockifier/resources/versioned_constants_0_13_1_1.json | 2 ++ crates/blockifier/resources/versioned_constants_0_13_2.json | 2 ++ crates/blockifier/resources/versioned_constants_0_13_2_1.json | 2 ++ crates/blockifier/resources/versioned_constants_0_13_3.json | 2 ++ crates/blockifier/resources/versioned_constants_0_13_4.json | 2 ++ crates/blockifier/src/versioned_constants.rs | 2 ++ 8 files changed, 16 insertions(+) diff --git a/crates/blockifier/resources/versioned_constants_0_13_0.json b/crates/blockifier/resources/versioned_constants_0_13_0.json index 36c41326c8..294fa14ecc 100644 --- a/crates/blockifier/resources/versioned_constants_0_13_0.json +++ b/crates/blockifier/resources/versioned_constants_0_13_0.json @@ -4,6 +4,7 @@ "max_contract_bytecode_size": 61440 }, "invoke_tx_max_n_steps": 3000000, + "execute_max_sierra_gas": 10000000000, "max_recursion_depth": 50, "segment_arena_cells": true, "disable_cairo0_redeclaration": false, @@ -562,6 +563,7 @@ } }, "validate_max_n_steps": 1000000, + "validate_max_sierra_gas": 10000000000, "min_compiler_version_for_sierra_gas": "2.8.0", "vm_resource_fee_cost": { "builtins": { diff --git a/crates/blockifier/resources/versioned_constants_0_13_1.json b/crates/blockifier/resources/versioned_constants_0_13_1.json index cfea76e432..d70e03cc55 100644 --- a/crates/blockifier/resources/versioned_constants_0_13_1.json +++ b/crates/blockifier/resources/versioned_constants_0_13_1.json @@ -9,6 +9,7 @@ "max_contract_bytecode_size": 81920 }, "invoke_tx_max_n_steps": 4000000, + "execute_max_sierra_gas": 10000000000, "deprecated_l2_resource_gas_costs": { "gas_per_data_felt": [ 128, @@ -598,6 +599,7 @@ } }, "validate_max_n_steps": 1000000, + "validate_max_sierra_gas": 10000000000, "min_compiler_version_for_sierra_gas": "2.8.0", "vm_resource_fee_cost": { "builtins": { diff --git a/crates/blockifier/resources/versioned_constants_0_13_1_1.json b/crates/blockifier/resources/versioned_constants_0_13_1_1.json index 8849299c49..20463ac307 100644 --- a/crates/blockifier/resources/versioned_constants_0_13_1_1.json +++ b/crates/blockifier/resources/versioned_constants_0_13_1_1.json @@ -9,6 +9,7 @@ "max_contract_bytecode_size": 81920 }, "invoke_tx_max_n_steps": 4000000, + "execute_max_sierra_gas": 10000000000, "deprecated_l2_resource_gas_costs": { "gas_per_data_felt": [ 128, @@ -598,6 +599,7 @@ } }, "validate_max_n_steps": 1000000, + "validate_max_sierra_gas": 10000000000, "min_compiler_version_for_sierra_gas": "2.8.0", "vm_resource_fee_cost": { "builtins": { diff --git a/crates/blockifier/resources/versioned_constants_0_13_2.json b/crates/blockifier/resources/versioned_constants_0_13_2.json index da5869a94c..e02561d466 100644 --- a/crates/blockifier/resources/versioned_constants_0_13_2.json +++ b/crates/blockifier/resources/versioned_constants_0_13_2.json @@ -9,6 +9,7 @@ "max_contract_bytecode_size": 81920 }, "invoke_tx_max_n_steps": 10000000, + "execute_max_sierra_gas": 10000000000, "deprecated_l2_resource_gas_costs": { "gas_per_data_felt": [ 128, @@ -604,6 +605,7 @@ } }, "validate_max_n_steps": 1000000, + "validate_max_sierra_gas": 10000000000, "min_compiler_version_for_sierra_gas": "2.8.0", "vm_resource_fee_cost": { "builtins": { diff --git a/crates/blockifier/resources/versioned_constants_0_13_2_1.json b/crates/blockifier/resources/versioned_constants_0_13_2_1.json index 357d42ff12..0cc5406078 100644 --- a/crates/blockifier/resources/versioned_constants_0_13_2_1.json +++ b/crates/blockifier/resources/versioned_constants_0_13_2_1.json @@ -9,6 +9,7 @@ "max_contract_bytecode_size": 81920 }, "invoke_tx_max_n_steps": 10000000, + "execute_max_sierra_gas": 10000000000, "deprecated_l2_resource_gas_costs": { "gas_per_data_felt": [ 128, @@ -604,6 +605,7 @@ } }, "validate_max_n_steps": 1000000, + "validate_max_sierra_gas": 10000000000, "min_compiler_version_for_sierra_gas": "2.8.0", "vm_resource_fee_cost": { "builtins": { diff --git a/crates/blockifier/resources/versioned_constants_0_13_3.json b/crates/blockifier/resources/versioned_constants_0_13_3.json index 357d42ff12..0cc5406078 100644 --- a/crates/blockifier/resources/versioned_constants_0_13_3.json +++ b/crates/blockifier/resources/versioned_constants_0_13_3.json @@ -9,6 +9,7 @@ "max_contract_bytecode_size": 81920 }, "invoke_tx_max_n_steps": 10000000, + "execute_max_sierra_gas": 10000000000, "deprecated_l2_resource_gas_costs": { "gas_per_data_felt": [ 128, @@ -604,6 +605,7 @@ } }, "validate_max_n_steps": 1000000, + "validate_max_sierra_gas": 10000000000, "min_compiler_version_for_sierra_gas": "2.8.0", "vm_resource_fee_cost": { "builtins": { diff --git a/crates/blockifier/resources/versioned_constants_0_13_4.json b/crates/blockifier/resources/versioned_constants_0_13_4.json index c04fd8a728..f8c835060d 100644 --- a/crates/blockifier/resources/versioned_constants_0_13_4.json +++ b/crates/blockifier/resources/versioned_constants_0_13_4.json @@ -9,6 +9,7 @@ "max_contract_bytecode_size": 81920 }, "invoke_tx_max_n_steps": 10000000, + "execute_max_sierra_gas": 1000000000, "deprecated_l2_resource_gas_costs": { "gas_per_data_felt": [ 128, @@ -609,6 +610,7 @@ } }, "validate_max_n_steps": 1000000, + "validate_max_sierra_gas": 100000000, "min_compiler_version_for_sierra_gas": "2.8.0", "vm_resource_fee_cost": { "builtins": { diff --git a/crates/blockifier/src/versioned_constants.rs b/crates/blockifier/src/versioned_constants.rs index abbcc6ef14..85f61f483a 100644 --- a/crates/blockifier/src/versioned_constants.rs +++ b/crates/blockifier/src/versioned_constants.rs @@ -177,10 +177,12 @@ pub struct VersionedConstants { // Limits. pub tx_event_limits: EventLimits, pub invoke_tx_max_n_steps: u32, + pub execute_max_sierra_gas: GasAmount, pub deprecated_l2_resource_gas_costs: ArchivalDataGasCosts, pub archival_data_gas_costs: ArchivalDataGasCosts, pub max_recursion_depth: usize, pub validate_max_n_steps: u32, + pub validate_max_sierra_gas: GasAmount, pub min_compiler_version_for_sierra_gas: CompilerVersion, // BACKWARD COMPATIBILITY: If true, the segment_arena builtin instance counter will be // multiplied by 3. This offsets a bug in the old vm where the counter counted the number of