Skip to content

Commit

Permalink
Update trie-db version to 0.28.0 (#1522)
Browse files Browse the repository at this point in the history
This PR updates:
- trie-db from 0.27.1 to 0.28.0
- trie-bench from 0.37.0 to 0.38.0 (deb-dependency)


While at it, also adapts the recorder to take into account the newly
added `TrieAccess::InlineValue`.

Needed by:
- #1153

@paritytech/subxt-team

---------

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
Co-authored-by: Bastian Köcher <git@kchr.de>
  • Loading branch information
lexnv and bkchr committed Sep 13, 2023
1 parent 07bad23 commit 0bebc8a
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bridges/primitives/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ sp-runtime = { path = "../../../substrate/primitives/runtime", default-features
sp-state-machine = { path = "../../../substrate/primitives/state-machine", default-features = false }
sp-std = { path = "../../../substrate/primitives/std", default-features = false }
sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
trie-db = { version = "0.27.1", default-features = false }
trie-db = { version = "0.28.0", default-features = false }

[dev-dependencies]
hex-literal = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion cumulus/pallets/parachain-system/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
environmental = { version = "1.1.4", default-features = false }
impl-trait-for-tuples = "0.2.1"
log = { version = "0.4.20", default-features = false }
trie-db = { version = "0.27.1", default-features = false }
trie-db = { version = "0.28.0", default-features = false }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }

# Substrate
Expand Down
2 changes: 1 addition & 1 deletion substrate/primitives/state-machine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sp-externalities = { path = "../externalities", default-features = false}
sp-panic-handler = { path = "../panic-handler", optional = true}
sp-std = { path = "../std", default-features = false}
sp-trie = { path = "../trie", default-features = false}
trie-db = { version = "0.27.1", default-features = false }
trie-db = { version = "0.28.0", default-features = false }

[dev-dependencies]
array-bytes = "6.1"
Expand Down
4 changes: 2 additions & 2 deletions substrate/primitives/trie/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ parking_lot = { version = "0.12.1", optional = true }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.48", optional = true }
tracing = { version = "0.1.29", optional = true }
trie-db = { version = "0.27.0", default-features = false }
trie-db = { version = "0.28.0", default-features = false }
trie-root = { version = "0.18.0", default-features = false }
sp-core = { path = "../core", default-features = false}
sp-std = { path = "../std", default-features = false}
Expand All @@ -38,7 +38,7 @@ schnellru = { version = "0.2.1", optional = true }
[dev-dependencies]
array-bytes = "6.1"
criterion = "0.4.0"
trie-bench = "0.37.0"
trie-bench = "0.38.0"
trie-standardmap = "0.16.0"
sp-runtime = { path = "../runtime" }

Expand Down
11 changes: 11 additions & 0 deletions substrate/primitives/trie/src/recorder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,17 @@ impl<H: Hasher, I: DerefMut<Target = RecorderInner<H::Out>>> trie_db::TrieRecord
// that the value doesn't exist in the trie.
self.update_recorded_keys(full_key, RecordedForKey::Value);
},
TrieAccess::InlineValue { full_key } => {
tracing::trace!(
target: LOG_TARGET,
key = ?sp_core::hexdisplay::HexDisplay::from(&full_key),
"Recorded inline value access for key",
);

// A value was accessed that is stored inline a node and we recorded all trie nodes
// to access this value.
self.update_recorded_keys(full_key, RecordedForKey::Value);
},
};

self.encoded_size_estimation.fetch_add(encoded_size_update, Ordering::Relaxed);
Expand Down
2 changes: 1 addition & 1 deletion substrate/test-utils/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pallet-timestamp = { path = "../../frame/timestamp", default-features = false}
sp-consensus-grandpa = { path = "../../primitives/consensus/grandpa", default-features = false, features = ["serde"] }
sp-trie = { path = "../../primitives/trie", default-features = false}
sp-transaction-pool = { path = "../../primitives/transaction-pool", default-features = false}
trie-db = { version = "0.27.0", default-features = false }
trie-db = { version = "0.28.0", default-features = false }
sc-service = { path = "../../client/service", default-features = false, features = ["test-helpers"], optional = true}
sp-state-machine = { path = "../../primitives/state-machine", default-features = false}
sp-externalities = { path = "../../primitives/externalities", default-features = false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde = { version = "1", features = ["derive"] }
sp-core = { path = "../../../../primitives/core" }
sp-state-machine = { path = "../../../../primitives/state-machine" }
sp-trie = { path = "../../../../primitives/trie" }
trie-db = "0.27.0"
trie-db = "0.28.0"

jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }

Expand Down

0 comments on commit 0bebc8a

Please sign in to comment.