Merge remote-tracking branch 'origin/main' into meshi/merge-main-v0.1…

…3.2-into-main-1725348388

.github/workflows/committer_ci.yml

@@ -12,6 +12,7 @@ on:
       - 'Cargo.toml'
       - 'Cargo.lock'
       - 'crates/committer_cli/**'
+      - 'crates/starknet_api/**'
       - 'crates/starknet_committer/**'
       - 'crates/starknet_patricia/**'
 
@@ -27,6 +28,7 @@ on:
       - 'Cargo.toml'
       - 'Cargo.lock'
       - 'crates/committer_cli/**'
+      - 'crates/starknet_api/**'
       - 'crates/starknet_committer/**'
       - 'crates/starknet_patricia/**'
 

.github/workflows/main.yml

@@ -45,17 +45,30 @@ jobs:
           TITLE: ${{ github.event.pull_request.title }}
         run: echo "$TITLE" | commitlint --verbose
 
-  code_style:
+  format:
+    runs-on: starkware-ubuntu-20-04-medium
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master # TODO(Nimrod, 15/8/2024): Use stable toolchain.
+        with:
+          components: rustfmt
+          toolchain: nightly-2024-04-29
+      - uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: "v0-rust-ubuntu-20.04"
+      - run: scripts/rust_fmt.sh --check
+
+  clippy:
     runs-on: starkware-ubuntu-20-04-medium
     steps:
-      # Enviorment setup.
       - uses: actions/checkout@v4
       - uses: Noelware/setup-protoc@1.1.0
-      - uses: baptiste0928/cargo-install@v3
+      - uses: ./.github/actions/install_rust
         with:
-          crate: taplo-cli
-          version: '0.9.0'
-          locked: true
+          components: clippy
+      - uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: "v0-rust-ubuntu-20.04"
 
       # Setup pypy and link to the location expected by .cargo/config.toml.
       - uses: actions/setup-python@v5
@@ -75,27 +88,12 @@ jobs:
       RUSTDOCFLAGS: "-D warnings"
     steps:
       - uses: actions/checkout@v4
-      # Install rust components.
       - uses: ./.github/actions/install_rust
+      - uses: Swatinem/rust-cache@v2
+      - uses: Noelware/setup-protoc@1.1.0
         with:
-          components: rustfmt, clippy
-
-      # Run tests.
-      - name: "Run rustfmt and clippy"
-        run: scripts/rust_fmt.sh --check
-      - name: "Run clippy"
-        run: scripts/clippy.sh
-      - name: "Run cargo doc"
-        run: cargo doc --workspace -r --document-private-items --no-deps
-      - name: "Run taplo"
-        run: scripts/taplo.sh
-      - name: "Run cargo check"
-        env:
-          RUSTDOCFLAGS: "-D warnings"
-        run: cargo check --workspace -r --all-features
-      - name: Run Machete (detect unused dependencies)
-        uses: bnjbvr/cargo-machete@main
-
+          version: ${{env.PROTOC_VERSION}}
+      - run: cargo doc --workspace -r --document-private-items --no-deps
 
   run-workspace-tests:
     runs-on: starkware-ubuntu-latest-small
@@ -146,6 +144,39 @@ jobs:
         env:
           SEED: 0
 
+  taplo:
+    runs-on: starkware-ubuntu-latest-small
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/install_rust
+      - uses: Swatinem/rust-cache@v2
+      - uses: baptiste0928/cargo-install@v3
+        with:
+          crate: taplo-cli
+          version: "0.9.0"
+          locked: true
+      - run: scripts/taplo.sh
+
+  machete:
+    runs-on: starkware-ubuntu-latest-small
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run Machete (detect unused dependencies)
+        uses: bnjbvr/cargo-machete@main
+
+  check:
+    runs-on: starkware-ubuntu-latest-small
+    env:
+      RUSTDOCFLAGS: "-D warnings"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/install_rust
+      - uses: Swatinem/rust-cache@v2
+      - uses: Noelware/setup-protoc@1.1.0
+        with:
+          version: ${{env.PROTOC_VERSION}}
+      - run: cargo check --workspace -r --all-features
+
   merge-gatekeeper:
     runs-on: starkware-ubuntu-latest-small
     # Restrict permissions of the GITHUB_TOKEN.
