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

Multi tree support #3386

Open
wants to merge 167 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
a70794d
Use the new trie
arkpar Aug 29, 2023
f544f79
Fixes for parity-db
arkpar Sep 20, 2023
c135b9f
Merge branch 'master' of github.com:paritytech/polkadot-sdk
arkpar Sep 20, 2023
c6fca87
Merge branch 'master' of github.com:paritytech/polkadot-sdk into arkp…
arkpar Sep 27, 2023
3d1b7b5
patch
cheme Jan 18, 2024
2859b82
location trait
cheme Jan 18, 2024
7a984c6
pass location to trie for child usage
cheme Jan 18, 2024
09f4f09
change to child trie access (state machine and trie crates)
cheme Jan 18, 2024
f7fb149
code change for count state mig
cheme Jan 18, 2024
8ff6c2a
pass child changeset in main trie one
cheme Jan 18, 2024
024889a
flatten trie_commit
cheme Jan 18, 2024
dde33fc
adapt, not right db branch.
cheme Jan 18, 2024
6c66129
right parity-db branch and remaining fixes
cheme Jan 19, 2024
a85164d
others
cheme Jan 19, 2024
866ddc6
update for deps
cheme Jan 24, 2024
c432446
trie root rem
cheme Jan 24, 2024
69a6020
adapt, tests sc-client-db full ko
cheme Jan 24, 2024
90b753d
sc-client-db tests
cheme Jan 24, 2024
532e352
child changeset single alias
cheme Jan 24, 2024
0b0a428
update patches
cheme Feb 15, 2024
8716a26
merge will need work/rework
cheme Feb 15, 2024
9ba6a2d
resolve sp_trie merge (state machine will need recorder rework next)
cheme Feb 15, 2024
c39a35f
Use MemTreeDB on some sp_trie tests.
cheme Feb 15, 2024
32e75ff
actually keyspace the data in changeset
cheme Feb 16, 2024
d686d50
rename to avoid confusion with other with_recorder
cheme Feb 16, 2024
1653b67
wrap should not be usefull if using with_temp_recorder.
cheme Feb 16, 2024
a980c65
memo
cheme Feb 16, 2024
1f878a9
restore prefix memory db by default
cheme Feb 16, 2024
f196361
fix test
cheme Feb 16, 2024
930b0b0
sp-api, here hard coded location do not impact struct sizes.
cheme Feb 16, 2024
f676126
fix client db merge, less recheck
cheme Feb 16, 2024
f19cca4
need the lock around recorder.
cheme Feb 16, 2024
45df4c8
bad direction
cheme Feb 16, 2024
3519e36
Revert "bad direction"
cheme Feb 16, 2024
9cdc9b1
dirty solution, maybe move back to warp code but using an Arc on top of
cheme Feb 16, 2024
d7b1f01
a bit more, bef trying warp
cheme Feb 16, 2024
52242a1
fix a bit
cheme Feb 16, 2024
e097d07
Fixes.
cheme Feb 19, 2024
2644056
naive option def
cheme Feb 19, 2024
f89b2c0
pass multitree to db init
cheme Feb 19, 2024
5d98d30
options for multitree
cheme Feb 19, 2024
09f658f
somehow aligned...
cheme Feb 19, 2024
76c7451
Merge branch 'master' into tt
cheme Feb 19, 2024
8a4f0fa
test
cheme Feb 19, 2024
b5bd725
resolving
cheme Feb 19, 2024
caeb0fa
Rem standardmap
cheme Feb 19, 2024
94ef589
fmts
cheme Feb 19, 2024
6a1e031
fmt2
cheme Feb 19, 2024
b4e8e36
benches
cheme Feb 19, 2024
eacd0d8
few clippy warn
cheme Feb 19, 2024
84c5375
fmt
cheme Feb 19, 2024
9a317be
fix
cheme Feb 19, 2024
70cc271
fix test
cheme Feb 20, 2024
5e0f0a2
allow multi tree direct access
cheme Feb 20, 2024
bffb94b
store is multi tree in db adapter
cheme Feb 20, 2024
9a28dd4
restore key stripping for rocksdb ref count no multitree
cheme Feb 21, 2024
f6b23aa
purge chain test over multi
cheme Feb 21, 2024
7a7997a
missing i
cheme Feb 21, 2024
958b51b
Merge branch 'master' into cheme/new-trie2
cheme Feb 26, 2024
742f008
fix
cheme Feb 26, 2024
056231f
change to use prefix on contains root
cheme Feb 27, 2024
1a04af6
Revert "change to use prefix on contains root"
cheme Feb 27, 2024
b9ba5e4
use empty prefix on contains root
cheme Feb 27, 2024
d58d72a
apply_to with no prefix
cheme Feb 27, 2024
1748085
missing
cheme Feb 27, 2024
8af3690
fmt
cheme Feb 27, 2024
8a87c80
test
cheme Feb 27, 2024
f786dd6
proper test
cheme Feb 27, 2024
584c159
clipy
cheme Feb 27, 2024
1f3e031
restore (issue may just be to not use empty for next values when old
cheme Feb 27, 2024
70666d0
Merge branch 'master' into cheme/new-trie2
cheme Feb 28, 2024
0fdeef2
to check
cheme Feb 28, 2024
83182d0
workable tests TODO revert and move to bench
cheme Feb 29, 2024
c7311b6
state_capabilities of db
cheme Feb 29, 2024
5a9e158
initial bench feed
cheme Feb 29, 2024
893a29a
append only should not ref count
cheme Feb 29, 2024
c457b5f
avoid migrating existing db
cheme Feb 29, 2024
54c447e
fmt
cheme Feb 29, 2024
6281aad
Do not assume no statedb is multitree (eg benchmark)
cheme Mar 1, 2024
2bfb662
contains with get
cheme Mar 1, 2024
9c0e59a
fix benchmarks
cheme Mar 1, 2024
fb0bf23
fmt
cheme Mar 1, 2024
20cb03f
revert renaming to TrieCommit.
cheme Mar 1, 2024
bc5c377
Merge branch 'master' into cheme/new-trie2
cheme Mar 1, 2024
f5577fc
Merge branch 'master' into cheme/new-trie2
cheme Mar 25, 2024
d987a01
fix
cheme Mar 25, 2024
c2a1f30
fix
cheme Mar 25, 2024
9cde418
fix sp-state-machine
cheme Mar 25, 2024
cc69d31
unused import
cheme Mar 25, 2024
f47f8bd
rem checks
cheme Mar 25, 2024
e29923c
non needed std
cheme Mar 25, 2024
0892234
missing
cheme Mar 25, 2024
e1a77e2
actually need std (maybe refcell the no std)
cheme Mar 25, 2024
2e553be
allow dead code, should really consider implement with refcell
cheme Mar 25, 2024
e7c9525
add with recorder in no std
cheme Mar 25, 2024
c0c3b7f
send sync unsafe impl (should only be for wasm)
cheme Mar 25, 2024
d3f62ba
real unsafe
cheme Mar 25, 2024
410c8d1
other
cheme Mar 25, 2024
c97c77d
switch to subtrie
cheme Apr 2, 2024
1b30649
Merge branch 'master' into cheme/new-trie2
cheme Apr 2, 2024
b8f47b6
Merge branch 'master' into cheme/new-trie2
cheme Apr 3, 2024
d600175
switch
cheme Apr 16, 2024
425120f
update
cheme Apr 17, 2024
eeeee67
small fix and trace
cheme Apr 19, 2024
4ca70b7
update
cheme Apr 30, 2024
f0ec96e
f
cheme May 6, 2024
1d70579
Merge branch 'master' into cheme/new-trie2
cheme May 6, 2024
ed73a60
fix
cheme May 6, 2024
794b4a8
fmt
cheme May 6, 2024
35d913e
fix old write storage bench
cheme May 6, 2024
7a22d90
fix multi (slow)
cheme May 6, 2024
06e32c9
mix node conf multi and rocks
cheme May 6, 2024
449f6ae
fmt
cheme May 6, 2024
e5ec853
missing
cheme May 6, 2024
a769dcc
Use location internally a bit more.
cheme May 6, 2024
af068fb
rem some todos
cheme May 6, 2024
ac74627
partially restore test
cheme May 6, 2024
e375922
try restoring clone (may be an issue)
cheme May 6, 2024
6381c21
bench state access
cheme May 7, 2024
bfb7aa5
benches
cheme May 7, 2024
9d97920
update
cheme May 7, 2024
b8aa260
clippy to maste
cheme May 7, 2024
5848ecb
Merge branch 'master' into cheme/new-trie2
cheme May 7, 2024
89a72b3
fmt
cheme May 7, 2024
def9b7c
fix merge
cheme May 7, 2024
d095643
fmt
cheme May 7, 2024
1bba97f
fix
cheme May 7, 2024
042288d
fix fix
cheme May 7, 2024
adff644
fix
cheme May 7, 2024
d41a02a
Merge
MattHalpinParity Aug 13, 2024
1e7145e
Merge master
MattHalpinParity Aug 14, 2024
2178de5
Merge master
MattHalpinParity Aug 14, 2024
a014145
Merge master
MattHalpinParity Aug 14, 2024
eb9322b
Merge master
MattHalpinParity Aug 15, 2024
51b5c6f
Merge master
MattHalpinParity Aug 15, 2024
4a7a2bd
Merge master
MattHalpinParity Aug 21, 2024
73441a8
Workspace dependencies
MattHalpinParity Aug 22, 2024
668703c
Remove unused workspace dependencies
MattHalpinParity Aug 22, 2024
b50970b
Merge master
MattHalpinParity Aug 22, 2024
9f7ff78
Merge master
MattHalpinParity Sep 11, 2024
9cd9290
Merge master
MattHalpinParity Sep 20, 2024
186846c
Merge master
MattHalpinParity Sep 21, 2024
2565390
Merge master
MattHalpinParity Sep 21, 2024
e03fcc3
Merge master
MattHalpinParity Sep 22, 2024
e2c91e5
Merge master
MattHalpinParity Sep 23, 2024
780f63f
Merge branch master into cheme/new-trie2
MattHalpinParity Sep 23, 2024
eeeac52
Merge branch master into cheme/new-trie2
MattHalpinParity Sep 23, 2024
14b3286
Merge branch master into cheme/new-trie2
MattHalpinParity Sep 24, 2024
10d729b
Fixes
MattHalpinParity Sep 25, 2024
1f7e810
Fixes
MattHalpinParity Sep 26, 2024
1f59d23
Fixes and fmt
MattHalpinParity Sep 30, 2024
2afead2
parity-db patch no longer needed
MattHalpinParity Oct 7, 2024
ce2fcdc
Merge branch master into cheme/new-trie2
MattHalpinParity Oct 16, 2024
105aff1
Merge branch master into cheme/new-trie2
MattHalpinParity Oct 17, 2024
bd3c214
Merge branch master into cheme/new-trie2
MattHalpinParity Oct 17, 2024
216f619
Compile fixes
MattHalpinParity Oct 18, 2024
96d75b5
fmt
MattHalpinParity Oct 18, 2024
8185962
taplo format
MattHalpinParity Oct 18, 2024
8c5b5ba
subtrie patch no longer needed
MattHalpinParity Oct 29, 2024
854af66
Merge branch master into cheme/new-trie2
MattHalpinParity Oct 31, 2024
e41f92c
Merge branch master into cheme/new-trie2
MattHalpinParity Oct 31, 2024
4e89372
prdoc 3386
MattHalpinParity Nov 6, 2024
24ee2e3
Merge branch master into cheme/new-trie2
MattHalpinParity Nov 6, 2024
2640630
Merge branch master into cheme/new-trie2
MattHalpinParity Nov 6, 2024
5413fe0
Fix prdoc
MattHalpinParity Nov 12, 2024
c496b68
Fix prdoc
MattHalpinParity Nov 14, 2024
73f72cb
Merge branch master into cheme/new-trie2
MattHalpinParity Nov 14, 2024
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
92 changes: 34 additions & 58 deletions Cargo.lock

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

10 changes: 2 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,6 @@ governor = { version = "0.6.0" }
gum = { path = "polkadot/node/gum", default-features = false, package = "tracing-gum" }
gum-proc-macro = { path = "polkadot/node/gum/proc-macro", default-features = false, package = "tracing-gum-proc-macro" }
handlebars = { version = "5.1.0" }
hash-db = { version = "0.16.0", default-features = false }
hash256-std-hasher = { version = "0.15.2", default-features = false }
hex = { version = "0.4.3", default-features = false }
hex-literal = { version = "0.4.1", default-features = false }
Expand Down Expand Up @@ -853,7 +852,6 @@ log = { version = "0.4.22", default-features = false }
macro_magic = { version = "0.5.1" }
maplit = { version = "1.0.2" }
memmap2 = { version = "0.9.3" }
memory-db = { version = "0.32.0", default-features = false }
merkleized-metadata = { version = "0.1.0" }
merlin = { version = "3.0", default-features = false }
messages-relay = { path = "bridges/relays/messages" }
Expand Down Expand Up @@ -1019,7 +1017,7 @@ parachains-common = { path = "cumulus/parachains/common", default-features = fal
parachains-relay = { path = "bridges/relays/parachains" }
parachains-runtimes-test-utils = { path = "cumulus/parachains/runtimes/test-utils", default-features = false }
parity-bytes = { version = "0.1.2", default-features = false }
parity-db = { version = "0.4.12" }
parity-db = { version = "0.5.0" }
parity-wasm = { version = "0.45.0" }
parking_lot = { version = "0.12.1", default-features = false }
partial_sort = { version = "0.2.0" }
Expand Down Expand Up @@ -1352,10 +1350,7 @@ tracing-futures = { version = "0.2.4" }
tracing-log = { version = "0.2.0" }
tracing-subscriber = { version = "0.3.18" }
tracking-allocator = { path = "polkadot/node/tracking-allocator", default-features = false, package = "staging-tracking-allocator" }
trie-bench = { version = "0.39.0" }
trie-db = { version = "0.29.1", default-features = false }
trie-root = { version = "0.18.0", default-features = false }
trie-standardmap = { version = "0.16.0" }
trie-db = { package = "subtrie", version = "0.0.1", default-features = false }
trybuild = { version = "1.0.89" }
tt-call = { version = "1.0.8" }
tuplex = { version = "0.1", default-features = false }
Expand Down Expand Up @@ -1433,7 +1428,6 @@ curve25519-dalek = { opt-level = 3 }
ed25519-dalek = { opt-level = 3 }
flate2 = { opt-level = 3 }
futures-channel = { opt-level = 3 }
hash-db = { opt-level = 3 }
hashbrown = { opt-level = 3 }
hmac = { opt-level = 3 }
httparse = { opt-level = 3 }
Expand Down
2 changes: 2 additions & 0 deletions bridges/bin/runtime-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
workspace = true

[dependencies]
trie-db = { workspace = true }
codec = { features = ["derive"], workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
Expand Down Expand Up @@ -82,6 +83,7 @@ std = [
"sp-std/std",
"sp-trie/std",
"sp-weights/std",
"trie-db/std",
"tuplex/std",
"xcm/std",
]
Expand Down
Loading
Loading