fix: reject log retrieval requests for not-in-context contracts (#22047)

Closes F-476

---------

Co-authored-by: AztecBot <tech@aztec-labs.com>
Co-authored-by: Jan Beneš <janbenes1234@gmail.com>

Author: 3 people

yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts

@@ -623,7 +623,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
       this.logger.getBindings(),
     );
 
-    const maybeLogRetrievalResponses = await logService.fetchLogsByTag(logRetrievalRequests);
+    const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
 
     // Requests are cleared once we're done.
     await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);

yarn-project/pxe/src/logs/log_service.test.ts

@@ -65,7 +65,7 @@ describe('LogService', () => {
       aztecNode.getPrivateLogsByTags.mockResolvedValue([[]]);
       aztecNode.getPublicLogsByTagsFromContract.mockResolvedValue([[]]);
       const request = new LogRetrievalRequest(contractAddress, tag);
-      const responses = await logService.fetchLogsByTag([request]);
+      const responses = await logService.fetchLogsByTag(contractAddress, [request]);
       expect(responses.length).toEqual(1);
       expect(responses[0]).toBeNull();
     });
@@ -78,7 +78,7 @@ describe('LogService', () => {
 
       const request = new LogRetrievalRequest(contractAddress, new Tag(scopedLog.logData[0]));
 
-      const responses = await logService.fetchLogsByTag([request]);
+      const responses = await logService.fetchLogsByTag(contractAddress, [request]);
 
       expect(responses.length).toEqual(1);
       expect(responses[0]).not.toBeNull();
@@ -92,10 +92,20 @@ describe('LogService', () => {
 
       const request = new LogRetrievalRequest(contractAddress, new Tag(scopedLog.logData[0]));
 
-      const responses = await logService.fetchLogsByTag([request]);
+      const responses = await logService.fetchLogsByTag(contractAddress, [request]);
 
       expect(responses.length).toEqual(1);
       expect(responses[0]).not.toBeNull();
     });
+
+    it('rejects a batch where at least one request targets a different contract', async () => {
+      const differentContract = await AztecAddress.random();
+      const validRequest = new LogRetrievalRequest(contractAddress, tag);
+      const invalidRequest = new LogRetrievalRequest(differentContract, new Tag(Fr.random()));
+
+      await expect(logService.fetchLogsByTag(contractAddress, [validRequest, invalidRequest])).rejects.toThrow(
+        /Got a log retrieval request from/,
+      );
+    });
   });
 });

yarn-project/pxe/src/logs/log_service.ts

@@ -41,7 +41,16 @@ export class LogService {
     this.log = createLogger('pxe:log_service', bindings);
   }
 
-  public async fetchLogsByTag(logRetrievalRequests: LogRetrievalRequest[]): Promise<(LogRetrievalResponse | null)[]> {
+  public async fetchLogsByTag(
+    contractAddress: AztecAddress,
+    logRetrievalRequests: LogRetrievalRequest[],
+  ): Promise<(LogRetrievalResponse | null)[]> {
+    for (const request of logRetrievalRequests) {
+      if (!contractAddress.equals(request.contractAddress)) {
+        throw new Error(`Got a log retrieval request from ${request.contractAddress}, expected ${contractAddress}`);
+      }
+    }
+
     return await Promise.all(
       logRetrievalRequests.map(async request => {
         const [publicLog, privateLog] = await Promise.all([