Companion pr for Substrate #3860 #743

bkchr · 2020-01-08T15:54:08Z

This is build on top of: #665

So, we need to merge this first.

Sorry for the weird and long commit history, these pr evolved over quite some time.

This also changes the encoding of the `ValidationResult` return value to match the default encoding used in Substrate.

* Bump version * Update Cargo lock and bump runtime version * Remove balance transfer disabler.

* Tweak some Kusama params - Council elections daily - No treasury burn - Bonding/slash defer periods of 7 days * Bump runtime * Bump version

* Make compat with exit-future updates * Update exit-future entirely * Tidy * Bump Substrate

* Bump Substrate, add Identity module * Bump Substrate again

* Make availability-store compile for WASM * Use --manifest-path instead * Make validation work on wasm! * Switch to Spawn trait * Migrate validation to std futures * Migrate network to std futures * Final changes to validation * Tidy up network * Tidy up validation * Switch branch * Migrate service * Get polkadot to compile via wasm! * Add browser-demo * Add initial browser file * Add browser-demo * Tidy * Temp switch back to substrate/master * tidy * Fix wasm build * Re-add release flag * Switch to polkadot-master * Revert cli tokio version to avoid libp2p panic * Update tokio version * Fix availability store tests * Fix validation tests * Remove futures01 from availability-store * Fix network tests * Small changes * Fix collator * Fix typo * Revert removal of tokio_executor that causes tokio version mismatch panic * Fix adder test parachain * Revert "Revert removal of tokio_executor that causes tokio version mismatch panic" This reverts commit cfeb50c. * Update availability-store/src/worker.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update network/src/lib.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update network/src/lib.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Box pin changes * Asyncify network functions * Clean up browser validation worker error * Fix av store test * Nits * Fix validation test * Switch favicon * Fix validation test again * Revert "Asyncify network functions" This reverts commit f20ae65. * Add async blocks back in

