Merge remote-tracking branch 'upstream/master' into fix-ed25519-dalek
Showing
- .maintain/gitlab/check_polkadot_companion_status.sh 3 additions, 1 deletion.maintain/gitlab/check_polkadot_companion_status.sh
- Cargo.lock 12 additions, 3 deletionsCargo.lock
- bin/node-template/runtime/src/lib.rs 1 addition, 1 deletionbin/node-template/runtime/src/lib.rs
- bin/node/bench/Cargo.toml 2 additions, 1 deletionbin/node/bench/Cargo.toml
- bin/node/bench/src/main.rs 3 additions, 0 deletionsbin/node/bench/src/main.rs
- bin/node/bench/src/txpool.rs 106 additions, 0 deletionsbin/node/bench/src/txpool.rs
- bin/node/cli/src/service.rs 1 addition, 3 deletionsbin/node/cli/src/service.rs
- bin/node/cli/tests/version.rs 1 addition, 1 deletionbin/node/cli/tests/version.rs
- bin/node/runtime/Cargo.toml 1 addition, 0 deletionsbin/node/runtime/Cargo.toml
- bin/node/runtime/src/lib.rs 7 additions, 11 deletionsbin/node/runtime/src/lib.rs
- bin/node/testing/src/bench.rs 3 additions, 1 deletionbin/node/testing/src/bench.rs
- bin/node/testing/src/keyring.rs 0 additions, 1 deletionbin/node/testing/src/keyring.rs
- bin/utils/subkey/src/main.rs 0 additions, 2 deletionsbin/utils/subkey/src/main.rs
- client/finality-grandpa/src/environment.rs 5 additions, 3 deletionsclient/finality-grandpa/src/environment.rs
- client/finality-grandpa/src/tests.rs 1 addition, 1 deletionclient/finality-grandpa/src/tests.rs
- client/service/Cargo.toml 1 addition, 1 deletionclient/service/Cargo.toml
- client/transaction-pool/graph/Cargo.toml 1 addition, 0 deletionsclient/transaction-pool/graph/Cargo.toml
- client/transaction-pool/graph/src/pool.rs 2 additions, 2 deletionsclient/transaction-pool/graph/src/pool.rs
- client/transaction-pool/graph/src/validated_pool.rs 19 additions, 4 deletionsclient/transaction-pool/graph/src/validated_pool.rs
- frame/grandpa/Cargo.toml 6 additions, 0 deletionsframe/grandpa/Cargo.toml
Please register or sign in to comment