chore(blockifier): split builtin gas costs from base gas costs

starkware-libs · Dec 8, 2024 · ad1ba0b · ad1ba0b
1 parent a0dd2fb
commit ad1ba0b
Show file tree

Hide file tree

Showing 10 changed files with 155 additions and 146 deletions.
diff --git a/crates/blockifier/resources/versioned_constants_0_13_0.json b/crates/blockifier/resources/versioned_constants_0_13_0.json
@@ -73,15 +73,17 @@
         "default_entry_point_selector": 0,
         "stored_block_hash_buffer": 10,
         "step_gas_cost": 100,
-        "range_check_gas_cost": 70,
-        "keccak_builtin_gas_cost": 0,
-        "pedersen_gas_cost": 0,
-        "bitwise_builtin_gas_cost": 0,
-        "ecop_gas_cost": 0,
-        "poseidon_gas_cost": 0,
-        "add_mod_gas_cost": 0,
-        "mul_mod_gas_cost": 0,
-        "ecdsa_gas_cost": 0,
+        "builtin_gas_costs": {
+            "range_check_gas_cost": 70,
+            "keccak_builtin_gas_cost": 0,
+            "pedersen_gas_cost": 0,
+            "bitwise_builtin_gas_cost": 0,
+            "ecop_gas_cost": 0,
+            "poseidon_gas_cost": 0,
+            "add_mod_gas_cost": 0,
+            "mul_mod_gas_cost": 0,
+            "ecdsa_gas_cost": 0
+        },
         "memory_hole_gas_cost": 10,
         "os_contract_addresses": {
             "block_hash_contract_address": 1,
@@ -101,11 +103,6 @@
             "entry_point_initial_budget": 1,
             "step_gas_cost": 600
         },
-        "transaction_gas_cost": {
-            "entry_point_initial_budget": 2,
-            "fee_transfer_gas_cost": 1,
-            "step_gas_cost": 1100
-        },
         "error_block_number_out_of_range": "Block number out of range",
         "error_out_of_gas": "Out of gas",
         "error_entry_point_failed": "ENTRYPOINT_FAILED",
@@ -620,4 +617,4 @@
             1000
         ]
     }
-}
+}
diff --git a/crates/blockifier/resources/versioned_constants_0_13_1.json b/crates/blockifier/resources/versioned_constants_0_13_1.json
@@ -73,15 +73,17 @@
         "default_entry_point_selector": 0,
         "stored_block_hash_buffer": 10,
         "step_gas_cost": 100,
-        "range_check_gas_cost": 70,
-        "keccak_builtin_gas_cost": 0,
-        "pedersen_gas_cost": 0,
-        "bitwise_builtin_gas_cost": 0,
-        "ecop_gas_cost": 0,
-        "poseidon_gas_cost": 0,
-        "add_mod_gas_cost": 0,
-        "mul_mod_gas_cost": 0,
-        "ecdsa_gas_cost": 0,
+        "builtin_gas_costs": {
+            "range_check_gas_cost": 70,
+            "keccak_builtin_gas_cost": 0,
+            "pedersen_gas_cost": 0,
+            "bitwise_builtin_gas_cost": 0,
+            "ecop_gas_cost": 0,
+            "poseidon_gas_cost": 0,
+            "add_mod_gas_cost": 0,
+            "mul_mod_gas_cost": 0,
+            "ecdsa_gas_cost": 0
+        },
         "os_contract_addresses": {
             "block_hash_contract_address": 1,
             "alias_contract_address": 2,
@@ -101,11 +103,6 @@
             "entry_point_initial_budget": 1,
             "step_gas_cost": 600
         },
-        "transaction_gas_cost": {
-            "entry_point_initial_budget": 2,
-            "fee_transfer_gas_cost": 1,
-            "step_gas_cost": 1100
-        },
         "error_block_number_out_of_range": "Block number out of range",
         "error_out_of_gas": "Out of gas",
         "error_entry_point_failed": "ENTRYPOINT_FAILED",
