Skip to content

Commit 4057d0b

Browse files
authored
fix(txe): align aztec_avm_returndataSize registry type with Noir u32 (#24480)
It was set to Field but was u32. I also adjusted some slightly outdated comments.
1 parent 8486183 commit 4057d0b

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

yarn-project/txe/src/bin/oracle_test_server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { createOracleTestRpcServer } from '../oracle/test-resolver/index.js';
66

77
/**
88
* Starts an HTTP RPC server that resolves oracle foreign calls using auto-synthesized fixture scenarios. Used by
9-
* `nargo test --oracle-resolver` to run `#[auto_serialization_test]` serialization tests against a dedicated resolver.
9+
* `nargo test --oracle-resolver` to run `#[generate_oracle_tests]` serialization tests against a dedicated resolver.
1010
* Logs fixture coverage on shutdown.
1111
*/
1212
async function main() {

yarn-project/txe/src/oracle/interfaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export interface IAvmExecutionOracle {
4343
getContractInstanceClassId(address: AztecAddress): Promise<{ member: Fr; exists: boolean }>;
4444
getContractInstanceInitializationHash(address: AztecAddress): Promise<{ member: Fr; exists: boolean }>;
4545
getContractInstanceImmutablesHash(address: AztecAddress): Promise<{ member: Fr; exists: boolean }>;
46-
returndataSize(): Promise<Fr>;
46+
returndataSize(): Promise<number>;
4747
returndataCopy(rdOffset: number, copySize: number): Promise<Fr[]>;
4848
call(l2Gas: number, daGas: number, address: AztecAddress, argsLength: number, args: Fr[]): Promise<void>;
4949
staticCall(l2Gas: number, daGas: number, address: AztecAddress, argsLength: number, args: Fr[]): Promise<void>;

yarn-project/txe/src/oracle/test-resolver/default_fixtures.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import type { OracleTestScenario } from './resolver.js';
2727
/**
2828
* Synthesizes fixture scenarios for every oracle in the registry whose parameters and return are built from scalars,
2929
* arrays/bounded vecs of them, or `Option`s of them. The matching Noir serialization tests are auto-generated by
30-
* `#[auto_serialization_test]` from the same seed/scenario convention.
30+
* `#[generate_oracle_tests]` from the same seed/scenario convention.
3131
*/
3232
export function synthesizeDefaultFixtures(
3333
registry: Record<string, OracleRegistryEntry>,

yarn-project/txe/src/oracle/test-resolver/resolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class OracleTestResolver {
5353

5454
/**
5555
* Builds a resolver whose fixtures are the default scenarios synthesized from the registry's type mappings. The
56-
* matching Noir serialization tests are auto-generated by `#[auto_serialization_test]` from the same convention.
56+
* matching Noir serialization tests are auto-generated by `#[generate_oracle_tests]` from the same convention.
5757
*/
5858
static fromRegistry(registry: Record<string, OracleRegistryEntry>, logger?: Logger): OracleTestResolver {
5959
return new OracleTestResolver(registry, synthesizeDefaultFixtures(registry), logger);

yarn-project/txe/src/oracle/txe_oracle_public_context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export class TXEOraclePublicContext implements IAvmExecutionOracle {
153153
return { member: accessor(instance), exists: true };
154154
}
155155

156-
returndataSize(): Promise<Fr> {
156+
returndataSize(): Promise<number> {
157157
throw new Error(
158158
'Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead',
159159
);

yarn-project/txe/src/oracle/txe_oracle_registry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ export const TXE_ORACLE_REGISTRY = {
414414
params: [{ name: 'message', type: ARRAY(FIELD) }],
415415
}),
416416

417-
aztec_avm_returndataSize: makeEntry({ returnType: FIELD }),
417+
aztec_avm_returndataSize: makeEntry({ returnType: U32 }),
418418

419419
aztec_avm_returndataCopy: makeEntry({
420420
params: [

yarn-project/txe/src/oracle/txe_oracle_version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ export const TXE_ORACLE_VERSION_MINOR = 2;
1414
* - TXE_ORACLE_VERSION_MAJOR (and reset MINOR to 0) for breaking changes, or
1515
* - TXE_ORACLE_VERSION_MINOR for additive changes (new oracle method added).
1616
*/
17-
export const TXE_ORACLE_INTERFACE_HASH = '118698345ea9d368ca82ea574a051e72f4df0b85454539ade14838a934976b62';
17+
export const TXE_ORACLE_INTERFACE_HASH = 'f6694961673ada551f57f5c09fa04cd566b175e63b7b965343bd4cf02b3cbdf6';

0 commit comments

Comments
 (0)