Add `childstate_getStorageEntries` RPC #9459

hirschenberger · 2021-07-29T14:14:42Z

Maybe it would make sense to deprecate getStorage as it can be substituted with getStorageEntries now?

client/rpc/src/state/state_full.rs

bkchr · 2021-08-02T08:27:17Z

client/rpc/src/state/state_full.rs

+		};
+		let client = self.client.clone();
+		Box::new(
+			join_all(keys.into_iter().map(move |key| {


bkchr · 2021-08-02T08:31:28Z

client/rpc-api/src/child_state/mod.rs

@@ -66,6 +66,15 @@ pub trait ChildStateApi<Hash> {
 		hash: Option<Hash>,
 	) -> FutureResult<Option<StorageData>>;

+	/// Returns child storage entries for multiple keys at a specific block's state.
+	#[rpc(name = "childstate_getStorages")]
+	fn storages(


storage_entries maybe? storages sounds weird.

Yes, that's better.

Another question is if we should deprecate storage because of the overlapping functionality?

bkchr · 2021-08-02T08:34:25Z

client/rpc/src/state/state_light.rs

+		let fetcher = self.fetcher.clone();
+		let block = self.block_or_best(block);
+		Box::new(join_all(keys.into_iter().map(move |key| {
+			storage(&*remote_blockchain, fetcher.clone(), block, vec![key.0.clone()])


You should request all keys in one request and not one request per key.

bkchr · 2021-08-02T08:34:46Z

client/rpc/src/state/state_light.rs

+				.map(move |mut values| {
+					values
+						.remove(&key)
+						.expect("successful request has entries for all requested keys; qed")


Are you sure?

At least it's the claim that was made in the storage function. But I'll add a test to check it.

bkchr · 2021-08-02T08:35:41Z

client/rpc/src/state/state_light.rs

+									block,
+									header,
+									storage_key,
+									keys: vec![key.0.clone()],


Again you are only requesting one key after another.

… issue_9203

hirschenberger

followup PR coming...

client/rpc/src/state/state_full.rs

hirschenberger · 2021-08-02T17:16:47Z

client/rpc/src/state/state_light.rs

+				.map(move |mut values| {
+					values
+						.remove(&key)
+						.expect("successful request has entries for all requested keys; qed")


At least it's the claim that was made in the storage function. But I'll add a test to check it.

hirschenberger · 2021-08-02T17:23:26Z

client/rpc-api/src/child_state/mod.rs

@@ -66,6 +66,15 @@ pub trait ChildStateApi<Hash> {
 		hash: Option<Hash>,
 	) -> FutureResult<Option<StorageData>>;

+	/// Returns child storage entries for multiple keys at a specific block's state.
+	#[rpc(name = "childstate_getStorages")]
+	fn storages(


Yes, that's better.

Another question is if we should deprecate storage because of the overlapping functionality?

… issue_9203

hirschenberger · 2021-08-27T10:50:37Z

Can I have another review, please?

… issue_9203

hirschenberger · 2021-09-01T05:38:57Z

@bkchr Can I have another review?

bkchr

Sorry for the delay. Some last nitpicks, then we are good to merge this

client/rpc/src/state/state_full.rs

client/rpc/src/state/mod.rs

client/rpc/src/state/state_full.rs

client/rpc/src/state/state_light.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

This reverts commit d840015.

This reverts commit 5813b43.

hirschenberger · 2021-09-09T11:58:24Z

Should be ready now.

bkchr · 2021-09-09T12:12:01Z

@hirschenberger please run cargo fmt

bkchr · 2021-09-09T12:16:40Z

bot merge

ghost · 2021-09-09T12:16:44Z

Waiting for commit status.

ghost · 2021-09-09T13:07:20Z

Bot will approve on the behalf of @bkchr, since they are a team lead, in an attempt to reach the minimum approval count

ghost · 2021-09-09T13:07:22Z

Merge failed: Could not recover from: "Required status check \"continuous-integration/gitlab-check-polkadot-companion-build\" is failing. At least 2 approving reviews are required by reviewers with write access." due to: WithIssue: Error merging: "Required status check \"continuous-integration/gitlab-check-polkadot-companion-build\" is failing."

hirschenberger · 2021-09-13T08:41:29Z

@bkchr There's some CI issue here?

bkchr · 2021-09-13T09:42:01Z

bot merge

ghost · 2021-09-13T09:42:08Z

Trying merge.

Add storage query functions for multiple keys

d2ad280

fixes paritytech#9203

bkchr reviewed Aug 2, 2021

View reviewed changes

Merge branch 'master' of https://github.com/paritytech/substrate into…

993a877

… issue_9203

hirschenberger commented Aug 3, 2021

View reviewed changes

hirschenberger added 3 commits August 3, 2021 15:15

Query all keys in one request and add more tests

ab725c8

Merge branch 'master' of https://github.com/paritytech/substrate into…

3a3c1ae

… issue_9203

Make it compatible with stable release channel

a23ed69

hirschenberger added 2 commits August 30, 2021 16:34

Merge branch 'master' of https://github.com/paritytech/substrate into…

fa146dc

… issue_9203

Update to new futures

d73a745

hirschenberger requested a review from bkchr September 5, 2021 14:40

bkchr reviewed Sep 9, 2021

View reviewed changes

bkchr changed the title ~~Add storage query functions for multiple keys~~ Add childstate_getStorageEntries RPC Sep 9, 2021

bkchr added B5-clientnoteworthy C1-low PR touches the given topic and has a low impact on builders. A0-please_review Pull request needs code review. labels Sep 9, 2021

hirschenberger and others added 11 commits September 9, 2021 11:58

Update client/rpc/src/state/state_full.rs

0cbe5eb

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Update client/rpc/src/state/state_full.rs

cd4c158

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Update client/rpc/src/state/state_full.rs

3199a10

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Update client/rpc/src/state/state_full.rs

a1b6eed

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Update client/rpc/src/state/state_full.rs

83251ad

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Update client/rpc/src/state/state_light.rs

58fe359

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Update client/rpc/src/state/state_light.rs

f3e3ce3

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Satisfy borrowck

d618704

Remove non-RPC storage_entries functions.

d840015

Revert "Remove non-RPC storage_entries functions."

5813b43

This reverts commit d840015.

Revert "Revert "Remove non-RPC storage_entries functions.""

a001771

This reverts commit 5813b43.

Finally some formatting

19f5d24

bkchr approved these changes Sep 9, 2021

View reviewed changes

bkchr added the D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit label Sep 9, 2021

ghost approved these changes Sep 9, 2021

View reviewed changes

ghost merged commit c022f88 into paritytech:master Sep 13, 2021

github-actions bot mentioned this pull request Oct 11, 2021

Update substrate/polkadot/cumulus from v0.9.10 to v0.9.11 moonbeam-foundation/moonbeam#892

Closed

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `childstate_getStorageEntries` RPC #9459

Add `childstate_getStorageEntries` RPC #9459

hirschenberger commented Jul 29, 2021 •

edited

Loading

bkchr Aug 2, 2021

bkchr Aug 2, 2021

hirschenberger Aug 2, 2021

bkchr Aug 2, 2021

bkchr Aug 2, 2021

hirschenberger Aug 2, 2021

bkchr Aug 2, 2021

hirschenberger left a comment

hirschenberger Aug 2, 2021

hirschenberger Aug 2, 2021

hirschenberger commented Aug 27, 2021

hirschenberger commented Sep 1, 2021

bkchr left a comment

hirschenberger commented Sep 9, 2021

bkchr commented Sep 9, 2021

bkchr commented Sep 9, 2021

ghost commented Sep 9, 2021

ghost commented Sep 9, 2021

ghost commented Sep 9, 2021

hirschenberger commented Sep 13, 2021

bkchr commented Sep 13, 2021

ghost commented Sep 13, 2021

Add childstate_getStorageEntries RPC #9459

Add childstate_getStorageEntries RPC #9459

Conversation

hirschenberger commented Jul 29, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hirschenberger left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hirschenberger commented Aug 27, 2021

hirschenberger commented Sep 1, 2021

bkchr left a comment

Choose a reason for hiding this comment

hirschenberger commented Sep 9, 2021

bkchr commented Sep 9, 2021

bkchr commented Sep 9, 2021

ghost commented Sep 9, 2021

ghost commented Sep 9, 2021

ghost commented Sep 9, 2021

hirschenberger commented Sep 13, 2021

bkchr commented Sep 13, 2021

ghost commented Sep 13, 2021

Add `childstate_getStorageEntries` RPC #9459

Add `childstate_getStorageEntries` RPC #9459

hirschenberger commented Jul 29, 2021 •

edited

Loading