Merge branch 'next' into merge-train/spartan

Author: AztecBot

barretenberg/cpp/format.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
+
+# we have to unset this env var set by git hooks so that the relative paths below work correctly when used inside worktrees
+unset GIT_DIR
+
 function format_files {
   if [ -n "$1" ]; then
     echo "$1" | parallel -j+0 'clang-format-20 -i {} && sed -i.bak "s/\r$//" {} && rm {}.bak'

barretenberg/cpp/pil/vm2/constants_gen.pil

@@ -15,10 +15,9 @@ namespace constants;
     pol MAX_L2_TO_L1_MSGS_PER_TX = 8;
     pol MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 3000;
     pol MAX_PROTOCOL_CONTRACTS = 11;
+    pol CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 1;
     pol CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
-    pol CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 3;
-    pol MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
-    pol FEE_JUICE_ADDRESS = 5;
+    pol FEE_JUICE_ADDRESS = 3;
     pol FEE_JUICE_BALANCES_SLOT = 1;
     pol UPDATED_CLASS_IDS_SLOT = 1;
     pol FLAT_PUBLIC_LOGS_HEADER_LENGTH = 1;

barretenberg/cpp/src/barretenberg/aztec/aztec_constants.hpp

@@ -21,10 +21,9 @@
 #define GENESIS_ARCHIVE_ROOT "0x177a4955b31ecaafad999753938a44e526b54c5ba5d536688227f85f15cfbdf5"
 #define MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS 3000
 #define MAX_PROTOCOL_CONTRACTS 11
+#define CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS 1
 #define CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS 2
-#define CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS 3
-#define MULTI_CALL_ENTRYPOINT_ADDRESS 4
-#define FEE_JUICE_ADDRESS 5
+#define FEE_JUICE_ADDRESS 3
 #define FEE_JUICE_BALANCES_SLOT 1
 #define UPDATED_CLASS_IDS_SLOT 1
 #define FLAT_PUBLIC_LOGS_HEADER_LENGTH 1

barretenberg/cpp/src/barretenberg/crypto/merkle_tree/lmdb_store/lmdb_tree_store.cpp

@@ -54,8 +54,9 @@ int index_key_cmp(const MDB_val* a, const MDB_val* b)
     return value_cmp<uint64_t>(a, b);
 }
 