@@ -656,4 +653,4 @@
             10000
         ]
     }
-}
+}
diff --git a/crates/blockifier/resources/versioned_constants_0_13_1_1.json b/crates/blockifier/resources/versioned_constants_0_13_1_1.json
@@ -73,15 +73,17 @@
         "default_entry_point_selector": 0,
         "stored_block_hash_buffer": 10,
         "step_gas_cost": 100,
-        "range_check_gas_cost": 70,
-        "keccak_builtin_gas_cost": 0,
-        "pedersen_gas_cost": 0,
-        "bitwise_builtin_gas_cost": 0,
-        "ecop_gas_cost": 0,
-        "poseidon_gas_cost": 0,
-        "add_mod_gas_cost": 0,
-        "mul_mod_gas_cost": 0,
-        "ecdsa_gas_cost": 0,
+        "builtin_gas_costs": {
+            "range_check_gas_cost": 70,
+            "keccak_builtin_gas_cost": 0,
+            "pedersen_gas_cost": 0,
+            "bitwise_builtin_gas_cost": 0,
+            "ecop_gas_cost": 0,
+            "poseidon_gas_cost": 0,
+            "add_mod_gas_cost": 0,
+            "mul_mod_gas_cost": 0,
+            "ecdsa_gas_cost": 0
+        },
         "memory_hole_gas_cost": 10,
         "os_contract_addresses": {
             "block_hash_contract_address": 1,
@@ -101,11 +103,6 @@
             "entry_point_initial_budget": 1,
             "step_gas_cost": 600
         },
-        "transaction_gas_cost": {
-            "entry_point_initial_budget": 2,
-            "fee_transfer_gas_cost": 1,
-            "step_gas_cost": 1100
-        },
         "error_block_number_out_of_range": "Block number out of range",
         "error_out_of_gas": "Out of gas",
         "error_entry_point_failed": "ENTRYPOINT_FAILED",
@@ -656,4 +653,4 @@
             10000
         ]
     }
-}
+}
diff --git a/crates/blockifier/resources/versioned_constants_0_13_2.json b/crates/blockifier/resources/versioned_constants_0_13_2.json
@@ -93,26 +93,23 @@
             "alias_contract_address": 2,
             "reserved_contract_address": 3
         },
-        "range_check_gas_cost": 70,
-        "keccak_builtin_gas_cost": 0,
-        "pedersen_gas_cost": 0,
-        "bitwise_builtin_gas_cost": 594,
-        "ecop_gas_cost": 0,
-        "poseidon_gas_cost": 0,
-        "add_mod_gas_cost": 0,
-        "mul_mod_gas_cost": 0,
-        "ecdsa_gas_cost": 0,
+        "builtin_gas_costs": {
+            "range_check_gas_cost": 70,
+            "keccak_builtin_gas_cost": 0,
+            "pedersen_gas_cost": 0,
+            "bitwise_builtin_gas_cost": 594,
+            "ecop_gas_cost": 0,
+            "poseidon_gas_cost": 0,
+            "add_mod_gas_cost": 0,
+            "mul_mod_gas_cost": 0,
+            "ecdsa_gas_cost": 0
+        },
         "sierra_array_len_bound": 4294967296,
         "step_gas_cost": 100,
         "stored_block_hash_buffer": 10,
         "syscall_base_gas_cost": {
             "step_gas_cost": 100
         },
-        "transaction_gas_cost": {
-            "entry_point_initial_budget": 2,
-            "fee_transfer_gas_cost": 1,
-            "step_gas_cost": 1100
-        },
         "transfer_entry_point_selector": "0x83afd3f4caedc6eebf44246fe54e38c95e3179a5ec9ea81740eca5b482d12e",
         "validate_declare_entry_point_selector": "0x289da278a8dc833409cabfdad1581e8e7d40e42dcaed693fa4008dcdb4963b3",
         "validate_deploy_entry_point_selector": "0x36fcbf06cd96843058359e1a75928beacfac10727dab22a3972f0af8aa92895",
