Skip to content
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

fix: fix sub tree prefix and go to version 2.2.1 #352

Merged
merged 5 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion costs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grovedb-costs"
version = "2.2.0"
version = "2.2.1"
edition = "2021"
license = "MIT"
description = "Costs extension crate for GroveDB"
Expand Down
4 changes: 2 additions & 2 deletions grovedb-epoch-based-storage-flags/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
name = "grovedb-epoch-based-storage-flags"
authors = ["Samuel Westrich <[email protected]>"]
description = "Epoch based storage flags for GroveDB"
version = "2.2.0"
version = "2.2.1"
edition = "2021"
license = "MIT"
repository = "https://github.com/dashpay/grovedb"

[dependencies]
grovedb-costs = { version = "2.2.0", path = "../costs" }
grovedb-costs = { version = "2.2.1", path = "../costs" }

hex = { version = "0.4.3" }
integer-encoding = { version = "4.0.0" }
Expand Down
2 changes: 1 addition & 1 deletion grovedb-version/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "grovedb-version"
authors = ["Samuel Westrich <[email protected]>"]
description = "Versioning library for Platform"
version = "2.2.0"
version = "2.2.1"
edition = "2021"
license = "MIT"
repository = "https://github.com/dashpay/grovedb"
Expand Down
18 changes: 9 additions & 9 deletions grovedb/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "grovedb"
description = "Fully featured database using balanced hierarchical authenticated data structures"
version = "2.2.0"
version = "2.2.1"
authors = ["Samuel Westrich <[email protected]>", "Wisdom Ogwu <[email protected]", "Evgeny Fomin <[email protected]>"]
edition = "2021"
license = "MIT"
Expand All @@ -11,13 +11,13 @@ readme = "../README.md"
documentation = "https://docs.rs/grovedb"

[dependencies]
grovedb-costs = { version = "2.2.0", path = "../costs" , optional = true }
grovedbg-types = { version = "2.2.0", path = "../grovedbg-types", optional = true }
grovedb-merk = { version = "2.2.0", path = "../merk", optional = true, default-features = false }
grovedb-path = { version = "2.2.0", path = "../path" }
grovedb-storage = { version = "2.2.0", path = "../storage", optional = true }
grovedb-version = { version = "2.2.0", path = "../grovedb-version" }
grovedb-visualize = { version = "2.2.0", path = "../visualize", optional = true }
grovedb-costs = { version = "2.2.1", path = "../costs" , optional = true }
grovedbg-types = { version = "2.2.1", path = "../grovedbg-types", optional = true }
grovedb-merk = { version = "2.2.1", path = "../merk", optional = true, default-features = false }
grovedb-path = { version = "2.2.1", path = "../path" }
grovedb-storage = { version = "2.2.1", path = "../storage", optional = true }
grovedb-version = { version = "2.2.1", path = "../grovedb-version" }
grovedb-visualize = { version = "2.2.1", path = "../visualize", optional = true }

axum = { version = "=0.7.5", features = ["macros"], optional = true }
bincode = { version = "2.0.0-rc.3" }
Expand All @@ -36,7 +36,7 @@ zip-extensions = { version = "0.8.1", optional = true }
serde = { version = "1.0.210", features = ["derive"], optional = true }

[dev-dependencies]
grovedb-epoch-based-storage-flags = { version = "2.2.0", path = "../grovedb-epoch-based-storage-flags" }
grovedb-epoch-based-storage-flags = { version = "2.2.1", path = "../grovedb-epoch-based-storage-flags" }

criterion = "0.5.1"
hex = "0.4.3"
Expand Down
2 changes: 1 addition & 1 deletion grovedb/src/replication/state_sync_session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use super::{
};
use crate::{replication, Element, Error, GroveDb, Transaction};

pub(crate) type SubtreePrefix = [u8; blake3::OUT_LEN];
pub(crate) type SubtreePrefix = [u8; 32];

