From 88cd267b4baa0d4e5db07d6f606600b66882137c Mon Sep 17 00:00:00 2001
From: Jean M <132435771+jeanmon@users.noreply.github.com>
Date: Fri, 18 Aug 2023 17:14:45 +0200
Subject: [PATCH] fix bb conflicts (#1648)

Re-sync BB upstream repo.

# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [x] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [x] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [x] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).
---
 circuits/cpp/barretenberg/.gitrepo        | 2 +-
 circuits/cpp/barretenberg/ts/package.json | 6 ++++--
 circuits/cpp/barretenberg/ts/yarn.lock    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo
index eeab819db85..6104bbe8788 100644
--- a/circuits/cpp/barretenberg/.gitrepo
+++ b/circuits/cpp/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 39f622855fcb5cafdce3d5112c9cfc50fd91704c
+	commit = c734295a10d2c40ede773519664170880f28b2b7
 	parent = 347a38a54e0ea7f6da1b45a8640b8506c3712bb1
 	method = merge
 	cmdver = 0.4.6
diff --git a/circuits/cpp/barretenberg/ts/package.json b/circuits/cpp/barretenberg/ts/package.json
index b5a7f3cfe11..d2e0297026f 100644
--- a/circuits/cpp/barretenberg/ts/package.json
+++ b/circuits/cpp/barretenberg/ts/package.json
@@ -9,8 +9,10 @@
     "displayName": "bb.js",
     "tsconfig": "./tsconfig.json"
   },
-  "main": "./dest/index.js",
-  "bin": "./dest/main.js",
+  "main": "./dest/node/index.js",
+  "bin": {
+    "bb": "dest/node/main.js"
+  },
   "files": [
     "src/",
     "dest/",
diff --git a/circuits/cpp/barretenberg/ts/yarn.lock b/circuits/cpp/barretenberg/ts/yarn.lock
index f9a4a3eb538..d3a83f73895 100644
--- a/circuits/cpp/barretenberg/ts/yarn.lock
+++ b/circuits/cpp/barretenberg/ts/yarn.lock
@@ -48,7 +48,7 @@ __metadata:
     webpack-cli: ^5.1.1
     webpack-dev-server: ^4.15.0
   bin:
-    bb.js: ./dest/main.js
+    bb: dest/node/main.js
   languageName: unknown
   linkType: soft