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

Recover transaction pool on light client #3833

Merged
merged 48 commits into from
Nov 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
34ea521
recover tx pool on light client
svyatonik Oct 14, 2019
4b6b1c9
Merge branch 'master' into light_tx_pool3
svyatonik Oct 16, 2019
5b207b9
revert local tests fix
svyatonik Oct 16, 2019
28b0388
removed import renamings
svyatonik Oct 22, 2019
736cabe
futures03::Future -> std::future::Future
svyatonik Oct 22, 2019
2d485e7
Update core/transaction-pool/graph/src/error.rs
svyatonik Oct 22, 2019
eecb819
replace remove_from_ready with remove_invalid
svyatonik Oct 22, 2019
b5cdc4e
avoid excess hashing
svyatonik Oct 22, 2019
184420b
Merge branch 'light_tx_pool3' of https://github.com/paritytech/substr…
svyatonik Oct 22, 2019
bf9d91b
debug -> warn
svyatonik Oct 22, 2019
e9f0d33
TransactionPool + BasicTransactionPool
svyatonik Oct 23, 2019
fc5406e
pause future tx reject when resubmitting
svyatonik Oct 23, 2019
a349d20
bump impl_version to make CI happy
svyatonik Oct 23, 2019
7e6712a
Merge branch 'master' into light_tx_pool3
svyatonik Oct 23, 2019
30c2a05
and revert back local test fixes
svyatonik Oct 23, 2019
b1340ab
alter doc to restart CI
svyatonik Oct 23, 2019
b283fc3
Transaction::clone() -> Transaction::duplicate()
svyatonik Oct 24, 2019
92c4eea
transactions -> updated_tranasctions
svyatonik Oct 24, 2019
1faa209
remove explicit consensus-common ref
svyatonik Oct 24, 2019
a8318ba
::std:: -> std::
svyatonik Oct 24, 2019
3a220bf
manual set/unset flag -> calling clusore with given flag value
svyatonik Oct 24, 2019
1c2f75e
removed comments
svyatonik Oct 24, 2019
f645a41
removed force argument
svyatonik Oct 24, 2019
441a771
BestIterator -> Box<Iterator>
svyatonik Oct 24, 2019
8d67a59
separate crate for TxPool + Maintainer trait
svyatonik Oct 25, 2019
3db29ec
long line fix
svyatonik Oct 25, 2019
a3e4662
Merge branch 'master' into light_tx_pool3
svyatonik Oct 25, 2019
b21f3ca
Merge branch 'master' into light_tx_pool3
svyatonik Nov 12, 2019
0edc893
pos-merge fix
svyatonik Nov 12, 2019
3a26f36
fix benches compilation
svyatonik Nov 12, 2019
50e99f2
Rename txpoolapi to txpool_api
tomusdrw Nov 22, 2019
a014b9f
Merge branch 'master' into light_tx_pool3
tomusdrw Nov 22, 2019
d7e67a5
Clean up.
tomusdrw Nov 22, 2019
deaedd2
Finalize merge.
tomusdrw Nov 23, 2019
6660f98
Merge branch 'master' into light_tx_pool3
svyatonik Nov 25, 2019
b6b4473
post-merge fix
svyatonik Nov 25, 2019
d36edbc
Move transaction pool api to primitives directly.
tomusdrw Nov 25, 2019
53b86fc
Consistent naming for txpool-runtime-api
tomusdrw Nov 25, 2019
2ce206b
Warn about missing docs.
tomusdrw Nov 25, 2019
446647d
Move abstraction for offchain calls to tx-pool-api.
tomusdrw Nov 25, 2019
1bd6c28
Merge RPC instantiation.
tomusdrw Nov 25, 2019
6e5d0cd
Merge branch 'master' into light_tx_pool3
tomusdrw Nov 26, 2019
f141a45
Update cargo.lock
tomusdrw Nov 26, 2019
416f609
Merge branch 'master' into light_tx_pool3
tomusdrw Nov 27, 2019
aa37301
Post merge fixes.
tomusdrw Nov 27, 2019
564d1f0
Avoid depending on client.
tomusdrw Nov 27, 2019
159a3a4
Merge branch 'master' into light_tx_pool3
gavofyork Nov 27, 2019
a90a7cd
Fix build
gavofyork Nov 27, 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
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
**/*.rs.bk
*.swp
.wasm-binaries
polkadot/runtime/wasm/target/
core/executor/wasm/target/
core/test-runtime/wasm/target/
pwasm-alloc/target/
pwasm-libc/target/
pwasm-alloc/Cargo.lock
pwasm-libc/Cargo.lock
node/runtime/wasm/target/
bin/node/runtime/wasm/target/
**/._*
**/.criterion/
.vscode
Expand Down
21 changes: 0 additions & 21 deletions .maintain/common.sh

This file was deleted.

29 changes: 0 additions & 29 deletions .maintain/update.sh

This file was deleted.

75 changes: 58 additions & 17 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ members = [
"primitives/sr-version",
"primitives/state-machine",
"primitives/timestamp",
"primitives/transaction-pool",
"primitives/transaction-pool/runtime-api",
"primitives/trie",
"primitives/wasm-interface",
Expand Down
3 changes: 2 additions & 1 deletion bin/node-template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core"
substrate-executor = { path = "../../client/executor" }
substrate-service = { path = "../../client/service" }
inherents = { package = "substrate-inherents", path = "../../primitives/inherents" }
transaction-pool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" }
txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" }
txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" }
network = { package = "substrate-network", path = "../../client/network" }
aura = { package = "substrate-consensus-aura", path = "../../client/consensus/aura" }
aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../../primitives/consensus/aura" }
Expand Down
4 changes: 2 additions & 2 deletions bin/node-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ support = { package = "frame-support", path = "../../../frame/support", default-
system = { package = "frame-system", path = "../../../frame/system", default-features = false }
timestamp = { package = "pallet-timestamp", path = "../../../frame/timestamp", default-features = false }
transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment", default-features = false }
tx-pool-api = { package = "substrate-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
txpool-runtime-api = { package = "sp-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
version = { package = "sr-version", path = "../../../primitives/sr-version", default-features = false }

[build-dependencies]
Expand Down Expand Up @@ -62,6 +62,6 @@ std = [
"system/std",
"timestamp/std",
"transaction-payment/std",
"tx-pool-api/std",
"txpool-runtime-api/std",
"version/std",
]
2 changes: 1 addition & 1 deletion bin/node-template/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ impl_runtime_apis! {
}
}

impl tx_pool_api::TaggedTransactionQueue<Block> for Runtime {
impl txpool_runtime_api::TaggedTransactionQueue<Block> for Runtime {
fn validate_transaction(tx: <Block as BlockT>::Extrinsic) -> TransactionValidity {
Executive::validate_transaction(tx)
}
Expand Down
Loading