/// Struct governing the state synchronization of one subtree.
struct SubtreeStateSyncInfo<'db> {
Expand Down
2 changes: 1 addition & 1 deletion grovedbg-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grovedbg-types"
version = "2.2.0"
version = "2.2.1"
edition = "2021"
description = "Common type definitions for data exchange over GroveDBG protocol"
authors = ["Evgeny Fomin <[email protected]>"]
Expand Down
12 changes: 6 additions & 6 deletions merk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "grovedb-merk"
description = "Merkle key/value store adapted for GroveDB"
version = "2.2.0"
version = "2.2.1"
authors = ["Samuel Westrich <[email protected]>", "Wisdom Ogwu <[email protected]", "Evgeny Fomin <[email protected]>", "Matt Bell <[email protected]>"]
edition = "2021"
license = "MIT"
Expand All @@ -11,11 +11,11 @@ readme = "README.md"
documentation = "https://docs.rs/grovedb-merk"

[dependencies]
grovedb-costs = { version = "2.2.0" , path = "../costs" }
grovedb-path = { version = "2.2.0", path = "../path" }
grovedb-storage = { version = "2.2.0", path = "../storage", optional = true }
grovedb-version = { version = "2.2.0", path = "../grovedb-version" }
grovedb-visualize = { version = "2.2.0", path = "../visualize" }
grovedb-costs = { version = "2.2.1" , path = "../costs" }
grovedb-path = { version = "2.2.1", path = "../path" }
grovedb-storage = { version = "2.2.1", path = "../storage", optional = true }
grovedb-version = { version = "2.2.1", path = "../grovedb-version" }
grovedb-visualize = { version = "2.2.1", path = "../visualize" }

bincode = { version = "2.0.0-rc.3" }
hex = "0.4.3"
Expand Down
4 changes: 2 additions & 2 deletions node-grove/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ exclude = ["index.node"]
crate-type = ["cdylib"]

[dependencies]
grovedb = { version = "2.2.0", path = "../grovedb", features = ["full", "estimated_costs"] }
grovedb-version = { version = "2.2.0", path = "../grovedb-version" }
grovedb = { version = "2.2.1", path = "../grovedb", features = ["full", "estimated_costs"] }
grovedb-version = { version = "2.2.1", path = "../grovedb-version" }

[dependencies.neon]
version = "0.10.1"
Expand Down
2 changes: 1 addition & 1 deletion path/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grovedb-path"
version = "2.2.0"
version = "2.2.1"
edition = "2021"
license = "MIT"
description = "Path extension crate for GroveDB"
Expand Down
8 changes: 4 additions & 4 deletions storage/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grovedb-storage"
version = "2.2.0"
version = "2.2.1"
edition = "2021"
license = "MIT"
description = "Storage extension crate for GroveDB"
Expand All @@ -9,9 +9,9 @@ documentation = "https://docs.rs/grovedb-storage"
repository = "https://github.com/dashpay/grovedb"

[dependencies]
grovedb-costs = { version = "2.2.0", path = "../costs" }
grovedb-path = { version = "2.2.0", path = "../path" }
grovedb-visualize = { version = "2.2.0", path = "../visualize" }
grovedb-costs = { version = "2.2.1", path = "../costs" }
grovedb-path = { version = "2.2.1", path = "../path" }
grovedb-visualize = { version = "2.2.1", path = "../visualize" }

blake3 = { version = "1.5.1", optional = true }
hex = "0.4.3"
Expand Down
3 changes: 1 addition & 2 deletions storage/src/rocksdb_storage/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ use crate::{
};

const BLAKE_BLOCK_LEN: usize = 64;

pub type SubtreePrefix = [u8; blake3::OUT_LEN];
pub type SubtreePrefix = [u8; 32];

fn blake_block_count(len: usize) -> usize {
if len == 0 {
Expand Down
3 changes: 1 addition & 2 deletions storage/src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ use grovedb_path::SubtreePath;
use grovedb_visualize::visualize_to_vec;

use crate::{worst_case_costs::WorstKeyLength, Error};

pub type SubtreePrefix = [u8; blake3::OUT_LEN];
pub type SubtreePrefix = [u8; 32];

/// Top-level storage_cost abstraction.
/// Should be able to hold storage_cost connection and to start transaction when
Expand Down
2 changes: 1 addition & 1 deletion visualize/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grovedb-visualize"
version = "2.2.0"
version = "2.2.1"
edition = "2021"
license = "MIT"
description = "Debug prints extension crate for GroveDB"
Expand Down
Loading