Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Prepare for asynchronous transaction validation in tx pool #3650

Merged
svyatonik merged 14 commits into from
Oct 1, 2019
Merged

Prepare for asynchronous transaction validation in tx pool #3650

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1b74df1
async txpool API
svyatonik Sep 19, 2019
d37467d
Update core/rpc/src/author/mod.rs
svyatonik Sep 19, 2019
7981291
Update core/transaction-pool/graph/src/pool.rs
svyatonik Sep 19, 2019
760c7cf
Pool -> Pool + ValidatedPool
svyatonik Sep 24, 2019
0d4f842
removed lost block_on when importing xt from network
svyatonik Sep 24, 2019
8449a17
fix grumbles
svyatonik Sep 24, 2019
c819eac
Merge branch 'master' into async_tx_pool
svyatonik Sep 24, 2019
c88b42b
alias for future::Executor in rpc
svyatonik Sep 30, 2019
6044471
removed executor from Author RPCs
svyatonik Sep 30, 2019
00e602b
Pool + SharedValidatedPool -> Pool
svyatonik Sep 30, 2019
8864b76
Merge branch 'master' into async_tx_pool
svyatonik Sep 30, 2019
b795e3c
fix compilation after merge
svyatonik Oct 1, 2019
c63f9b2
another fix
svyatonik Oct 1, 2019
eeb4717
another fix
svyatonik Oct 1, 2019
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
Prev Previous commit
Next Next commit
Merge branch 'master' into async_tx_pool
  • Loading branch information
@svyatonik
svyatonik committed Sep 24, 2019
commit c819eac36cd19b6b5d8e70a20614adbce2791bf4
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion core/service/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,8 @@ pub(crate) fn maintain_transaction_pool<Api, Backend, Block, Executor, PoolApi>(
let client_copy = client.clone();
let retracted_transactions = retracted.to_vec().into_iter()
.filter_map(move |hash| client_copy.block(&BlockId::hash(hash)).ok().unwrap_or(None))
.flat_map(|block| block.block.deconstruct().1.into_iter());
.flat_map(|block| block.block.deconstruct().1.into_iter())
.filter(|tx| tx.is_signed().unwrap_or(false));
let resubmit_future = transaction_pool
.submit_at(id, retracted_transactions, true)
.then(|resubmit_result| ready(match resubmit_result {
Expand Down
2 changes: 1 addition & 1 deletion core/service/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
tempdir = "0.3"
tokio = "0.1.7"
futures = "0.1"
futures03 = { package = "futures-preview", version = "=0.3.0-alpha.17", features = ["compat"] }
futures03 = { package = "futures-preview", version = "=0.3.0-alpha.18", features = ["compat"] }
log = "0.4"
env_logger = "0.6"
fdlimit = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion core/transaction-pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
derive_more = "0.14.0"
futures-preview = "=0.3.0-alpha.17"
futures-preview = "=0.3.0-alpha.18"
log = "0.4"
codec = { package = "parity-scale-codec", version = "1.0.0" }
parking_lot = "0.9.0"
Expand Down
2 changes: 1 addition & 1 deletion node/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ transaction_pool = { package = "substrate-transaction-pool", path = "../../core/
node-testing = { path = "../testing" }
node-runtime = { path = "../runtime" }
env_logger = "0.6"
futures03 = { package = "futures-preview", version = "=0.3.0-alpha.17" }
futures03 = { package = "futures-preview", version = "=0.3.0-alpha.18" }
You are viewing a condensed version of this merge commit. You can view the full changes here.