@aztec/txe 4.3.0-nightly.20260513 → 4.3.0-nightly.20260515
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/oracle/interfaces.d.ts +4 -3
- package/dest/oracle/interfaces.d.ts.map +1 -1
- package/dest/oracle/txe_oracle_top_level_context.d.ts +4 -3
- package/dest/oracle/txe_oracle_top_level_context.d.ts.map +1 -1
- package/dest/oracle/txe_oracle_top_level_context.js +9 -11
- package/dest/rpc_translator.d.ts +7 -4
- package/dest/rpc_translator.d.ts.map +1 -1
- package/dest/rpc_translator.js +25 -6
- package/dest/txe_oracle_version.d.ts +10 -0
- package/dest/txe_oracle_version.d.ts.map +1 -0
- package/dest/txe_oracle_version.js +8 -0
- package/dest/txe_session.d.ts +14 -3
- package/dest/txe_session.d.ts.map +1 -1
- package/dest/txe_session.js +21 -6
- package/package.json +15 -15
- package/src/oracle/interfaces.ts +3 -0
- package/src/oracle/txe_oracle_top_level_context.ts +8 -23
- package/src/rpc_translator.ts +42 -2
- package/src/txe_oracle_version.ts +9 -0
- package/src/txe_session.ts +43 -5
|
@@ -6,6 +6,7 @@ import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
|
6
6
|
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
7
7
|
import type { EventSelector, FunctionSelector } from '@aztec/stdlib/abi';
|
|
8
8
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
9
|
+
import type { GasSettings } from '@aztec/stdlib/gas';
|
|
9
10
|
import type { PrivateLog } from '@aztec/stdlib/logs';
|
|
10
11
|
import type { UInt64 } from '@aztec/stdlib/types';
|
|
11
12
|
/**
|
|
@@ -52,12 +53,12 @@ export interface ITxeExecutionOracle {
|
|
|
52
53
|
privateLogs: PrivateLog[];
|
|
53
54
|
}>;
|
|
54
55
|
getPrivateEvents(selector: EventSelector, contractAddress: AztecAddress, scope: AztecAddress): Promise<Fr[][]>;
|
|
55
|
-
privateCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress, functionSelector: FunctionSelector, args: Fr[], argsHash: Fr, isStaticCall: boolean, additionalScopes: AztecAddress[], jobId: string, authorizedUtilityCallTargets: AztecAddress[]): Promise<{
|
|
56
|
+
privateCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress, functionSelector: FunctionSelector, args: Fr[], argsHash: Fr, isStaticCall: boolean, additionalScopes: AztecAddress[], jobId: string, authorizedUtilityCallTargets: AztecAddress[], gasSettings: GasSettings): Promise<{
|
|
56
57
|
returnValues: Fr[];
|
|
57
58
|
offchainEffects: Fr[][];
|
|
58
59
|
}>;
|
|
59
60
|
executeUtilityFunction(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, args: Fr[], jobId: string, authorizedUtilityCallTargets: AztecAddress[]): Promise<Fr[]>;
|
|
60
|
-
publicCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress, calldata: Fr[], isStaticCall: boolean): Promise<Fr[]>;
|
|
61
|
+
publicCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress, calldata: Fr[], isStaticCall: boolean, gasSettings: GasSettings): Promise<Fr[]>;
|
|
61
62
|
syncContractNonOracleMethod(contractAddress: AztecAddress, scope: AztecAddress, jobId: string): Promise<void>;
|
|
62
63
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yYWNsZS9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDN0UsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQVFsRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLEtBQUssRUFBRSxJQUFJLENBQUM7SUFFWixPQUFPLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2pDLE1BQU0sSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDaEMsV0FBVyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNwQyxTQUFTLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzdCLFlBQVksSUFBSSxPQUFPLENB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/oracle/interfaces.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/oracle/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { type ContractArtifact, EventSelector, FunctionSelector } from '@aztec/s
|
|
|
7
7
|
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
8
8
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
9
9
|
import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
10
|
+
import { GasSettings } from '@aztec/stdlib/gas';
|
|
10
11
|
import { TxHash } from '@aztec/stdlib/tx';
|
|
11
12
|
import type { UInt64 } from '@aztec/stdlib/types';
|
|
12
13
|
import type { TXEStateMachine } from '../state_machine/index.js';
|
|
@@ -61,15 +62,15 @@ export declare class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecut
|
|
|
61
62
|
mineBlock(options?: {
|
|
62
63
|
nullifiers?: Fr[];
|
|
63
64
|
}): Promise<void>;
|
|
64
|
-
privateCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress | undefined, functionSelector: FunctionSelector | undefined, args: Fr[], argsHash: Fr | undefined, isStaticCall: boolean | undefined, additionalScopes: AztecAddress[] | undefined, jobId: string, authorizedUtilityCallTargets: AztecAddress[]): Promise<{
|
|
65
|
+
privateCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress | undefined, functionSelector: FunctionSelector | undefined, args: Fr[], argsHash: Fr | undefined, isStaticCall: boolean | undefined, additionalScopes: AztecAddress[] | undefined, jobId: string, authorizedUtilityCallTargets: AztecAddress[], gasSettings: GasSettings): Promise<{
|
|
65
66
|
returnValues: Fr[];
|
|
66
67
|
offchainEffects: Fr[][];
|
|
67
68
|
}>;
|
|
68
|
-
publicCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress, calldata: Fr[], isStaticCall: boolean): Promise<Fr[]>;
|
|
69
|
+
publicCallNewFlow(from: AztecAddress | undefined, targetContractAddress: AztecAddress, calldata: Fr[], isStaticCall: boolean, gasSettings: GasSettings): Promise<Fr[]>;
|
|
69
70
|
executeUtilityFunction(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, args: Fr[], jobId: string, authorizedUtilityCallTargets: AztecAddress[]): Promise<Fr[]>;
|
|
70
71
|
private executeUtilityCall;
|
|
71
72
|
close(): [bigint, Map<string, AuthWitness>];
|
|
72
73
|
private getLastBlockNumber;
|
|
73
74
|
private buildAuthorizeUtilityCallHook;
|
|
74
75
|
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX29yYWNsZV90b3BfbGV2ZWxfY29udGV4dC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29yYWNsZS90eGVfb3JhY2xlX3RvcF9sZXZlbF9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDakQsT0FBTyxFQUNMLFlBQVksRUFFWixZQUFZLEVBQ1osS0FBSyxhQUFhLEVBRWxCLFNBQVMsRUFFVCxpQkFBaUIsRUFDakIscUJBQXFCLEVBQ3JCLHNCQUFzQixFQUN0QixrQkFBa0IsRUFHbkIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBSUwsS0FBSyxXQUFXLEVBTWpCLE1BQU0sc0JBQXNCLENBQUM7QUFnQjlCLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUFFLGFBQWEsRUFBZ0IsZ0JBQWdCLEVBQWdCLE1BQU0sbUJBQW1CLENBQUM7QUFDdkgsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRXpELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSywyQkFBMkIsRUFBeUIsTUFBTSx3QkFBd0IsQ0FBQztBQUNqRyxPQUFPLEVBQWdCLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBVzlELE9BQU8sRUFTTCxNQUFNLEVBRVAsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUlsRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUdwRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTNELHFCQUFhLHdCQUF5QixZQUFXLFdBQVcsRUFBRSxtQkFBbUI7SUFPN0UsT0FBTyxDQUFDLFlBQVk7SUFDcEIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLFFBQVE7SUFDaEIsT0FBTyxDQUFDLFlBQVk7SUFDcEIsT0FBTyxDQUFDLFlBQVk7SUFDcEIsT0FBTyxDQUFDLGtCQUFrQjtJQUMxQixPQUFPLENBQUMscUJBQXFCO0lBQzdCLE9BQU8sQ0FBQyxzQkFBc0I7SUFDOUIsT0FBTyxDQUFDLFlBQVk7SUFDcEIsT0FBTyxDQUFDLGlCQUFpQjtJQUN6QixPQUFPLENBQUMsa0JBQWtCO0lBQzFCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLE9BQU87SUFDZixPQUFPLENBQUMsUUFBUTtJQXBCbEIsTUFBTSxPQUFpQjtJQUN2QixLQUFLLE9BQWlCO0lBRXRCLE9BQU8sQ0FBQyxNQUFNLENBQVM7SUFFdkIsWUFDVSxZQUFZLEVBQUUsZUFBZSxFQUM3QixhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsU0FBUyxFQUNwQixRQUFRLEVBQUUsUUFBUSxFQUNsQixZQUFZLEVBQUUsWUFBWSxFQUMxQixZQUFZLEVBQUUsZUFBZSxFQUM3QixrQkFBa0IsRUFBRSxrQkFBa0IsRUFDdEMscUJBQXFCLEVBQUUscUJBQXFCLEVBQzVDLHNCQUFzQixFQUFFLHNCQUFzQixFQUM5QyxZQUFZLEVBQUUsWUFBWSxFQUMxQixpQkFBaUIsRUFBRSxpQkFBaUIsRUFDcEMsa0JBQWtCLEVBQUUsTUFBTSxFQUMxQixPQUFPLEVBQUUsRUFBRSxFQUNYLE9BQU8sRUFBRSxFQUFFLEVBQ1gsUUFBUSxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsV0FBVyxDQUFDLEVBSTNDO0lBRUQsT0FBTyxDQUFDLHFCQUFxQixDQUErQztJQUU1RSw2QkFBNkIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsSUFBSSxDQVdoRTtJQUdELHlDQUF5QyxJQUFJO1FBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQztRQUFDLEtBQUssRUFBRSxNQUFNLENBQUE7S0FBRSxHQUFHLFNBQVMsQ0FFeEY7SUFJRCxjQUFjLElBQUksRUFBRSxDQUVuQjtJQUdELEdBQUcsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FRL0Q7SUFFRCxpQkFBaUIsSUFBSSxZQUFZLENBRWhDO0lBRUssa0JBQWtCLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUUvQztJQUVELHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFdkM7SUFFSyxxQkFBcUIsb0JBRTFCO0lBRUssZ0JBQWdCOzs7OztPQWlCckI7SUFFSywyQkFBMkIsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLE1BQU0saUJBaUJsRztJQUVLLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxhQUFhLEVBQUUsZUFBZSxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsWUFBWSxtQkFTakc7SUFFSyxlQUFlLENBQUMsTUFBTSxFQUFFLE1BQU0saUJBTW5DO0lBRUQsa0JBQWtCLENBQUMsUUFBUSxFQUFFLE1BQU0sUUFHbEM7SUFFSyxNQUFNLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLFFBQVEsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLEVBQUUsRUFBRSxpQkFrQnpGO0lBRUssVUFBVSxDQUFDLFFBQVEsRUFBRSxnQkFBZ0IsRUFBRSxRQUFRLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxFQUFFLEVBQUUsNkRBYTdGO0lBRUssYUFBYSxDQUFDLE1BQU0sRUFBRSxFQUFFLDZEQVE3QjtJQUVLLGNBQWMsQ0FBQyxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxFQUFFLGlCQVUxRDtJQUVLLFNBQVMsQ0FBQyxPQUFPLEdBQUU7UUFBRSxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQTtLQUFPLGlCQXVCbEQ7SUFFSyxrQkFBa0IsQ0FDdEIsSUFBSSxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQzlCLHFCQUFxQiwwQkFBb0MsRUFDekQsZ0JBQWdCLDhCQUE2QyxFQUM3RCxJQUFJLEVBQUUsRUFBRSxFQUFFLEVBQ1YsUUFBUSxnQkFBZ0IsRUFDeEIsWUFBWSxxQkFBaUIsRUFDN0IsZ0JBQWdCLDRCQUFxQixFQUNyQyxLQUFLLEVBQUUsTUFBTSxFQUNiLDRCQUE0QixFQUFFLFlBQVksRUFBRSxFQUM1QyxXQUFXLEVBQUUsV0FBVzs7O09BZ096QjtJQUVLLGlCQUFpQixDQUNyQixJQUFJLEVBQUUsWUFBWSxHQUFHLFNBQVMsRUFDOUIscUJBQXFCLEVBQUUsWUFBWSxFQUNuQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEVBQ2QsWUFBWSxFQUFFLE9BQU8sRUFDckIsV0FBVyxFQUFFLFdBQVcsaUJBK0l6QjtJQUVLLHNCQUFzQixDQUMxQixxQkFBcUIsRUFBRSxZQUFZLEVBQ25DLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxJQUFJLEVBQUUsRUFBRSxFQUFFLEVBQ1YsS0FBSyxFQUFFLE1BQU0sRUFDYiw0QkFBNEIsRUFBRSxZQUFZLEVBQUUsaUJBZ0M3QztZQUVhLGtCQUFrQjtJQXFFaEMsS0FBSyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FHMUM7WUFFYSxrQkFBa0I7SUFLaEMsT0FBTyxDQUFDLDZCQUE2QjtDQVl0QyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"txe_oracle_top_level_context.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle_top_level_context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"txe_oracle_top_level_context.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle_top_level_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
|
|
1
|
+
import { CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
|
|
2
2
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
3
3
|
import { Schnorr } from '@aztec/foundation/crypto/schnorr';
|
|
4
4
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
@@ -13,7 +13,7 @@ import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
|
13
13
|
import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
|
|
14
14
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
15
15
|
import { computePartialAddress } from '@aztec/stdlib/contract';
|
|
16
|
-
import {
|
|
16
|
+
import { Gas, GasFees } from '@aztec/stdlib/gas';
|
|
17
17
|
import { computeCalldataHash, computeProtocolNullifier, siloNullifier } from '@aztec/stdlib/hash';
|
|
18
18
|
import { PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, PrivateToPublicAccumulatedData, PublicCallRequest } from '@aztec/stdlib/kernel';
|
|
19
19
|
import { ChonkProof } from '@aztec/stdlib/proofs';
|
|
@@ -221,7 +221,7 @@ export class TXEOracleTopLevelContext {
|
|
|
221
221
|
this.logger.info(`Created block ${blockNumber} with timestamp ${block.header.globalVariables.timestamp}`);
|
|
222
222
|
await this.stateMachine.handleL2Block(block);
|
|
223
223
|
}
|
|
224
|
-
async privateCallNewFlow(from, targetContractAddress = AztecAddress.zero(), functionSelector = FunctionSelector.empty(), args, argsHash = Fr.zero(), isStaticCall = false, additionalScopes = [], jobId, authorizedUtilityCallTargets) {
|
|
224
|
+
async privateCallNewFlow(from, targetContractAddress = AztecAddress.zero(), functionSelector = FunctionSelector.empty(), args, argsHash = Fr.zero(), isStaticCall = false, additionalScopes = [], jobId, authorizedUtilityCallTargets, gasSettings) {
|
|
225
225
|
this.logger.verbose(`Executing external function ${await this.contractStore.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`);
|
|
226
226
|
const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
|
|
227
227
|
if (!artifact) {
|
|
@@ -241,9 +241,6 @@ export class TXEOracleTopLevelContext {
|
|
|
241
241
|
const blockNumber = await this.getNextBlockNumber();
|
|
242
242
|
const msgSender = from ?? AztecAddress.NULL_MSG_SENDER;
|
|
243
243
|
const callContext = new CallContext(msgSender, targetContractAddress, functionSelector, isStaticCall);
|
|
244
|
-
const gasLimits = new Gas(MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT, MAX_PROCESSABLE_L2_GAS);
|
|
245
|
-
const teardownGasLimits = new Gas(FALLBACK_TEARDOWN_DA_GAS_LIMIT, FALLBACK_TEARDOWN_L2_GAS_LIMIT);
|
|
246
|
-
const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
|
|
247
244
|
const txContext = new TxContext(this.chainId, this.version, gasSettings);
|
|
248
245
|
const protocolNullifier = await computeProtocolNullifier(getSingleTxBlockRequestHash(blockNumber));
|
|
249
246
|
const noteCache = new ExecutionNoteCache(protocolNullifier);
|
|
@@ -396,12 +393,9 @@ export class TXEOracleTopLevelContext {
|
|
|
396
393
|
offchainEffects
|
|
397
394
|
};
|
|
398
395
|
}
|
|
399
|
-
async publicCallNewFlow(from, targetContractAddress, calldata, isStaticCall) {
|
|
396
|
+
async publicCallNewFlow(from, targetContractAddress, calldata, isStaticCall, gasSettings) {
|
|
400
397
|
this.logger.verbose(`Executing public function ${await this.contractStore.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`);
|
|
401
398
|
const blockNumber = await this.getNextBlockNumber();
|
|
402
|
-
const gasLimits = new Gas(MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT, MAX_PROCESSABLE_L2_GAS);
|
|
403
|
-
const teardownGasLimits = new Gas(FALLBACK_TEARDOWN_DA_GAS_LIMIT, FALLBACK_TEARDOWN_L2_GAS_LIMIT);
|
|
404
|
-
const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
|
|
405
399
|
const txContext = new TxContext(this.chainId, this.version, gasSettings);
|
|
406
400
|
const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
|
|
407
401
|
const calldataHash = await computeCalldataHash(calldata);
|
|
@@ -524,6 +518,9 @@ export class TXEOracleTopLevelContext {
|
|
|
524
518
|
try {
|
|
525
519
|
const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
|
|
526
520
|
const simulator = new WASMSimulator();
|
|
521
|
+
const utilityExecutor = async (syncCall, execScopes)=>{
|
|
522
|
+
await this.executeUtilityCall(syncCall, execScopes, jobId);
|
|
523
|
+
};
|
|
527
524
|
const oracle = new UtilityExecutionOracle({
|
|
528
525
|
contractAddress: call.to,
|
|
529
526
|
authWitnesses: [],
|
|
@@ -546,7 +543,8 @@ export class TXEOracleTopLevelContext {
|
|
|
546
543
|
simulator,
|
|
547
544
|
hooks: composeHooks({
|
|
548
545
|
authorizeUtilityCall: this.buildAuthorizeUtilityCallHook('utility', authorizedUtilityCallTargets)
|
|
549
|
-
})
|
|
546
|
+
}),
|
|
547
|
+
utilityExecutor
|
|
550
548
|
});
|
|
551
549
|
const acirExecutionResult = await simulator.executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback()).catch((err)=>{
|
|
552
550
|
err.message = resolveAssertionMessageFromError(err, entryPointArtifact);
|
package/dest/rpc_translator.d.ts
CHANGED
|
@@ -25,10 +25,13 @@ export declare class RPCTranslator {
|
|
|
25
25
|
private handlerAsPrivate;
|
|
26
26
|
private handlerAsAvm;
|
|
27
27
|
private handlerAsTxe;
|
|
28
|
+
aztec_txe_assertCompatibleOracleVersion(foreignMajor: ForeignCallSingle, foreignMinor: ForeignCallSingle): {
|
|
29
|
+
values: (string | ForeignCallArray)[];
|
|
30
|
+
};
|
|
28
31
|
aztec_txe_setTopLevelTXEContext(): Promise<{
|
|
29
32
|
values: (string | ForeignCallArray)[];
|
|
30
33
|
}>;
|
|
31
|
-
aztec_txe_setPrivateTXEContext(foreignContractAddressIsSome: ForeignCallSingle, foreignContractAddressValue: ForeignCallSingle, foreignAnchorBlockNumberIsSome: ForeignCallSingle, foreignAnchorBlockNumberValue: ForeignCallSingle): Promise<{
|
|
34
|
+
aztec_txe_setPrivateTXEContext(foreignContractAddressIsSome: ForeignCallSingle, foreignContractAddressValue: ForeignCallSingle, foreignAnchorBlockNumberIsSome: ForeignCallSingle, foreignAnchorBlockNumberValue: ForeignCallSingle, foreignGasSettings: ForeignCallArray): Promise<{
|
|
32
35
|
values: (string | ForeignCallArray)[];
|
|
33
36
|
}>;
|
|
34
37
|
aztec_txe_setPublicTXEContext(foreignContractAddressIsSome: ForeignCallSingle, foreignContractAddressValue: ForeignCallSingle): Promise<{
|
|
@@ -279,13 +282,13 @@ export declare class RPCTranslator {
|
|
|
279
282
|
aztec_avm_call(_foreignL2Gas: ForeignCallSingle, _foreignDaGas: ForeignCallSingle, _foreignAddress: ForeignCallSingle, _foreignLength: ForeignCallSingle, _foreignArgs: ForeignCallArray): void;
|
|
280
283
|
aztec_avm_staticCall(_foreignL2Gas: ForeignCallSingle, _foreignDaGas: ForeignCallSingle, _foreignAddress: ForeignCallSingle, _foreignLength: ForeignCallSingle, _foreignArgs: ForeignCallArray): void;
|
|
281
284
|
aztec_avm_successCopy(): void;
|
|
282
|
-
aztec_txe_privateCallNewFlow(foreignFromIsSome: ForeignCallSingle, foreignFromValue: ForeignCallSingle, foreignTargetContractAddress: ForeignCallSingle, foreignFunctionSelector: ForeignCallSingle, foreignArgs: ForeignCallArray, foreignArgsHash: ForeignCallSingle, foreignIsStaticCall: ForeignCallSingle, foreignAdditionalScopes: ForeignCallArray, foreignAuthorizedUtilityCallTargets: ForeignCallArray): Promise<{
|
|
285
|
+
aztec_txe_privateCallNewFlow(foreignFromIsSome: ForeignCallSingle, foreignFromValue: ForeignCallSingle, foreignTargetContractAddress: ForeignCallSingle, foreignFunctionSelector: ForeignCallSingle, foreignArgs: ForeignCallArray, foreignArgsHash: ForeignCallSingle, foreignIsStaticCall: ForeignCallSingle, foreignAdditionalScopes: ForeignCallArray, foreignAuthorizedUtilityCallTargets: ForeignCallArray, foreignGasSettings: ForeignCallArray): Promise<{
|
|
283
286
|
values: (string | ForeignCallArray)[];
|
|
284
287
|
}>;
|
|
285
288
|
aztec_txe_executeUtilityFunction(foreignTargetContractAddress: ForeignCallSingle, foreignFunctionSelector: ForeignCallSingle, foreignArgs: ForeignCallArray, foreignAuthorizedUtilityCallTargets: ForeignCallArray): Promise<{
|
|
286
289
|
values: (string | ForeignCallArray)[];
|
|
287
290
|
}>;
|
|
288
|
-
aztec_txe_publicCallNewFlow(foreignFromIsSome: ForeignCallSingle, foreignFromValue: ForeignCallSingle, foreignAddress: ForeignCallSingle, foreignCalldata: ForeignCallArray, foreignIsStaticCall: ForeignCallSingle): Promise<{
|
|
291
|
+
aztec_txe_publicCallNewFlow(foreignFromIsSome: ForeignCallSingle, foreignFromValue: ForeignCallSingle, foreignAddress: ForeignCallSingle, foreignCalldata: ForeignCallArray, foreignIsStaticCall: ForeignCallSingle, foreignGasSettings: ForeignCallArray): Promise<{
|
|
289
292
|
values: (string | ForeignCallArray)[];
|
|
290
293
|
}>;
|
|
291
294
|
aztec_prv_getSenderForTags(): Promise<{
|
|
@@ -298,4 +301,4 @@ export declare class RPCTranslator {
|
|
|
298
301
|
values: (string | ForeignCallArray)[];
|
|
299
302
|
}>;
|
|
300
303
|
}
|
|
301
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rpc_translator.d.ts","sourceRoot":"","sources":["../src/rpc_translator.ts"],"names":[],"mappings":"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"}
|
|
304
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rpc_translator.d.ts","sourceRoot":"","sources":["../src/rpc_translator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc_translator.d.ts","sourceRoot":"","sources":["../src/rpc_translator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAY7E,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,EAE7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,gBAAgB,EAAiD,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc_translator.d.ts","sourceRoot":"","sources":["../src/rpc_translator.ts"],"names":[],"mappings":"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"}
|
package/dest/rpc_translator.js
CHANGED
|
@@ -6,6 +6,8 @@ import { packAsHintedNote } from '@aztec/pxe/simulator';
|
|
|
6
6
|
import { EventSelector, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
|
|
7
7
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
8
8
|
import { BlockHash } from '@aztec/stdlib/block';
|
|
9
|
+
import { GasSettings } from '@aztec/stdlib/gas';
|
|
10
|
+
import { TXE_ORACLE_VERSION_MAJOR } from './txe_oracle_version.js';
|
|
9
11
|
import { addressFromSingle, arrayOfArraysToBoundedVecOfArrays, arrayToBoundedVec, bufferToU8Array, fromArray, fromSingle, fromUintArray, fromUintBoundedVec, toArray, toForeignCallResult, toSingle } from './util/encoding.js';
|
|
10
12
|
const MAX_EVENT_LEN = 10; // This is MAX_MESSAGE_CONTENT_LEN - PRIVATE_EVENT_MSG_PLAINTEXT_RESERVED_FIELDS_LEN
|
|
11
13
|
const MAX_PRIVATE_EVENTS_PER_TXE_QUERY = 5;
|
|
@@ -61,6 +63,20 @@ export class RPCTranslator {
|
|
|
61
63
|
}
|
|
62
64
|
return this.oracleHandler;
|
|
63
65
|
}
|
|
66
|
+
// eslint-disable-next-line camelcase
|
|
67
|
+
aztec_txe_assertCompatibleOracleVersion(foreignMajor, foreignMinor) {
|
|
68
|
+
const major = fromSingle(foreignMajor).toNumber();
|
|
69
|
+
const minor = fromSingle(foreignMinor).toNumber();
|
|
70
|
+
if (major !== TXE_ORACLE_VERSION_MAJOR) {
|
|
71
|
+
const hint = major > TXE_ORACLE_VERSION_MAJOR ? 'The test was compiled with a newer version of Aztec.nr than your test environment supports. Upgrade your test environment to a compatible version.' : 'The test was compiled with an older version of Aztec.nr than your test environment supports. Recompile the test with a compatible version of Aztec.nr.';
|
|
72
|
+
throw new Error(`Incompatible test environment version: ${hint} See https://docs.aztec.network/errors/12 (expected test oracle major version ${TXE_ORACLE_VERSION_MAJOR}, got ${major})`);
|
|
73
|
+
}
|
|
74
|
+
this.stateHandler.setTxeOracleVersion({
|
|
75
|
+
major,
|
|
76
|
+
minor
|
|
77
|
+
});
|
|
78
|
+
return toForeignCallResult([]);
|
|
79
|
+
}
|
|
64
80
|
// TXE session state transition functions - these get handled by the state handler
|
|
65
81
|
// eslint-disable-next-line camelcase
|
|
66
82
|
async aztec_txe_setTopLevelTXEContext() {
|
|
@@ -68,10 +84,11 @@ export class RPCTranslator {
|
|
|
68
84
|
return toForeignCallResult([]);
|
|
69
85
|
}
|
|
70
86
|
// eslint-disable-next-line camelcase
|
|
71
|
-
async aztec_txe_setPrivateTXEContext(foreignContractAddressIsSome, foreignContractAddressValue, foreignAnchorBlockNumberIsSome, foreignAnchorBlockNumberValue) {
|
|
87
|
+
async aztec_txe_setPrivateTXEContext(foreignContractAddressIsSome, foreignContractAddressValue, foreignAnchorBlockNumberIsSome, foreignAnchorBlockNumberValue, foreignGasSettings) {
|
|
72
88
|
const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
|
|
73
89
|
const anchorBlockNumber = fromSingle(foreignAnchorBlockNumberIsSome).toBool() ? BlockNumber(fromSingle(foreignAnchorBlockNumberValue).toNumber()) : undefined;
|
|
74
|
-
const
|
|
90
|
+
const gasSettings = GasSettings.fromFields(fromArray(foreignGasSettings));
|
|
91
|
+
const privateContextInputs = await this.stateHandler.enterPrivateState(contractAddress, anchorBlockNumber, gasSettings);
|
|
75
92
|
return toForeignCallResult(privateContextInputs.toFields().map(toSingle));
|
|
76
93
|
}
|
|
77
94
|
// eslint-disable-next-line camelcase
|
|
@@ -905,7 +922,7 @@ export class RPCTranslator {
|
|
|
905
922
|
throw new Error('Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead');
|
|
906
923
|
}
|
|
907
924
|
// eslint-disable-next-line camelcase
|
|
908
|
-
async aztec_txe_privateCallNewFlow(foreignFromIsSome, foreignFromValue, foreignTargetContractAddress, foreignFunctionSelector, foreignArgs, foreignArgsHash, foreignIsStaticCall, foreignAdditionalScopes, foreignAuthorizedUtilityCallTargets) {
|
|
925
|
+
async aztec_txe_privateCallNewFlow(foreignFromIsSome, foreignFromValue, foreignTargetContractAddress, foreignFunctionSelector, foreignArgs, foreignArgsHash, foreignIsStaticCall, foreignAdditionalScopes, foreignAuthorizedUtilityCallTargets, foreignGasSettings) {
|
|
909
926
|
const from = fromSingle(foreignFromIsSome).toBool() ? addressFromSingle(foreignFromValue) : undefined;
|
|
910
927
|
const targetContractAddress = addressFromSingle(foreignTargetContractAddress);
|
|
911
928
|
const functionSelector = FunctionSelector.fromField(fromSingle(foreignFunctionSelector));
|
|
@@ -914,8 +931,9 @@ export class RPCTranslator {
|
|
|
914
931
|
const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
|
|
915
932
|
const additionalScopes = fromArray(foreignAdditionalScopes).map((field)=>AztecAddress.fromField(field));
|
|
916
933
|
const authorizedUtilityCallTargets = fromArray(foreignAuthorizedUtilityCallTargets).map((field)=>AztecAddress.fromField(field));
|
|
934
|
+
const gasSettings = GasSettings.fromFields(fromArray(foreignGasSettings));
|
|
917
935
|
const returnValues = await this.stateHandler.withTopLevelCallTracking(async ()=>{
|
|
918
|
-
const { returnValues, offchainEffects } = await this.handlerAsTxe().privateCallNewFlow(from, targetContractAddress, functionSelector, args, argsHash, isStaticCall, additionalScopes, this.stateHandler.getCurrentJob(), authorizedUtilityCallTargets);
|
|
936
|
+
const { returnValues, offchainEffects } = await this.handlerAsTxe().privateCallNewFlow(from, targetContractAddress, functionSelector, args, argsHash, isStaticCall, additionalScopes, this.stateHandler.getCurrentJob(), authorizedUtilityCallTargets, gasSettings);
|
|
919
937
|
// Private execution collects offchain effects inside PXE's PrivateExecutionOracle rather than
|
|
920
938
|
// round-tripping them through `aztec_utl_emitOffchainEffect`, so the session buffer is empty
|
|
921
939
|
// at this point. Drain the effects from the execution tree into the session buffer so the
|
|
@@ -962,13 +980,14 @@ export class RPCTranslator {
|
|
|
962
980
|
]);
|
|
963
981
|
}
|
|
964
982
|
// eslint-disable-next-line camelcase
|
|
965
|
-
async aztec_txe_publicCallNewFlow(foreignFromIsSome, foreignFromValue, foreignAddress, foreignCalldata, foreignIsStaticCall) {
|
|
983
|
+
async aztec_txe_publicCallNewFlow(foreignFromIsSome, foreignFromValue, foreignAddress, foreignCalldata, foreignIsStaticCall, foreignGasSettings) {
|
|
966
984
|
const from = fromSingle(foreignFromIsSome).toBool() ? addressFromSingle(foreignFromValue) : undefined;
|
|
967
985
|
const address = addressFromSingle(foreignAddress);
|
|
968
986
|
const calldata = fromArray(foreignCalldata);
|
|
969
987
|
const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
|
|
988
|
+
const gasSettings = GasSettings.fromFields(fromArray(foreignGasSettings));
|
|
970
989
|
const returnValues = await this.stateHandler.withTopLevelCallTracking(async ()=>{
|
|
971
|
-
const returnValues = await this.handlerAsTxe().publicCallNewFlow(from, address, calldata, isStaticCall);
|
|
990
|
+
const returnValues = await this.handlerAsTxe().publicCallNewFlow(from, address, calldata, isStaticCall, gasSettings);
|
|
972
991
|
// TODO(F-335): Avoid doing the following call here.
|
|
973
992
|
await this.stateHandler.cycleJob();
|
|
974
993
|
if (isStaticCall) {
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The TXE oracle version constants are used to check that the oracle interface used for tests is in sync between
|
|
3
|
+
* TXE and Aztec.nr. This is separate from the contract oracle version in `pxe/src/oracle_version.ts`, which covers
|
|
4
|
+
* oracles used during contract execution by PXE.
|
|
5
|
+
*
|
|
6
|
+
* The Noir counterparts are in `noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr`.
|
|
7
|
+
*/
|
|
8
|
+
export declare const TXE_ORACLE_VERSION_MAJOR = 1;
|
|
9
|
+
export declare const TXE_ORACLE_VERSION_MINOR = 0;
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX29yYWNsZV92ZXJzaW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHhlX29yYWNsZV92ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUNILGVBQU8sTUFBTSx3QkFBd0IsSUFBSSxDQUFDO0FBQzFDLGVBQU8sTUFBTSx3QkFBd0IsSUFBSSxDQUFDIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"txe_oracle_version.d.ts","sourceRoot":"","sources":["../src/txe_oracle_version.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,eAAO,MAAM,wBAAwB,IAAI,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The TXE oracle version constants are used to check that the oracle interface used for tests is in sync between
|
|
3
|
+
* TXE and Aztec.nr. This is separate from the contract oracle version in `pxe/src/oracle_version.ts`, which covers
|
|
4
|
+
* oracles used during contract execution by PXE.
|
|
5
|
+
*
|
|
6
|
+
* The Noir counterparts are in `noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr`.
|
|
7
|
+
*/ export const TXE_ORACLE_VERSION_MAJOR = 1;
|
|
8
|
+
export const TXE_ORACLE_VERSION_MINOR = 0;
|
package/dest/txe_session.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { KeyStore } from '@aztec/key-store';
|
|
|
5
5
|
import { AddressStore, CapsuleStore, ContractStore, JobCoordinator, NoteStore, PrivateEventStore, RecipientTaggingStore, SenderAddressBookStore, SenderTaggingStore } from '@aztec/pxe/server';
|
|
6
6
|
import { type IPrivateExecutionOracle, type IUtilityExecutionOracle } from '@aztec/pxe/simulator';
|
|
7
7
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
8
|
+
import type { GasSettings } from '@aztec/stdlib/gas';
|
|
8
9
|
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
9
10
|
import type { IAvmExecutionOracle, ITxeExecutionOracle } from './oracle/interfaces.js';
|
|
10
11
|
import { RPCTranslator } from './rpc_translator.js';
|
|
@@ -20,9 +21,14 @@ type MethodNames<T> = {
|
|
|
20
21
|
*/
|
|
21
22
|
export type TXEOracleFunctionName = Exclude<MethodNames<RPCTranslator>, 'constructor' | 'handlerAsMisc' | 'handlerAsUtility' | 'handlerAsPrivate' | 'handlerAsAvm' | 'handlerAsTxe'>;
|
|
22
23
|
export interface TXESessionStateHandler {
|
|
24
|
+
/** Records the TXE oracle version reported by the Noir test code for diagnostics. */
|
|
25
|
+
setTxeOracleVersion(version: {
|
|
26
|
+
major: number;
|
|
27
|
+
minor: number;
|
|
28
|
+
}): void;
|
|
23
29
|
enterTopLevelState(): Promise<void>;
|
|
24
30
|
enterPublicState(contractAddress?: AztecAddress): Promise<void>;
|
|
25
|
-
enterPrivateState(contractAddress
|
|
31
|
+
enterPrivateState(contractAddress: AztecAddress | undefined, anchorBlockNumber: BlockNumber | undefined, gasSettings: GasSettings): Promise<PrivateContextInputs>;
|
|
26
32
|
enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
|
|
27
33
|
cycleJob(): Promise<string>;
|
|
28
34
|
getCurrentJob(): string;
|
|
@@ -83,6 +89,7 @@ export declare class TXESession implements TXESessionStateHandler {
|
|
|
83
89
|
private state;
|
|
84
90
|
private authwits;
|
|
85
91
|
private lastCallInfo;
|
|
92
|
+
private txeOracleVersion;
|
|
86
93
|
constructor(logger: Logger, stateMachine: TXEStateMachine, oracleHandler: IUtilityExecutionOracle | IPrivateExecutionOracle | IAvmExecutionOracle | ITxeExecutionOracle, contractStore: ContractStore, noteStore: NoteStore, keyStore: KeyStore, addressStore: AddressStore, accountStore: TXEAccountStore, senderTaggingStore: SenderTaggingStore, recipientTaggingStore: RecipientTaggingStore, senderAddressBookStore: SenderAddressBookStore, capsuleStore: CapsuleStore, privateEventStore: PrivateEventStore, jobCoordinator: JobCoordinator, currentJobId: string, chainId: Fr, version: Fr, nextBlockTimestamp: bigint);
|
|
87
94
|
static init(contractStore: ContractStore): Promise<TXESession>;
|
|
88
95
|
/**
|
|
@@ -109,8 +116,12 @@ export declare class TXESession implements TXESessionStateHandler {
|
|
|
109
116
|
txHash: Fr;
|
|
110
117
|
anchorBlockTimestamp: bigint;
|
|
111
118
|
};
|
|
119
|
+
setTxeOracleVersion(version: {
|
|
120
|
+
major: number;
|
|
121
|
+
minor: number;
|
|
122
|
+
}): void;
|
|
112
123
|
enterTopLevelState(): Promise<void>;
|
|
113
|
-
enterPrivateState(contractAddress
|
|
124
|
+
enterPrivateState(contractAddress: AztecAddress | undefined, anchorBlockNumber: BlockNumber | undefined, gasSettings: GasSettings): Promise<PrivateContextInputs>;
|
|
114
125
|
enterPublicState(contractAddress?: AztecAddress): Promise<void>;
|
|
115
126
|
enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
|
|
116
127
|
private exitTopLevelState;
|
|
@@ -120,4 +131,4 @@ export declare class TXESession implements TXESessionStateHandler {
|
|
|
120
131
|
private utilityExecutorForContractSync;
|
|
121
132
|
}
|
|
122
133
|
export {};
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3Nlc3Npb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eGVfc2Vzc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFNUMsT0FBTyxFQUNMLFlBQVksRUFHWixZQUFZLEVBQ1osYUFBYSxFQUNiLGNBQWMsRUFFZCxTQUFTLEVBQ1QsaUJBQWlCLEVBQ2pCLHFCQUFxQixFQUNyQixzQkFBc0IsRUFDdEIsa0JBQWtCLEVBQ25CLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxFQUlMLEtBQUssdUJBQXVCLEVBQzVCLEtBQUssdUJBQXVCLEVBSTdCLE1BQU0sc0JBQXNCLENBQUM7QUFXOUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXJELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBTzVELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHdkYsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXBELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM3RSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF5QzlELEtBQUssV0FBVyxD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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"txe_session.d.ts","sourceRoot":"","sources":["../src/txe_session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EACL,YAAY,EAGZ,YAAY,EACZ,aAAa,EACb,cAAc,EAEd,SAAS,EACT,iBAAiB,EACjB,qBAAqB,EACrB,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAIL,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,EAI7B,MAAM,sBAAsB,CAAC;AAW9B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"txe_session.d.ts","sourceRoot":"","sources":["../src/txe_session.ts"],"names":[],"mappings":"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"}
|
package/dest/txe_session.js
CHANGED
|
@@ -8,7 +8,6 @@ import { ExecutionNoteCache, ExecutionTaggingIndexCache, HashedValuesCache, Orac
|
|
|
8
8
|
import { ExecutionError, WASMSimulator, createSimulationError, extractCallStack, resolveAssertionMessageFromError, toACVMWitness } from '@aztec/simulator/client';
|
|
9
9
|
import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
|
|
10
10
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
11
|
-
import { GasSettings } from '@aztec/stdlib/gas';
|
|
12
11
|
import { computeProtocolNullifier } from '@aztec/stdlib/hash';
|
|
13
12
|
import { makeGlobalVariables } from '@aztec/stdlib/testing';
|
|
14
13
|
import { CallContext, OFFCHAIN_MESSAGE_IDENTIFIER, TxContext } from '@aztec/stdlib/tx';
|
|
@@ -19,6 +18,7 @@ import { TXEOracleTopLevelContext } from './oracle/txe_oracle_top_level_context.
|
|
|
19
18
|
import { RPCTranslator } from './rpc_translator.js';
|
|
20
19
|
import { TXEArchiver } from './state_machine/archiver.js';
|
|
21
20
|
import { TXEStateMachine } from './state_machine/index.js';
|
|
21
|
+
import { TXE_ORACLE_VERSION_MAJOR, TXE_ORACLE_VERSION_MINOR } from './txe_oracle_version.js';
|
|
22
22
|
import { TXEAccountStore } from './util/txe_account_store.js';
|
|
23
23
|
import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlock } from './utils/block_creation.js';
|
|
24
24
|
import { makeTxEffect } from './utils/tx_effect_creation.js';
|
|
@@ -55,6 +55,7 @@ function emptyLastCallState() {
|
|
|
55
55
|
state;
|
|
56
56
|
authwits;
|
|
57
57
|
lastCallInfo;
|
|
58
|
+
txeOracleVersion;
|
|
58
59
|
constructor(logger, stateMachine, oracleHandler, contractStore, noteStore, keyStore, addressStore, accountStore, senderTaggingStore, recipientTaggingStore, senderAddressBookStore, capsuleStore, privateEventStore, jobCoordinator, currentJobId, chainId, version, nextBlockTimestamp){
|
|
59
60
|
this.logger = logger;
|
|
60
61
|
this.stateMachine = stateMachine;
|
|
@@ -125,7 +126,15 @@ function emptyLastCallState() {
|
|
|
125
126
|
return translator[validatedFunctionName](...inputs);
|
|
126
127
|
} catch (error) {
|
|
127
128
|
if (error instanceof z.ZodError) {
|
|
128
|
-
|
|
129
|
+
let versionHint;
|
|
130
|
+
if (!this.txeOracleVersion) {
|
|
131
|
+
versionHint = ' The test appears to use an older version of Aztec.nr that does not' + ' support test environment oracle versioning. Update Aztec.nr to a compatible version.' + ' See https://docs.aztec.network/errors/12';
|
|
132
|
+
} else if (this.txeOracleVersion.minor > TXE_ORACLE_VERSION_MINOR) {
|
|
133
|
+
versionHint = ` The test uses Aztec.nr test oracle version` + ` ${this.txeOracleVersion.major}.${this.txeOracleVersion.minor}, but this test environment` + ` only supports up to ${TXE_ORACLE_VERSION_MAJOR}.${TXE_ORACLE_VERSION_MINOR}.` + ` Upgrade the Aztec CLI to a compatible version.` + ` See https://docs.aztec.network/errors/12`;
|
|
134
|
+
} else {
|
|
135
|
+
versionHint = ` The test's oracle version (${this.txeOracleVersion.major}.${this.txeOracleVersion.minor})` + ` is compatible with this test environment` + ` (${TXE_ORACLE_VERSION_MAJOR}.${TXE_ORACLE_VERSION_MINOR}), so this oracle should be` + ` available. This is an unexpected error, please report it.` + ` See https://docs.aztec.network/errors/13`;
|
|
136
|
+
}
|
|
137
|
+
throw new Error(`Unknown oracle '${functionName}'.${versionHint}`);
|
|
129
138
|
} else if (error instanceof Error) {
|
|
130
139
|
throw new Error(`Execution error while processing function ${functionName} in state ${this.state.name}: ${error.message}`);
|
|
131
140
|
} else {
|
|
@@ -177,6 +186,10 @@ function emptyLastCallState() {
|
|
|
177
186
|
anchorBlockTimestamp
|
|
178
187
|
};
|
|
179
188
|
}
|
|
189
|
+
setTxeOracleVersion(version) {
|
|
190
|
+
this.txeOracleVersion = version;
|
|
191
|
+
this.logger.debug(`Test compiled with test oracle version ${version.major}.${version.minor}`);
|
|
192
|
+
}
|
|
180
193
|
async enterTopLevelState() {
|
|
181
194
|
switch(this.state.name){
|
|
182
195
|
case 'PRIVATE':
|
|
@@ -211,7 +224,7 @@ function emptyLastCallState() {
|
|
|
211
224
|
};
|
|
212
225
|
this.logger.debug(`Entered state ${this.state.name}`);
|
|
213
226
|
}
|
|
214
|
-
async enterPrivateState(contractAddress = DEFAULT_ADDRESS, anchorBlockNumber) {
|
|
227
|
+
async enterPrivateState(contractAddress = DEFAULT_ADDRESS, anchorBlockNumber, gasSettings) {
|
|
215
228
|
this.exitTopLevelState();
|
|
216
229
|
this.resetLastCall();
|
|
217
230
|
// Private execution has two associated block numbers: the anchor block (i.e. the historical block that is used to
|
|
@@ -233,7 +246,7 @@ function emptyLastCallState() {
|
|
|
233
246
|
const utilityExecutor = this.utilityExecutorForContractSync(anchorBlock);
|
|
234
247
|
this.oracleHandler = new PrivateExecutionOracle({
|
|
235
248
|
argsHash: Fr.ZERO,
|
|
236
|
-
txContext: new TxContext(this.chainId, this.version,
|
|
249
|
+
txContext: new TxContext(this.chainId, this.version, gasSettings),
|
|
237
250
|
callContext: new CallContext(AztecAddress.ZERO, contractAddress, FunctionSelector.empty(), false),
|
|
238
251
|
anchorBlockHeader: anchorBlock,
|
|
239
252
|
utilityExecutor,
|
|
@@ -325,7 +338,8 @@ function emptyLastCallState() {
|
|
|
325
338
|
l2TipsStore: this.stateMachine.node,
|
|
326
339
|
jobId: this.currentJobId,
|
|
327
340
|
scopes: await this.keyStore.getAccounts(),
|
|
328
|
-
simulator: new WASMSimulator()
|
|
341
|
+
simulator: new WASMSimulator(),
|
|
342
|
+
utilityExecutor: this.utilityExecutorForContractSync(anchorBlockHeader)
|
|
329
343
|
});
|
|
330
344
|
this.state = {
|
|
331
345
|
name: 'UTILITY'
|
|
@@ -411,7 +425,8 @@ function emptyLastCallState() {
|
|
|
411
425
|
l2TipsStore: this.stateMachine.node,
|
|
412
426
|
jobId: this.currentJobId,
|
|
413
427
|
scopes,
|
|
414
|
-
simulator
|
|
428
|
+
simulator,
|
|
429
|
+
utilityExecutor: this.utilityExecutorForContractSync(anchorBlock)
|
|
415
430
|
});
|
|
416
431
|
await simulator.executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback()).catch((err)=>{
|
|
417
432
|
err.message = resolveAssertionMessageFromError(err, entryPointArtifact);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/txe",
|
|
3
|
-
"version": "4.3.0-nightly.
|
|
3
|
+
"version": "4.3.0-nightly.20260515",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"bin": "./dest/bin/index.js",
|
|
@@ -61,20 +61,20 @@
|
|
|
61
61
|
]
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
|
-
"@aztec/accounts": "4.3.0-nightly.
|
|
65
|
-
"@aztec/archiver": "4.3.0-nightly.
|
|
66
|
-
"@aztec/aztec-node": "4.3.0-nightly.
|
|
67
|
-
"@aztec/aztec.js": "4.3.0-nightly.
|
|
68
|
-
"@aztec/bb-prover": "4.3.0-nightly.
|
|
69
|
-
"@aztec/constants": "4.3.0-nightly.
|
|
70
|
-
"@aztec/foundation": "4.3.0-nightly.
|
|
71
|
-
"@aztec/key-store": "4.3.0-nightly.
|
|
72
|
-
"@aztec/kv-store": "4.3.0-nightly.
|
|
73
|
-
"@aztec/protocol-contracts": "4.3.0-nightly.
|
|
74
|
-
"@aztec/pxe": "4.3.0-nightly.
|
|
75
|
-
"@aztec/simulator": "4.3.0-nightly.
|
|
76
|
-
"@aztec/stdlib": "4.3.0-nightly.
|
|
77
|
-
"@aztec/world-state": "4.3.0-nightly.
|
|
64
|
+
"@aztec/accounts": "4.3.0-nightly.20260515",
|
|
65
|
+
"@aztec/archiver": "4.3.0-nightly.20260515",
|
|
66
|
+
"@aztec/aztec-node": "4.3.0-nightly.20260515",
|
|
67
|
+
"@aztec/aztec.js": "4.3.0-nightly.20260515",
|
|
68
|
+
"@aztec/bb-prover": "4.3.0-nightly.20260515",
|
|
69
|
+
"@aztec/constants": "4.3.0-nightly.20260515",
|
|
70
|
+
"@aztec/foundation": "4.3.0-nightly.20260515",
|
|
71
|
+
"@aztec/key-store": "4.3.0-nightly.20260515",
|
|
72
|
+
"@aztec/kv-store": "4.3.0-nightly.20260515",
|
|
73
|
+
"@aztec/protocol-contracts": "4.3.0-nightly.20260515",
|
|
74
|
+
"@aztec/pxe": "4.3.0-nightly.20260515",
|
|
75
|
+
"@aztec/simulator": "4.3.0-nightly.20260515",
|
|
76
|
+
"@aztec/stdlib": "4.3.0-nightly.20260515",
|
|
77
|
+
"@aztec/world-state": "4.3.0-nightly.20260515",
|
|
78
78
|
"zod": "^3.23.8"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
package/src/oracle/interfaces.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
|
6
6
|
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
7
7
|
import type { EventSelector, FunctionSelector } from '@aztec/stdlib/abi';
|
|
8
8
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
9
|
+
import type { GasSettings } from '@aztec/stdlib/gas';
|
|
9
10
|
import type { PrivateLog } from '@aztec/stdlib/logs';
|
|
10
11
|
import type { UInt64 } from '@aztec/stdlib/types';
|
|
11
12
|
|
|
@@ -72,6 +73,7 @@ export interface ITxeExecutionOracle {
|
|
|
72
73
|
additionalScopes: AztecAddress[],
|
|
73
74
|
jobId: string,
|
|
74
75
|
authorizedUtilityCallTargets: AztecAddress[],
|
|
76
|
+
gasSettings: GasSettings,
|
|
75
77
|
): Promise<{ returnValues: Fr[]; offchainEffects: Fr[][] }>;
|
|
76
78
|
executeUtilityFunction(
|
|
77
79
|
targetContractAddress: AztecAddress,
|
|
@@ -85,6 +87,7 @@ export interface ITxeExecutionOracle {
|
|
|
85
87
|
targetContractAddress: AztecAddress,
|
|
86
88
|
calldata: Fr[],
|
|
87
89
|
isStaticCall: boolean,
|
|
90
|
+
gasSettings: GasSettings,
|
|
88
91
|
): Promise<Fr[]>;
|
|
89
92
|
// TODO(F-335): Drop this from here as it's not a real oracle handler - it's only called from
|
|
90
93
|
// RPCTranslator::txeGetPrivateEvents and never from Noir.
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
|
|
3
|
-
MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT,
|
|
4
|
-
MAX_PROCESSABLE_L2_GAS,
|
|
5
|
-
NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
|
|
6
|
-
} from '@aztec/constants';
|
|
1
|
+
import { CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
|
|
7
2
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
8
3
|
import { Schnorr } from '@aztec/foundation/crypto/schnorr';
|
|
9
4
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
@@ -56,13 +51,7 @@ import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
|
56
51
|
import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
|
|
57
52
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
58
53
|
import { type ContractInstanceWithAddress, computePartialAddress } from '@aztec/stdlib/contract';
|
|
59
|
-
import {
|
|
60
|
-
FALLBACK_TEARDOWN_DA_GAS_LIMIT,
|
|
61
|
-
FALLBACK_TEARDOWN_L2_GAS_LIMIT,
|
|
62
|
-
Gas,
|
|
63
|
-
GasFees,
|
|
64
|
-
GasSettings,
|
|
65
|
-
} from '@aztec/stdlib/gas';
|
|
54
|
+
import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
|
|
66
55
|
import { computeCalldataHash, computeProtocolNullifier, siloNullifier } from '@aztec/stdlib/hash';
|
|
67
56
|
import {
|
|
68
57
|
PartialPrivateTailPublicInputsForPublic,
|
|
@@ -329,6 +318,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
|
|
|
329
318
|
additionalScopes: AztecAddress[] = [],
|
|
330
319
|
jobId: string,
|
|
331
320
|
authorizedUtilityCallTargets: AztecAddress[],
|
|
321
|
+
gasSettings: GasSettings,
|
|
332
322
|
) {
|
|
333
323
|
this.logger.verbose(
|
|
334
324
|
`Executing external function ${await this.contractStore.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`,
|
|
@@ -364,10 +354,6 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
|
|
|
364
354
|
const msgSender = from ?? AztecAddress.NULL_MSG_SENDER;
|
|
365
355
|
const callContext = new CallContext(msgSender, targetContractAddress, functionSelector, isStaticCall);
|
|
366
356
|
|
|
367
|
-
const gasLimits = new Gas(MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT, MAX_PROCESSABLE_L2_GAS);
|
|
368
|
-
const teardownGasLimits = new Gas(FALLBACK_TEARDOWN_DA_GAS_LIMIT, FALLBACK_TEARDOWN_L2_GAS_LIMIT);
|
|
369
|
-
const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
|
|
370
|
-
|
|
371
357
|
const txContext = new TxContext(this.chainId, this.version, gasSettings);
|
|
372
358
|
|
|
373
359
|
const protocolNullifier = await computeProtocolNullifier(getSingleTxBlockRequestHash(blockNumber));
|
|
@@ -563,6 +549,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
|
|
|
563
549
|
targetContractAddress: AztecAddress,
|
|
564
550
|
calldata: Fr[],
|
|
565
551
|
isStaticCall: boolean,
|
|
552
|
+
gasSettings: GasSettings,
|
|
566
553
|
) {
|
|
567
554
|
this.logger.verbose(
|
|
568
555
|
`Executing public function ${await this.contractStore.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`,
|
|
@@ -570,12 +557,6 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
|
|
|
570
557
|
|
|
571
558
|
const blockNumber = await this.getNextBlockNumber();
|
|
572
559
|
|
|
573
|
-
const gasLimits = new Gas(MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT, MAX_PROCESSABLE_L2_GAS);
|
|
574
|
-
|
|
575
|
-
const teardownGasLimits = new Gas(FALLBACK_TEARDOWN_DA_GAS_LIMIT, FALLBACK_TEARDOWN_L2_GAS_LIMIT);
|
|
576
|
-
|
|
577
|
-
const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
|
|
578
|
-
|
|
579
560
|
const txContext = new TxContext(this.chainId, this.version, gasSettings);
|
|
580
561
|
|
|
581
562
|
const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
|
|
@@ -771,6 +752,9 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
|
|
|
771
752
|
try {
|
|
772
753
|
const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
|
|
773
754
|
const simulator = new WASMSimulator();
|
|
755
|
+
const utilityExecutor = async (syncCall: FunctionCall, execScopes: AztecAddress[]) => {
|
|
756
|
+
await this.executeUtilityCall(syncCall, execScopes, jobId);
|
|
757
|
+
};
|
|
774
758
|
const oracle = new UtilityExecutionOracle({
|
|
775
759
|
contractAddress: call.to,
|
|
776
760
|
authWitnesses: [],
|
|
@@ -794,6 +778,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
|
|
|
794
778
|
hooks: composeHooks({
|
|
795
779
|
authorizeUtilityCall: this.buildAuthorizeUtilityCallHook('utility', authorizedUtilityCallTargets),
|
|
796
780
|
}),
|
|
781
|
+
utilityExecutor,
|
|
797
782
|
});
|
|
798
783
|
const acirExecutionResult = await simulator
|
|
799
784
|
.executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback())
|
package/src/rpc_translator.ts
CHANGED
|
@@ -19,8 +19,10 @@ import {
|
|
|
19
19
|
import { type ContractArtifact, EventSelector, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
|
|
20
20
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
21
21
|
import { BlockHash } from '@aztec/stdlib/block';
|
|
22
|
+
import { GasSettings } from '@aztec/stdlib/gas';
|
|
22
23
|
|
|
23
24
|
import type { IAvmExecutionOracle, ITxeExecutionOracle } from './oracle/interfaces.js';
|
|
25
|
+
import { TXE_ORACLE_VERSION_MAJOR } from './txe_oracle_version.js';
|
|
24
26
|
import type { TXESessionStateHandler } from './txe_session.js';
|
|
25
27
|
import {
|
|
26
28
|
type ForeignCallArray,
|
|
@@ -110,6 +112,26 @@ export class RPCTranslator {
|
|
|
110
112
|
return this.oracleHandler;
|
|
111
113
|
}
|
|
112
114
|
|
|
115
|
+
// eslint-disable-next-line camelcase
|
|
116
|
+
aztec_txe_assertCompatibleOracleVersion(foreignMajor: ForeignCallSingle, foreignMinor: ForeignCallSingle) {
|
|
117
|
+
const major = fromSingle(foreignMajor).toNumber();
|
|
118
|
+
const minor = fromSingle(foreignMinor).toNumber();
|
|
119
|
+
|
|
120
|
+
if (major !== TXE_ORACLE_VERSION_MAJOR) {
|
|
121
|
+
const hint =
|
|
122
|
+
major > TXE_ORACLE_VERSION_MAJOR
|
|
123
|
+
? 'The test was compiled with a newer version of Aztec.nr than your test environment supports. Upgrade your test environment to a compatible version.'
|
|
124
|
+
: 'The test was compiled with an older version of Aztec.nr than your test environment supports. Recompile the test with a compatible version of Aztec.nr.';
|
|
125
|
+
throw new Error(
|
|
126
|
+
`Incompatible test environment version: ${hint} See https://docs.aztec.network/errors/12 (expected test oracle major version ${TXE_ORACLE_VERSION_MAJOR}, got ${major})`,
|
|
127
|
+
);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
this.stateHandler.setTxeOracleVersion({ major, minor });
|
|
131
|
+
|
|
132
|
+
return toForeignCallResult([]);
|
|
133
|
+
}
|
|
134
|
+
|
|
113
135
|
// TXE session state transition functions - these get handled by the state handler
|
|
114
136
|
|
|
115
137
|
// eslint-disable-next-line camelcase
|
|
@@ -125,6 +147,7 @@ export class RPCTranslator {
|
|
|
125
147
|
foreignContractAddressValue: ForeignCallSingle,
|
|
126
148
|
foreignAnchorBlockNumberIsSome: ForeignCallSingle,
|
|
127
149
|
foreignAnchorBlockNumberValue: ForeignCallSingle,
|
|
150
|
+
foreignGasSettings: ForeignCallArray,
|
|
128
151
|
) {
|
|
129
152
|
const contractAddress = fromSingle(foreignContractAddressIsSome).toBool()
|
|
130
153
|
? AztecAddress.fromField(fromSingle(foreignContractAddressValue))
|
|
@@ -134,7 +157,13 @@ export class RPCTranslator {
|
|
|
134
157
|
? BlockNumber(fromSingle(foreignAnchorBlockNumberValue).toNumber())
|
|
135
158
|
: undefined;
|
|
136
159
|
|
|
137
|
-
const
|
|
160
|
+
const gasSettings = GasSettings.fromFields(fromArray(foreignGasSettings));
|
|
161
|
+
|
|
162
|
+
const privateContextInputs = await this.stateHandler.enterPrivateState(
|
|
163
|
+
contractAddress,
|
|
164
|
+
anchorBlockNumber,
|
|
165
|
+
gasSettings,
|
|
166
|
+
);
|
|
138
167
|
|
|
139
168
|
return toForeignCallResult(privateContextInputs.toFields().map(toSingle));
|
|
140
169
|
}
|
|
@@ -1370,6 +1399,7 @@ export class RPCTranslator {
|
|
|
1370
1399
|
foreignIsStaticCall: ForeignCallSingle,
|
|
1371
1400
|
foreignAdditionalScopes: ForeignCallArray,
|
|
1372
1401
|
foreignAuthorizedUtilityCallTargets: ForeignCallArray,
|
|
1402
|
+
foreignGasSettings: ForeignCallArray,
|
|
1373
1403
|
) {
|
|
1374
1404
|
const from = fromSingle(foreignFromIsSome).toBool() ? addressFromSingle(foreignFromValue) : undefined;
|
|
1375
1405
|
const targetContractAddress = addressFromSingle(foreignTargetContractAddress);
|
|
@@ -1381,6 +1411,7 @@ export class RPCTranslator {
|
|
|
1381
1411
|
const authorizedUtilityCallTargets = fromArray(foreignAuthorizedUtilityCallTargets).map(field =>
|
|
1382
1412
|
AztecAddress.fromField(field),
|
|
1383
1413
|
);
|
|
1414
|
+
const gasSettings = GasSettings.fromFields(fromArray(foreignGasSettings));
|
|
1384
1415
|
|
|
1385
1416
|
const returnValues = await this.stateHandler.withTopLevelCallTracking(async () => {
|
|
1386
1417
|
const { returnValues, offchainEffects } = await this.handlerAsTxe().privateCallNewFlow(
|
|
@@ -1393,6 +1424,7 @@ export class RPCTranslator {
|
|
|
1393
1424
|
additionalScopes,
|
|
1394
1425
|
this.stateHandler.getCurrentJob(),
|
|
1395
1426
|
authorizedUtilityCallTargets,
|
|
1427
|
+
gasSettings,
|
|
1396
1428
|
);
|
|
1397
1429
|
|
|
1398
1430
|
// Private execution collects offchain effects inside PXE's PrivateExecutionOracle rather than
|
|
@@ -1458,14 +1490,22 @@ export class RPCTranslator {
|
|
|
1458
1490
|
foreignAddress: ForeignCallSingle,
|
|
1459
1491
|
foreignCalldata: ForeignCallArray,
|
|
1460
1492
|
foreignIsStaticCall: ForeignCallSingle,
|
|
1493
|
+
foreignGasSettings: ForeignCallArray,
|
|
1461
1494
|
) {
|
|
1462
1495
|
const from = fromSingle(foreignFromIsSome).toBool() ? addressFromSingle(foreignFromValue) : undefined;
|
|
1463
1496
|
const address = addressFromSingle(foreignAddress);
|
|
1464
1497
|
const calldata = fromArray(foreignCalldata);
|
|
1465
1498
|
const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
|
|
1499
|
+
const gasSettings = GasSettings.fromFields(fromArray(foreignGasSettings));
|
|
1466
1500
|
|
|
1467
1501
|
const returnValues = await this.stateHandler.withTopLevelCallTracking(async () => {
|
|
1468
|
-
const returnValues = await this.handlerAsTxe().publicCallNewFlow(
|
|
1502
|
+
const returnValues = await this.handlerAsTxe().publicCallNewFlow(
|
|
1503
|
+
from,
|
|
1504
|
+
address,
|
|
1505
|
+
calldata,
|
|
1506
|
+
isStaticCall,
|
|
1507
|
+
gasSettings,
|
|
1508
|
+
);
|
|
1469
1509
|
|
|
1470
1510
|
// TODO(F-335): Avoid doing the following call here.
|
|
1471
1511
|
await this.stateHandler.cycleJob();
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The TXE oracle version constants are used to check that the oracle interface used for tests is in sync between
|
|
3
|
+
* TXE and Aztec.nr. This is separate from the contract oracle version in `pxe/src/oracle_version.ts`, which covers
|
|
4
|
+
* oracles used during contract execution by PXE.
|
|
5
|
+
*
|
|
6
|
+
* The Noir counterparts are in `noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr`.
|
|
7
|
+
*/
|
|
8
|
+
export const TXE_ORACLE_VERSION_MAJOR = 1;
|
|
9
|
+
export const TXE_ORACLE_VERSION_MINOR = 0;
|
package/src/txe_session.ts
CHANGED
|
@@ -38,7 +38,7 @@ import {
|
|
|
38
38
|
import { FunctionCall, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
|
|
39
39
|
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
40
40
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
41
|
-
import { GasSettings } from '@aztec/stdlib/gas';
|
|
41
|
+
import type { GasSettings } from '@aztec/stdlib/gas';
|
|
42
42
|
import { computeProtocolNullifier } from '@aztec/stdlib/hash';
|
|
43
43
|
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
44
44
|
import { makeGlobalVariables } from '@aztec/stdlib/testing';
|
|
@@ -53,6 +53,7 @@ import { TXEOracleTopLevelContext } from './oracle/txe_oracle_top_level_context.
|
|
|
53
53
|
import { RPCTranslator } from './rpc_translator.js';
|
|
54
54
|
import { TXEArchiver } from './state_machine/archiver.js';
|
|
55
55
|
import { TXEStateMachine } from './state_machine/index.js';
|
|
56
|
+
import { TXE_ORACLE_VERSION_MAJOR, TXE_ORACLE_VERSION_MINOR } from './txe_oracle_version.js';
|
|
56
57
|
import type { ForeignCallArgs, ForeignCallResult } from './util/encoding.js';
|
|
57
58
|
import { TXEAccountStore } from './util/txe_account_store.js';
|
|
58
59
|
import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlock } from './utils/block_creation.js';
|
|
@@ -109,9 +110,16 @@ export type TXEOracleFunctionName = Exclude<
|
|
|
109
110
|
>;
|
|
110
111
|
|
|
111
112
|
export interface TXESessionStateHandler {
|
|
113
|
+
/** Records the TXE oracle version reported by the Noir test code for diagnostics. */
|
|
114
|
+
setTxeOracleVersion(version: { major: number; minor: number }): void;
|
|
115
|
+
|
|
112
116
|
enterTopLevelState(): Promise<void>;
|
|
113
117
|
enterPublicState(contractAddress?: AztecAddress): Promise<void>;
|
|
114
|
-
enterPrivateState(
|
|
118
|
+
enterPrivateState(
|
|
119
|
+
contractAddress: AztecAddress | undefined,
|
|
120
|
+
anchorBlockNumber: BlockNumber | undefined,
|
|
121
|
+
gasSettings: GasSettings,
|
|
122
|
+
): Promise<PrivateContextInputs>;
|
|
115
123
|
enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
|
|
116
124
|
|
|
117
125
|
// TODO(F-335): Exposing the job info is abstraction breakage - drop the following 2 functions.
|
|
@@ -186,6 +194,7 @@ export class TXESession implements TXESessionStateHandler {
|
|
|
186
194
|
private state: SessionState = { name: 'TOP_LEVEL' };
|
|
187
195
|
private authwits: Map<string, AuthWitness> = new Map();
|
|
188
196
|
private lastCallInfo: LastCallState = emptyLastCallState();
|
|
197
|
+
private txeOracleVersion: { major: number; minor: number } | undefined;
|
|
189
198
|
|
|
190
199
|
constructor(
|
|
191
200
|
private logger: Logger,
|
|
@@ -306,7 +315,28 @@ export class TXESession implements TXESessionStateHandler {
|
|
|
306
315
|
return translator[validatedFunctionName](...inputs);
|
|
307
316
|
} catch (error) {
|
|
308
317
|
if (error instanceof z.ZodError) {
|
|
309
|
-
|
|
318
|
+
let versionHint: string;
|
|
319
|
+
if (!this.txeOracleVersion) {
|
|
320
|
+
versionHint =
|
|
321
|
+
' The test appears to use an older version of Aztec.nr that does not' +
|
|
322
|
+
' support test environment oracle versioning. Update Aztec.nr to a compatible version.' +
|
|
323
|
+
' See https://docs.aztec.network/errors/12';
|
|
324
|
+
} else if (this.txeOracleVersion.minor > TXE_ORACLE_VERSION_MINOR) {
|
|
325
|
+
versionHint =
|
|
326
|
+
` The test uses Aztec.nr test oracle version` +
|
|
327
|
+
` ${this.txeOracleVersion.major}.${this.txeOracleVersion.minor}, but this test environment` +
|
|
328
|
+
` only supports up to ${TXE_ORACLE_VERSION_MAJOR}.${TXE_ORACLE_VERSION_MINOR}.` +
|
|
329
|
+
` Upgrade the Aztec CLI to a compatible version.` +
|
|
330
|
+
` See https://docs.aztec.network/errors/12`;
|
|
331
|
+
} else {
|
|
332
|
+
versionHint =
|
|
333
|
+
` The test's oracle version (${this.txeOracleVersion.major}.${this.txeOracleVersion.minor})` +
|
|
334
|
+
` is compatible with this test environment` +
|
|
335
|
+
` (${TXE_ORACLE_VERSION_MAJOR}.${TXE_ORACLE_VERSION_MINOR}), so this oracle should be` +
|
|
336
|
+
` available. This is an unexpected error, please report it.` +
|
|
337
|
+
` See https://docs.aztec.network/errors/13`;
|
|
338
|
+
}
|
|
339
|
+
throw new Error(`Unknown oracle '${functionName}'.${versionHint}`);
|
|
310
340
|
} else if (error instanceof Error) {
|
|
311
341
|
throw new Error(
|
|
312
342
|
`Execution error while processing function ${functionName} in state ${this.state.name}: ${error.message}`,
|
|
@@ -374,6 +404,11 @@ export class TXESession implements TXESessionStateHandler {
|
|
|
374
404
|
return { txHash, anchorBlockTimestamp };
|
|
375
405
|
}
|
|
376
406
|
|
|
407
|
+
setTxeOracleVersion(version: { major: number; minor: number }): void {
|
|
408
|
+
this.txeOracleVersion = version;
|
|
409
|
+
this.logger.debug(`Test compiled with test oracle version ${version.major}.${version.minor}`);
|
|
410
|
+
}
|
|
411
|
+
|
|
377
412
|
async enterTopLevelState() {
|
|
378
413
|
switch (this.state.name) {
|
|
379
414
|
case 'PRIVATE': {
|
|
@@ -423,7 +458,8 @@ export class TXESession implements TXESessionStateHandler {
|
|
|
423
458
|
|
|
424
459
|
async enterPrivateState(
|
|
425
460
|
contractAddress: AztecAddress = DEFAULT_ADDRESS,
|
|
426
|
-
anchorBlockNumber
|
|
461
|
+
anchorBlockNumber: BlockNumber | undefined,
|
|
462
|
+
gasSettings: GasSettings,
|
|
427
463
|
): Promise<PrivateContextInputs> {
|
|
428
464
|
this.exitTopLevelState();
|
|
429
465
|
this.resetLastCall();
|
|
@@ -454,7 +490,7 @@ export class TXESession implements TXESessionStateHandler {
|
|
|
454
490
|
const utilityExecutor = this.utilityExecutorForContractSync(anchorBlock);
|
|
455
491
|
this.oracleHandler = new PrivateExecutionOracle({
|
|
456
492
|
argsHash: Fr.ZERO,
|
|
457
|
-
txContext: new TxContext(this.chainId, this.version,
|
|
493
|
+
txContext: new TxContext(this.chainId, this.version, gasSettings),
|
|
458
494
|
callContext: new CallContext(AztecAddress.ZERO, contractAddress, FunctionSelector.empty(), false),
|
|
459
495
|
anchorBlockHeader: anchorBlock!,
|
|
460
496
|
utilityExecutor,
|
|
@@ -562,6 +598,7 @@ export class TXESession implements TXESessionStateHandler {
|
|
|
562
598
|
jobId: this.currentJobId,
|
|
563
599
|
scopes: await this.keyStore.getAccounts(),
|
|
564
600
|
simulator: new WASMSimulator(),
|
|
601
|
+
utilityExecutor: this.utilityExecutorForContractSync(anchorBlockHeader),
|
|
565
602
|
});
|
|
566
603
|
|
|
567
604
|
this.state = { name: 'UTILITY' };
|
|
@@ -661,6 +698,7 @@ export class TXESession implements TXESessionStateHandler {
|
|
|
661
698
|
jobId: this.currentJobId,
|
|
662
699
|
scopes,
|
|
663
700
|
simulator,
|
|
701
|
+
utilityExecutor: this.utilityExecutorForContractSync(anchorBlock),
|
|
664
702
|
});
|
|
665
703
|
await simulator
|
|
666
704
|
.executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback())
|