Contract artifact propagation tech debt (#408)

* chore: fix attempt * chore: yarn.lock with fewer modifications * test: disabled publisher test * refactor: separate constants file * refactor: artifacts script * chore: fixed docker dependencies * chore: cleanup after rebase * chore: cleanup after rebase 2 * chore: cleanup after rebase 3 * chore: cleanup after rebase 4
AztecProtocol · May 4, 2023 · 4f144b7 · 4f144b7
1 parent 900919f
commit 4f144b7
Show file tree

Hide file tree

Showing 212 changed files with 181 additions and 38,327 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -157,7 +157,7 @@ jobs:
       - *checkout
       - *setup_env
       - run:
-          name: "Build"
+          name: "Build and test"
           command: build l1-contracts
 
   yarn-project-base:
@@ -177,17 +177,6 @@ jobs:
           name: "Build"
           command: build yarn-project-base
 
-  ethereum-js:
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build and test"
-          command: build ethereum.js
-
   foundation:
     machine:
       image: ubuntu-2004:202010-01
@@ -441,9 +430,10 @@ workflows:
       - yarn-project-base:
           requires:
             - circuits-wasm-linux-clang
+            - l1-contracts
           <<: *defaults
+      - l1-contracts: *defaults
 
-      - ethereum-js: *yarn_project
       - aztec-js: *yarn_project
       - end-to-end: *yarn_project
       - foundation: *yarn_project
@@ -461,7 +451,6 @@ workflows:
 
       - e2e-join:
           requires:
-            - ethereum-js
             - aztec-js
             - end-to-end
             - noir-contracts

diff --git a/build_manifest.json b/build_manifest.json
@@ -53,21 +53,30 @@
     "rebuildPatterns": [
       "^l1-contracts/"
     ],
-    "dependencies": [
-      "ethereum.js",
-      "foundation"
-    ]
+    "dependencies": []
+  },
+  "l1-artifacts": {
+    "buildDir": "yarn-project",
+    "projectDir": "yarn-project/l1-artifacts",
+    "dockerfile": "l1-artifacts/Dockerfile",
+    "rebuildPatterns": [
+      "^l1-contracts/",
+      "^yarn-project/l1-artifacts/"
+    ],
+    "dependencies": []
   },
   "yarn-project-base": {
     "buildDir": "yarn-project",
     "dockerfile": "yarn-project-base/Dockerfile",
     "rebuildPatterns": [
       "^circuits/",
+      "^l1-contracts/",
       "^yarn-project/yarn-project-base/",
       "^yarn-project/yarn.lock"
     ],
     "dependencies": [
-      "circuits-wasm-linux-clang"
+      "circuits-wasm-linux-clang",
+      "l1-contracts"
     ]
   },
   "acir-simulator": {
@@ -94,9 +103,8 @@
       "^yarn-project/archiver/"
     ],
     "dependencies": [
-      "ethereum.js",
       "foundation",
-      "l1-contracts",
+      "l1-artifacts",
       "types"
     ]
   },
@@ -179,21 +187,10 @@
       "aztec-node",
       "aztec.js",
       "foundation",
-      "l1-contracts",
+      "l1-artifacts",
       "noir-contracts"
     ]
   },
-  "ethereum.js": {
-    "buildDir": "yarn-project",
-    "projectDir": "yarn-project/ethereum.js",
-    "dockerfile": "ethereum.js/Dockerfile",
-    "rebuildPatterns": [
-      "^yarn-project/ethereum.js/"
-    ],
-    "dependencies": [
-      "foundation"
-    ]
-  },
   "foundation": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/foundation",
@@ -227,20 +224,6 @@
       "foundation"
     ]
   },
-  "l2-block": {
-    "buildDir": "yarn-project",
-    "projectDir": "yarn-project/l2-block",
-    "dockerfile": "l2-block/Dockerfile",
-    "rebuildPatterns": [
-      "^yarn-project/l2-block/"
-    ],
-    "dependencies": [
-      "circuits.js",
-      "foundation",
-      "l1-contracts",
-      "tx"
-    ]
-  },
   "merkle-tree": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/merkle-tree",
@@ -298,9 +281,8 @@
     "dependencies": [
       "archiver",
       "barretenberg.js",
-      "ethereum.js",
       "foundation",
-      "l1-contracts",
+      "l1-artifacts",
       "merkle-tree",
       "p2p",
       "sequencer-client",
@@ -318,29 +300,14 @@
     "dependencies": [
       "acir-simulator",
       "circuits.js",
-      "ethereum.js",
       "foundation",
-      "l1-contracts",
+      "l1-artifacts",
       "merkle-tree",
       "p2p",
       "types",
       "world-state"
     ]
   },
