Skip to content

refactor(pxe): restore satisfies-typed oracle registries #24132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nchamo merged 1 commit into from
Jun 16, 2026
+6 −70
Merged

refactor(pxe): restore satisfies-typed oracle registries #24132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 2 additions & 66 deletions yarn-project/pxe/src/contract_function_simulator/oracle/oracle_registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,71 +81,7 @@ export {
type TypeMapping,
} from './oracle_type_mappings.js';

type OracleRegistryName =
| 'aztec_misc_assertCompatibleOracleVersion'
| 'aztec_misc_getRandomField'
| 'aztec_misc_log'
| 'aztec_utl_getUtilityContext'
| 'aztec_utl_getKeyValidationRequest'
| 'aztec_utl_getContractInstance'
| 'aztec_utl_getNoteHashMembershipWitness'
| 'aztec_utl_getBlockHashMembershipWitness'
| 'aztec_utl_getNullifierMembershipWitness'
| 'aztec_utl_getLowNullifierMembershipWitness'
| 'aztec_utl_getPublicDataWitness'
| 'aztec_utl_getBlockHeader'
| 'aztec_utl_getAuthWitness'
| 'aztec_utl_getPublicKeysAndPartialAddress'
| 'aztec_utl_doesNullifierExist'
| 'aztec_utl_getL1ToL2MembershipWitness'
| 'aztec_utl_getFromPublicStorage'
| 'aztec_utl_getNotes'
| 'aztec_utl_getPendingTaggedLogs'
| 'aztec_utl_validateAndStoreEnqueuedNotesAndEvents'
| 'aztec_utl_getLogsByTag'
| 'aztec_utl_getMessageContextsByTxHash'
| 'aztec_utl_getTxEffect'
| 'aztec_utl_setCapsule'
| 'aztec_utl_getCapsule'
| 'aztec_utl_deleteCapsule'
| 'aztec_utl_copyCapsule'
| 'aztec_utl_decryptAes128'
| 'aztec_utl_getSharedSecrets'
| 'aztec_utl_setContractSyncCacheInvalid'
| 'aztec_utl_emitOffchainEffect'
| 'aztec_utl_callUtilityFunction'
| 'aztec_utl_pushEphemeral'
| 'aztec_utl_popEphemeral'
| 'aztec_utl_getEphemeral'
| 'aztec_utl_setEphemeral'
| 'aztec_utl_getEphemeralLen'
| 'aztec_utl_removeEphemeral'
| 'aztec_utl_clearEphemeral'
| 'aztec_utl_pushTransient'
| 'aztec_utl_popTransient'
| 'aztec_utl_getTransient'
| 'aztec_utl_setTransient'
| 'aztec_utl_getTransientLen'
| 'aztec_utl_removeTransient'
| 'aztec_utl_clearTransient'
| 'aztec_prv_setHashPreimage'
| 'aztec_prv_getHashPreimage'
| 'aztec_prv_notifyCreatedNote'
| 'aztec_prv_notifyNullifiedNote'
| 'aztec_prv_notifyCreatedNullifier'
| 'aztec_prv_isNullifierPending'
| 'aztec_prv_notifyCreatedContractClassLog'
| 'aztec_prv_callPrivateFunction'
| 'aztec_prv_assertValidPublicCalldata'
| 'aztec_prv_notifyRevertiblePhaseStart'
| 'aztec_prv_isExecutionInRevertiblePhase'
| 'aztec_prv_getAppTaggingSecret'
| 'aztec_prv_getNextTaggingIndex'
| 'aztec_prv_getSenderForTags';

type OracleRegistry = Record<OracleRegistryName, OracleRegistryEntry>;

export const ORACLE_REGISTRY: OracleRegistry = {
export const ORACLE_REGISTRY = {
aztec_misc_assertCompatibleOracleVersion: makeEntry({
params: [
{ name: 'major', type: U32 },
Expand Down Expand Up @@ -566,7 +502,7 @@ export const ORACLE_REGISTRY: OracleRegistry = {
}),

aztec_prv_getSenderForTags: makeEntry({ returnType: OPTION(AZTEC_ADDRESS) }),
};
} satisfies Record<string, OracleRegistryEntry>;

// ─── Registry Infrastructure ─────────────────────────────────────────────────

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/txe/src/oracle/test-resolver/resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class OracleTestResolver {

constructor(
private readonly registry: Record<string, OracleRegistryEntry>,
private readonly fixtures: Partial<Record<string, OracleTestScenario[]>>,
private readonly fixtures: Record<string, OracleTestScenario[]>,
logger?: Logger,
) {
this.logger = logger ?? createLogger('txe:test-resolver');
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/txe/src/oracle/txe_oracle_registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const TXE_PRIVATE_EVENTS: TypeMapping<Fr[][]> = {
},
};

export const TXE_ORACLE_REGISTRY: Record<string, OracleRegistryEntry> = {
export const TXE_ORACLE_REGISTRY = {
...ORACLE_REGISTRY,

aztec_txe_assertCompatibleOracleVersion: makeEntry({
Expand Down Expand Up @@ -368,7 +368,7 @@ export const TXE_ORACLE_REGISTRY: Record<string, OracleRegistryEntry> = {
params: [{ name: 'address', type: AZTEC_ADDRESS }],
returnType: CONTRACT_INSTANCE_MEMBER,
}),
};
} satisfies Record<string, OracleRegistryEntry>;

/**
* Deserializes oracle inputs, calls the handler with typed params, serializes the result, and wraps
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/txe/src/oracle/txe_oracle_top_level_context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
return (await this.stateMachine.node.getBlockData('latest'))!.header.globalVariables.timestamp;
}

async getLastTxEffects(): ReturnType<ITxeExecutionOracle['getLastTxEffects']> {
async getLastTxEffects() {
const latestBlockNumber = await this.stateMachine.archiver.getBlockNumber();
const block = await this.stateMachine.archiver.getBlock({ number: latestBlockNumber });

Expand Down
Loading