…rsion mismatch panic"" (#685) This reverts commit 938f411.

* Fixes a flaky test * Renames a var * Do not unit the errors in tests

* update to latest renames * Bump Substrate * Bump substrate

* Make availability-store compile for WASM * Use --manifest-path instead * Make validation work on wasm! * Switch to Spawn trait * Migrate validation to std futures * Migrate network to std futures * Final changes to validation * Tidy up network * Tidy up validation * Switch branch * Migrate service * Get polkadot to compile via wasm! * Add browser-demo * Add initial browser file * Add browser-demo * Tidy * Temp switch back to substrate/master * tidy * Fix wasm build * Re-add release flag * Add the /ws bootnode to the chain specs * Copy changes from master * Switch branch * Switch libp2p and add wasm-timer * Switch back libp2p and add rand * Fix bootnodes PeerIds * use browser indexdb * Reduce changeset

* Add matrix release alert script and gitlab job * Update .gitlab-ci.yml Co-Authored-By: Kirill Pimenov <kirill@parity.io>

* Squashed commit of the following: commit e97a171 Author: Ashley <ashley.ruglys@gmail.com> Date: Tue Dec 10 15:06:28 2019 +0100 Rewrite some functions as async commit 970e485 Merge: f98966a 4782840 Author: Ashley <ashley.ruglys@gmail.com> Date: Tue Dec 10 11:19:37 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-futures-update commit f98966a Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 23:40:20 2019 +0100 Add async blocks back in commit 7fa88af Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 23:17:02 2019 +0100 Revert "Asyncify network functions" This reverts commit f20ae65. commit 8241355 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 19:09:55 2019 +0100 Fix validation test again commit 47e002b Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 19:07:43 2019 +0100 Switch favicon commit 0c5c140 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 18:54:10 2019 +0100 Fix validation test commit 8bb6a01 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 18:53:54 2019 +0100 Nits commit 33410f3 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 18:43:09 2019 +0100 Fix av store test commit f0c517e Merge: 938f411 60e7211 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 18:21:39 2019 +0100 Merge branch 'ashley-futures-updates' into ashley-futures-update commit 60e7211 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 18:19:40 2019 +0100 Clean up browser validation worker error commit f20ae65 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 18:16:40 2019 +0100 Asyncify network functions commit b22758d Merge: 2e8b05e ca8d5c5 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 17:47:26 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-futures-updates commit 2e8b05e Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 17:45:52 2019 +0100 Box pin changes commit 08bfdf7 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 17:15:38 2019 +0100 Update network/src/lib.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> commit d8be456 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 17:15:32 2019 +0100 Update network/src/lib.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> commit ec73672 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 17:14:36 2019 +0100 Update availability-store/src/worker.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> commit 938f411 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 17:05:05 2019 +0100 Revert "Revert removal of tokio_executor that causes tokio version mismatch panic" This reverts commit cfeb50c. commit f92f580 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 15:47:35 2019 +0100 Fix adder test parachain commit cfeb50c Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 15:31:36 2019 +0100 Revert removal of tokio_executor that causes tokio version mismatch panic commit 5bcb83a Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 15:17:55 2019 +0100 Fix typo commit fc02b1d Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 15:02:50 2019 +0100 Fix collator commit 6c4ff5b Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 14:35:37 2019 +0100 Small changes commit e1338cb Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 14:24:42 2019 +0100 Fix network tests commit 4e458f7 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 12:25:26 2019 +0100 Remove futures01 from availability-store commit 5729f6c Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 12:22:33 2019 +0100 Fix validation tests commit a820612 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 12:01:48 2019 +0100 Fix availability store tests commit 112344f Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 11:36:03 2019 +0100 Update tokio version commit d2de6d8 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 11:33:25 2019 +0100 Revert cli tokio version to avoid libp2p panic commit 0c5f24e Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 9 11:27:13 2019 +0100 Switch to polkadot-master commit 2e2311e Author: Ashley <ashley.ruglys@gmail.com> Date: Fri Dec 6 15:07:21 2019 +0100 Re-add release flag commit 6adc1b6 Merge: 9767f83 5e9542c Author: Ashley <ashley.ruglys@gmail.com> Date: Fri Dec 6 13:36:35 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm commit 9767f83 Merge: c528dc6 84ece42 Author: Ashley <ashley.ruglys@gmail.com> Date: Wed Dec 4 17:11:39 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm commit c528dc6 Author: Ashley <ashley.ruglys@gmail.com> Date: Wed Dec 4 17:07:00 2019 +0100 Fix wasm build commit da233a1 Author: Ashley <ashley.ruglys@gmail.com> Date: Wed Dec 4 16:25:49 2019 +0100 tidy commit 832f805 Merge: 4e1da88 78e828d Author: Ashley <ashley.ruglys@gmail.com> Date: Wed Dec 4 15:56:56 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm commit 4e1da88 Author: Ashley <ashley.ruglys@gmail.com> Date: Tue Dec 3 16:47:02 2019 +0100 Temp switch back to substrate/master commit af88a87 Merge: a03a980 abb5111 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 2 19:33:14 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm commit a03a980 Merge: 31a88a9 f7d4826 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 2 13:52:37 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm commit 31a88a9 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 2 13:52:35 2019 +0100 Tidy commit 5b33b7a Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 2 11:55:51 2019 +0100 Add browser-demo commit 868f6e5 Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 2 10:51:57 2019 +0100 Add initial browser file commit e5e399c Author: Ashley <ashley.ruglys@gmail.com> Date: Mon Dec 2 10:45:02 2019 +0100 Add browser-demo commit 408288b Author: Ashley <ashley.ruglys@gmail.com> Date: Sun Dec 1 19:28:33 2019 +0100 Get polkadot to compile via wasm! commit 04ffe72 Author: Ashley <ashley.ruglys@gmail.com> Date: Sun Dec 1 19:28:16 2019 +0100 Migrate service commit 119f082 Merge: 93fb642 5422684 Author: Ashley <ashley.ruglys@gmail.com> Date: Sun Dec 1 17:43:49 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm commit 93fb642 Author: Ashley <ashley.ruglys@gmail.com> Date: Sun Dec 1 12:21:25 2019 +0100 Switch branch commit 0c4fe83 Author: Ashley <ashley.ruglys@gmail.com> Date: Sat Nov 30 11:45:59 2019 +0100 Tidy up validation commit 7356325 Author: Ashley <ashley.ruglys@gmail.com> Date: Sat Nov 30 11:39:09 2019 +0100 Tidy up network commit 1c9cf04 Author: Ashley <ashley.ruglys@gmail.com> Date: Sat Nov 30 01:16:35 2019 +0100 Final changes to validation commit 322cca5 Author: Ashley <ashley.ruglys@gmail.com> Date: Sat Nov 30 00:31:55 2019 +0100 Migrate network to std futures commit 96f1a99 Author: Ashley <ashley.ruglys@gmail.com> Date: Fri Nov 29 23:31:04 2019 +0100 Migrate validation to std futures commit aaf5e55 Author: Ashley <ashley.ruglys@gmail.com> Date: Fri Nov 29 17:10:11 2019 +0100 Switch to Spawn trait commit 2ab282f Merge: cceb6b7 5598ed9 Author: Ashley <ashley.ruglys@gmail.com> Date: Fri Nov 29 16:31:24 2019 +0100 Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm commit cceb6b7 Author: Ashley <ashley.ruglys@gmail.com> Date: Fri Nov 29 15:47:14 2019 +0100 Make validation work on wasm! commit b45a95c Merge: 3773d5c db7eaa6 Author: Ashley <ashley.ruglys@gmail.com> Date: Fri Nov 29 13:57:23 2019 +0100 Merge remote-tracking branch 'tomaka/wasm-start' into HEAD commit db7eaa6 Merge: 6f97dbb 2ab32da Author: Pierre Krieger <pierre.krieger1708@gmail.com> Date: Thu Nov 28 13:58:15 2019 +0100 Merge branch 'master' into wasm-start commit 6f97dbb Author: Pierre Krieger <pierre.krieger1708@gmail.com> Date: Thu Nov 28 12:47:45 2019 +0100 Use --manifest-path instead commit 20104e9 Author: Pierre Krieger <pierre.krieger1708@gmail.com> Date: Thu Nov 28 10:44:51 2019 +0100 Make availability-store compile for WASM * Fix build * Fix futures blocking panic in validators (again) * Deindent

* Propagate Substrate#4284 to Polkadot * Fix tests * Fixes * Use hash part of fund id as child unique id. * Add comma * Switch branch * run cargo update * Update polkadot-master only * Fix collator

* Increase the minimum treasury bond to reduce silly proposals * Bump substrate * Bump version

* Update to latest Substrate master * Fix tests

* Introduce an event for when transaction fees are paid * Fix Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Updates, but won't build. * Bump version. * Fix * Fix test

* service: reset grandpa into a future round (not past) * update substrate version * service: create grandpa reset round variable * service: fine grained grandpa reset on startup Co-authored-by: Gavin Wood <github@gavwood.com>

* bump substrate version * bump version to 0.7.13

... parity/tools doesn't have /bin/bash

* Select native runtime based on chain spec * Bumped substrate

* Fix up Kusama balance constants * Bump versions * Fix for the --dev option

* Tweak Polkadot constants. * Bump and remove warning * Bump impl version * Bump Substrate * Bump Substrate again

gavofyork · 2020-01-10T07:49:41Z

Looks fine, but need to replace bkchr-propose-with-proof to polkadot-master and reslove.

* Companion PR for Substrate#4394 (#723) * service/src/lib.rs: Register network event stream for authority disc Previously one would create a sender and receiver channel pair, pass the sender to the build_network_future through the service builder and funnel network events returned from polling the network service into the sender to be consumed by the authority discovery module owning the receiver. With recent changes it is now possible to register an event_stream with the network service directly, thus one does not need to make the detour through the build_network_future. This commit is an adjusted clone of one targeting the Substrate repository. * service/src/lib.rs: Fix futures::stream imports * [TMP] *: Replace polkadot-upstream with feature branch * Switch branch * Small change * Companion PR to substrate#4542 * Revert "Merge remote-tracking branch 'tomaka/companion-4542' into ashley-browser-utils" This reverts commit 17f00af, reversing changes made to 928cbb9. * ashley-browser-utils -> ashley-browser-utils-polkadot * Switch branches back Co-authored-by: Max Inden <mail@max-inden.de> Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> * Companion PR to substrate#4542 (#732) * Companion PR for Substrate#4585 Co-authored-by: Ashley <ashley.ruglys@gmail.com> Co-authored-by: Max Inden <mail@max-inden.de> Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>

tomusdrw

lgtm, few minor nitpicks and the branch rename is required.

tomusdrw · 2020-01-10T10:55:01Z

cli/src/lib.rs

+	// Rust bug: https://github.com/rust-lang/rust/issues/43580
+	R: ConstructRuntimeApi<
+		Block,
+		sc_client::Client<


We could introduce a typedef for Client to simplify the bounds here a bit

I'm with you and I would have used it, but it does not work here. Rustc is broken and fails to resolve the bounds with a typedef...

tomusdrw · 2020-01-10T10:57:42Z

service/src/lib.rs

+	// Rust bug: https://github.com/rust-lang/rust/issues/43580
+	Runtime: sp_api::ConstructRuntimeApi<
+		Block,
+		Client<


type ConcreteClient<_> = would be useful here as well

Same as above.

tomusdrw · 2020-01-10T10:58:33Z

validation/src/lib.rs

 {
 	type Error = Error;
-	type Create = Pin<Box<dyn Future<Output = Result<Block, Error>> + Send>>;
+	type Transaction = sp_api::TransactionFor<C, Block>;
+	type Proposal = Pin<Box<dyn Future<Output = Result<Proposal<Block, sp_api::TransactionFor<C, Block>>, Error>> + Send>>;


Line seems long, worth to break it for readabiltiy as well.

tomusdrw · 2020-01-10T10:59:55Z

validation/src/lib.rs

-pub struct Proposer<C: Send + Sync, TxPool: TransactionPool> where
-	C: ProvideRuntimeApi + HeaderBackend<Block>,
-{
+pub struct Proposer<C, TxPool, B> {


I'd replace C and B with Client and Backend, cause it can easily get out of hand soon if we add any more.
I've also thought that we don't want to expose Backend directly any more, no?

This reverts commit 6459a19.

bkchr and others added 30 commits December 5, 2019 10:44

Make use of runtime_interface for parachain externalities

fcc7f6e

This also changes the encoding of the `ValidationResult` return value to match the default encoding used in Substrate.

Bump versions (#655)

e28e3e6

* Bump version * Update Cargo lock and bump runtime version * Remove balance transfer disabler.

Fix checking that get_heads exists (#657)

d0d7a9d

Tweak some Kusama params (#659)

7d40ec7

* Tweak some Kusama params - Council elections daily - No treasury burn - Bonding/slash defer periods of 7 days * Bump runtime * Bump version

Update Substrate (#661)

56e5bca

* Make compat with exit-future updates * Update exit-future entirely * Tidy * Bump Substrate

Update branch

dd332e9

Add back sudo and fixing compilation

7d7c984

Increase nick deposit (10 KSM) and require 2 councillors to slash (#663)

4860340

Bump Substrate (#664)

abc950c

Replace Substrate mentions in license headers with Polkadot (#674)

ccfc8a1

Fix typo in comment (#671)

e744087

Bump Substrate, add Identity module (#676)

fa2f5b6

* Bump Substrate, add Identity module * Bump Substrate again

Fix typo in comment (#672)

e737405

Add the /ws bootnode to the chain specs (#681)

a13a613

Revert "Revert "Revert removal of tokio_executor that causes tokio ve…

5d53fc8

…rsion mismatch panic"" (#685) This reverts commit 938f411.

Fix bootnodes PeerIds (#683)

e1663a1

Fixes a flaky test (#675)

a89528c

* Fixes a flaky test * Renames a var * Do not unit the errors in tests

Bump Substrate (#686)

aa435c5

* update to latest renames * Bump Substrate * Bump substrate

Add matrix release alert script and gitlab job (#688)

4425ba4

* Add matrix release alert script and gitlab job * Update .gitlab-ci.yml Co-Authored-By: Kirill Pimenov <kirill@parity.io>

Supercede 'Propagate Substrate#4284 to Polkadot' (#695)

5406d9e

* Propagate Substrate#4284 to Polkadot * Fix tests * Fixes * Use hash part of fund id as child unique id. * Add comma * Switch branch * run cargo update * Update polkadot-master only * Fix collator

More update

9e41806

Fix compilation

6171016

Some stylistic cleanups

6060a3d

Increase the minimum treasury bond to reduce silly proposals (#701)

9de7269

* Increase the minimum treasury bond to reduce silly proposals * Bump substrate * Bump version

Update to latest Substrate master (#703)

97262aa

* Update to latest Substrate master * Fix tests

Introduce an event for when transaction fees are paid (#702)

184e21b

* Introduce an event for when transaction fees are paid * Fix Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Bump to latest Substrate (#706)

b19a4e1

* Updates, but won't build. * Bump version. * Fix * Fix test

andresilva and others added 13 commits January 8, 2020 13:46

Bump version (#729)

5308d49

polkadot v0.7.13 (#730)

91fa237

* bump substrate version * bump version to 0.7.13

Fix pending-release alert script (#734)

b626875

... parity/tools doesn't have /bin/bash

Select native runtime based on chain spec (#733)

c3c5e72

* Select native runtime based on chain spec * Bumped substrate

Add sudo module to polkadot-runtime (#735)

5621523

Bump versions (#736)

bcaa971

* Fix up Kusama balance constants * Bump versions * Fix for the --dev option

remove kusama fixes (#738)

9d4bdec

Tweak Polkadot constants & bump Substrate (#739)

46df15e

* Tweak Polkadot constants. * Bump and remove warning * Bump impl version * Bump Substrate * Bump Substrate again

Some fixes

fdd6577

Fix compilation

616b8d1

Merge remote-tracking branch 'origin/master' into bkchr-proposer-stuff

e9504a0

Remove TODO

76a4af0

bkchr added the A0-please_review Pull request needs code review. label Jan 8, 2020

bkchr added 3 commits January 8, 2020 21:12

Merge remote-tracking branch 'origin/master' into bkchr-proposer-stuff

7653c3d

Remove old dir

8bc955b

Merge remote-tracking branch 'origin/master' into bkchr-proposer-stuff

fe8eb3c

gavofyork approved these changes Jan 10, 2020

View reviewed changes

bkchr and others added 3 commits January 10, 2020 10:52

Merge remote-tracking branch 'origin/master' into bkchr-proposer-stuff

9f0303e

Reset branch and make it compile

35d638d

bkchr mentioned this pull request Jan 10, 2020

Companion PR for Substrate #4200 #750

Closed

tomusdrw approved these changes Jan 10, 2020

View reviewed changes

bkchr and others added 2 commits January 10, 2020 12:21

Review feedback

b08719e

Make the bounds a bit cleaner.

78ed588

bkchr merged commit 6459a19 into master Jan 10, 2020

bkchr deleted the bkchr-proposer-stuff branch January 10, 2020 12:09

andresilva added a commit that referenced this pull request Jan 16, 2020

Revert "Companion pr for Substrate #3860 (#743)"

57cfa2b

This reverts commit 6459a19.

tomusdrw pushed a commit that referenced this pull request Mar 26, 2021

updating paths to binaries (#743)

af441e4

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Companion pr for Substrate #3860 #743

Companion pr for Substrate #3860 #743

bkchr commented Jan 8, 2020

gavofyork commented Jan 10, 2020

tomusdrw left a comment

tomusdrw Jan 10, 2020

bkchr Jan 10, 2020

tomusdrw Jan 10, 2020

bkchr Jan 10, 2020

tomusdrw Jan 10, 2020

tomusdrw Jan 10, 2020

Companion pr for Substrate #3860 #743

Companion pr for Substrate #3860 #743

Conversation

bkchr commented Jan 8, 2020

gavofyork commented Jan 10, 2020

tomusdrw left a comment

Choose a reason for hiding this comment

tomusdrw Jan 10, 2020

Choose a reason for hiding this comment

bkchr Jan 10, 2020

Choose a reason for hiding this comment

tomusdrw Jan 10, 2020

Choose a reason for hiding this comment

bkchr Jan 10, 2020

Choose a reason for hiding this comment

tomusdrw Jan 10, 2020

Choose a reason for hiding this comment

tomusdrw Jan 10, 2020

Choose a reason for hiding this comment