Moving publisher test to e2e and re-enabling it

.circleci/config.yml

@@ -375,6 +375,17 @@ jobs:
           name: "Test"
           command: cond_spot_run_tests end-to-end e2e_nested_contract.test.ts
 
+  integration-l1-publisher:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_tests end-to-end integration_l1_publisher.test.ts
+
   e2e-join:
     docker:
       - image: cimg/base:current
@@ -452,11 +463,15 @@ workflows:
       - e2e-join:
           requires:
             - aztec-js
+            - circuits-js
             - end-to-end
-            - noir-contracts
             - foundation
+            - noir-contracts
+            - sequencer-client
+            - world-state
           <<: *defaults
       - e2e-deploy-contract: *e2e_test
       - e2e-zk-token-contract: *e2e_test
       - e2e-block-building: *e2e_test
       - e2e-nested-contract: *e2e_test
+      - integration-l1-publisher: *e2e_test

build_manifest.json

@@ -186,9 +186,12 @@
     "dependencies": [
       "aztec-node",
       "aztec.js",
+      "circuits.js",
       "foundation",
       "l1-artifacts",
-      "noir-contracts"
+      "noir-contracts",
+      "sequencer-client",
+      "world-state"
     ]
   },
   "foundation": {

yarn-project/end-to-end/package.json

@@ -26,33 +26,34 @@
   "dependencies": {
     "@aztec/aztec-node": "workspace:^",
     "@aztec/aztec.js": "workspace:^",
+    "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
     "@aztec/noir-contracts": "workspace:^",
+    "@aztec/sequencer-client": "workspace:^",
+    "@aztec/world-state": "workspace:^",
+    "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
+    "@types/levelup": "^5.1.2",
+    "@types/lodash.times": "^4.3.7",
+    "@types/node": "^18.7.23",
     "jest": "^29.5.0",
+    "levelup": "^5.1.1",
     "lodash.times": "^4.3.2",
     "ts-jest": "^29.1.0",
+    "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
-    "typescript": "^4.9.5",
+    "typescript": "^5.0.4",
     "viem": "^0.3.13"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
     "@rushstack/eslint-patch": "^1.1.4",
-    "@types/jest": "^29.5.0",
-    "@types/lodash.times": "^4.3.7",
-    "@types/node": "^18.7.23",
-    "concurrently": "^7.6.0",
-    "jest": "^29.5.0",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "concurrently": "^7.6.0"
   },
   "files": [
     "dest",
     "src",
     "!*.test.*"
   ],
   "types": "./dest/index.d.ts"
-}
+}

yarn-project/end-to-end/src/deploy_l1_contracts.ts

@@ -1,6 +1,8 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { DebugLogger } from '@aztec/foundation/log';
 import {
+  DecoderHelperAbi,
+  DecoderHelperBytecode,
   RollupAbi,
   RollupBytecode,
   UnverifiedDataEmitterAbi,
@@ -18,11 +20,16 @@ import {
   createWalletClient,
   http,
 } from 'viem';
-import { HDAccount } from 'viem/accounts';
+import { HDAccount, PrivateKeyAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
-export const deployL1Contracts = async (rpcUrl: string, account: HDAccount, logger: DebugLogger) => {
-  logger('Deploying contracts... (rpcURL: %s)', rpcUrl);
+export const deployL1Contracts = async (
+  rpcUrl: string,
+  account: HDAccount | PrivateKeyAccount,
+  logger: DebugLogger,
+  deployDecoderHelper = false,
+) => {
+  logger('Deploying contracts...');
 
   const walletClient = createWalletClient({
     account,
@@ -35,7 +42,7 @@ export const deployL1Contracts = async (rpcUrl: string, account: HDAccount, logg
   });
 
   const rollupAddress = await deployL1Contract(walletClient, publicClient, RollupAbi, RollupBytecode);
-  logger(`Deployed rollup contract at ${rollupAddress}`);
+  logger(`Deployed Rollup at ${rollupAddress}`);
 
   const unverifiedDataEmitterAddress = await deployL1Contract(
     walletClient,
@@ -45,9 +52,16 @@ export const deployL1Contracts = async (rpcUrl: string, account: HDAccount, logg
   );
   logger(`Deployed unverified data emitter at ${unverifiedDataEmitterAddress}`);
 
+  let decoderHelperAddress: EthAddress | undefined;
+  if (deployDecoderHelper) {
+    decoderHelperAddress = await deployL1Contract(walletClient, publicClient, DecoderHelperAbi, DecoderHelperBytecode);
+    logger(`Deployed DecoderHelper at ${decoderHelperAddress}`);
+  }
+
   return {
     rollupAddress,
     unverifiedDataEmitterAddress,
+    decoderHelperAddress,
   };
 };
 
@@ -56,7 +70,7 @@ async function deployL1Contract(
   publicClient: PublicClient<HttpTransport, Chain>,
   abi: Narrow<Abi | readonly unknown[]>,
   bytecode: Hex,
-) {
+): Promise<EthAddress> {
   const hash = await walletClient.deployContract({
     abi,
     bytecode,

yarn-project/end-to-end/src/e2e_block_building.test.ts

@@ -23,7 +23,6 @@ describe('e2e_block_building', () => {
   beforeEach(async () => {
     const account = mnemonicToAccount(MNEMONIC);
     const privKey = account.getHdKey().privateKey;
-    console.log(config);
     const { rollupAddress, unverifiedDataEmitterAddress } = await deployL1Contracts(config.rpcUrl, account, logger);
 
     config.publisherPrivateKey = Buffer.from(privKey!);