From e0f8cd27a32d1530248343514b85f60a4dcbb566 Mon Sep 17 00:00:00 2001
From: Santiago Palladino <santiago@aztecprotocol.com>
Date: Thu, 28 Nov 2024 10:00:27 -0300
Subject: [PATCH 1/2] chore: Fix bad merge in integration l1 publisher

Fixes build after a bad merge from #10163.
---
 .../end-to-end/src/composed/integration_l1_publisher.test.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts
index a8fd46b09380..f64f23b9ab5b 100644
--- a/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts
+++ b/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts
@@ -195,7 +195,8 @@ describe('L1Publisher integration', () => {
     prevHeader = fork.getInitialHeader();
     await fork.close();
 
-    baseFee = new GasFees(0, await rollup.read.getManaBaseFee([true]));
+    const ts = (await publicClient.getBlock()).timestamp;
+    baseFee = new GasFees(0, await rollup.read.getManaBaseFeeAt([ts, true]));
 
     // We jump to the next epoch such that the committee can be setup.
     const timeToJump = await rollup.read.EPOCH_DURATION();

From 3a17f1e5d7c0344e2c5d9e379e4159ebec255da8 Mon Sep 17 00:00:00 2001
From: LHerskind <lasse.herskind@gmail.com>
Date: Thu, 28 Nov 2024 12:50:47 +0000
Subject: [PATCH 2/2] chore: check artifact consistency

---
 .../src/contract/artifact_hash.test.ts        | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/yarn-project/circuits.js/src/contract/artifact_hash.test.ts b/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
index af06a189075f..45cc32d51387 100644
--- a/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
+++ b/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
@@ -1,14 +1,8 @@
 import { type ContractArtifact } from '@aztec/foundation/abi';
-import { loadContractArtifact } from '@aztec/types/abi';
-import type { NoirCompiledContract } from '@aztec/types/noir';
 
-import { readFileSync } from 'fs';
-
-import { getPathToFixture, getTestContractArtifact } from '../tests/fixtures.js';
+import { getTestContractArtifact } from '../tests/fixtures.js';
 import { computeArtifactHash } from './artifact_hash.js';
 
-const TEST_CONTRACT_ARTIFACT_HASH = `"0x19142676527045a118066698e292cc35db16ab4d7bd16610d35d2e1c607eb8b2"`;
-
 describe('ArtifactHash', () => {
   it('calculates the artifact hash', () => {
     const emptyArtifact: ContractArtifact = {
@@ -31,19 +25,8 @@ describe('ArtifactHash', () => {
     const testArtifact = getTestContractArtifact();
 
     const calculatedArtifactHash = computeArtifactHash(testArtifact).toString();
-    expect(calculatedArtifactHash).toMatchInlineSnapshot(TEST_CONTRACT_ARTIFACT_HASH);
     for (let i = 0; i < 1000; i++) {
       expect(computeArtifactHash(testArtifact).toString()).toBe(calculatedArtifactHash);
     }
   });
-
-  it('calculates the test contract artifact hash', () => {
-    const path = getPathToFixture('Test.test.json');
-    const content = JSON.parse(readFileSync(path).toString()) as NoirCompiledContract;
-    content.outputs.structs.functions.reverse();
-
-    const testArtifact = loadContractArtifact(content);
-
-    expect(computeArtifactHash(testArtifact).toString()).toMatchInlineSnapshot(TEST_CONTRACT_ARTIFACT_HASH);
-  });
 });