@aztec/txe 5.0.0-rc.1 → 5.0.0-rc.2
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/AuthRegistry-URXCCPYF.js +3 -0
- package/dest/AuthRegistry-URXCCPYF.js.map +7 -0
- package/dest/{ContractClassRegistry-EHVIHGEK.js → ContractClassRegistry-5RDBM6TC.js} +1 -1
- package/dest/{ContractClassRegistry-EHVIHGEK.js.map → ContractClassRegistry-5RDBM6TC.js.map} +2 -2
- package/dest/{ContractInstanceRegistry-DWZDXHRG.js → ContractInstanceRegistry-GCR4G4D7.js} +1 -1
- package/dest/{ContractInstanceRegistry-DWZDXHRG.js.map → ContractInstanceRegistry-GCR4G4D7.js.map} +1 -1
- package/dest/{FeeJuice-MI32ZO7B.js → FeeJuice-O3KOSZO5.js} +1 -1
- package/dest/{FeeJuice-MI32ZO7B.js.map → FeeJuice-O3KOSZO5.js.map} +1 -1
- package/dest/HandshakeRegistry-TXSMHMNY.js +3 -0
- package/dest/HandshakeRegistry-TXSMHMNY.js.map +7 -0
- package/dest/MultiCallEntrypoint-P4FSRXAD.js +3 -0
- package/dest/MultiCallEntrypoint-P4FSRXAD.js.map +7 -0
- package/dest/SchnorrAccount-AQZX7ROU.js +3 -0
- package/dest/SchnorrAccount-AQZX7ROU.js.map +7 -0
- package/dest/SchnorrInitializerlessAccount-KMX2H3J6.js +3 -0
- package/dest/SchnorrInitializerlessAccount-KMX2H3J6.js.map +7 -0
- package/dest/bin/index.js +1 -1
- package/dest/bin/oracle_test_server.js +2 -2
- package/dest/{chunk-UPW55EJX.js → chunk-I6DL4FT2.js} +2 -2
- package/dest/chunk-IAO54JS2.js +266 -0
- package/dest/{chunk-5U25VAFR.js.map → chunk-IAO54JS2.js.map} +4 -4
- package/dest/constants.d.ts +1 -1
- package/dest/constants.d.ts.map +1 -1
- package/dest/constants.js +1 -1
- package/dest/metafile.json +7241 -6706
- package/dest/oracle/interfaces.d.ts +10 -5
- package/dest/oracle/interfaces.d.ts.map +1 -1
- package/dest/oracle/test-resolver/default_fixtures.d.ts +9 -0
- package/dest/oracle/test-resolver/default_fixtures.d.ts.map +1 -0
- package/dest/oracle/test-resolver/default_fixtures.js +164 -0
- package/dest/oracle/test-resolver/index.d.ts +1 -1
- package/dest/oracle/test-resolver/index.d.ts.map +1 -1
- package/dest/oracle/test-resolver/index.js +1 -2
- package/dest/oracle/test-resolver/resolver.d.ts +22 -8
- package/dest/oracle/test-resolver/resolver.d.ts.map +1 -1
- package/dest/oracle/test-resolver/resolver.js +62 -32
- package/dest/oracle/txe_oracle_public_context.d.ts +4 -4
- package/dest/oracle/txe_oracle_public_context.d.ts.map +1 -1
- package/dest/oracle/txe_oracle_registry.d.ts +156 -3
- package/dest/oracle/txe_oracle_registry.d.ts.map +1 -1
- package/dest/oracle/txe_oracle_registry.js +179 -26
- package/dest/oracle/txe_oracle_top_level_context.d.ts +20 -8
- package/dest/oracle/txe_oracle_top_level_context.d.ts.map +1 -1
- package/dest/oracle/txe_oracle_top_level_context.js +72 -30
- package/dest/oracle/txe_oracle_version.d.ts +2 -2
- package/dest/oracle/txe_oracle_version.js +2 -2
- package/dest/rpc_translator.d.ts +10 -2
- package/dest/rpc_translator.d.ts.map +1 -1
- package/dest/rpc_translator.js +69 -5
- package/dest/server.bundle.js +1 -1
- package/dest/state_machine/archiver.d.ts +1 -1
- package/dest/state_machine/archiver.d.ts.map +1 -1
- package/dest/state_machine/archiver.js +1 -2
- package/dest/state_machine/dummy_p2p_client.d.ts +3 -2
- package/dest/state_machine/dummy_p2p_client.d.ts.map +1 -1
- package/dest/state_machine/dummy_p2p_client.js +3 -0
- package/dest/state_machine/global_variable_builder.d.ts +3 -4
- package/dest/state_machine/global_variable_builder.d.ts.map +1 -1
- package/dest/state_machine/global_variable_builder.js +0 -3
- package/dest/state_machine/index.d.ts +6 -5
- package/dest/state_machine/index.d.ts.map +1 -1
- package/dest/state_machine/index.js +35 -10
- package/dest/state_machine/synchronizer.d.ts +3 -2
- package/dest/state_machine/synchronizer.d.ts.map +1 -1
- package/dest/state_machine/synchronizer.js +3 -2
- package/dest/txe_session.d.ts +8 -6
- package/dest/txe_session.d.ts.map +1 -1
- package/dest/txe_session.js +53 -27
- package/dest/utils/block_creation.d.ts +2 -2
- package/dest/utils/block_creation.d.ts.map +1 -1
- package/dest/utils/block_creation.js +2 -2
- package/dest/worker.bundle.js +1 -1
- package/package.json +17 -17
- package/src/bin/oracle_test_server.ts +2 -2
- package/src/constants.ts +1 -1
- package/src/oracle/interfaces.ts +9 -3
- package/src/oracle/test-resolver/default_fixtures.ts +226 -0
- package/src/oracle/test-resolver/index.ts +1 -2
- package/src/oracle/test-resolver/resolver.ts +74 -41
- package/src/oracle/txe_oracle_public_context.ts +3 -3
- package/src/oracle/txe_oracle_registry.ts +106 -13
- package/src/oracle/txe_oracle_top_level_context.ts +76 -30
- package/src/oracle/txe_oracle_version.ts +2 -2
- package/src/rpc_translator.ts +93 -5
- package/src/state_machine/archiver.ts +0 -1
- package/src/state_machine/dummy_p2p_client.ts +5 -0
- package/src/state_machine/global_variable_builder.ts +2 -16
- package/src/state_machine/index.ts +31 -29
- package/src/state_machine/synchronizer.ts +3 -2
- package/src/txe_session.ts +62 -23
- package/src/utils/block_creation.ts +2 -1
- package/dest/AuthRegistry-CPGFQR26.js +0 -3
- package/dest/AuthRegistry-CPGFQR26.js.map +0 -7
- package/dest/HandshakeRegistry-3KSP3ITH.js +0 -3
- package/dest/HandshakeRegistry-3KSP3ITH.js.map +0 -7
- package/dest/MultiCallEntrypoint-IU7HYFYE.js +0 -3
- package/dest/MultiCallEntrypoint-IU7HYFYE.js.map +0 -7
- package/dest/SchnorrAccount-6TUE7JX4.js +0 -3
- package/dest/SchnorrAccount-6TUE7JX4.js.map +0 -7
- package/dest/SchnorrInitializerlessAccount-S3DU2DJK.js +0 -3
- package/dest/SchnorrInitializerlessAccount-S3DU2DJK.js.map +0 -7
- package/dest/chunk-5U25VAFR.js +0 -265
- package/dest/oracle/test-resolver/fixtures.d.ts +0 -43
- package/dest/oracle/test-resolver/fixtures.d.ts.map +0 -1
- package/dest/oracle/test-resolver/fixtures.js +0 -39
- package/src/oracle/test-resolver/fixtures.ts +0 -84
- /package/dest/{chunk-UPW55EJX.js.map → chunk-I6DL4FT2.js.map} +0 -0
|
@@ -2,6 +2,9 @@ import { CompleteAddress } from '@aztec/aztec.js/addresses';
|
|
|
2
2
|
import { TxHash } from '@aztec/aztec.js/tx';
|
|
3
3
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
4
4
|
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
|
+
import type { TaggingSecretStrategy } from '@aztec/pxe/server';
|
|
7
|
+
import type { Option } from '@aztec/pxe/simulator';
|
|
5
8
|
import type { EventSelector, FunctionSelector } from '@aztec/stdlib/abi';
|
|
6
9
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
7
10
|
import type { GasSettings } from '@aztec/stdlib/gas';
|
|
@@ -46,9 +49,9 @@ export interface IAvmExecutionOracle {
|
|
|
46
49
|
}>;
|
|
47
50
|
returndataSize(): Promise<Fr>;
|
|
48
51
|
returndataCopy(rdOffset: number, copySize: number): Promise<Fr[]>;
|
|
49
|
-
call(l2Gas: number, daGas: number, address: AztecAddress, argsLength: number, args: Fr[]): Promise<
|
|
50
|
-
staticCall(l2Gas: number, daGas: number, address: AztecAddress, argsLength: number, args: Fr[]): Promise<
|
|
51
|
-
successCopy(): Promise<
|
|
52
|
+
call(l2Gas: number, daGas: number, address: AztecAddress, argsLength: number, args: Fr[]): Promise<void>;
|
|
53
|
+
staticCall(l2Gas: number, daGas: number, address: AztecAddress, argsLength: number, args: Fr[]): Promise<void>;
|
|
54
|
+
successCopy(): Promise<boolean>;
|
|
52
55
|
}
|
|
53
56
|
/**
|
|
54
57
|
* Oracle methods associated with the execution of an Aztec Noir test.
|
|
@@ -64,6 +67,8 @@ export interface ITxeExecutionOracle {
|
|
|
64
67
|
createAccount(secret: Fr): Promise<CompleteAddress>;
|
|
65
68
|
addAccount(secret: Fr): Promise<CompleteAddress>;
|
|
66
69
|
addAuthWitness(address: AztecAddress, messageHash: Fr): Promise<void>;
|
|
70
|
+
sendL1ToL2Message(content: Fr, secretHash: Fr, sender: EthAddress, recipient: AztecAddress): Promise<Fr>;
|
|
71
|
+
setTaggingSecretStrategy(strategy: Option<TaggingSecretStrategy>): void;
|
|
67
72
|
getLastBlockTimestamp(): Promise<bigint>;
|
|
68
73
|
getLastTxEffects(): Promise<{
|
|
69
74
|
txHash: TxHash;
|
|
@@ -76,8 +81,8 @@ export interface ITxeExecutionOracle {
|
|
|
76
81
|
returnValues: Fr[];
|
|
77
82
|
offchainEffects: Fr[][];
|
|
78
83
|
}>;
|
|
79
|
-
executeUtilityFunction(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, args: Fr[], jobId: string, authorizedUtilityCallTargets: AztecAddress[]): Promise<Fr[]>;
|
|
84
|
+
executeUtilityFunction(from: AztecAddress | undefined, targetContractAddress: AztecAddress, functionSelector: FunctionSelector, args: Fr[], jobId: string, authorizedUtilityCallTargets: AztecAddress[]): Promise<Fr[]>;
|
|
80
85
|
publicCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress, calldata: Fr[], isStaticCall: boolean, gasSettings: GasSettings): Promise<Fr[]>;
|
|
81
86
|
syncContractNonOracleMethod(contractAddress: AztecAddress, scope: AztecAddress, jobId: string): Promise<void>;
|
|
82
87
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yYWNsZS9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFRbEQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxXQUFXLG1CQUFtQjtJQUNsQyxLQUFLLEVBQUUsSUFBSSxDQUFDO0lBRVosT0FBTyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUNqQyxNQUFNLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2hDLFdBQVcsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDcEMsU0FBUyxJQUFJLE9B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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/oracle/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAQlD;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,IAAI,CAAC;IAEZ,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IACjC,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAChC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IACpC,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;IACvB,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;IACvB,aAAa,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,YAAY,CAAC,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,eAAe,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;IAClE,2BAA2B,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC7F,0BAA0B,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC5F,qCAAqC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACvG,iCAAiC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACnG,cAAc,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9B,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/oracle/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type OracleRegistryEntry } from '@aztec/pxe/simulator';
|
|
2
|
+
import type { OracleTestScenario } from './resolver.js';
|
|
3
|
+
/**
|
|
4
|
+
* Synthesizes fixture scenarios for every oracle in the registry whose parameters and return are built from scalars,
|
|
5
|
+
* arrays/bounded vecs of them, or `Option`s of them. The matching Noir serialization tests are auto-generated by
|
|
6
|
+
* `#[auto_serialization_test]` from the same seed/scenario convention.
|
|
7
|
+
*/
|
|
8
|
+
export declare function synthesizeDefaultFixtures(registry: Record<string, OracleRegistryEntry>): Record<string, OracleTestScenario[]>;
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdF9maXh0dXJlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL29yYWNsZS90ZXN0LXJlc29sdmVyL2RlZmF1bHRfZml4dHVyZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQWFMLEtBQUssbUJBQW1CLEVBR3pCLE1BQU0sc0JBQXNCLENBQUM7QUFJOUIsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFeEQ7Ozs7R0FJRztBQUNILHdCQUFnQix5QkFBeUIsQ0FDdkMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLENBQUMsR0FDNUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxDQUFDLENBV3RDIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"default_fixtures.d.ts","sourceRoot":"","sources":["../../../src/oracle/test-resolver/default_fixtures.ts"],"names":[],"mappings":"AAIA,OAAO,EAaL,KAAK,mBAAmB,EAGzB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAC5C,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAWtC"}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
3
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
|
+
import { AZTEC_ADDRESS, BIGINT, BLOCK_HASH, BLOCK_NUMBER, BOOL, BYTE, BoundedVec, ETH_ADDRESS, FIELD, FUNCTION_SELECTOR, NOTE_SELECTOR, Option, U32 } from '@aztec/pxe/simulator';
|
|
6
|
+
import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
|
|
7
|
+
import { BlockHash } from '@aztec/stdlib/block';
|
|
8
|
+
/**
|
|
9
|
+
* Synthesizes fixture scenarios for every oracle in the registry whose parameters and return are built from scalars,
|
|
10
|
+
* arrays/bounded vecs of them, or `Option`s of them. The matching Noir serialization tests are auto-generated by
|
|
11
|
+
* `#[auto_serialization_test]` from the same seed/scenario convention.
|
|
12
|
+
*/ export function synthesizeDefaultFixtures(registry) {
|
|
13
|
+
const synthesized = {};
|
|
14
|
+
for (const [name, entry] of Object.entries(registry)){
|
|
15
|
+
const scenarios = synthesizeScenarios(entry);
|
|
16
|
+
if (scenarios !== undefined) {
|
|
17
|
+
synthesized[name] = scenarios;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return synthesized;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* The test-value implementations, one per oracle type, mirroring the Noir `OracleTestValue` trait exactly
|
|
24
|
+
* (`noir-projects/aztec-nr/.../macros/oracle_testing.nr`).
|
|
25
|
+
*/ const TEST_VALUE_IMPLS = [
|
|
26
|
+
scalar(FIELD, (seed)=>new Fr(seed)),
|
|
27
|
+
scalar(U32, (seed)=>seed),
|
|
28
|
+
scalar(BLOCK_NUMBER, (seed)=>BlockNumber(seed)),
|
|
29
|
+
scalar(BIGINT, (seed)=>BigInt(seed)),
|
|
30
|
+
scalar(BYTE, (seed)=>seed),
|
|
31
|
+
scalar(BOOL, (seed)=>seed % 2 !== 0),
|
|
32
|
+
scalar(AZTEC_ADDRESS, (seed)=>AztecAddress.fromNumberUnsafe(seed)),
|
|
33
|
+
scalar(ETH_ADDRESS, (seed)=>EthAddress.fromField(new Fr(seed))),
|
|
34
|
+
scalar(FUNCTION_SELECTOR, (seed)=>FunctionSelector.fromField(new Fr(seed))),
|
|
35
|
+
scalar(NOTE_SELECTOR, (seed)=>NoteSelector.fromField(new Fr(seed))),
|
|
36
|
+
scalar(BLOCK_HASH, (seed)=>new BlockHash(new Fr(seed))),
|
|
37
|
+
composite(isOption, (type, seed)=>[
|
|
38
|
+
named(Option.some(firstValue(type.inner, seed)), 'some'),
|
|
39
|
+
named(Option.none(firstValue(type.inner, seed)), 'none')
|
|
40
|
+
]),
|
|
41
|
+
composite(isArray, (type, seed)=>[
|
|
42
|
+
unnamed(collectionData(type.inner, seed, DEFAULT_ARRAY_LENGTH))
|
|
43
|
+
]),
|
|
44
|
+
composite(isBoundedVec, (type, seed)=>[
|
|
45
|
+
unnamed(BoundedVec.from({
|
|
46
|
+
data: collectionData(type.inner, seed, DEFAULT_ARRAY_LENGTH),
|
|
47
|
+
maxLength: BOUNDED_VEC_MAX_LENGTH
|
|
48
|
+
}))
|
|
49
|
+
])
|
|
50
|
+
];
|
|
51
|
+
/**
|
|
52
|
+
* The base every seed is offset by, applied once where a parameter's position becomes its seed, so generated values
|
|
53
|
+
* stay clear of 0. Must match `SEED_BASE` in the Noir `oracle_testing.nr`.
|
|
54
|
+
*/ const SEED_BASE = 10;
|
|
55
|
+
/** Elements per synthesized array and bounded vec. Must match `TEST_COLLECTION_LEN` in the Noir `oracle_testing.nr`. */ const DEFAULT_ARRAY_LENGTH = 3;
|
|
56
|
+
/**
|
|
57
|
+
* Capacity of synthesized bounded vecs, deliberately larger than the data length so padding is exercised. Must match
|
|
58
|
+
* `TEST_BOUNDED_VEC_CAP` in the Noir `oracle_testing.nr`.
|
|
59
|
+
*/ const BOUNDED_VEC_MAX_LENGTH = 5;
|
|
60
|
+
function unnamed(value) {
|
|
61
|
+
return {
|
|
62
|
+
value
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function named(value, name) {
|
|
66
|
+
return {
|
|
67
|
+
value,
|
|
68
|
+
name
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
/** A scalar impl: matches the singleton `type` by identity and yields a single unnamed scenario. */ function scalar(type, value) {
|
|
72
|
+
return {
|
|
73
|
+
match: (t)=>t === type,
|
|
74
|
+
scenarios: (_type, seed)=>[
|
|
75
|
+
unnamed(value(seed))
|
|
76
|
+
]
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
/** A composite impl: selected by the `kind` type guard, recursing through its element/inner mapping. */ function composite(guard, scenarios) {
|
|
80
|
+
return {
|
|
81
|
+
match: guard,
|
|
82
|
+
scenarios: (type, seed)=>scenarios(type, seed)
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
/** Synthesized element values for a collection. */ function collectionData(element, seed, length) {
|
|
86
|
+
return Array.from({
|
|
87
|
+
length
|
|
88
|
+
}, (_, i)=>firstValue(element, seed + i));
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* The [`Scenario`]s for `type` at `seed`, one per serialization *shape*, mirroring the Noir
|
|
92
|
+
* `OracleTestValue::oracle_test_value(seed) -> [Scenario<Self>; N]`. Throws if the type has no matching impl.
|
|
93
|
+
*/ function scenariosForType(type, seed) {
|
|
94
|
+
const impl = TEST_VALUE_IMPLS.find((i)=>i.match(type));
|
|
95
|
+
if (!impl) {
|
|
96
|
+
throw new UnsynthesizableTypeError(type);
|
|
97
|
+
}
|
|
98
|
+
return impl.scenarios(type, seed);
|
|
99
|
+
}
|
|
100
|
+
/** The first (representative) test value of `type`, used for collection elements and `Option` inners. */ function firstValue(type, seed) {
|
|
101
|
+
return scenariosForType(type, seed)[0].value;
|
|
102
|
+
}
|
|
103
|
+
class UnsynthesizableTypeError extends Error {
|
|
104
|
+
constructor(type){
|
|
105
|
+
super(`No test-value impl for type: ${JSON.stringify(Object.keys(type))}`);
|
|
106
|
+
this.name = 'UnsynthesizableTypeError';
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* Synthesizes the scenarios for one oracle by zipping every position's [`Scenario`] list to one case per test (a
|
|
111
|
+
* shorter list wraps around via mod), mirroring the Noir macro. Returns `undefined` if any param or return type is
|
|
112
|
+
* unsynthesizable (structs, ephemeral arrays).
|
|
113
|
+
*/ function synthesizeScenarios(entry) {
|
|
114
|
+
try {
|
|
115
|
+
return synthesizeScenariosOrThrow(entry);
|
|
116
|
+
} catch (e) {
|
|
117
|
+
if (e instanceof UnsynthesizableTypeError) {
|
|
118
|
+
return undefined;
|
|
119
|
+
}
|
|
120
|
+
throw e;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
function synthesizeScenariosOrThrow(entry) {
|
|
124
|
+
const params = entry.params.map((param, index)=>({
|
|
125
|
+
name: param.name,
|
|
126
|
+
scenarios: scenariosForType(param.type, SEED_BASE + index)
|
|
127
|
+
}));
|
|
128
|
+
// The return's seed is the slot right after the last parameter, so its value is distinct from every parameter.
|
|
129
|
+
const returnScenarios = entry.returnType === undefined ? undefined : scenariosForType(entry.returnType, SEED_BASE + entry.params.length);
|
|
130
|
+
// Positions with more than one scenario drive the test count; their names are zipped together (joined with `+`) per
|
|
131
|
+
// test, matching the announcements the Noir tests emit and the resolver joins.
|
|
132
|
+
const positions = [
|
|
133
|
+
...params.map((p)=>p.scenarios),
|
|
134
|
+
...returnScenarios !== undefined ? [
|
|
135
|
+
returnScenarios
|
|
136
|
+
] : []
|
|
137
|
+
];
|
|
138
|
+
const namedPositions = positions.filter((s)=>s.length > 1);
|
|
139
|
+
const testCount = Math.max(1, ...positions.map((s)=>s.length));
|
|
140
|
+
const scenarios = [];
|
|
141
|
+
for(let index = 0; index < testCount; index++){
|
|
142
|
+
const inputs = {};
|
|
143
|
+
for (const { name, scenarios: cases } of params){
|
|
144
|
+
inputs[name] = cases[index % cases.length].value;
|
|
145
|
+
}
|
|
146
|
+
const output = returnScenarios === undefined ? undefined : returnScenarios[index % returnScenarios.length].value;
|
|
147
|
+
const scenario = namedPositions.length === 0 ? undefined : namedPositions.map((cases)=>cases[index % cases.length].name).join('+');
|
|
148
|
+
scenarios.push({
|
|
149
|
+
scenario,
|
|
150
|
+
inputs,
|
|
151
|
+
output
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
return scenarios;
|
|
155
|
+
}
|
|
156
|
+
function isArray(type) {
|
|
157
|
+
return 'kind' in type && type.kind === 'array';
|
|
158
|
+
}
|
|
159
|
+
function isBoundedVec(type) {
|
|
160
|
+
return 'kind' in type && type.kind === 'bounded-vec';
|
|
161
|
+
}
|
|
162
|
+
function isOption(type) {
|
|
163
|
+
return 'kind' in type && type.kind === 'option';
|
|
164
|
+
}
|
|
@@ -6,4 +6,4 @@ export declare function createOracleTestRpcServer(logger: Logger): {
|
|
|
6
6
|
resolver: OracleTestResolver;
|
|
7
7
|
};
|
|
8
8
|
export { OracleTestResolver } from './resolver.js';
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9vcmFjbGUvdGVzdC1yZXNvbHZlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVFwRCxPQUFPLEVBQTRCLGtCQUFrQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBd0I3RSxnRUFBZ0U7QUFDaEUsd0JBQWdCLHlCQUF5QixDQUFDLE1BQU0sRUFBRSxNQUFNOzs7RUFNdkQ7QUFFRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxlQUFlLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/oracle/test-resolver/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/oracle/test-resolver/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAQpD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAwB7E,gEAAgE;AAChE,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM;;;EAMvD;AAED,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC"}
|
|
@@ -3,7 +3,6 @@ import { zodFor } from '@aztec/stdlib/schemas';
|
|
|
3
3
|
import { z } from 'zod';
|
|
4
4
|
import { ForeignCallArgsSchema, ForeignCallResultSchema } from '../../utils/encoding.js';
|
|
5
5
|
import { TXE_ORACLE_REGISTRY } from '../txe_oracle_registry.js';
|
|
6
|
-
import { ORACLE_TEST_FIXTURES } from './fixtures.js';
|
|
7
6
|
import { OracleTestResolver } from './resolver.js';
|
|
8
7
|
const OracleTestCallInputSchema = zodFor()(z.object({
|
|
9
8
|
session_id: z.number().nonnegative(),
|
|
@@ -21,7 +20,7 @@ const OracleTestRpcHandlerSchema = {
|
|
|
21
20
|
})
|
|
22
21
|
};
|
|
23
22
|
/** Creates an RPC server backed by the oracle test resolver. */ export function createOracleTestRpcServer(logger) {
|
|
24
|
-
const resolver =
|
|
23
|
+
const resolver = OracleTestResolver.fromRegistry(TXE_ORACLE_REGISTRY, logger);
|
|
25
24
|
const server = createSafeJsonRpcServer(resolver, OracleTestRpcHandlerSchema, {
|
|
26
25
|
http200OnError: true
|
|
27
26
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
-
import type
|
|
2
|
+
import { BoundedVec, type OracleRegistryEntry } from '@aztec/pxe/simulator';
|
|
3
3
|
import type { ForeignCallArgs, ForeignCallResult } from '../../utils/encoding.js';
|
|
4
|
-
|
|
4
|
+
export declare const SET_SCENARIO_ENTRY: OracleRegistryEntry<[import("@aztec/pxe/simulator").NamedValue<"name", BoundedVec<number>>], void>;
|
|
5
5
|
export type OracleTestCallInput = {
|
|
6
6
|
session_id: number;
|
|
7
7
|
function: string;
|
|
@@ -10,12 +10,21 @@ export type OracleTestCallInput = {
|
|
|
10
10
|
inputs: ForeignCallArgs;
|
|
11
11
|
};
|
|
12
12
|
/**
|
|
13
|
-
*
|
|
13
|
+
* One test case for an oracle: the expected deserialized `inputs`, the `output` to serialize back to Noir, and the
|
|
14
|
+
* `scenario` name (`some`/`none`) the matching Noir test announces. Single-scenario oracles leave `scenario` undefined
|
|
15
|
+
* and are selected automatically.
|
|
16
|
+
*/
|
|
17
|
+
export interface OracleTestScenario {
|
|
18
|
+
scenario?: string;
|
|
19
|
+
inputs: Record<string, unknown>;
|
|
20
|
+
output: unknown;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Oracle resolver for serialization tests. Selects a fixture scenario, verifies that the received inputs match, and
|
|
14
24
|
* returns the corresponding fixture output.
|
|
15
25
|
*
|
|
16
|
-
* For oracles with a single
|
|
17
|
-
*
|
|
18
|
-
* real oracle.
|
|
26
|
+
* For oracles with a single scenario, it is selected automatically. For oracles with multiple scenarios, the Noir test
|
|
27
|
+
* announces the scenario by name via the `aztec_oracle_test_set_scenario` meta-oracle before calling the real oracle.
|
|
19
28
|
*/
|
|
20
29
|
export declare class OracleTestResolver {
|
|
21
30
|
#private;
|
|
@@ -24,11 +33,16 @@ export declare class OracleTestResolver {
|
|
|
24
33
|
private readonly calledOracles;
|
|
25
34
|
private readonly pendingScenario;
|
|
26
35
|
private readonly logger;
|
|
27
|
-
constructor(registry: Record<string, OracleRegistryEntry>, fixtures:
|
|
36
|
+
constructor(registry: Record<string, OracleRegistryEntry>, fixtures: Record<string, OracleTestScenario[]>, logger?: Logger);
|
|
37
|
+
/**
|
|
38
|
+
* Builds a resolver whose fixtures are the default scenarios synthesized from the registry's type mappings. The
|
|
39
|
+
* matching Noir serialization tests are auto-generated by `#[auto_serialization_test]` from the same convention.
|
|
40
|
+
*/
|
|
41
|
+
static fromRegistry(registry: Record<string, OracleRegistryEntry>, logger?: Logger): OracleTestResolver;
|
|
28
42
|
resolve_foreign_call(callData: OracleTestCallInput): Promise<ForeignCallResult>;
|
|
29
43
|
/** Returns oracles that have a fixture defined but were never called during testing. */
|
|
30
44
|
getUncalledFixtures(): string[];
|
|
31
45
|
/** Returns oracles in the registry that have no fixture defined at all. */
|
|
32
46
|
getMissingFixtures(): string[];
|
|
33
47
|
}
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9vcmFjbGUvdGVzdC1yZXNvbHZlci9yZXNvbHZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQXFCLFVBQVUsRUFBVSxLQUFLLG1CQUFtQixFQUFhLE1BQU0sc0JBQXNCLENBQUM7QUFFbEgsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFNbEYsZUFBTyxNQUFNLGtCQUFrQixvR0FBcUUsQ0FBQztBQUVyRyxNQUFNLE1BQU0sbUJBQW1CLEdBQUc7SUFDaEMsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixNQUFNLEVBQUUsZUFBZSxDQUFDO0NBQ3pCLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsTUFBTSxXQUFXLGtCQUFrQjtJQUNqQyxRQUFRLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEIsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDaEMsTUFBTSxFQUFFLE9BQU8sQ0FBQztDQUNqQjtBQUVEOzs7Ozs7R0FNRztBQUNILHFCQUFhLGtCQUFrQjs7SUFNM0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRO0lBQ3pCLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUTtJQU4zQixPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBcUI7SUFDbkQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQTZCO0lBQzdELE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFTO0lBRWhDLFlBQ21CLFFBQVEsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLG1CQUFtQixDQUFDLEVBQzdDLFFBQVEsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLGtCQUFrQixFQUFFLENBQUMsRUFDL0QsTUFBTSxDQUFDLEVBQUUsTUFBTSxFQUdoQjtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLENBQUMsRUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBRXRHO0lBR0ssb0JBQW9CLENBQUMsUUFBUSxFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQTRCcEY7SUFFRCx3RkFBd0Y7SUFDeEYsbUJBQW1CLElBQUksTUFBTSxFQUFFLENBRTlCO0lBRUQsMkVBQTJFO0lBQzNFLGtCQUFrQixJQUFJLE1BQU0sRUFBRSxDQUU3QjtDQXNFRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/oracle/test-resolver/resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/oracle/test-resolver/resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAqB,UAAU,EAAU,KAAK,mBAAmB,EAAa,MAAM,sBAAsB,CAAC;AAElH,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAMlF,eAAO,MAAM,kBAAkB,oGAAqE,CAAC;AAErG,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC;AAEF;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;GAMG;AACH,qBAAa,kBAAkB;;IAM3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAN3B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC,YACmB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC7C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,EAC/D,MAAM,CAAC,EAAE,MAAM,EAGhB;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAEtG;IAGK,oBAAoB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA4BpF;IAED,wFAAwF;IACxF,mBAAmB,IAAI,MAAM,EAAE,CAE9B;IAED,2EAA2E;IAC3E,kBAAkB,IAAI,MAAM,EAAE,CAE7B;CAsEF"}
|
|
@@ -1,13 +1,23 @@
|
|
|
1
1
|
/* eslint-disable camelcase */ import { createLogger } from '@aztec/foundation/log';
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import { withoutHexPrefix } from '@aztec/foundation/string';
|
|
3
|
+
import { BOUNDED_VEC, BYTE, BoundedVec, Option, makeEntry } from '@aztec/pxe/simulator';
|
|
4
|
+
import { toInputSlots } from '../txe_oracle_registry.js';
|
|
5
|
+
import { synthesizeDefaultFixtures } from './default_fixtures.js';
|
|
6
|
+
/** Name of the meta-oracle that Noir tests call to announce the next call's scenario by name. */ const SET_SCENARIO_ORACLE = 'aztec_oracle_test_set_scenario';
|
|
7
|
+
export const SET_SCENARIO_ENTRY = makeEntry({
|
|
8
|
+
params: [
|
|
9
|
+
{
|
|
10
|
+
name: 'name',
|
|
11
|
+
type: BOUNDED_VEC(BYTE)
|
|
12
|
+
}
|
|
13
|
+
]
|
|
14
|
+
});
|
|
4
15
|
/**
|
|
5
|
-
* Oracle resolver for
|
|
16
|
+
* Oracle resolver for serialization tests. Selects a fixture scenario, verifies that the received inputs match, and
|
|
6
17
|
* returns the corresponding fixture output.
|
|
7
18
|
*
|
|
8
|
-
* For oracles with a single
|
|
9
|
-
*
|
|
10
|
-
* real oracle.
|
|
19
|
+
* For oracles with a single scenario, it is selected automatically. For oracles with multiple scenarios, the Noir test
|
|
20
|
+
* announces the scenario by name via the `aztec_oracle_test_set_scenario` meta-oracle before calling the real oracle.
|
|
11
21
|
*/ export class OracleTestResolver {
|
|
12
22
|
registry;
|
|
13
23
|
fixtures;
|
|
@@ -21,6 +31,12 @@ import { withHexPrefix, withoutHexPrefix } from '@aztec/foundation/string';
|
|
|
21
31
|
this.pendingScenario = new Map();
|
|
22
32
|
this.logger = logger ?? createLogger('txe:test-resolver');
|
|
23
33
|
}
|
|
34
|
+
/**
|
|
35
|
+
* Builds a resolver whose fixtures are the default scenarios synthesized from the registry's type mappings. The
|
|
36
|
+
* matching Noir serialization tests are auto-generated by `#[auto_serialization_test]` from the same convention.
|
|
37
|
+
*/ static fromRegistry(registry, logger) {
|
|
38
|
+
return new OracleTestResolver(registry, synthesizeDefaultFixtures(registry), logger);
|
|
39
|
+
}
|
|
24
40
|
// eslint-disable-next-line require-await
|
|
25
41
|
async resolve_foreign_call(callData) {
|
|
26
42
|
const oracleName = callData.function;
|
|
@@ -30,7 +46,6 @@ import { withHexPrefix, withoutHexPrefix } from '@aztec/foundation/string';
|
|
|
30
46
|
if (oracleName === SET_SCENARIO_ORACLE) {
|
|
31
47
|
return this.#handleSetScenario(callData);
|
|
32
48
|
}
|
|
33
|
-
this.calledOracles.add(oracleName);
|
|
34
49
|
if (!(oracleName in this.registry)) {
|
|
35
50
|
throw new Error(`Oracle '${oracleName}' not found in registry`);
|
|
36
51
|
}
|
|
@@ -41,6 +56,7 @@ import { withHexPrefix, withoutHexPrefix } from '@aztec/foundation/string';
|
|
|
41
56
|
}
|
|
42
57
|
const match = this.#selectScenario(callData.session_id, oracleName, scenarios);
|
|
43
58
|
this.#verifyInputs(callData.inputs, entry, match, oracleName);
|
|
59
|
+
this.calledOracles.add(oracleName);
|
|
44
60
|
this.logger.debug('Verified scenario for oracle', {
|
|
45
61
|
oracleName
|
|
46
62
|
});
|
|
@@ -55,60 +71,74 @@ import { withHexPrefix, withoutHexPrefix } from '@aztec/foundation/string';
|
|
|
55
71
|
/** Returns oracles in the registry that have no fixture defined at all. */ getMissingFixtures() {
|
|
56
72
|
return Object.keys(this.registry).filter((name)=>!(name in this.fixtures));
|
|
57
73
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
74
|
+
/**
|
|
75
|
+
* Records the scenario name for the session's next oracle call. A test announces once per multi-scenario position
|
|
76
|
+
* (param or return), so successive announcements accumulate joined with `+`, matching the names the fixture
|
|
77
|
+
* synthesizer builds (e.g. `some+some`).
|
|
78
|
+
*/ #handleSetScenario(callData) {
|
|
79
|
+
const name = decodeScenarioName(callData.inputs);
|
|
80
|
+
const existing = this.pendingScenario.get(callData.session_id);
|
|
81
|
+
const scenario = existing !== undefined ? `${existing}+${name}` : name;
|
|
61
82
|
this.logger.debug('Setting scenario for next oracle call', {
|
|
62
83
|
sessionId: callData.session_id,
|
|
63
|
-
|
|
84
|
+
scenario
|
|
64
85
|
});
|
|
65
|
-
this.pendingScenario.set(callData.session_id,
|
|
86
|
+
this.pendingScenario.set(callData.session_id, scenario);
|
|
66
87
|
return {
|
|
67
88
|
values: []
|
|
68
89
|
};
|
|
69
90
|
}
|
|
70
|
-
/** Selects
|
|
71
|
-
const
|
|
72
|
-
if (
|
|
91
|
+
/** Selects the fixture by the announced scenario name (for multi-scenario oracles) or returns the single fixture. */ #selectScenario(sessionId, oracleName, fixtures) {
|
|
92
|
+
const announced = this.pendingScenario.get(sessionId);
|
|
93
|
+
if (announced !== undefined) {
|
|
73
94
|
this.pendingScenario.delete(sessionId);
|
|
74
|
-
const
|
|
75
|
-
if (
|
|
76
|
-
const available = fixtures.map((s)=>s.scenario).join(', ');
|
|
77
|
-
throw new Error(`No scenario
|
|
78
|
-
}
|
|
79
|
-
if (matches.length > 1) {
|
|
80
|
-
throw new Error(`Duplicate scenario name '${selectedName}' for oracle '${oracleName}'`);
|
|
95
|
+
const match = fixtures.find((s)=>s.scenario === announced);
|
|
96
|
+
if (!match) {
|
|
97
|
+
const available = fixtures.map((s)=>s.scenario ?? '<default>').join(', ');
|
|
98
|
+
throw new Error(`No scenario '${announced}' for oracle '${oracleName}'. Available: ${available}`);
|
|
81
99
|
}
|
|
82
|
-
return
|
|
100
|
+
return match;
|
|
83
101
|
}
|
|
84
102
|
if (fixtures.length === 1) {
|
|
85
103
|
return fixtures[0];
|
|
86
104
|
}
|
|
87
|
-
throw new Error(`Oracle '${oracleName}' has ${fixtures.length}
|
|
105
|
+
throw new Error(`Oracle '${oracleName}' has ${fixtures.length} scenarios but none was announced before the call.`);
|
|
88
106
|
}
|
|
89
|
-
/** Deserializes actual inputs and verifies they match the scenario's expected inputs. */ #verifyInputs(rawInputs, entry,
|
|
90
|
-
const expectedInputs =
|
|
107
|
+
/** Deserializes actual inputs and verifies they match the scenario's expected inputs. */ #verifyInputs(rawInputs, entry, fixture, oracleName) {
|
|
108
|
+
const expectedInputs = fixture.inputs;
|
|
91
109
|
if (Object.keys(expectedInputs).length === 0) {
|
|
92
110
|
return;
|
|
93
111
|
}
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
]);
|
|
97
|
-
const named = entry.deserializeParams(normalized);
|
|
112
|
+
const scenarioLabel = fixture.scenario ? ` (scenario '${fixture.scenario}')` : '';
|
|
113
|
+
const named = entry.deserializeParams(toInputSlots(rawInputs));
|
|
98
114
|
for (const param of named){
|
|
99
115
|
if (!(param.name in expectedInputs)) {
|
|
100
116
|
throw new Error(`Unexpected param '${param.name}' for oracle '${oracleName}'. ` + `Expected: ${Object.keys(expectedInputs).join(', ')}`);
|
|
101
117
|
}
|
|
102
118
|
if (!valuesEqual(param.value, expectedInputs[param.name])) {
|
|
103
|
-
|
|
104
|
-
throw new Error(`Input mismatch for oracle '${oracleName}'${scenarioLabel}: ` + `param '${param.name}' expected ${String(expectedInputs[param.name])} ` + `but got ${String(param.value)}`);
|
|
119
|
+
throw new Error(`Input mismatch for oracle '${oracleName}'${scenarioLabel}: ` + `param '${param.name}' expected ${String(expectedInputs[param.name])} ` + `but got ${String(param.value)}. ${versionBumpHint(oracleName)}`);
|
|
105
120
|
}
|
|
106
121
|
}
|
|
107
122
|
}
|
|
108
123
|
}
|
|
124
|
+
/**
|
|
125
|
+
* Decodes the scenario name announced by `set_oracle_test_scenario`, whose argument is a `BoundedVec<u8, N>`
|
|
126
|
+
*/ function decodeScenarioName(inputs) {
|
|
127
|
+
const [{ value }] = SET_SCENARIO_ENTRY.deserializeParams(toInputSlots(inputs));
|
|
128
|
+
return String.fromCharCode(...value.data);
|
|
129
|
+
}
|
|
109
130
|
function valuesEqual(actual, expected) {
|
|
131
|
+
if (actual instanceof Option && expected instanceof Option) {
|
|
132
|
+
return actual.equals(expected, valuesEqual);
|
|
133
|
+
}
|
|
134
|
+
if (actual instanceof BoundedVec && expected instanceof BoundedVec) {
|
|
135
|
+
return actual.equals(expected, valuesEqual);
|
|
136
|
+
}
|
|
110
137
|
if (Array.isArray(actual) && Array.isArray(expected)) {
|
|
111
138
|
return actual.length === expected.length && actual.every((v, i)=>valuesEqual(v, expected[i]));
|
|
112
139
|
}
|
|
113
140
|
return String(actual) === String(expected);
|
|
114
141
|
}
|
|
142
|
+
function versionBumpHint(oracle) {
|
|
143
|
+
return oracle.startsWith('aztec_txe_') || oracle.startsWith('aztec_avm_') ? 'If you changed this oracle, consider bumping the TXE oracle version in yarn-project/txe/src/oracle/txe_oracle_version.ts.' : 'If you changed this oracle, consider bumping the PXE oracle version in yarn-project/pxe/src/oracle_version.ts.';
|
|
144
|
+
}
|
|
@@ -49,10 +49,10 @@ export declare class TXEOraclePublicContext implements IAvmExecutionOracle {
|
|
|
49
49
|
private getContractInstanceMember;
|
|
50
50
|
returndataSize(): Promise<Fr>;
|
|
51
51
|
returndataCopy(_rdOffset: number, _copySize: number): Promise<Fr[]>;
|
|
52
|
-
call(_l2Gas: number, _daGas: number, _address: AztecAddress, _argsLength: number, _args: Fr[]): Promise<
|
|
53
|
-
staticCall(_l2Gas: number, _daGas: number, _address: AztecAddress, _argsLength: number, _args: Fr[]): Promise<
|
|
54
|
-
successCopy(): Promise<
|
|
52
|
+
call(_l2Gas: number, _daGas: number, _address: AztecAddress, _argsLength: number, _args: Fr[]): Promise<void>;
|
|
53
|
+
staticCall(_l2Gas: number, _daGas: number, _address: AztecAddress, _argsLength: number, _args: Fr[]): Promise<void>;
|
|
54
|
+
successCopy(): Promise<boolean>;
|
|
55
55
|
close(): Promise<L2Block>;
|
|
56
56
|
private makeTxEffect;
|
|
57
57
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX29yYWNsZV9wdWJsaWNfY29udGV4dC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yYWNsZS90eGVfb3JhY2xlX3B1YmxpY19jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBR25ELE9BQU8sRUFFTCxLQUFLLHlCQUF5QixFQUcvQixNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxlQUFlLEVBQW9CLE1BQU0sa0JBQWtCLENBQUM7QUFHckUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUzRCxxQkFBYSxzQkFBdUIsWUFBVyxtQkFBbUI7SUFTOUQsT0FBTyxDQUFDLGVBQWU7SUFDdkIsT0FBTyxDQUFDLGdCQUFnQjtJQUN4QixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsZUFBZTtJQUN2QixPQUFPLENBQUMsYUFBYTtJQVp2QixLQUFLLE9BQWlCO0lBRXRCLE9BQU8sQ0FBQyxNQUFNLENBQVM7SUFDdkIsT0FBTyxDQUFDLHlCQUF5QixDQUFZO0lBQzdDLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBWTtJQUM3QyxPQUFPLENBQUMsZ0JBQWdCLENBQXlCO0lBRWpELFlBQ1UsZUFBZSxFQUFFLFlBQVksRUFDN0IsZ0JBQWdCLEVBQUUseUJBQXlCLEVBQzNDLGFBQWEsRUFBRSxFQUFFLEVBQ2pCLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLGFBQWEsRUFBRSxhQUFh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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"txe_oracle_public_context.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle_public_context.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"txe_oracle_public_context.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle_public_context.ts"],"names":[],"mappings":"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"}
|