Include new contract data function tree root in tx hash

.ignore

@@ -0,0 +1,2 @@
+/circuits/cpp/barretenberg/ts
+/circuits/cpp/barretenberg/foundation

build_manifest.json

@@ -2,32 +2,45 @@
   "aztec3-circuits-wasm-linux-clang": {
     "buildDir": "circuits/cpp",
     "dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang",
-    "rebuildPatterns": ["^circuits/"],
+    "rebuildPatterns": [
+      "^circuits/"
+    ],
     "dependencies": []
   },
   "circuits-x86_64-linux-clang": {
     "buildDir": "circuits",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang",
-    "rebuildPatterns": ["^circuits/"],
+    "rebuildPatterns": [
+      "^circuits/"
+    ],
     "dependencies": []
   },
   "circuits-x86_64-linux-clang-assert": {
     "buildDir": "circuits",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-assert",
-    "rebuildPatterns": ["^circuits/"],
+    "rebuildPatterns": [
+      "^circuits/"
+    ],
     "dependencies": []
   },
   "circuits-x86_64-linux-gcc": {
     "buildDir": "circuits",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-gcc",
-    "rebuildPatterns": ["^circuits/"],
+    "rebuildPatterns": [
+      "^circuits/"
+    ],
     "dependencies": []
   },
   "l1-contracts": {
     "buildDir": "l1-contracts",
     "dockerfile": "Dockerfile",
-    "rebuildPatterns": ["^l1-contracts/"],
-    "dependencies": []
+    "rebuildPatterns": [
+      "^l1-contracts/"
+    ],
+    "dependencies": [
+      "ethereum.js",
+      "foundation"
+    ]
   },
   "yarn-project-base": {
     "buildDir": "yarn-project",
@@ -42,138 +55,232 @@
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/acir-simulator",
     "dockerfile": "acir-simulator/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/acir-simulator/"],
-    "dependencies": ["foundation", "circuits.js"]
+    "rebuildPatterns": [
+      "^yarn-project/acir-simulator/"
+    ],
+    "dependencies": [
+      "barretenberg.js",
+      "circuits.js",
+      "foundation",
+      "merkle-tree",
+      "noir-contracts"
+    ]
   },
   "archiver": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/archiver",
     "dockerfile": "archiver/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/archiver/"],
-    "dependencies": ["foundation", "l1-contracts", "l2-block"]
+    "rebuildPatterns": [
+      "^yarn-project/archiver/"
+    ],
+    "dependencies": [
+      "ethereum.js",
+      "foundation",
+      "l1-contracts",
+      "l2-block"
+    ]
   },
   "aztec-cli": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/aztec-cli",
     "dockerfile": "aztec-cli/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/aztec-cli/"],
-    "dependencies": ["foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/aztec-cli/"
+    ],
+    "dependencies": [
+      "foundation"
+    ]
   },
   "aztec-rpc": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/aztec-rpc",
     "dockerfile": "aztec-rpc/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/aztec-rpc/"],
+    "rebuildPatterns": [
+      "^yarn-project/aztec-rpc/"
+    ],
     "dependencies": [
       "acir-simulator",
       "aztec-node",
+      "barretenberg.js",
+      "circuits.js",
       "foundation",
       "kernel-prover",
-      "circuits.js",
+      "l2-block",
+      "noir-contracts",
       "tx"
     ]
   },
   "aztec.js": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/aztec.js",
     "dockerfile": "aztec.js/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/aztec.js/"],
-    "dependencies": ["aztec-rpc", "foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/aztec.js/"
+    ],
+    "dependencies": [
+      "aztec-rpc",
+      "circuits.js",
+      "foundation",
+      "noir-contracts"
+    ]
   },
   "barretenberg.js": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/barretenberg.js",
     "dockerfile": "barretenberg.js/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/barretenberg.js/"],
+    "rebuildPatterns": [
+      "^yarn-project/barretenberg.js/"
+    ],
     "dependencies": []
   },
   "circuits.js": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/circuits.js",
     "dockerfile": "circuits.js/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/circuits.js/"],
-    "dependencies": ["aztec3-circuits-wasm-linux-clang", "yarn-project-base"]
+    "rebuildPatterns": [
+      "^yarn-project/circuits.js/"
+    ],
+    "dependencies": [
+      "aztec3-circuits-wasm-linux-clang",
+      "yarn-project-base"
+    ]
   },
   "end-to-end": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/end-to-end",
     "dockerfile": "end-to-end/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/end-to-end/"],
-    "dependencies": ["aztec-node", "aztec.js", "ethereum.js", "noir-contracts"]
+    "rebuildPatterns": [
+      "^yarn-project/end-to-end/"
+    ],
+    "dependencies": [
+      "aztec-node",
+      "aztec.js",
+      "ethereum.js",
+      "foundation",
+      "l1-contracts",
+      "noir-contracts"
+    ]
   },
   "ethereum.js": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/ethereum.js",
     "dockerfile": "ethereum.js/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/ethereum.js/"],