@@ -239,4 +270,4 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
           fail_ci_if_error: true
-          version: "v0.1.15"
+          version: "v0.1.15"

crates/blockifier/resources/versioned_constants.json

@@ -194,7 +194,7 @@
     "os_resources": {
         "execute_syscalls": {
             "CallContract": {
-                "n_steps": 827,
+                "n_steps": 860,
                 "builtin_instance_counter": {
                     "range_check_builtin": 15
                 },
@@ -215,7 +215,7 @@
                 "n_memory_holes": 0
             },
             "Deploy": {
-                "n_steps": 1099,
+                "n_steps": 1128,
                 "builtin_instance_counter": {
                     "pedersen_builtin": 7,
                     "range_check_builtin": 18
@@ -294,7 +294,7 @@
                 "n_memory_holes": 0
             },
             "LibraryCall": {
-                "n_steps": 818,
+                "n_steps": 836,
                 "builtin_instance_counter": {
                     "range_check_builtin": 15
                 },
@@ -308,7 +308,7 @@
                 "n_memory_holes": 0
             },
             "ReplaceClass": {
-                "n_steps": 98,
+                "n_steps": 104,
                 "builtin_instance_counter": {
                     "range_check_builtin": 1
                 },
@@ -400,14 +400,14 @@
                 "n_memory_holes": 0
             },
             "StorageRead": {
-                "n_steps": 87,
+                "n_steps": 89,
                 "builtin_instance_counter": {
                     "range_check_builtin": 1
                 },
                 "n_memory_holes": 0
             },
             "StorageWrite": {
-                "n_steps": 89,
+                "n_steps": 93,
                 "builtin_instance_counter": {
                     "range_check_builtin": 1
                 },
@@ -418,7 +418,7 @@
             "Declare": {
                 "deprecated_resources": {
                     "constant": {
-                        "n_steps": 3099,
+                        "n_steps": 3161,
                         "builtin_instance_counter": {
                             "pedersen_builtin": 16,
                             "range_check_builtin": 56,
@@ -434,7 +434,7 @@
                 },
                 "resources": {
                     "constant": {
-                        "n_steps": 3231,
+                        "n_steps": 3293,
                         "builtin_instance_counter": {
                             "pedersen_builtin": 4,
                             "range_check_builtin": 64,
@@ -452,7 +452,7 @@
             "DeployAccount": {
                 "deprecated_resources": {
                     "constant": {
-                        "n_steps": 4020,
+                        "n_steps": 4114,
                         "builtin_instance_counter": {
                             "pedersen_builtin": 23,
                             "range_check_builtin": 72
@@ -469,7 +469,7 @@
                 },
                 "resources": {
                     "constant": {
-                        "n_steps": 4169,
+                        "n_steps": 4263,
                         "builtin_instance_counter": {
                             "pedersen_builtin": 11,
                             "range_check_builtin": 80,
@@ -489,7 +489,7 @@
             "InvokeFunction": {
                 "deprecated_resources": {
                     "constant": {
-                        "n_steps": 3769,
+                        "n_steps": 3854,
                         "builtin_instance_counter": {
                             "pedersen_builtin": 14,
                             "range_check_builtin": 69
@@ -506,7 +506,7 @@
                 },
                 "resources": {
                     "constant": {
-                        "n_steps": 3942,
+                        "n_steps": 4027,
                         "builtin_instance_counter": {
                             "pedersen_builtin": 4,
                             "range_check_builtin": 77,
@@ -526,7 +526,7 @@
             "L1Handler": {
                 "deprecated_resources": {
                     "constant": {
-                        "n_steps": 1234,
+                        "n_steps": 1257,
                         "builtin_instance_counter": {
                             "pedersen_builtin": 11,
                             "range_check_builtin": 16
@@ -616,4 +616,4 @@
             100
         ]
     }
-}
+}

crates/blockifier/src/blockifier/stateful_validator.rs

@@ -18,11 +18,7 @@ use crate::state::cached_state::CachedState;
 use crate::state::errors::StateError;
 use crate::state::state_api::StateReader;
 use crate::transaction::account_transaction::AccountTransaction;
-use crate::transaction::errors::{
-    TransactionExecutionError,
-    TransactionInfoCreationError,
-    TransactionPreValidationError,
-};
+use crate::transaction::errors::{TransactionExecutionError, TransactionPreValidationError};
 use crate::transaction::transaction_execution::Transaction;
 use crate::transaction::transactions::ValidatableTransaction;
 
@@ -40,8 +36,6 @@ pub enum StatefulValidatorError {
     TransactionExecutorError(#[from] TransactionExecutorError),
     #[error(transparent)]
     TransactionPreValidationError(#[from] TransactionPreValidationError),
-    #[error(transparent)]
-    TransactionCreationError(#[from] TransactionInfoCreationError),
 }
 
 pub type StatefulValidatorResult<T> = Result<T, StatefulValidatorError>;
@@ -71,7 +65,7 @@ impl<S: StateReader> StatefulValidator<S> {
             return Ok(());
         }
 
-        let tx_context = self.tx_executor.block_context.to_tx_context(&tx)?;
+        let tx_context = self.tx_executor.block_context.to_tx_context(&tx);
         self.perform_pre_validation_stage(&tx, &tx_context)?;
 
         if skip_validate {
@@ -118,7 +112,7 @@ impl<S: StateReader> StatefulValidator<S> {
         mut remaining_gas: u64,
     ) -> StatefulValidatorResult<(Option<CallInfo>, TransactionReceipt)> {
         let mut execution_resources = ExecutionResources::default();
-        let tx_context = Arc::new(self.tx_executor.block_context.to_tx_context(tx)?);
+        let tx_context = Arc::new(self.tx_executor.block_context.to_tx_context(tx));
 
         let limit_steps_by_resources = true;
         let validate_call_info = tx.validate_tx(

crates/blockifier/src/blockifier/stateful_validator_test.rs

@@ -1,6 +1,6 @@
 use assert_matches::assert_matches;
 use rstest::rstest;
-use starknet_api::transaction::{DeprecatedResourceBoundsMapping, Fee, TransactionVersion};
+use starknet_api::transaction::{Fee, TransactionVersion, ValidResourceBounds};
 
 use crate::blockifier::stateful_validator::StatefulValidator;
 use crate::context::BlockContext;
@@ -33,7 +33,7 @@ fn test_transaction_validator(
     #[case] validate_constructor: bool,
     #[case] tx_version: TransactionVersion,
     block_context: BlockContext,
-    max_resource_bounds: DeprecatedResourceBoundsMapping,
+    max_resource_bounds: ValidResourceBounds,
     #[values(CairoVersion::Cairo0, CairoVersion::Cairo1)] cairo_version: CairoVersion,
 ) {
     let chain_info = &block_context.chain_info;
@@ -75,7 +75,7 @@ fn test_transaction_validator(
 }
 
 #[rstest]
-fn test_transaction_validator_skip_validate(max_resource_bounds: DeprecatedResourceBoundsMapping) {
+fn test_transaction_validator_skip_validate(max_resource_bounds: ValidResourceBounds) {
     let block_context = BlockContext::create_for_testing();
     let faulty_account = FeatureContract::FaultyAccount(CairoVersion::Cairo1);
     let state = test_state(&block_context.chain_info, BALANCE, &[(faulty_account, 1)]);

crates/blockifier/src/concurrency/fee_utils_test.rs

@@ -1,7 +1,7 @@
 use num_bigint::BigUint;
 use rstest::rstest;
 use starknet_api::felt;
-use starknet_api::transaction::{DeprecatedResourceBoundsMapping, Fee};
+use starknet_api::transaction::{Fee, ValidResourceBounds};
 use starknet_types_core::felt::Felt;
 
 use crate::concurrency::fee_utils::{add_fee_to_sequencer_balance, fill_sequencer_balance_reads};
@@ -19,7 +19,7 @@ use crate::transaction::test_utils::{account_invoke_tx, block_context, max_resou
 #[rstest]
 pub fn test_fill_sequencer_balance_reads(
     block_context: BlockContext,
-    max_resource_bounds: DeprecatedResourceBoundsMapping,
+    max_resource_bounds: ValidResourceBounds,
     #[values(CairoVersion::Cairo0, CairoVersion::Cairo1)] erc20_version: CairoVersion,
 ) {
     let account = FeatureContract::AccountWithoutValidations(CairoVersion::Cairo1);

crates/blockifier/src/concurrency/versioned_state_test.rs

@@ -11,7 +11,7 @@ use starknet_api::core::{
     Nonce,
     PatriciaKey,
 };
-use starknet_api::transaction::{Calldata, ContractAddressSalt, DeprecatedResourceBoundsMapping};
+use starknet_api::transaction::{Calldata, ContractAddressSalt, ValidResourceBounds};
 use starknet_api::{calldata, class_hash, contract_address, felt, patricia_key};
 
 use crate::abi::abi_utils::{get_fee_token_var_address, get_storage_var_address};
@@ -201,7 +201,7 @@ fn test_versioned_state_proxy() {
 
 #[rstest]
 // Test parallel execution of two transactions that use the same versioned state.
-fn test_run_parallel_txs(max_resource_bounds: DeprecatedResourceBoundsMapping) {
+fn test_run_parallel_txs(max_resource_bounds: ValidResourceBounds) {
     let block_context = BlockContext::create_for_account_testing();
     let chain_info = &block_context.chain_info;
     let zero_bounds = true;
@@ -233,7 +233,7 @@ fn test_run_parallel_txs(max_resource_bounds: DeprecatedResourceBoundsMapping) {
         &mut NonceManager::default(),
     );
     let account_tx_1 = AccountTransaction::DeployAccount(deploy_account_tx_1);
-    let enforce_fee = account_tx_1.create_tx_info().unwrap().enforce_fee();
+    let enforce_fee = account_tx_1.create_tx_info().enforce_fee();
 
     let class_hash = grindy_account.get_class_hash();
     let ctor_storage_arg = felt!(1_u8);
@@ -248,7 +248,7 @@ fn test_run_parallel_txs(max_resource_bounds: DeprecatedResourceBoundsMapping) {
     let deploy_account_tx_2 = deploy_account_tx(deploy_tx_args, nonce_manager);
     let account_address = deploy_account_tx_2.contract_address();
     let account_tx_2 = AccountTransaction::DeployAccount(deploy_account_tx_2);
-    let tx_context = block_context.to_tx_context(&account_tx_2).unwrap();
+    let tx_context = block_context.to_tx_context(&account_tx_2);
     let fee_type = tx_context.tx_info.fee_type();
 
     let deployed_account_balance_key = get_fee_token_var_address(account_address);

crates/blockifier/src/concurrency/worker_logic.rs

@@ -230,10 +230,7 @@ impl<'a, S: StateReader> WorkerExecutor<'a, S> {
             &mut execution_output.as_mut().expect(EXECUTION_OUTPUTS_UNWRAP_ERROR).result;
 
         if let Ok(tx_execution_info) = tx_result.as_mut() {
-            let tx_context = self
-                .block_context
-                .to_tx_context(&self.chunk[tx_index])
-                .expect("Failed to create tx context.");
+            let tx_context = self.block_context.to_tx_context(&self.chunk[tx_index]);
             // Add the deleted sequencer balance key to the storage keys.
             let concurrency_mode = true;
             tx_state_changes_keys.update_sequencer_key_in_storage(