-  "tx": {
-    "buildDir": "yarn-project",
-    "projectDir": "yarn-project/tx",
-    "dockerfile": "tx/Dockerfile",
-    "rebuildPatterns": [
-      "^yarn-project/tx/"
-    ],
-    "dependencies": [
-      "barretenberg.js",
-      "circuits.js",
-      "foundation",
-      "types"
-    ]
-  },
   "types": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/types",
@@ -351,7 +318,7 @@
     "dependencies": [
       "circuits.js",
       "foundation",
-      "l1-contracts"
+      "l1-artifacts"
     ]
   },
   "world-state": {

diff --git a/l1-contracts/Dockerfile b/l1-contracts/Dockerfile
@@ -3,23 +3,21 @@ FROM ubuntu:focal as builder
 # Required for foundry
 RUN apt-get update && apt install -y git curl
 
-WORKDIR /usr/src/contracts
+WORKDIR /usr/src/l1-contracts
 
 # Install foundry
 RUN git init
-COPY ./scripts/install_foundry.sh ./scripts/install_foundry.sh
+COPY . .
 RUN ./scripts/install_foundry.sh
-ENV PATH="/usr/src/contracts/.foundry/bin:${PATH}"
+ENV PATH="/usr/src/l1-contracts/.foundry/bin:${PATH}"
 
 # Install deps
 RUN forge install --no-commit \
   https://github.com/foundry-rs/forge-std \
   https://github.com/openzeppelin/openzeppelin-contracts
 ENV MAINNET_RPC_URL='https://mainnet.infura.io/v3/9928b52099854248b3a096be07a6b23c'
 
-COPY . .
-
 # Run build and tests
 RUN forge clean && forge fmt --check && forge build && forge test
 
-WORKDIR /usr/src/contracts
+WORKDIR /usr/src/l1-contracts
diff --git a/yarn-project/.prettierignore b/yarn-project/.prettierignore
@@ -2,5 +2,3 @@
 node_modules/
 dest/
 *.md
-ethereum.js/example/
-ethereum.js/src/contract/fixtures/
diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json
@@ -34,9 +34,8 @@
     "rootDir": "./src"
   },
   "dependencies": {
-    "@aztec/ethereum.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-contracts": "workspace:^",
+    "@aztec/l1-artifacts": "workspace:^",
     "@aztec/types": "workspace:^",
     "debug": "^4.3.4",
     "tsc-watch": "^6.0.0",

diff --git a/yarn-project/archiver/src/archiver/archiver.test.ts b/yarn-project/archiver/src/archiver/archiver.test.ts
@@ -1,4 +1,4 @@
-import { RollupAbi, UnverifiedDataEmitterAbi } from '@aztec/l1-contracts/viem';
+import { RollupAbi, UnverifiedDataEmitterAbi } from '@aztec/l1-artifacts';
 import { ContractData, ContractPublicData, EncodedContractFunction, L2Block } from '@aztec/types';
 import { MockProxy, mock } from 'jest-mock-extended';
 import { Chain, HttpTransport, Log, PublicClient, Transaction, encodeFunctionData, toHex } from 'viem';

diff --git a/yarn-project/archiver/src/archiver/archiver.ts b/yarn-project/archiver/src/archiver/archiver.ts
@@ -4,8 +4,8 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/l1-contracts';
-import { RollupAbi, UnverifiedDataEmitterAbi } from '@aztec/l1-contracts/viem';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/types';
+import { RollupAbi, UnverifiedDataEmitterAbi } from '@aztec/l1-artifacts';
 import {
   ContractData,
   ContractPublicData,

diff --git a/yarn-project/archiver/src/archiver/config.ts b/yarn-project/archiver/src/archiver/config.ts
@@ -1,5 +1,5 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { L1Addresses } from '@aztec/l1-contracts';
+import { L1Addresses } from '@aztec/types';
 
 /**
  * The archiver configuration.

diff --git a/yarn-project/archiver/tsconfig.json b/yarn-project/archiver/tsconfig.json
@@ -6,14 +6,11 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
-    {
-      "path": "../ethereum.js"
-    },
     {
       "path": "../foundation"
     },
     {
-      "path": "../l1-contracts"
+      "path": "../l1-artifacts"
     },
     {
       "path": "../types"

diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json
@@ -33,9 +33,8 @@
   "dependencies": {
     "@aztec/archiver": "workspace:^",
     "@aztec/barretenberg.js": "workspace:^",
-    "@aztec/ethereum.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-contracts": "workspace:^",
+    "@aztec/l1-artifacts": "workspace:^",
     "@aztec/merkle-tree": "workspace:^",
     "@aztec/p2p": "workspace:^",
     "@aztec/sequencer-client": "workspace:^",

diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json
@@ -12,14 +12,11 @@
     {
       "path": "../barretenberg.js"
     },
-    {
-      "path": "../ethereum.js"
-    },
     {
       "path": "../foundation"
     },
     {
-      "path": "../l1-contracts"
+      "path": "../l1-artifacts"
     },
     {
       "path": "../merkle-tree"

diff --git a/yarn-project/aztec-rpc/src/account_state/account_state.ts b/yarn-project/aztec-rpc/src/account_state/account_state.ts
@@ -3,8 +3,7 @@ import { AztecNode } from '@aztec/aztec-node';
 import { Grumpkin } from '@aztec/barretenberg.js/crypto';
 import { EcdsaSignature, KERNEL_NEW_COMMITMENTS_LENGTH, PrivateHistoricTreeRoots, TxRequest } from '@aztec/circuits.js';
 import { KernelProver, OutputNoteData } from '@aztec/kernel-prover';
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/l1-contracts';
-import { EncodedContractFunction, L2BlockContext, Tx, UnverifiedData } from '@aztec/types';
+import { EncodedContractFunction, INITIAL_L2_BLOCK_NUM, L2BlockContext, Tx, UnverifiedData } from '@aztec/types';
 import { NotePreimage, TxAuxData } from '../aztec_rpc_server/tx_aux_data/index.js';
 import { ContractDataOracle } from '../contract_data_oracle/index.js';
 import { Database, TxAuxDataDao, TxDao } from '../database/index.js';

diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
@@ -27,7 +27,7 @@
     "@aztec/aztec-node": "workspace:^",
     "@aztec/aztec.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "@aztec/l1-contracts": "workspace:^",
+    "@aztec/l1-artifacts": "workspace:^",
     "@aztec/noir-contracts": "workspace:^",
     "@types/jest": "^29.5.0",
     "jest": "^29.5.0",

diff --git a/yarn-project/end-to-end/src/deploy_l1_contracts.ts b/yarn-project/end-to-end/src/deploy_l1_contracts.ts
@@ -5,7 +5,7 @@ import {
   RollupBytecode,
   UnverifiedDataEmitterAbi,
   UnverifiedDataEmitterBytecode,
-} from '@aztec/l1-contracts/viem';
+} from '@aztec/l1-artifacts';
 import type { Abi, Narrow } from 'abitype';
 import {
   Account,

diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts
@@ -1,6 +1,5 @@
 import { AztecNode, getConfigEnvVars } from '@aztec/aztec-node';
 import { AztecRPCServer, ContractDeployer, Fr, TxStatus } from '@aztec/aztec.js';
-
 import { mnemonicToAccount } from 'viem/accounts';
 import { createAztecRpcServer } from './create_aztec_rpc_client.js';
 import { deployL1Contracts } from './deploy_l1_contracts.js';

diff --git a/yarn-project/end-to-end/src/e2e_zk_token_contract.test.ts b/yarn-project/end-to-end/src/e2e_zk_token_contract.test.ts
@@ -1,6 +1,5 @@
 import { AztecNode, getConfigEnvVars } from '@aztec/aztec-node';
 import { AztecAddress, AztecRPCServer, Contract, ContractDeployer, TxStatus } from '@aztec/aztec.js';
-
 import { ZkTokenContractAbi } from '@aztec/noir-contracts/examples';
 
 import { mnemonicToAccount } from 'viem/accounts';

diff --git a/yarn-project/end-to-end/tsconfig.json b/yarn-project/end-to-end/tsconfig.json
@@ -16,7 +16,7 @@
       "path": "../foundation"
     },
     {
-      "path": "../l1-contracts"
+      "path": "../l1-artifacts"
     },
     {
       "path": "../noir-contracts"

diff --git a/yarn-project/ethereum.js/.eslintrc.cjs b/yarn-project/ethereum.js/.eslintrc.cjs
diff --git a/yarn-project/ethereum.js/.gitignore b/yarn-project/ethereum.js/.gitignore
diff --git a/yarn-project/ethereum.js/.prettierignore b/yarn-project/ethereum.js/.prettierignore
diff --git a/yarn-project/ethereum.js/Dockerfile b/yarn-project/ethereum.js/Dockerfile