-    "dependencies": ["foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/ethereum.js/"
+    ],
+    "dependencies": [
+      "foundation"
+    ]
   },
   "foundation": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/foundation",
     "dockerfile": "foundation/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/foundation/"],
-    "dependencies": ["yarn-project-base"]
+    "rebuildPatterns": [
+      "^yarn-project/foundation/"
+    ],
+    "dependencies": []
   },
   "kernel-prover": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/kernel-prover",
     "dockerfile": "kernel-prover/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/kernel-prover/"],
-    "dependencies": ["acir-simulator", "circuits.js", "foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/kernel-prover/"
+    ],
+    "dependencies": [
+      "acir-simulator",
+      "circuits.js",
+      "foundation"
+    ]
   },
   "key-store": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/key-store",
     "dockerfile": "key-store/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/key-store/"],
-    "dependencies": ["foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/key-store/"
+    ],
+    "dependencies": [
+      "foundation"
+    ]
   },
   "l2-block": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/l2-block",
     "dockerfile": "l2-block/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/l2-block/"],
-    "dependencies": ["circuits.js", "foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/l2-block/"
+    ],
+    "dependencies": [
+      "circuits.js",
+      "foundation",
+      "l1-contracts"
+    ]
   },
   "merkle-tree": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/merkle-tree",
     "dockerfile": "merkle-tree/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/merkle-tree/"],
-    "dependencies": ["barretenberg.js", "foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/merkle-tree/"
+    ],
+    "dependencies": [
+      "barretenberg.js",
+      "foundation"
+    ]
   },
   "noir-contracts": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/noir-contracts",
     "dockerfile": "noir-contracts/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/noir-contracts/"],
-    "dependencies": ["foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/noir-contracts/"
+    ],
+    "dependencies": [
+      "foundation"
+    ]
   },
   "p2p": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/p2p",
     "dockerfile": "p2p/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/p2p/"],
-    "dependencies": ["foundation", "l2-block", "tx"]
+    "rebuildPatterns": [
+      "^yarn-project/p2p/"
+    ],
+    "dependencies": [
+      "circuits.js",
+      "foundation",
+      "l2-block",
+      "tx"
+    ]
   },
   "prover-client": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/prover-client",
     "dockerfile": "prover-client/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/prover-client/"],
-    "dependencies": ["foundation"]
+    "rebuildPatterns": [
+      "^yarn-project/prover-client/"
+    ],
+    "dependencies": [
+      "foundation"
+    ]
   },
   "aztec-node": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/aztec-node",
     "dockerfile": "aztec-node/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/aztec-node/"],
+    "rebuildPatterns": [
+      "^yarn-project/aztec-node/"
+    ],
     "dependencies": [
       "archiver",
+      "barretenberg.js",
       "ethereum.js",
       "foundation",
       "l1-contracts",
+      "l2-block",
+      "merkle-tree",
       "p2p",
       "sequencer-client",
       "tx",
@@ -184,13 +291,16 @@
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/sequencer-client",
     "dockerfile": "sequencer-client/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/sequencer-client/"],
+    "rebuildPatterns": [
+      "^yarn-project/sequencer-client/"
+    ],
     "dependencies": [
       "circuits.js",
       "ethereum.js",
       "foundation",
       "l1-contracts",
       "l2-block",
+      "merkle-tree",
       "p2p",
       "tx",
       "world-state"
@@ -200,14 +310,23 @@
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/tx",
     "dockerfile": "tx/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/tx/"],
-    "dependencies": ["foundation", "circuits.js", "l2-block"]
+    "rebuildPatterns": [
+      "^yarn-project/tx/"
+    ],
+    "dependencies": [
+      "barretenberg.js",
+      "circuits.js",
+      "foundation",
+      "l2-block"
+    ]
   },
   "world-state": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/world-state",
     "dockerfile": "world-state/Dockerfile",
-    "rebuildPatterns": ["^yarn-project/world-state/"],
+    "rebuildPatterns": [
+      "^yarn-project/world-state/"
+    ],
     "dependencies": [
       "barretenberg.js",
       "circuits.js",
@@ -216,4 +335,4 @@
       "merkle-tree"
     ]
   }
-}
+}

yarn-project/archiver/Dockerfile

@@ -1,14 +1,6 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
 
-COPY archiver archiver
-# dependencies
-COPY ethereum.js ethereum.js
-COPY foundation foundation
-COPY circuits.js circuits.js
-COPY l1-contracts l1-contracts
-COPY l2-block l2-block
-COPY tx tx
-COPY unverified-data unverified-data
+COPY . .
 
 WORKDIR /usr/src/yarn-project/archiver
 RUN yarn build && yarn formatting && yarn test