@aztec/pxe 5.0.0-rc.1 → 5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/block_synchronizer/block_stream_source.d.ts +5 -5
- package/dest/block_synchronizer/block_stream_source.d.ts.map +1 -1
- package/dest/block_synchronizer/block_stream_source.js +4 -29
- package/dest/block_synchronizer/block_synchronizer.d.ts +16 -12
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +49 -15
- package/dest/config/index.d.ts +2 -1
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +1 -0
- package/dest/contract/contract_class_service.d.ts +31 -0
- package/dest/contract/contract_class_service.d.ts.map +1 -0
- package/dest/contract/contract_class_service.js +68 -0
- package/dest/{contract_sync → contract}/contract_sync_service.d.ts +7 -6
- package/dest/contract/contract_sync_service.d.ts.map +1 -0
- package/dest/{contract_sync → contract}/contract_sync_service.js +10 -30
- package/dest/contract/helpers.d.ts +7 -0
- package/dest/contract/helpers.d.ts.map +1 -0
- package/dest/contract/helpers.js +20 -0
- package/dest/contract_function_simulator/anchored_contract_data.d.ts +36 -0
- package/dest/contract_function_simulator/anchored_contract_data.d.ts.map +1 -0
- package/dest/contract_function_simulator/anchored_contract_data.js +54 -0
- package/dest/contract_function_simulator/aztec_node_read_cache.d.ts +39 -0
- package/dest/contract_function_simulator/aztec_node_read_cache.d.ts.map +1 -0
- package/dest/contract_function_simulator/aztec_node_read_cache.js +60 -0
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +19 -18
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +52 -31
- package/dest/contract_function_simulator/execution_note_cache.d.ts +3 -9
- package/dest/contract_function_simulator/execution_note_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_note_cache.js +8 -28
- package/dest/contract_function_simulator/index.d.ts +17 -9
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +4 -7
- package/dest/contract_function_simulator/noir-structs/bounded_vec.d.ts +8 -27
- package/dest/contract_function_simulator/noir-structs/bounded_vec.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/bounded_vec.js +8 -23
- package/dest/contract_function_simulator/noir-structs/contract_class_log_data.d.ts +9 -0
- package/dest/contract_function_simulator/noir-structs/contract_class_log_data.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/contract_class_log_data.js +1 -0
- package/dest/contract_function_simulator/noir-structs/embedded_curve_point.d.ts +7 -0
- package/dest/contract_function_simulator/noir-structs/embedded_curve_point.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/embedded_curve_point.js +1 -0
- package/dest/contract_function_simulator/noir-structs/event_validation_request.js +1 -1
- package/dest/contract_function_simulator/noir-structs/fact.d.ts +16 -0
- package/dest/contract_function_simulator/noir-structs/fact.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/fact.js +6 -0
- package/dest/contract_function_simulator/noir-structs/fact_collection.d.ts +27 -0
- package/dest/contract_function_simulator/noir-structs/fact_collection.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/fact_collection.js +31 -0
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +11 -12
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +6 -49
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +10 -8
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +1 -60
- package/dest/contract_function_simulator/noir-structs/note_validation_request.js +2 -2
- package/dest/contract_function_simulator/noir-structs/option.d.ts +9 -11
- package/dest/contract_function_simulator/noir-structs/option.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/option.js +18 -13
- package/dest/contract_function_simulator/noir-structs/origin_block.d.ts +11 -0
- package/dest/contract_function_simulator/noir-structs/origin_block.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/origin_block.js +5 -0
- package/dest/contract_function_simulator/noir-structs/pending_tagged_log.d.ts +11 -0
- package/dest/contract_function_simulator/noir-structs/pending_tagged_log.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/pending_tagged_log.js +4 -0
- package/dest/contract_function_simulator/noir-structs/provided_secret.d.ts +6 -9
- package/dest/contract_function_simulator/noir-structs/provided_secret.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/provided_secret.js +1 -14
- package/dest/contract_function_simulator/noir-structs/resolved_tagging_strategy.d.ts +28 -0
- package/dest/contract_function_simulator/noir-structs/resolved_tagging_strategy.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/resolved_tagging_strategy.js +50 -0
- package/dest/contract_function_simulator/noir-structs/resolved_tx.d.ts +21 -0
- package/dest/contract_function_simulator/noir-structs/resolved_tx.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/resolved_tx.js +50 -0
- package/dest/contract_function_simulator/noir-structs/tx_effect_data.d.ts +14 -0
- package/dest/contract_function_simulator/noir-structs/tx_effect_data.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/tx_effect_data.js +5 -0
- package/dest/contract_function_simulator/noir-structs/utility_context.d.ts +6 -11
- package/dest/contract_function_simulator/noir-structs/utility_context.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/utility_context.js +1 -20
- package/dest/contract_function_simulator/oracle/acir_callback.d.ts +7 -2
- package/dest/contract_function_simulator/oracle/acir_callback.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/acir_callback.js +55 -11
- package/dest/contract_function_simulator/oracle/legacy_oracle_registry.d.ts +39 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_registry.d.ts.map +1 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_registry.js +107 -0
- package/dest/contract_function_simulator/oracle/message_load_oracle_inputs.d.ts +3 -14
- package/dest/contract_function_simulator/oracle/message_load_oracle_inputs.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/message_load_oracle_inputs.js +1 -24
- package/dest/contract_function_simulator/oracle/oracle_registry.d.ts +86 -8
- package/dest/contract_function_simulator/oracle/oracle_registry.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle_registry.js +168 -18
- package/dest/contract_function_simulator/oracle/oracle_type_mappings.d.ts +123 -40
- package/dest/contract_function_simulator/oracle/oracle_type_mappings.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle_type_mappings.js +947 -264
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +21 -8
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +126 -16
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +63 -33
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +175 -90
- package/dest/debug/pxe_debug_utils.d.ts +2 -2
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.d.ts +1 -1
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +3 -2
- package/dest/entrypoints/client/lazy/utils.d.ts +1 -1
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +3 -2
- package/dest/entrypoints/pxe_creation_options.d.ts +8 -2
- package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
- package/dest/entrypoints/server/index.d.ts +5 -3
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +3 -2
- package/dest/entrypoints/server/utils.d.ts +1 -1
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +3 -1
- package/dest/error_enriching.d.ts +5 -3
- package/dest/error_enriching.d.ts.map +1 -1
- package/dest/error_enriching.js +13 -11
- package/dest/hooks/execution_hooks.d.ts +27 -7
- package/dest/hooks/execution_hooks.d.ts.map +1 -1
- package/dest/hooks/execution_hooks.js +3 -3
- package/dest/hooks/index.d.ts +4 -3
- package/dest/hooks/index.d.ts.map +1 -1
- package/dest/hooks/index.js +1 -0
- package/dest/hooks/resolve_custom_request.d.ts +23 -0
- package/dest/hooks/resolve_custom_request.d.ts.map +1 -0
- package/dest/hooks/resolve_custom_request.js +3 -0
- package/dest/hooks/resolve_tagging_secret_strategy.d.ts +50 -0
- package/dest/hooks/resolve_tagging_secret_strategy.d.ts.map +1 -0
- package/dest/hooks/resolve_tagging_secret_strategy.js +3 -0
- package/dest/logs/log_service.d.ts +7 -6
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +79 -28
- package/dest/messages/tx_resolver_service.d.ts +17 -0
- package/dest/messages/tx_resolver_service.d.ts.map +1 -0
- package/dest/messages/{message_context_service.js → tx_resolver_service.js} +8 -8
- package/dest/oracle_version.d.ts +3 -3
- package/dest/oracle_version.js +3 -3
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +6 -2
- package/dest/private_kernel/hints/test_utils.js +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.d.ts +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.js +17 -36
- package/dest/private_kernel/private_kernel_oracle.d.ts +4 -2
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_oracle.js +17 -5
- package/dest/pxe.d.ts +109 -47
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +222 -139
- package/dest/storage/allowed_scopes.d.ts +6 -0
- package/dest/storage/allowed_scopes.d.ts.map +1 -0
- package/dest/storage/allowed_scopes.js +7 -0
- package/dest/storage/backwards_compatibility_tests/schema_tests.d.ts +1 -1
- package/dest/storage/backwards_compatibility_tests/schema_tests.d.ts.map +1 -1
- package/dest/storage/backwards_compatibility_tests/schema_tests.js +114 -37
- package/dest/storage/capsule_store/capsule_service.d.ts +1 -1
- package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -1
- package/dest/storage/capsule_store/capsule_service.js +6 -9
- package/dest/storage/contract_store/contract_store.d.ts +27 -24
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +64 -75
- package/dest/storage/fact_store/fact_service.d.ts +22 -0
- package/dest/storage/fact_store/fact_service.d.ts.map +1 -0
- package/dest/storage/fact_store/fact_service.js +45 -0
- package/dest/storage/fact_store/fact_store.d.ts +95 -0
- package/dest/storage/fact_store/fact_store.d.ts.map +1 -0
- package/dest/storage/fact_store/fact_store.js +408 -0
- package/dest/storage/fact_store/fact_store_keys.d.ts +34 -0
- package/dest/storage/fact_store/fact_store_keys.d.ts.map +1 -0
- package/dest/storage/fact_store/fact_store_keys.js +50 -0
- package/dest/storage/fact_store/index.d.ts +6 -0
- package/dest/storage/fact_store/index.d.ts.map +1 -0
- package/dest/storage/fact_store/index.js +4 -0
- package/dest/storage/fact_store/origin_state.d.ts +57 -0
- package/dest/storage/fact_store/origin_state.d.ts.map +1 -0
- package/dest/storage/fact_store/origin_state.js +53 -0
- package/dest/storage/fact_store/stored_fact.d.ts +32 -0
- package/dest/storage/fact_store/stored_fact.d.ts.map +1 -0
- package/dest/storage/fact_store/stored_fact.js +64 -0
- package/dest/storage/index.d.ts +2 -1
- package/dest/storage/index.d.ts.map +1 -1
- package/dest/storage/index.js +1 -0
- package/dest/storage/metadata.d.ts +2 -2
- package/dest/storage/metadata.d.ts.map +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/open_pxe_stores.d.ts +5 -3
- package/dest/storage/open_pxe_stores.d.ts.map +1 -1
- package/dest/storage/open_pxe_stores.js +5 -3
- package/dest/storage/tagging_store/index.d.ts +2 -2
- package/dest/storage/tagging_store/index.d.ts.map +1 -1
- package/dest/storage/tagging_store/index.js +1 -1
- package/dest/storage/tagging_store/tagging_secret_sources_store.d.ts +51 -0
- package/dest/storage/tagging_store/tagging_secret_sources_store.d.ts.map +1 -0
- package/dest/storage/tagging_store/tagging_secret_sources_store.js +105 -0
- package/dest/tagging/constants.d.ts +2 -2
- package/dest/tagging/constants.d.ts.map +1 -1
- package/dest/tagging/constants.js +18 -9
- package/package.json +17 -17
- package/src/block_synchronizer/block_stream_source.ts +6 -45
- package/src/block_synchronizer/block_synchronizer.ts +65 -24
- package/src/config/index.ts +1 -0
- package/src/contract/contract_class_service.ts +83 -0
- package/src/{contract_sync → contract}/contract_sync_service.ts +18 -37
- package/src/contract/helpers.ts +35 -0
- package/src/contract_function_simulator/anchored_contract_data.ts +74 -0
- package/src/contract_function_simulator/aztec_node_read_cache.ts +89 -0
- package/src/contract_function_simulator/contract_function_simulator.ts +86 -43
- package/src/contract_function_simulator/execution_note_cache.ts +7 -28
- package/src/contract_function_simulator/index.ts +24 -9
- package/src/contract_function_simulator/noir-structs/bounded_vec.ts +12 -24
- package/src/contract_function_simulator/noir-structs/contract_class_log_data.ts +9 -0
- package/src/contract_function_simulator/noir-structs/embedded_curve_point.ts +4 -0
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +1 -1
- package/src/contract_function_simulator/noir-structs/fact.ts +13 -0
- package/src/contract_function_simulator/noir-structs/fact_collection.ts +64 -0
- package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +20 -46
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +13 -60
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +2 -2
- package/src/contract_function_simulator/noir-structs/option.ts +17 -11
- package/src/contract_function_simulator/noir-structs/origin_block.ts +8 -0
- package/src/contract_function_simulator/noir-structs/pending_tagged_log.ts +12 -0
- package/src/contract_function_simulator/noir-structs/provided_secret.ts +4 -15
- package/src/contract_function_simulator/noir-structs/resolved_tagging_strategy.ts +66 -0
- package/src/contract_function_simulator/noir-structs/resolved_tx.ts +53 -0
- package/src/contract_function_simulator/noir-structs/tx_effect_data.ts +15 -0
- package/src/contract_function_simulator/noir-structs/utility_context.ts +5 -17
- package/src/contract_function_simulator/oracle/acir_callback.ts +58 -12
- package/src/contract_function_simulator/oracle/legacy_oracle_registry.ts +147 -0
- package/src/contract_function_simulator/oracle/message_load_oracle_inputs.ts +6 -21
- package/src/contract_function_simulator/oracle/oracle_registry.ts +119 -86
- package/src/contract_function_simulator/oracle/oracle_type_mappings.ts +659 -248
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +155 -24
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +300 -115
- package/src/debug/pxe_debug_utils.ts +1 -1
- package/src/entrypoints/client/bundle/utils.ts +3 -2
- package/src/entrypoints/client/lazy/utils.ts +3 -2
- package/src/entrypoints/pxe_creation_options.ts +7 -1
- package/src/entrypoints/server/index.ts +5 -2
- package/src/entrypoints/server/utils.ts +3 -1
- package/src/error_enriching.ts +27 -11
- package/src/hooks/execution_hooks.ts +28 -8
- package/src/hooks/index.ts +8 -2
- package/src/hooks/resolve_custom_request.ts +24 -0
- package/src/hooks/resolve_tagging_secret_strategy.ts +60 -0
- package/src/logs/log_service.ts +91 -37
- package/src/messages/{message_context_service.ts → tx_resolver_service.ts} +16 -9
- package/src/oracle_version.ts +3 -3
- package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +11 -1
- package/src/private_kernel/hints/test_utils.ts +1 -1
- package/src/private_kernel/private_kernel_execution_prover.ts +22 -52
- package/src/private_kernel/private_kernel_oracle.ts +23 -4
- package/src/pxe.ts +320 -158
- package/src/storage/allowed_scopes.ts +14 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/AddressStore.json +6 -6
- package/src/storage/backwards_compatibility_tests/__snapshots__/ContractStore.json +1 -1
- package/src/storage/backwards_compatibility_tests/__snapshots__/FactStore.json +40 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/KeyStore.json +12 -12
- package/src/storage/backwards_compatibility_tests/__snapshots__/L2TipsKVStore.json +1 -1
- package/src/storage/backwards_compatibility_tests/__snapshots__/RecipientTaggingStore.json +11 -3
- package/src/storage/backwards_compatibility_tests/__snapshots__/SenderTaggingStore.json +12 -4
- package/src/storage/backwards_compatibility_tests/__snapshots__/TaggingSecretSourcesStore.json +30 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/opened_stores.json +21 -5
- package/src/storage/backwards_compatibility_tests/schema_tests.ts +125 -36
- package/src/storage/capsule_store/capsule_service.ts +8 -13
- package/src/storage/contract_store/contract_store.ts +86 -93
- package/src/storage/fact_store/fact_service.ts +69 -0
- package/src/storage/fact_store/fact_store.ts +487 -0
- package/src/storage/fact_store/fact_store_keys.ts +75 -0
- package/src/storage/fact_store/index.ts +14 -0
- package/src/storage/fact_store/origin_state.ts +75 -0
- package/src/storage/fact_store/stored_fact.ts +80 -0
- package/src/storage/index.ts +1 -0
- package/src/storage/metadata.ts +1 -1
- package/src/storage/open_pxe_stores.ts +6 -3
- package/src/storage/tagging_store/index.ts +1 -1
- package/src/storage/tagging_store/tagging_secret_sources_store.ts +138 -0
- package/src/tagging/constants.ts +19 -9
- package/dest/contract_function_simulator/proxied_contract_data_source.d.ts +0 -6
- package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map +0 -1
- package/dest/contract_function_simulator/proxied_contract_data_source.js +0 -51
- package/dest/contract_sync/contract_sync_service.d.ts.map +0 -1
- package/dest/contract_sync/helpers.d.ts +0 -27
- package/dest/contract_sync/helpers.d.ts.map +0 -1
- package/dest/contract_sync/helpers.js +0 -53
- package/dest/messages/message_context_service.d.ts +0 -17
- package/dest/messages/message_context_service.d.ts.map +0 -1
- package/dest/storage/tagging_store/sender_address_book_store.d.ts +0 -14
- package/dest/storage/tagging_store/sender_address_book_store.d.ts.map +0 -1
- package/dest/storage/tagging_store/sender_address_book_store.js +0 -36
- package/src/contract_function_simulator/proxied_contract_data_source.ts +0 -60
- package/src/contract_sync/helpers.ts +0 -86
- package/src/storage/backwards_compatibility_tests/__snapshots__/SenderAddressBookStore.json +0 -16
- package/src/storage/tagging_store/sender_address_book_store.ts +0 -48
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
1
|
+
import type { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
|
|
3
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
|
+
import type { Tag } from '@aztec/stdlib/logs';
|
|
5
|
+
|
|
6
|
+
import type { Option } from './option.js';
|
|
6
7
|
|
|
7
8
|
/** Discriminant for which log source to query. */
|
|
8
9
|
export enum LogSource {
|
|
@@ -15,47 +16,20 @@ export enum LogSource {
|
|
|
15
16
|
* Intermediate struct used to perform batch log retrieval by PXE. The `utilityBulkRetrieveLogs` oracle expects values of this
|
|
16
17
|
* type to be stored in a `EphemeralArray`.
|
|
17
18
|
*/
|
|
18
|
-
export
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
new Fr(this.fromBlock !== undefined ? 1 : 0),
|
|
33
|
-
new Fr(this.fromBlock ?? 0),
|
|
34
|
-
new Fr(this.toBlock !== undefined ? 1 : 0),
|
|
35
|
-
new Fr(this.toBlock ?? 0),
|
|
36
|
-
];
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
static fromFields(fields: Fr[] | FieldReader): LogRetrievalRequest {
|
|
40
|
-
const reader = FieldReader.asReader(fields);
|
|
41
|
-
|
|
42
|
-
const contractAddress = AztecAddress.fromField(reader.readField());
|
|
43
|
-
const tag = new Tag(reader.readField());
|
|
44
|
-
const sourceNum = reader.readField().toNumber();
|
|
45
|
-
if (!(sourceNum in LogSource)) {
|
|
46
|
-
const validNames = Object.keys(LogSource).filter(k => isNaN(Number(k)));
|
|
47
|
-
throw new Error(`Invalid LogSource value ${sourceNum}, expected one of ${validNames.join(', ')}`);
|
|
48
|
-
}
|
|
49
|
-
const source = sourceNum as LogSource;
|
|
50
|
-
|
|
51
|
-
const fromBlockIsSome = reader.readBoolean();
|
|
52
|
-
const fromBlockValue = reader.readField();
|
|
53
|
-
const fromBlock = fromBlockIsSome ? BlockNumber(fromBlockValue.toNumber()) : undefined;
|
|
54
|
-
|
|
55
|
-
const toBlockIsSome = reader.readBoolean();
|
|
56
|
-
const toBlockValue = reader.readField();
|
|
57
|
-
const toBlock = toBlockIsSome ? BlockNumber(toBlockValue.toNumber()) : undefined;
|
|
58
|
-
|
|
59
|
-
return new LogRetrievalRequest(contractAddress, tag, source, fromBlock, toBlock);
|
|
19
|
+
export type LogRetrievalRequest = {
|
|
20
|
+
contractAddress: AztecAddress;
|
|
21
|
+
tag: Tag;
|
|
22
|
+
source: LogSource;
|
|
23
|
+
fromBlock: Option<BlockNumber>;
|
|
24
|
+
toBlock: Option<BlockNumber>;
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
/** Parses a `LogSource` from its wire field, throwing on an out-of-range value. */
|
|
28
|
+
export function logSourceFromField(field: Fr): LogSource {
|
|
29
|
+
const sourceNum = field.toNumber();
|
|
30
|
+
if (!(sourceNum in LogSource)) {
|
|
31
|
+
const validNames = Object.keys(LogSource).filter(k => isNaN(Number(k)));
|
|
32
|
+
throw new Error(`Invalid LogSource value ${sourceNum}, expected one of ${validNames.join(', ')}`);
|
|
60
33
|
}
|
|
34
|
+
return sourceNum as LogSource;
|
|
61
35
|
}
|
|
@@ -1,66 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import type { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import type { BlockHash } from '@aztec/stdlib/block';
|
|
4
4
|
import type { TxHash } from '@aztec/stdlib/tx';
|
|
5
|
-
|
|
6
|
-
const MAX_LOG_CONTENT_LEN = PRIVATE_LOG_CIPHERTEXT_LEN;
|
|
5
|
+
import type { UInt64 } from '@aztec/stdlib/types';
|
|
7
6
|
|
|
8
7
|
/**
|
|
9
8
|
* Intermediate struct used to perform batch log retrieval by PXE. The `utilityBulkRetrieveLogs` oracle stores values of this
|
|
10
9
|
* type in a `EphemeralArray`.
|
|
11
10
|
*/
|
|
12
|
-
export
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
return [
|
|
22
|
-
// We need to trim the payload since public logs can be larger than MAX_LOG_CONTENT_LEN.
|
|
23
|
-
// This is currently not a problem since this class is only used with public logs for note completion.
|
|
24
|
-
...serializeBoundedVec(this.logPayload.slice(0, MAX_LOG_CONTENT_LEN), MAX_LOG_CONTENT_LEN),
|
|
25
|
-
this.txHash.hash,
|
|
26
|
-
...serializeBoundedVec(this.uniqueNoteHashesInTx, MAX_NOTE_HASHES_PER_TX),
|
|
27
|
-
this.firstNullifierInTx,
|
|
28
|
-
];
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
static toEmptyFields(): Fr[] {
|
|
32
|
-
const serializationLen =
|
|
33
|
-
MAX_LOG_CONTENT_LEN +
|
|
34
|
-
1 /* logPayload BVec */ +
|
|
35
|
-
1 /* txHash */ +
|
|
36
|
-
MAX_NOTE_HASHES_PER_TX +
|
|
37
|
-
1 /* uniqueNoteHashesInTx BVec */ +
|
|
38
|
-
1; /* firstNullifierInTx */
|
|
39
|
-
return range(serializationLen).map(_ => Fr.zero());
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
static toSerializedOption(response: LogRetrievalResponse | null): Fr[] {
|
|
43
|
-
if (response) {
|
|
44
|
-
return [new Fr(1), ...response.toFields()];
|
|
45
|
-
} else {
|
|
46
|
-
return [new Fr(0), ...LogRetrievalResponse.toEmptyFields()];
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
/**
|
|
52
|
-
* Helper function to serialize a bounded vector according to Noir's BoundedVec format
|
|
53
|
-
* @param values - The values to serialize
|
|
54
|
-
* @param maxLength - The maximum length of the bounded vector
|
|
55
|
-
* @returns The serialized bounded vector as Fr[]
|
|
56
|
-
*/
|
|
57
|
-
function serializeBoundedVec(values: Fr[], maxLength: number): Fr[] {
|
|
58
|
-
if (values.length > maxLength) {
|
|
59
|
-
throw new Error(`Attempted to serialize ${values} values into a BoundedVec with max length ${maxLength}`);
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
const lengthDiff = maxLength - values.length;
|
|
63
|
-
const zeroPaddingArray = Array(lengthDiff).fill(Fr.ZERO);
|
|
64
|
-
const storage = values.concat(zeroPaddingArray);
|
|
65
|
-
return [...storage, new Fr(values.length)];
|
|
66
|
-
}
|
|
11
|
+
export type LogRetrievalResponse = {
|
|
12
|
+
logPayload: Fr[];
|
|
13
|
+
txHash: TxHash;
|
|
14
|
+
uniqueNoteHashesInTx: Fr[];
|
|
15
|
+
firstNullifierInTx: Fr;
|
|
16
|
+
blockNumber: BlockNumber;
|
|
17
|
+
blockTimestamp: UInt64;
|
|
18
|
+
blockHash: BlockHash;
|
|
19
|
+
};
|
|
@@ -23,8 +23,8 @@ export class NoteValidationRequest {
|
|
|
23
23
|
static fromFields(fields: Fr[] | FieldReader): NoteValidationRequest {
|
|
24
24
|
const reader = FieldReader.asReader(fields);
|
|
25
25
|
|
|
26
|
-
const contractAddress = AztecAddress.
|
|
27
|
-
const owner = AztecAddress.
|
|
26
|
+
const contractAddress = AztecAddress.fromFieldUnsafe(reader.readField());
|
|
27
|
+
const owner = AztecAddress.fromFieldUnsafe(reader.readField());
|
|
28
28
|
const storageSlot = reader.readField();
|
|
29
29
|
const randomness = reader.readField();
|
|
30
30
|
const noteNonce = reader.readField();
|
|
@@ -8,7 +8,9 @@
|
|
|
8
8
|
export class Option<T> {
|
|
9
9
|
private constructor(
|
|
10
10
|
public readonly value: T | undefined,
|
|
11
|
-
|
|
11
|
+
// `unknown` (not the descriptor shape) keeps this generic Option decoupled from the serialization layer's
|
|
12
|
+
// `{ length }`/`{ maxLength }` size descriptors; only the None-serialization path inspects it.
|
|
13
|
+
public readonly size: unknown,
|
|
12
14
|
) {}
|
|
13
15
|
|
|
14
16
|
/**
|
|
@@ -26,25 +28,22 @@ export class Option<T> {
|
|
|
26
28
|
/**
|
|
27
29
|
* Construct an absent Option.
|
|
28
30
|
*
|
|
29
|
-
* When serialized back to ACVM, the `None` case must produce the same number of fields as `Some`.
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
* re-serialized (e.g. deserialized input params).
|
|
33
|
-
*
|
|
34
|
-
* @param template - A representative empty `T` whose serialization determines the zero-filled wire format.
|
|
31
|
+
* When serialized back to ACVM, the `None` case must produce the same number of fields as `Some`. For an inner type whose
|
|
32
|
+
* wire size varies per call site (`BoundedVec`, an array), pass a `size` descriptor so the inner type's shape can
|
|
33
|
+
* resolve how many zero fields to emit; fixed-size inners take no argument.
|
|
35
34
|
*
|
|
36
35
|
* @example None for a fixed-size type:
|
|
37
36
|
* ```ts
|
|
38
|
-
* return Option.none(
|
|
37
|
+
* return Option.none();
|
|
39
38
|
* ```
|
|
40
39
|
*
|
|
41
40
|
* @example None for a dynamic-size type:
|
|
42
41
|
* ```ts
|
|
43
|
-
* return Option.none(
|
|
42
|
+
* return Option.none({ maxLength: ciphertext.maxLength });
|
|
44
43
|
* ```
|
|
45
44
|
*/
|
|
46
|
-
static none<T>(
|
|
47
|
-
return new Option<T>(undefined,
|
|
45
|
+
static none<T>(size?: unknown): Option<T> {
|
|
46
|
+
return new Option<T>(undefined, size);
|
|
48
47
|
}
|
|
49
48
|
|
|
50
49
|
/**
|
|
@@ -66,4 +65,11 @@ export class Option<T> {
|
|
|
66
65
|
isNone(): this is Option<T> & { value: undefined } {
|
|
67
66
|
return this.value === undefined;
|
|
68
67
|
}
|
|
68
|
+
|
|
69
|
+
equals(other: Option<T>, innerEquals: (a: T, b: T) => boolean): boolean {
|
|
70
|
+
if (this.isSome() && other.isSome()) {
|
|
71
|
+
return innerEquals(this.value, other.value);
|
|
72
|
+
}
|
|
73
|
+
return this.isNone() && other.isNone();
|
|
74
|
+
}
|
|
69
75
|
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
|
|
3
|
+
import type { ResolvedTx } from './resolved_tx.js';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Represents a pending tagged log as it is stored in the pending tagged log array to which the fetchTaggedLogs oracle
|
|
7
|
+
* inserts found private logs. A TS version of `pending_tagged_log.nr`.
|
|
8
|
+
*/
|
|
9
|
+
export type PendingTaggedLog = {
|
|
10
|
+
log: Fr[];
|
|
11
|
+
context: ResolvedTx;
|
|
12
|
+
};
|
|
@@ -1,16 +1,5 @@
|
|
|
1
|
-
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
-
import {
|
|
3
|
-
import { AppTaggingSecretKind, appTaggingSecretKindFromDeliveryMode } from '@aztec/stdlib/logs';
|
|
1
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
import type { AppTaggingSecretKind } from '@aztec/stdlib/logs';
|
|
4
3
|
|
|
5
|
-
/** A tagging secret an app supplies explicitly to `
|
|
6
|
-
export
|
|
7
|
-
constructor(
|
|
8
|
-
public secret: Fr,
|
|
9
|
-
public mode: AppTaggingSecretKind,
|
|
10
|
-
) {}
|
|
11
|
-
|
|
12
|
-
static fromFields(fields: Fr[] | FieldReader): ProvidedSecret {
|
|
13
|
-
const reader = FieldReader.asReader(fields);
|
|
14
|
-
return new ProvidedSecret(reader.readField(), appTaggingSecretKindFromDeliveryMode(reader.readField().toNumber()));
|
|
15
|
-
}
|
|
16
|
-
}
|
|
4
|
+
/** A tagging secret an app supplies explicitly to `getPendingTaggedLogsV2` when PXE cannot derive it internally. */
|
|
5
|
+
export type ProvidedSecret = { secret: Fr; mode: AppTaggingSecretKind };
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
|
|
3
|
+
// Keep in sync with aztec::messages::delivery::ResolvedTaggingStrategy
|
|
4
|
+
const NON_INTERACTIVE_HANDSHAKE = 1;
|
|
5
|
+
const UNCONSTRAINED_SECRET = 2;
|
|
6
|
+
const INTERACTIVE_HANDSHAKE = 3;
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* The tagging secret PXE hands to the contract after applying the wallet's {@link TaggingSecretStrategy} choice
|
|
10
|
+
* (and app-siloing). The contract uses it directly to derive the message tag, so it never sees raw key material.
|
|
11
|
+
*/
|
|
12
|
+
export type ResolvedTaggingStrategy =
|
|
13
|
+
| {
|
|
14
|
+
/** A non-interactive handshake: the recipient re-derives the secret from the onchain handshake registry. */
|
|
15
|
+
type: 'non-interactive-handshake';
|
|
16
|
+
}
|
|
17
|
+
| {
|
|
18
|
+
/**
|
|
19
|
+
* An interactive handshake: the registry obtains the recipient's signed authorization through the custom
|
|
20
|
+
* request oracle, and the recipient learns the secret while signing. Nothing announcing the handshake is
|
|
21
|
+
* published onchain.
|
|
22
|
+
*/
|
|
23
|
+
type: 'interactive-handshake';
|
|
24
|
+
}
|
|
25
|
+
| {
|
|
26
|
+
/**
|
|
27
|
+
* An app-siloed, recipient-directional secret, ready to use. Only sound for unconstrained delivery.
|
|
28
|
+
*/
|
|
29
|
+
type: 'unconstrained-secret';
|
|
30
|
+
/** The app-siloed directional tagging secret. */
|
|
31
|
+
secret: Fr;
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
/** Serializes a {@link ResolvedTaggingStrategy} to its Noir `[kind, secret]` field layout, zero-filling absent fields. */
|
|
35
|
+
export function resolvedTaggingStrategyToFields(resolved: ResolvedTaggingStrategy): Fr[] {
|
|
36
|
+
switch (resolved.type) {
|
|
37
|
+
case 'non-interactive-handshake':
|
|
38
|
+
return [new Fr(NON_INTERACTIVE_HANDSHAKE), Fr.ZERO];
|
|
39
|
+
case 'unconstrained-secret':
|
|
40
|
+
return [new Fr(UNCONSTRAINED_SECRET), resolved.secret];
|
|
41
|
+
case 'interactive-handshake':
|
|
42
|
+
return [new Fr(INTERACTIVE_HANDSHAKE), Fr.ZERO];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** Deserializes a {@link ResolvedTaggingStrategy} from its `kind` discriminant and `secret` field. */
|
|
47
|
+
export function resolvedTaggingStrategyFromFields(kind: number, secret: Fr): ResolvedTaggingStrategy {
|
|
48
|
+
switch (kind) {
|
|
49
|
+
case NON_INTERACTIVE_HANDSHAKE:
|
|
50
|
+
assertAbsentSecret(kind, secret);
|
|
51
|
+
return { type: 'non-interactive-handshake' };
|
|
52
|
+
case INTERACTIVE_HANDSHAKE:
|
|
53
|
+
assertAbsentSecret(kind, secret);
|
|
54
|
+
return { type: 'interactive-handshake' };
|
|
55
|
+
case UNCONSTRAINED_SECRET:
|
|
56
|
+
return { type: 'unconstrained-secret', secret };
|
|
57
|
+
default:
|
|
58
|
+
throw new Error(`Unrecognized resolved tagging strategy kind: ${kind}`);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function assertAbsentSecret(kind: number, secret: Fr): void {
|
|
63
|
+
if (!secret.isZero()) {
|
|
64
|
+
throw new Error(`Resolved tagging strategy ${kind} must not include a secret`);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
|
|
2
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
3
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
+
import { TxHash } from '@aztec/stdlib/tx';
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The resolved on-chain context of a transaction.
|
|
8
|
+
*
|
|
9
|
+
* Carries the note hashes and first nullifier needed to discover notes that originated from the transaction, plus the
|
|
10
|
+
* number and hash of the block in which it was mined.
|
|
11
|
+
*
|
|
12
|
+
* A TS version of the `ResolvedTx` struct in `oracle/tx_resolution.nr`.
|
|
13
|
+
*/
|
|
14
|
+
export class ResolvedTx {
|
|
15
|
+
constructor(
|
|
16
|
+
public txHash: TxHash,
|
|
17
|
+
public uniqueNoteHashesInTx: Fr[],
|
|
18
|
+
public firstNullifierInTx: Fr,
|
|
19
|
+
public blockNumber: number,
|
|
20
|
+
public blockHash: Fr,
|
|
21
|
+
) {}
|
|
22
|
+
|
|
23
|
+
toFields(): Fr[] {
|
|
24
|
+
return [
|
|
25
|
+
this.txHash.hash,
|
|
26
|
+
...serializeBoundedVec(this.uniqueNoteHashesInTx, MAX_NOTE_HASHES_PER_TX),
|
|
27
|
+
this.firstNullifierInTx,
|
|
28
|
+
new Fr(this.blockNumber),
|
|
29
|
+
this.blockHash,
|
|
30
|
+
];
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
static empty(): ResolvedTx {
|
|
34
|
+
return new ResolvedTx(TxHash.zero(), [], Fr.ZERO, 0, Fr.ZERO);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Helper function to serialize a bounded vector according to Noir's BoundedVec format: the storage array padded to
|
|
40
|
+
* `maxLength`, followed by the actual length.
|
|
41
|
+
* @param values - The values to serialize
|
|
42
|
+
* @param maxLength - The maximum length of the bounded vector
|
|
43
|
+
* @returns The serialized bounded vector as Fr[]
|
|
44
|
+
*/
|
|
45
|
+
function serializeBoundedVec(values: Fr[], maxLength: number): Fr[] {
|
|
46
|
+
const storage = padArrayEnd(
|
|
47
|
+
values,
|
|
48
|
+
Fr.ZERO,
|
|
49
|
+
maxLength,
|
|
50
|
+
`Attempted to serialize ${values} values into a BoundedVec with max length ${maxLength}`,
|
|
51
|
+
);
|
|
52
|
+
return [...storage, new Fr(values.length)];
|
|
53
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { FieldsOf } from '@aztec/foundation/types';
|
|
2
|
+
import type { FlatPublicLogs } from '@aztec/stdlib/logs';
|
|
3
|
+
import type { TxEffect } from '@aztec/stdlib/tx';
|
|
4
|
+
|
|
5
|
+
import type { ContractClassLogData } from './contract_class_log_data.js';
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Wire form of a {@link TxEffect} as the `getTxEffect` oracle returns it: identical to the domain type except its logs
|
|
9
|
+
* are flattened to their Noir layout. Keeping the conversion in the handler lets the `TX_EFFECT` mapping stay purely
|
|
10
|
+
* structural.
|
|
11
|
+
*/
|
|
12
|
+
export type TxEffectData = Omit<FieldsOf<TxEffect>, 'publicLogs' | 'contractClassLogs'> & {
|
|
13
|
+
publicLogs: FlatPublicLogs;
|
|
14
|
+
contractClassLogs: ContractClassLogData[];
|
|
15
|
+
};
|
|
@@ -1,23 +1,11 @@
|
|
|
1
|
-
import { toACVMField } from '@aztec/simulator/client';
|
|
2
1
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
3
2
|
import type { BlockHeader } from '@aztec/stdlib/tx';
|
|
4
3
|
|
|
5
4
|
/**
|
|
6
5
|
* TypeScript counterpart of utility_context.nr. Used only as a return value for the utilityGetUtilityContext oracle.
|
|
7
6
|
*/
|
|
8
|
-
export
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* Returns a representation of the utility context as expected by intrinsic Noir deserialization.
|
|
16
|
-
* The order of the fields has to be the same as the order of the fields in the utility_context.nr.
|
|
17
|
-
*/
|
|
18
|
-
public toNoirRepresentation(): (string | string[])[] {
|
|
19
|
-
// TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
|
|
20
|
-
const blockHeaderFields = this.blockHeader.toFields().map(toACVMField);
|
|
21
|
-
return [...blockHeaderFields, this.contractAddress.toString() as string];
|
|
22
|
-
}
|
|
23
|
-
}
|
|
7
|
+
export type UtilityContext = {
|
|
8
|
+
blockHeader: BlockHeader;
|
|
9
|
+
contractAddress: AztecAddress;
|
|
10
|
+
msgSender: AztecAddress;
|
|
11
|
+
};
|
|
@@ -2,7 +2,8 @@ import type { ACIRCallback, ACVMField } from '@aztec/simulator/client';
|
|
|
2
2
|
|
|
3
3
|
import { ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR } from '../../oracle_version.js';
|
|
4
4
|
import type { IMiscOracle, IPrivateExecutionOracle, IUtilityExecutionOracle } from './interfaces.js';
|
|
5
|
-
import {
|
|
5
|
+
import { LEGACY_ORACLE_REGISTRY, type LegacyOracleEntry } from './legacy_oracle_registry.js';
|
|
6
|
+
import { type NamedValue, ORACLE_REGISTRY, type OracleRegistryEntry, makeEntry } from './oracle_registry.js';
|
|
6
7
|
|
|
7
8
|
export class UnavailableOracleError extends Error {
|
|
8
9
|
constructor(oracleName: string) {
|
|
@@ -17,26 +18,71 @@ export class UnavailableOracleError extends Error {
|
|
|
17
18
|
* `aztec_{scope}_{methodName}` convention to resolve the handler, and calling the method directly. Unknown oracle
|
|
18
19
|
* names produce enhanced error messages based on the contract's oracle version.
|
|
19
20
|
*/
|
|
20
|
-
export function buildACIRCallback(
|
|
21
|
+
export function buildACIRCallback(
|
|
22
|
+
handler: OracleHandler,
|
|
23
|
+
registries: {
|
|
24
|
+
real?: Record<string, OracleRegistryEntry>;
|
|
25
|
+
legacy?: Record<string, LegacyOracleEntry>;
|
|
26
|
+
} = {},
|
|
27
|
+
): ACIRCallback {
|
|
28
|
+
const { real = ORACLE_REGISTRY, legacy: legacyRegistry = LEGACY_ORACLE_REGISTRY } = registries;
|
|
21
29
|
const target = {} as ACIRCallback;
|
|
22
|
-
for (const [oracleKey, entry] of Object.entries(
|
|
23
|
-
const
|
|
24
|
-
if (!match) {
|
|
25
|
-
throw new Error(`Oracle "${oracleKey}" does not follow the aztec_{scope}_{method} convention`);
|
|
26
|
-
}
|
|
27
|
-
const [, scope, methodName] = match;
|
|
30
|
+
for (const [oracleKey, entry] of Object.entries(real)) {
|
|
31
|
+
const { scope, methodName } = parseOracleName(oracleKey, 'Oracle');
|
|
28
32
|
target[oracleKey] = async (...inputs: ACVMField[][]) => {
|
|
29
33
|
assertHandlerSupportsScope(handler, scope);
|
|
30
34
|
const named = entry.deserializeParams(inputs);
|
|
31
|
-
const positional = named.map(p => p.value);
|
|
35
|
+
const positional = named.map((p: NamedValue) => p.value);
|
|
32
36
|
const result = await (handler as any)[methodName](...positional);
|
|
33
37
|
return entry.serializeReturn(result);
|
|
34
38
|
};
|
|
35
39
|
}
|
|
36
40
|
|
|
37
|
-
|
|
41
|
+
// Legacy oracle names: served for contracts compiled against a retired oracle version. Each reuses the current
|
|
42
|
+
// handler of its `modernOracle` and reshapes the wire (params and/or return) back to what the old bytecode expects.
|
|
43
|
+
for (const [legacyKey, legacy] of Object.entries(legacyRegistry)) {
|
|
44
|
+
const { scope } = parseOracleName(legacyKey, 'Legacy oracle');
|
|
45
|
+
if (legacyKey in target) {
|
|
46
|
+
throw new Error(`Legacy oracle "${legacyKey}" collides with a live oracle of the same name in the registry`);
|
|
47
|
+
}
|
|
48
|
+
const modernEntry = real[legacy.modernOracle];
|
|
49
|
+
const { methodName } = parseOracleName(legacy.modernOracle, 'Oracle');
|
|
50
|
+
// Override only the side whose wire changed; inherit the other from the modern entry.
|
|
51
|
+
const paramOverride = legacy.params;
|
|
52
|
+
const paramSource = paramOverride ? makeEntry({ params: [...paramOverride.legacyType] }) : modernEntry;
|
|
53
|
+
const returnOverride = legacy.returnType;
|
|
54
|
+
const returnSource = returnOverride ? makeEntry({ returnType: returnOverride.legacyType }) : modernEntry;
|
|
55
|
+
target[legacyKey] = async (...inputs: ACVMField[][]) => {
|
|
56
|
+
assertHandlerSupportsScope(handler, scope);
|
|
57
|
+
const legacyArgs = paramSource.deserializeParams(inputs).map(p => p.value);
|
|
58
|
+
const positional = paramOverride ? await paramOverride.mapping(legacyArgs) : legacyArgs;
|
|
59
|
+
const result = await (handler as any)[methodName](...positional);
|
|
60
|
+
return returnSource.serializeReturn(returnOverride ? returnOverride.mapping(result) : result);
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
return new Proxy(target, makeUnknownOracleTrap(handler));
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/** Parses an `aztec_{scope}_{method}` oracle name into its parts, throwing if it doesn't follow the convention. */
|
|
68
|
+
function parseOracleName(key: string, label: string): { scope: string; methodName: string } {
|
|
69
|
+
const match = key.match(/^aztec_(\w+?)_(.+)$/);
|
|
70
|
+
if (!match) {
|
|
71
|
+
throw new Error(`${label} "${key}" does not follow the aztec_{scope}_{method} convention`);
|
|
72
|
+
}
|
|
73
|
+
return { scope: match[1], methodName: match[2] };
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/**
|
|
77
|
+
* Proxy trap for the callback table: a known oracle name passes through; an unknown one throws a diagnostic keyed on
|
|
78
|
+
* the contract's oracle version (version unknown, contract newer than this environment, or a same-version mismatch).
|
|
79
|
+
*/
|
|
80
|
+
function makeUnknownOracleTrap(handler: OracleHandler): ProxyHandler<ACIRCallback> {
|
|
81
|
+
return {
|
|
38
82
|
get(obj, prop: string) {
|
|
39
|
-
|
|
83
|
+
// Own-property check only: `in` would match inherited `Object.prototype` keys (e.g. `constructor`, `toString`)
|
|
84
|
+
// and return the built-in instead of falling through to the unknown-oracle diagnostic below.
|
|
85
|
+
if (Object.hasOwn(obj, prop)) {
|
|
40
86
|
return (obj as Record<string, unknown>)[prop];
|
|
41
87
|
}
|
|
42
88
|
|
|
@@ -76,7 +122,7 @@ export function buildACIRCallback(handler: OracleHandler): ACIRCallback {
|
|
|
76
122
|
}
|
|
77
123
|
};
|
|
78
124
|
},
|
|
79
|
-
}
|
|
125
|
+
};
|
|
80
126
|
}
|
|
81
127
|
|
|
82
128
|
type OracleHandler = IMiscOracle & (IUtilityExecutionOracle | IPrivateExecutionOracle);
|