@@ -663,4 +660,4 @@
             10000
         ]
     }
-}
+}
diff --git a/crates/blockifier/resources/versioned_constants_0_13_2_1.json b/crates/blockifier/resources/versioned_constants_0_13_2_1.json
@@ -93,26 +93,23 @@
             "alias_contract_address": 2,
             "reserved_contract_address": 3
         },
-        "range_check_gas_cost": 70,
-        "keccak_builtin_gas_cost": 0,
-        "pedersen_gas_cost": 0,
-        "bitwise_builtin_gas_cost": 594,
-        "ecop_gas_cost": 0,
-        "poseidon_gas_cost": 0,
-        "add_mod_gas_cost": 0,
-        "mul_mod_gas_cost": 0,
-        "ecdsa_gas_cost": 0,
+        "builtin_gas_costs": {
+            "range_check_gas_cost": 70,
+            "keccak_builtin_gas_cost": 0,
+            "pedersen_gas_cost": 0,
+            "bitwise_builtin_gas_cost": 594,
+            "ecop_gas_cost": 0,
+            "poseidon_gas_cost": 0,
+            "add_mod_gas_cost": 0,
+            "mul_mod_gas_cost": 0,
+            "ecdsa_gas_cost": 0
+        },
         "sierra_array_len_bound": 4294967296,
         "step_gas_cost": 100,
         "stored_block_hash_buffer": 10,
         "syscall_base_gas_cost": {
             "step_gas_cost": 100
         },
-        "transaction_gas_cost": {
-            "entry_point_initial_budget": 2,
-            "fee_transfer_gas_cost": 1,
-            "step_gas_cost": 1100
-        },
         "transfer_entry_point_selector": "0x83afd3f4caedc6eebf44246fe54e38c95e3179a5ec9ea81740eca5b482d12e",
         "validate_declare_entry_point_selector": "0x289da278a8dc833409cabfdad1581e8e7d40e42dcaed693fa4008dcdb4963b3",
         "validate_deploy_entry_point_selector": "0x36fcbf06cd96843058359e1a75928beacfac10727dab22a3972f0af8aa92895",
@@ -663,4 +660,4 @@
             10000
         ]
     }
-}
+}
diff --git a/crates/blockifier/resources/versioned_constants_0_13_3.json b/crates/blockifier/resources/versioned_constants_0_13_3.json
@@ -93,26 +93,23 @@
             "alias_contract_address": 2,
             "reserved_contract_address": 3
         },
-        "range_check_gas_cost": 70,
-        "keccak_builtin_gas_cost": 0,
-        "pedersen_gas_cost": 0,
-        "bitwise_builtin_gas_cost": 594,
-        "ecop_gas_cost": 0,
-        "poseidon_gas_cost": 0,
-        "add_mod_gas_cost": 0,
-        "mul_mod_gas_cost": 0,
-        "ecdsa_gas_cost": 0,
+        "builtin_gas_costs": {
+            "range_check_gas_cost": 70,
+            "keccak_builtin_gas_cost": 0,
+            "pedersen_gas_cost": 0,
+            "bitwise_builtin_gas_cost": 594,
+            "ecop_gas_cost": 0,
+            "poseidon_gas_cost": 0,
+            "add_mod_gas_cost": 0,
+            "mul_mod_gas_cost": 0,
+            "ecdsa_gas_cost": 0
+        },
         "sierra_array_len_bound": 4294967296,
         "step_gas_cost": 100,
         "stored_block_hash_buffer": 10,
         "syscall_base_gas_cost": {
             "step_gas_cost": 100
         },
