Merge 1e31b31 into e31887e

AztecProtocol · Jul 11, 2024 · 512459c · 512459c
2 parents e31887e + 1e31b31
commit 512459c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 28 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,7 +5,8 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "port": 9229,
+      "address": "${config:mainframeAddress}",
+      "port": 9221,
       "type": "node",
       "request": "attach",
       "name": "Attach to Remote",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -120,7 +120,7 @@
     "editor.defaultFormatter": "hashicorp.terraform"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"

diff --git a/barretenberg/.vscode/launch.json b/barretenberg/.vscode/launch.json
diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp
@@ -245,11 +245,6 @@ bool proveAndVerifyHonkProgram(const std::string& bytecodePath, const std::strin
     return true;
 }
 
-struct VectorOfAcirAndWitnesses {
-    std::vector<std::vector<uint8_t>> acirGzippedBincoes;
-    std::vector<std::map<uint8_t, std::string>> witnessMaps;
-};
-
 // TODO(#7371): this could probably be more idiomatic
 template <typename T> T unpack_from_file(const std::string& filename)
 {

diff --git a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/arithmetization/arithmetization.hpp b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/arithmetization/arithmetization.hpp
@@ -354,7 +354,7 @@ template <typename FF_> class UltraHonkArith {
         std::array<uint32_t, 10> fixed_block_sizes{
             1 << 10, // ecc_op;
             30000,   // pub_inputs;
-            755000,  // arithmetic;
+            600000,  // arithmetic;
             140000,  // delta_range;
             600000,  // elliptic;
             1400000, // aux;