pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 05:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Async keystore + Authority-Discovery async/await (#7000)

Browse Source 
* Asyncify sign_with

* Asyncify generate/get keys

* Complete BareCryptoStore asyncification

* Cleanup

* Rebase

* Add Proxy

* Inject keystore proxy into extensions

* Implement some methods

* Await on send

* Cleanup

* Send result over the oneshot channel sender

* Process one future at a time

* Fix cargo stuff

* Asyncify sr25519_vrf_sign

* Cherry-pick and fix changes

* Introduce SyncCryptoStore

* SQUASH ME WITH THE first commit

* Implement into SyncCryptoStore

* Implement BareCryptoStore for KeystoreProxyAdapter

* authority-discovery

* AURA

* BABE

* finality-grandpa

* offchain-workers

* benchmarking-cli

* sp_io

* test-utils

* application-crypto

* Extensions and RPC

* Client Service

* bin

* Update cargo.lock

* Implement BareCryptoStore on proxy directly

* Simplify proxy setup

* Fix authority-discover

* Pass async keystore to authority-discovery

* Fix tests

* Use async keystore in authority-discovery

* Rename BareCryptoStore to CryptoStore

* WIP

* Remote mutable borrow in CryptoStore trait

* Implement Keystore with backends

* Remove Proxy implementation

* Fix service builder and keystore user-crates

* Fix tests

* Rework authority-discovery after refactoring

* futures::select!

* Fix multiple mut borrows in authority-discovery

* Merge fixes

* Require sync

* Restore Cargo.lock

* PR feedback - round 1

* Remove Keystore and use LocalKeystore directly

Also renamed KeystoreParams to KeystoreContainer

* Join

* Remove sync requirement

* Fix keystore tests

* Fix tests

* client/authority-discovery: Remove event stream dynamic dispatching

With authority-discovery moving from a poll based future to an `async`
future Rust has difficulties propagating the `Sync` trade through the
generated state machine.

Instead of using dynamic dispatching, use a trait parameter to specify
the DHT event stream.

* Make it compile

* Fix submit_transaction

* Fix block_on issue

* Use await in async context

* Fix manual seal keystore

* Fix authoring_blocks test

* fix aura authoring_blocks

* Try to fix tests for auth-discovery

* client/authority-discovery: Fix lookup_throttling test

* client/authority-discovery: Fix triggers_dht_get_query test

* Fix epoch_authorship_works

* client/authority-discovery: Remove timing assumption in unit test

* client/authority-discovery: Revert changes to termination test

* PR feedback

* Remove deadcode and mark test code

* Fix test_sync

* Use the correct keyring type

* Return when from_service stream is closed

* Convert SyncCryptoStore to a trait

* Fix line width

* Fix line width - take 2

* Remove unused import

* Fix keystore instantiation

* PR feedback

* Remove KeystoreContainer

* Revert "Remove KeystoreContainer"

This reverts commit ea4a37c7d74f9772b93d974e05e4498af6192730.

* Take a ref of keystore

* Move keystore to dev-dependencies

* Address some PR feedback

* Missed one

* Pass keystore reference - take 2

* client/finality-grandpa: Use `Arc<dyn CryptoStore>` instead of SyncXXX

Instead of using `SyncCryptoStorePtr` within `client/finality-grandpa`,
which is a type alias for `Arc<dyn SyncCryptoStore>`, use `Arc<dyn
CryptoStore>`. Benefits are:

1. No additional mental overhead of a `SyncCryptoStorePtr`.

2. Ability for new code to use the asynchronous methods of `CryptoStore`
instead of the synchronous `SyncCryptoStore` methods within
`client/finality-granpa` without the need for larger refactorings.

Note: This commit uses `Arc<dyn CryptoStore>` instead of
`CryptoStorePtr`, as I find the type signature more descriptive. This is
subjective and in no way required.

* Remove SyncCryptoStorePtr

* Remove KeystoreContainer & SyncCryptoStorePtr

* PR feedback

* *: Use CryptoStorePtr whereever possible

* *: Define SyncCryptoStore as a pure extension trait of CryptoStore

* Follow up to SyncCryptoStore extension trait

* Adjust docs for SyncCryptoStore as Ben suggested

* Cleanup unnecessary requirements

* sp-keystore

* Use async_std::task::block_on in keystore

* Fix block_on std requirement

* Update primitives/keystore/src/lib.rs

Co-authored-by: Max Inden <mail@max-inden.de>

* Fix wasm build

* Remove unused var

* Fix wasm compilation - take 2

* Revert async-std in keystore

* Fix indent

* Fix version and copyright

* Cleanup feature = "std"

* Auth Discovery: Ignore if from_service is cloed

* Max's suggestion

* Revert async-std usage for block_on

* Address PR feedback

* Fix example offchain worker build

* Address PR feedback

* Update Cargo.lock

* Move unused methods to test helper functions

* Restore accidentally deleted cargo.lock files

* Fix unused imports

Co-authored-by: Max Inden <mail@max-inden.de>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
Rakan Alhneiti
2020-10-08 22:56:35 +02:00
committed by GitHub
parent db8a0cafa9
commit 3aa4bfacfc
70 changed files with 2394 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/Cargo.lock
Generated
+42 -2
View File
@@ -682,6 +682,7 @@ dependencies = [
"sc-chain-spec",
"sc-keystore",
"sp-core",
"sp-keystore",
"structopt",
]
@@ -1541,6 +1542,7 @@ dependencies = [
"sc-service",
"sp-core",
"sp-externalities",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
"structopt",
@@ -3736,6 +3738,7 @@ dependencies = [
"sp-inherents",
"sp-io",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"sp-timestamp",
"sp-transaction-pool",
@@ -3776,6 +3779,7 @@ dependencies = [
"sp-core",
"sp-externalities",
"sp-io",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
"sp-trie",
@@ -3836,6 +3840,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
"sp-keystore",
"sp-runtime",
"sp-transaction-pool",
"substrate-frame-rpc-system",
@@ -4520,6 +4525,7 @@ dependencies = [
"serde",
"sp-core",
"sp-io",
"sp-keystore",
"sp-runtime",
"sp-std",
]
@@ -6251,6 +6257,7 @@ dependencies = [
"sp-authority-discovery",
"sp-blockchain",
"sp-core",
"sp-keystore",
"sp-runtime",
"sp-tracing",
"substrate-prometheus-endpoint",
@@ -6363,6 +6370,7 @@ dependencies = [
"sp-core",
"sp-io",
"sp-keyring",
"sp-keystore",
"sp-panic-handler",
"sp-runtime",
"sp-state-machine",
@@ -6403,6 +6411,7 @@ dependencies = [
"sp-externalities",
"sp-inherents",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
"sp-std",
@@ -6489,6 +6498,7 @@ dependencies = [
"sp-inherents",
"sp-io",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"sp-timestamp",
"sp-tracing",
@@ -6541,6 +6551,7 @@ dependencies = [
"sp-inherents",
"sp-io",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"sp-timestamp",
"sp-tracing",
@@ -6574,6 +6585,7 @@ dependencies = [
"sp-consensus-babe",
"sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"substrate-test-runtime-client",
"tempfile",
@@ -6607,7 +6619,6 @@ dependencies = [
"sc-client-api",
"sc-consensus-babe",
"sc-consensus-epochs",
"sc-keystore",
"sc-transaction-pool",
"serde",
"sp-api",
@@ -6616,6 +6627,7 @@ dependencies = [
"sp-consensus-babe",
"sp-core",
"sp-inherents",
"sp-keystore",
"sp-runtime",
"sp-timestamp",
"sp-transaction-pool",
@@ -6807,6 +6819,7 @@ dependencies = [
"sp-finality-tracker",
"sp-inherents",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
"sp-tracing",
@@ -6868,7 +6881,10 @@ dependencies = [
name = "sc-keystore"
version = "2.0.0"
dependencies = [
"async-trait",
"derive_more",
"futures 0.3.5",
"futures-util",
"hex",
"merlin",
"parking_lot 0.10.2",
@@ -6876,6 +6892,7 @@ dependencies = [
"serde_json",
"sp-application-crypto",
"sp-core",
"sp-keystore",
"subtle 2.2.3",
"tempfile",
]
@@ -7084,6 +7101,7 @@ dependencies = [
"sp-chain-spec",
"sp-core",
"sp-io",
"sp-keystore",
"sp-offchain",
"sp-rpc",
"sp-runtime",
@@ -7200,6 +7218,7 @@ dependencies = [
"sp-finality-grandpa",
"sp-inherents",
"sp-io",
"sp-keystore",
"sp-runtime",
"sp-session",
"sp-state-machine",
@@ -7847,6 +7866,7 @@ dependencies = [
"sp-api",
"sp-application-crypto",
"sp-core",
"sp-keystore",
"sp-runtime",
"substrate-test-runtime-client",
]
@@ -7986,6 +8006,7 @@ dependencies = [
"sp-consensus-vrf",
"sp-core",
"sp-inherents",
"sp-keystore",
"sp-runtime",
"sp-std",
"sp-timestamp",
@@ -8029,7 +8050,6 @@ dependencies = [
"blake2-rfc",
"byteorder 1.3.4",
"criterion",
"derive_more",
"dyn-clonable",
"ed25519-dalek",
"futures 0.3.5",
@@ -8108,6 +8128,7 @@ dependencies = [
"sp-api",
"sp-application-crypto",
"sp-core",
"sp-keystore",
"sp-runtime",
"sp-std",
]
@@ -8144,6 +8165,7 @@ dependencies = [
"parking_lot 0.10.2",
"sp-core",
"sp-externalities",
"sp-keystore",
"sp-runtime-interface",
"sp-state-machine",
"sp-std",
@@ -8164,6 +8186,23 @@ dependencies = [
"strum",
]
[[package]]
name = "sp-keystore"
version = "0.8.0"
dependencies = [
"async-trait",
"derive_more",
"futures 0.3.5",
"merlin",
"parity-scale-codec",
"parking_lot 0.10.2",
"rand 0.7.3",
"rand_chacha 0.2.2",
"schnorrkel",
"sp-core",
"sp-externalities",
]
[[package]]
name = "sp-npos-elections"
version = "2.0.0"
@@ -8752,6 +8791,7 @@ dependencies = [
"sp-consensus",
"sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
]