-        "transaction_gas_cost": {
-            "entry_point_initial_budget": 2,
-            "fee_transfer_gas_cost": 1,
-            "step_gas_cost": 1100
-        },
         "transfer_entry_point_selector": "0x83afd3f4caedc6eebf44246fe54e38c95e3179a5ec9ea81740eca5b482d12e",
         "validate_declare_entry_point_selector": "0x289da278a8dc833409cabfdad1581e8e7d40e42dcaed693fa4008dcdb4963b3",
         "validate_deploy_entry_point_selector": "0x36fcbf06cd96843058359e1a75928beacfac10727dab22a3972f0af8aa92895",
@@ -663,4 +660,4 @@
             10000
         ]
     }
-}
+}
diff --git a/crates/blockifier/resources/versioned_constants_0_13_4.json b/crates/blockifier/resources/versioned_constants_0_13_4.json
@@ -91,27 +91,23 @@
             "alias_contract_address": 2,
             "reserved_contract_address": 3
         },
-        "range_check_gas_cost": 70,
-        "keccak_builtin_gas_cost": 136189,
-        "pedersen_gas_cost": 4050,
-        "bitwise_builtin_gas_cost": 583,
-        "ecop_gas_cost": 4085,
-        "poseidon_gas_cost": 491,
-        "add_mod_gas_cost": 230,
-        "mul_mod_gas_cost": 604,
-        "ecdsa_gas_cost": 10561,
+        "builtin_gas_costs": {
+            "range_check_gas_cost": 70,
+            "keccak_builtin_gas_cost": 136189,
+            "pedersen_gas_cost": 4050,
+            "bitwise_builtin_gas_cost": 583,
+            "ecop_gas_cost": 4085,
+            "poseidon_gas_cost": 491,
+            "add_mod_gas_cost": 230,
+            "mul_mod_gas_cost": 604,
+            "ecdsa_gas_cost": 10561
+        },
         "sierra_array_len_bound": 4294967296,
         "step_gas_cost": 100,
         "stored_block_hash_buffer": 10,
         "syscall_base_gas_cost": {
             "step_gas_cost": 100
         },
-        "transaction_gas_cost": {
-            "step_gas_cost": 4098,
-            "pedersen_gas_cost": 4,
-            "range_check_gas_cost": 77,
-            "poseidon_gas_cost": 11
-        },
         "transfer_entry_point_selector": "0x83afd3f4caedc6eebf44246fe54e38c95e3179a5ec9ea81740eca5b482d12e",
         "validate_declare_entry_point_selector": "0x289da278a8dc833409cabfdad1581e8e7d40e42dcaed693fa4008dcdb4963b3",
         "validate_deploy_entry_point_selector": "0x36fcbf06cd96843058359e1a75928beacfac10727dab22a3972f0af8aa92895",
@@ -666,4 +662,4 @@
             10000
         ]
     }
-}
+}
diff --git a/crates/blockifier/src/execution/entry_point_execution.rs b/crates/blockifier/src/execution/entry_point_execution.rs
@@ -196,12 +196,12 @@ fn prepare_program_extra_data(
     // Create the builtin cost segment, the builtin order should be the same as the price builtin
     // array in the os in compiled_class.cairo in load_compiled_class_facts.
     let builtin_price_array = [
-        gas_costs.base.pedersen_gas_cost,
-        gas_costs.base.bitwise_builtin_gas_cost,
-        gas_costs.base.ecop_gas_cost,
-        gas_costs.base.poseidon_gas_cost,
-        gas_costs.base.add_mod_gas_cost,
-        gas_costs.base.mul_mod_gas_cost,
+        gas_costs.builtins.pedersen_gas_cost,
+        gas_costs.builtins.bitwise_builtin_gas_cost,
+        gas_costs.builtins.ecop_gas_cost,
+        gas_costs.builtins.poseidon_gas_cost,
+        gas_costs.builtins.add_mod_gas_cost,
+        gas_costs.builtins.mul_mod_gas_cost,
     ];
 
     let data = builtin_price_array