wip

Author: benesjan

yarn-project/pxe/src/entrypoints/server/index.ts

@@ -8,4 +8,3 @@ export { ORACLE_VERSION } from '../../oracle_version.js';
 export { type PXECreationOptions } from '../pxe_creation_options.js';
 export { JobCoordinator } from '../../job_coordinator/job_coordinator.js';
 export { ContractSyncService } from '../../contract_sync/contract_sync_service.js';
-export { syncState } from '../../contract_sync/helpers.js';

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

@@ -15,14 +15,14 @@ import type { KeyStore } from '@aztec/key-store';
 import {
   AddressStore,
   CapsuleStore,
+  ContractSyncService,
   NoteStore,
   ORACLE_VERSION,
   PrivateEventStore,
   RecipientTaggingStore,
   SenderAddressBookStore,
   SenderTaggingStore,
   enrichPublicSimulationError,
-  syncState,
 } from '@aztec/pxe/server';
 import {
   ExecutionNoteCache,
@@ -83,7 +83,6 @@ import { ForkCheckpoint } from '@aztec/world-state';
 
 import { DEFAULT_ADDRESS } from '../constants.js';
 import type { TXEStateMachine } from '../state_machine/index.js';
-import { NoopContractSyncService } from '../util/noop_contract_sync_service.js';
 import type { TXEAccountStore } from '../util/txe_account_store.js';
 import type { TXEContractStore } from '../util/txe_contract_store.js';
 import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
@@ -108,6 +107,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     private senderAddressBookStore: SenderAddressBookStore,
     private capsuleStore: CapsuleStore,
     private privateEventStore: PrivateEventStore,
+    private contractSyncService: ContractSyncService,
     private jobId: string,
     private nextBlockTimestamp: bigint,
     private version: Fr,
@@ -303,7 +303,13 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       await this.executeUtilityCall(call);
     };
 
-    await syncState(targetContractAddress, this.contractStore, functionSelector, utilityExecutor);
+    const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+    await this.contractSyncService.ensureContractSynced(
+      targetContractAddress,
+      functionSelector,
+      utilityExecutor,
+      blockHeader,
+    );
 
     const blockNumber = await this.txeGetNextBlockNumber();
 
@@ -315,8 +321,6 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
     const txContext = new TxContext(this.chainId, this.version, gasSettings);
 
-    const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
-
     const protocolNullifier = await computeProtocolNullifier(getSingleTxBlockRequestHash(blockNumber));
     const noteCache = new ExecutionNoteCache(protocolNullifier);
     // In production, the account contract sets the min revertible counter before calling the app function.
@@ -352,7 +356,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       this.senderAddressBookStore,
       this.capsuleStore,
       this.privateEventStore,
-      new NoopContractSyncService(),
+      this.contractSyncService,
       this.jobId,
       0, // totalPublicArgsCount
       minRevertibleSideEffectCounter, // (start) sideEffectCounter
@@ -665,9 +669,15 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     }
 
     // Sync notes before executing utility function to discover notes from previous transactions
-    await syncState(targetContractAddress, this.contractStore, functionSelector, async call => {
-      await this.executeUtilityCall(call);
-    });
+    const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+    await this.contractSyncService.ensureContractSynced(
+      targetContractAddress,
+      functionSelector,
+      async call => {
+        await this.executeUtilityCall(call);
+      },
+      blockHeader,
+    );
 
     const call = new FunctionCall(
       artifact.name,

yarn-project/txe/src/txe_session.test.ts

@@ -21,6 +21,7 @@ describe('TXESession.processFunction', () => {
       {} as any, // senderAddressBook
       {} as any, // capsuleStore
       {} as any, // privateEventStore
+      {} as any, // contractSyncService
       {} as any, // jobCoordinator
       {} as any, // initialJobId
       new Fr(1), // chainId

yarn-project/txe/src/txe_session.ts

@@ -7,6 +7,7 @@ import type { ProtocolContract } from '@aztec/protocol-contracts';
 import {
   AddressStore,
   CapsuleStore,
+  ContractSyncService,
   JobCoordinator,
   NoteService,
   NoteStore,
@@ -51,7 +52,6 @@ import { TXEOracleTopLevelContext } from './oracle/txe_oracle_top_level_context.
 import { RPCTranslator } from './rpc_translator.js';
 import { TXEStateMachine } from './state_machine/index.js';
 import type { ForeignCallArgs, ForeignCallResult } from './util/encoding.js';
-import { NoopContractSyncService } from './util/noop_contract_sync_service.js';
 import { TXEAccountStore } from './util/txe_account_store.js';
 import { TXEContractStore } from './util/txe_contract_store.js';
 import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlock } from './utils/block_creation.js';
@@ -140,6 +140,7 @@ export class TXESession implements TXESessionStateHandler {
     private senderAddressBookStore: SenderAddressBookStore,
     private capsuleStore: CapsuleStore,
     private privateEventStore: PrivateEventStore,
+    private contractSyncService: ContractSyncService,
     private jobCoordinator: JobCoordinator,
     private currentJobId: string,
     private chainId: Fr,
@@ -183,6 +184,12 @@ export class TXESession implements TXESessionStateHandler {
     const version = new Fr(await stateMachine.node.getVersion());
     const chainId = new Fr(await stateMachine.node.getChainId());
 
+    const contractSyncService = new ContractSyncService(
+      stateMachine.node,
+      contractStore,
+      createLogger('txe:contract_sync'),
+    );
+
     const initialJobId = jobCoordinator.beginJob();
 
     const topLevelOracleHandler = new TXEOracleTopLevelContext(
@@ -197,6 +204,7 @@ export class TXESession implements TXESessionStateHandler {
       senderAddressBookStore,
       capsuleStore,
       privateEventStore,
+      contractSyncService,
       initialJobId,
       nextBlockTimestamp,
       version,
@@ -219,6 +227,7 @@ export class TXESession implements TXESessionStateHandler {
       senderAddressBookStore,
       capsuleStore,
       privateEventStore,
+      contractSyncService,
       jobCoordinator,
       initialJobId,
       version,
@@ -296,6 +305,7 @@ export class TXESession implements TXESessionStateHandler {
       this.senderAddressBookStore,
       this.capsuleStore,
       this.privateEventStore,
+      this.contractSyncService,
       this.currentJobId,
       this.nextBlockTimestamp,
       this.version,
@@ -357,7 +367,7 @@ export class TXESession implements TXESessionStateHandler {
       this.senderAddressBookStore,
       this.capsuleStore,
       this.privateEventStore,
-      new NoopContractSyncService(),
+      this.contractSyncService,
       this.currentJobId,
     );