Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion yarn-project/txe/src/bin/oracle_test_server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { createOracleTestRpcServer } from '../oracle/test-resolver/index.js';

/**
* Starts an HTTP RPC server that resolves oracle foreign calls using auto-synthesized fixture scenarios. Used by
* `nargo test --oracle-resolver` to run `#[auto_serialization_test]` serialization tests against a dedicated resolver.
* `nargo test --oracle-resolver` to run `#[generate_oracle_tests]` serialization tests against a dedicated resolver.
* Logs fixture coverage on shutdown.
*/
async function main() {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/txe/src/oracle/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export interface IAvmExecutionOracle {
getContractInstanceClassId(address: AztecAddress): Promise<{ member: Fr; exists: boolean }>;
getContractInstanceInitializationHash(address: AztecAddress): Promise<{ member: Fr; exists: boolean }>;
getContractInstanceImmutablesHash(address: AztecAddress): Promise<{ member: Fr; exists: boolean }>;
returndataSize(): Promise<Fr>;
returndataSize(): Promise<number>;
returndataCopy(rdOffset: number, copySize: number): Promise<Fr[]>;
call(l2Gas: number, daGas: number, address: AztecAddress, argsLength: number, args: Fr[]): Promise<void>;
staticCall(l2Gas: number, daGas: number, address: AztecAddress, argsLength: number, args: Fr[]): Promise<void>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import type { OracleTestScenario } from './resolver.js';
/**
* Synthesizes fixture scenarios for every oracle in the registry whose parameters and return are built from scalars,
* arrays/bounded vecs of them, or `Option`s of them. The matching Noir serialization tests are auto-generated by
* `#[auto_serialization_test]` from the same seed/scenario convention.
* `#[generate_oracle_tests]` from the same seed/scenario convention.
*/
export function synthesizeDefaultFixtures(
registry: Record<string, OracleRegistryEntry>,
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/txe/src/oracle/test-resolver/resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class OracleTestResolver {

/**
* Builds a resolver whose fixtures are the default scenarios synthesized from the registry's type mappings. The
* matching Noir serialization tests are auto-generated by `#[auto_serialization_test]` from the same convention.
* matching Noir serialization tests are auto-generated by `#[generate_oracle_tests]` from the same convention.
*/
static fromRegistry(registry: Record<string, OracleRegistryEntry>, logger?: Logger): OracleTestResolver {
return new OracleTestResolver(registry, synthesizeDefaultFixtures(registry), logger);
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/txe/src/oracle/txe_oracle_public_context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export class TXEOraclePublicContext implements IAvmExecutionOracle {
return { member: accessor(instance), exists: true };
}

returndataSize(): Promise<Fr> {
returndataSize(): Promise<number> {
throw new Error(
'Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead',
);
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/txe/src/oracle/txe_oracle_registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ export const TXE_ORACLE_REGISTRY = {
params: [{ name: 'message', type: ARRAY(FIELD) }],
}),

aztec_avm_returndataSize: makeEntry({ returnType: FIELD }),
aztec_avm_returndataSize: makeEntry({ returnType: U32 }),

aztec_avm_returndataCopy: makeEntry({
params: [
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/txe/src/oracle/txe_oracle_version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ export const TXE_ORACLE_VERSION_MINOR = 2;
* - TXE_ORACLE_VERSION_MAJOR (and reset MINOR to 0) for breaking changes, or
* - TXE_ORACLE_VERSION_MINOR for additive changes (new oracle method added).
*/
export const TXE_ORACLE_INTERFACE_HASH = '118698345ea9d368ca82ea574a051e72f4df0b85454539ade14838a934976b62';
export const TXE_ORACLE_INTERFACE_HASH = 'f6694961673ada551f57f5c09fa04cd566b175e63b7b965343bd4cf02b3cbdf6';
Loading