starknet_os: refactor nondet hint LoadTxNonce (#11123)

Author: dorimedini-starkware

crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/execution/execute_transactions.cairo

@@ -331,13 +331,15 @@ func get_account_tx_common_fields(
     tempvar paymaster_data: felt*;
     tempvar nonce_data_availability_mode;
     tempvar fee_data_availability_mode;
+    tempvar nonce;
     %{ LoadCommonTxFields %}
+    %{ LoadTxNonceAccount %}
     tempvar common_tx_fields = new CommonTxFields(
         tx_hash_prefix=tx_hash_prefix,
         version=3,
         sender_address=sender_address,
         chain_id=block_context.os_global_context.starknet_os_config.chain_id,
-        nonce=nondet %{ tx.nonce %},
+        nonce=nonce,
         tip=tip,
         n_resource_bounds=3,
         resource_bounds=resource_bounds,
@@ -543,7 +545,8 @@ func execute_l1_handler_transaction{
     );
     local tx_execution_info: ExecutionInfo* = tx_execution_context.execution_info;
 
-    local nonce = nondet %{ tx.nonce %};
+    local nonce;
+    %{ LoadTxNonceL1Handler %}
     local chain_id = block_context.os_global_context.starknet_os_config.chain_id;
 
     let pedersen_ptr = builtin_ptrs.selectable.pedersen;

crates/starknet_os/resources/hint_coverage/declare_deploy_scenario_n_blocks_1_use_kzg_da_false_full_output_false.json

@@ -285,7 +285,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"

crates/starknet_os/resources/hint_coverage/declare_deploy_scenario_n_blocks_1_use_kzg_da_false_full_output_true.json

@@ -264,7 +264,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"

crates/starknet_os/resources/hint_coverage/declare_deploy_scenario_n_blocks_1_use_kzg_da_true_full_output_false.json

@@ -291,7 +291,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"

crates/starknet_os/resources/hint_coverage/declare_deploy_scenario_n_blocks_1_use_kzg_da_true_full_output_true.json

@@ -264,7 +264,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"

crates/starknet_os/resources/hint_coverage/declare_deploy_scenario_n_blocks_2_use_kzg_da_false_full_output_false.json

@@ -285,7 +285,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"

crates/starknet_os/resources/hint_coverage/declare_deploy_scenario_n_blocks_2_use_kzg_da_false_full_output_true.json

@@ -264,7 +264,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"

crates/starknet_os/resources/hint_coverage/declare_deploy_scenario_n_blocks_2_use_kzg_da_true_full_output_false.json

@@ -291,7 +291,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"

crates/starknet_os/resources/hint_coverage/declare_deploy_scenario_n_blocks_2_use_kzg_da_true_full_output_true.json

@@ -264,7 +264,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"

crates/starknet_os/resources/hint_coverage/test_block_info_cairo0.json

@@ -306,7 +306,7 @@
     "OsHint": "LogEnterSyscall"
   },
   {
-    "OsHint": "SetApToTxNonce"
+    "OsHint": "LoadTxNonceAccount"
   },
   {
     "OsHint": "WriteSyscallResult"