-LMDBTreeStore::LMDBTreeStore(std::string directory, std::string name, uint64_t mapSizeKb, uint64_t maxNumReaders)
-    : LMDBStoreBase(directory, mapSizeKb, maxNumReaders, 5)
+LMDBTreeStore::LMDBTreeStore(
+    std::string directory, std::string name, uint64_t mapSizeKb, uint64_t maxNumReaders, bool ephemeral)
+    : LMDBStoreBase(directory, mapSizeKb, maxNumReaders, 5, ephemeral)
     , _name(std::move(name))
 {
 

barretenberg/cpp/src/barretenberg/crypto/merkle_tree/lmdb_store/lmdb_tree_store.hpp

@@ -159,7 +159,8 @@ class LMDBTreeStore : public LMDBStoreBase {
     using SharedPtr = std::shared_ptr<LMDBTreeStore>;
     using ReadTransaction = LMDBReadTransaction;
     using WriteTransaction = LMDBWriteTransaction;
-    LMDBTreeStore(std::string directory, std::string name, uint64_t mapSizeKb, uint64_t maxNumReaders);
+    LMDBTreeStore(
+        std::string directory, std::string name, uint64_t mapSizeKb, uint64_t maxNumReaders, bool ephemeral = false);
     LMDBTreeStore(const LMDBTreeStore& other) = delete;
     LMDBTreeStore(LMDBTreeStore&& other) = delete;
     LMDBTreeStore& operator=(const LMDBTreeStore& other) = delete;

barretenberg/cpp/src/barretenberg/lmdblib/lmdb_environment.cpp

@@ -8,10 +8,8 @@
 
 namespace bb::lmdblib {
 
-LMDBEnvironment::LMDBEnvironment(const std::string& directory,
-                                 uint64_t mapSizeKB,
-                                 uint32_t maxNumDBs,
-                                 uint32_t maxNumReaders)
+LMDBEnvironment::LMDBEnvironment(
+    const std::string& directory, uint64_t mapSizeKB, uint32_t maxNumDBs, uint32_t maxNumReaders, bool ephemeral)
     : _id(0)
     , _directory(directory)
     , _readGuard(maxNumReaders)
@@ -21,6 +19,9 @@ LMDBEnvironment::LMDBEnvironment(const std::string& directory,
     uint64_t kb = 1024;
     uint64_t totalMapSize = kb * mapSizeKB;
     uint32_t flags = MDB_NOTLS;
+    if (ephemeral) {
+        flags |= MDB_NOSYNC | MDB_NOMETASYNC;
+    }
     try {
         call_lmdb_func("mdb_env_set_mapsize", mdb_env_set_mapsize, _mdbEnv, static_cast<size_t>(totalMapSize));
         call_lmdb_func("mdb_env_set_maxdbs", mdb_env_set_maxdbs, _mdbEnv, static_cast<MDB_dbi>(maxNumDBs));

barretenberg/cpp/src/barretenberg/lmdblib/lmdb_environment.hpp

@@ -25,8 +25,19 @@ class LMDBEnvironment {
      * @param mapSizeKb The maximum size of the database, can be increased from a previously used value
      * @param maxNumDbs The maximum number of databases that can be created withn this environment
      * @param maxNumReaders The maximum number of concurrent read transactions permitted.
+     * @param ephemeral When true, opens the env with `MDB_NOSYNC | MDB_NOMETASYNC`. Commits
+     *                  return as soon as the dirty pages are queued; the kernel flushes them
+     *                  lazily and never blocks the commit. Files stay sparse (we deliberately
+     *                  avoid `MDB_WRITEMAP`, which would eagerly allocate the full map size
+     *                  on disk). Intended for short-lived ephemeral world states (e.g. TXE
+     *                  test sessions) that discard the directory on close; never use for a
+     *                  real node — a crash mid-write yields an unrecoverable env.
      */
-    LMDBEnvironment(const std::string& directory, uint64_t mapSizeKb, uint32_t maxNumDBs, uint32_t maxNumReaders);
+    LMDBEnvironment(const std::string& directory,
+                    uint64_t mapSizeKb,
+                    uint32_t maxNumDBs,
+                    uint32_t maxNumReaders,
+                    bool ephemeral = false);
     LMDBEnvironment(const LMDBEnvironment& other) = delete;
     LMDBEnvironment(LMDBEnvironment&& other) = delete;
     LMDBEnvironment& operator=(const LMDBEnvironment& other) = delete;

barretenberg/cpp/src/barretenberg/lmdblib/lmdb_store.cpp

@@ -14,8 +14,8 @@
 #include <stdexcept>
 
 namespace bb::lmdblib {
-LMDBStore::LMDBStore(std::string directory, uint64_t mapSizeKb, uint64_t maxNumReaders, uint64_t maxDbs)
-    : LMDBStoreBase(std::move(directory), mapSizeKb, maxNumReaders, maxDbs)
+LMDBStore::LMDBStore(std::string directory, uint64_t mapSizeKb, uint64_t maxNumReaders, uint64_t maxDbs, bool ephemeral)
+    : LMDBStoreBase(std::move(directory), mapSizeKb, maxNumReaders, maxDbs, ephemeral)
 {}
 
 void LMDBStore::open_database(const std::string& name, bool duplicateKeysPermitted)

barretenberg/cpp/src/barretenberg/lmdblib/lmdb_store.hpp

@@ -35,7 +35,8 @@ class LMDBStore : public LMDBStoreBase {
         std::string name;
     };
 
-    LMDBStore(std::string directory, uint64_t mapSizeKb, uint64_t maxNumReaders, uint64_t maxDbs);
+    LMDBStore(
+        std::string directory, uint64_t mapSizeKb, uint64_t maxNumReaders, uint64_t maxDbs, bool ephemeral = false);
     LMDBStore(const LMDBStore& other) = delete;
     LMDBStore(LMDBStore&& other) = delete;
     LMDBStore& operator=(const LMDBStore& other) = delete;

barretenberg/cpp/src/barretenberg/lmdblib/lmdb_store_base.cpp

@@ -1,9 +1,10 @@
 #include "barretenberg/lmdblib/lmdb_store_base.hpp"
 
 namespace bb::lmdblib {
-LMDBStoreBase::LMDBStoreBase(std::string directory, uint64_t mapSizeKb, uint64_t maxNumReaders, uint64_t maxDbs)
+LMDBStoreBase::LMDBStoreBase(
+    std::string directory, uint64_t mapSizeKb, uint64_t maxNumReaders, uint64_t maxDbs, bool ephemeral)
     : _dbDirectory(std::move(directory))
-    , _environment((std::make_shared<LMDBEnvironment>(_dbDirectory, mapSizeKb, maxDbs, maxNumReaders)))
+    , _environment(std::make_shared<LMDBEnvironment>(_dbDirectory, mapSizeKb, maxDbs, maxNumReaders, ephemeral))
 {}
 LMDBStoreBase::~LMDBStoreBase() = default;
 LMDBStoreBase::ReadTransaction::Ptr LMDBStoreBase::create_read_transaction() const