-
Notifications
You must be signed in to change notification settings - Fork 268
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: native world state #7516
Merged
Merged
feat: native world state #7516
Changes from all commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
46b24db
feat: add world state
alexghr 87a2642
feat: add world state nodejs addon
alexghr bd0aab7
feat: add native world state node package
alexghr eb8ad58
chore: update db size
alexghr 8448cdc
test: enable block synch test
alexghr 7fbb305
refactor: simplify types
alexghr 30a0d5e
chore: update imports and interfaces
alexghr f8cba90
fix: switch to poseidon
alexghr 5b6284e
Merge remote-tracking branch 'origin/master' into ag/world-state
PhilWindle af13709
Add yarn command
PhilWindle b21d995
Another attempt
PhilWindle 60664e8
fix: remove bad includes
alexghr bd0bae9
Fix for gcc
PhilWindle c86cb35
fix: test
alexghr 1697a23
fix: update hashes
alexghr 8db2c50
Fix build attempt
PhilWindle 01bd840
Merge branch 'ag/world-state' of github.com:AztecProtocol/aztec-packa…
PhilWindle cee7209
More build fixes
PhilWindle 115e9be
Fixes
PhilWindle 91f37cc
Fix bootstrap
PhilWindle dd914ef
More build fixes
PhilWindle 8997dd3
More build stuff
PhilWindle 72b5fa8
Fix
PhilWindle a0d3b33
Build fix
PhilWindle 7ee00f8
Merge branch 'master' into ag/world-state
PhilWindle 7558d8e
Merge fixes
PhilWindle b93ad74
Skip test
PhilWindle 6a6ad5e
Comments
PhilWindle a9a39fa
Comments
PhilWindle fb9dc9b
Remove the gcc pic build
PhilWindle 37a06fa
Renamed pic targets
PhilWindle d8698ab
Remove gcc presets
PhilWindle 3afcd81
Typo
PhilWindle f1d7803
Add default-pic
PhilWindle 99248c5
Formatting
PhilWindle 67a8c27
fix: enable linker workaround for osx
alexghr 815e6c4
fix: restore TARGET_ARCH
alexghr a101fd8
Formatting
PhilWindle af77f8b
Merge branch 'ag/world-state' of github.com:AztecProtocol/aztec-packa…
PhilWindle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -e | ||
|
||
# run commands relative to parent directory | ||
cd $(dirname $0)/.. | ||
|
||
TEST=${1:-*} | ||
PRESET=${PRESET:-clang16} | ||
|
||
cmake --build --preset $PRESET --target world_state_tests | ||
./build/bin/world_state_tests --gtest_filter=WorldStateTest.${TEST} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
barretenberg/cpp/src/barretenberg/messaging/dispatcher.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
#pragma once | ||
|
||
#include "barretenberg/messaging/header.hpp" | ||
#include "barretenberg/serialize/cbind.hpp" | ||
#include <cstdint> | ||
#include <functional> | ||
#include <stdexcept> | ||
#include <utility> | ||
#include <vector> | ||
|
||
namespace bb::messaging { | ||
|
||
using message_handler = std::function<bool(msgpack::object&, msgpack::sbuffer&)>; | ||
|
||
class MessageDispatcher { | ||
private: | ||
std::unordered_map<uint32_t, message_handler> messageHandlers; | ||
|
||
public: | ||
MessageDispatcher() = default; | ||
|
||
bool onNewData(msgpack::object& obj, msgpack::sbuffer& buffer) | ||
{ | ||
bb::messaging::HeaderOnlyMessage header; | ||
obj.convert(header); | ||
|
||
auto iter = messageHandlers.find(header.msgType); | ||
if (iter == messageHandlers.end()) { | ||
throw std::runtime_error("No registered handler for message of type " + std::to_string(header.msgType)); | ||
} | ||
|
||
return (iter->second)(obj, buffer); | ||
} | ||
|
||
void registerTarget(uint32_t msgType, const message_handler& handler) | ||
{ | ||
messageHandlers.insert({ msgType, handler }); | ||
} | ||
}; | ||
|
||
} // namespace bb::messaging |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
barretenberg_module(world_state crypto_merkle_tree stdlib_poseidon2) |
34 changes: 34 additions & 0 deletions
34
barretenberg/cpp/src/barretenberg/world_state/tree_with_store.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
#pragma once | ||
|
||
#include <memory> | ||
|
||
namespace bb::world_state { | ||
|
||
template <typename Tree> struct TreeWithStore { | ||
using TreeType = Tree; | ||
std::unique_ptr<Tree> tree; | ||
std::unique_ptr<typename Tree::StoreType> store; | ||
std::unique_ptr<typename Tree::StoreType::PersistedStoreType> persisted_store; | ||
|
||
TreeWithStore(std::unique_ptr<Tree> t, | ||
std::unique_ptr<typename Tree::StoreType> s, | ||
std::unique_ptr<typename Tree::StoreType::PersistedStoreType> p) | ||
: tree(std::move(t)) | ||
, store(std::move(s)) | ||
, persisted_store(std::move(p)) | ||
{} | ||
|
||
TreeWithStore(TreeWithStore&& other) noexcept | ||
: tree(std::move(other.tree)) | ||
, store(std::move(other.store)) | ||
, persisted_store(std::move(other.persisted_store)) | ||
{} | ||
|
||
TreeWithStore(const TreeWithStore& other) = delete; | ||
~TreeWithStore() = default; | ||
|
||
TreeWithStore& operator=(TreeWithStore&& other) = delete; | ||
TreeWithStore& operator=(const TreeWithStore& other) = delete; | ||
}; | ||
|
||
} // namespace bb::world_state |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
#pragma once | ||
|
||
#include "barretenberg/crypto/merkle_tree/indexed_tree/indexed_leaf.hpp" | ||
#include "barretenberg/crypto/merkle_tree/types.hpp" | ||
#include "barretenberg/ecc/curves/bn254/fr.hpp" | ||
#include <cstdint> | ||
#include <variant> | ||
|
||
namespace bb::world_state { | ||
|
||
enum MerkleTreeId { | ||
NULLIFIER_TREE = 0, | ||
NOTE_HASH_TREE = 1, | ||
PUBLIC_DATA_TREE = 2, | ||
L1_TO_L2_MESSAGE_TREE = 3, | ||
ARCHIVE = 4, | ||
}; | ||
|
||
using TreeStateReference = std::pair<bb::fr, bb::crypto::merkle_tree::index_t>; | ||
using StateReference = std::unordered_map<MerkleTreeId, TreeStateReference>; | ||
|
||
struct WorldStateRevision { | ||
struct FinalisedBlock { | ||
uint32_t block; | ||
}; | ||
|
||
struct CurrentState { | ||
bool uncommitted; | ||
}; | ||
|
||
using Revision = std::variant<WorldStateRevision::FinalisedBlock, WorldStateRevision::CurrentState>; | ||
Revision inner; | ||
|
||
static WorldStateRevision committed() { return { CurrentState{ false } }; } | ||
static WorldStateRevision uncommitted() { return { CurrentState{ true } }; } | ||
static WorldStateRevision finalised_block(uint32_t block_number) { return { FinalisedBlock{ block_number } }; } | ||
}; | ||
} // namespace bb::world_state |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not a fan of the pic name, this is a low level detail for a high level feature. This preset and this earthly command could likely be preset-aztec-world-state or similar
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Renamed