diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a321729dcbc8..c93461c8806d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,3 +5,6 @@ updates:
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
schedule:
interval: "daily"
+ ignore:
+ - dependency-name: "jsonrpc-*"
+ versions: [">= 16"]
diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000000..61d0fd0228d9
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+# Issues with these labels will never be considered stale
+exemptLabels:
+ - "D9-needsaudit 👮"
+# Label to use when marking an issue as stale
+staleLabel: "A3-stale"
+# we only bother with pull requests
+only: pulls
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+ Hey, is anyone still working on this? Due to the inactivity this issue has
+ been automatically marked as stale. It will be closed if no further activity
+ occurs. Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml
index 7891195d90e2..64bd2d2a98a6 100644
--- a/.github/workflows/build-and-push-docker-image.yml
+++ b/.github/workflows/build-and-push-docker-image.yml
@@ -36,9 +36,9 @@ jobs:
- name: Copy wasm artifact from the image
run: |
container_id=$(docker create ${{ env.IMAGE_ID }})
- artifact_name=node_runtime.compact.${GITHUB_SHA:0:7}.wasm
+ artifact_name=node_runtime.compact.compressed.${GITHUB_SHA:0:7}.wasm
echo ARTIFACT_NAME=$artifact_name >> $GITHUB_ENV
- docker cp $container_id:/home/cere/node-runtime-artifacts/node_runtime.compact.wasm ./$artifact_name
+ docker cp $container_id:/home/cere/node-runtime-artifacts/node_runtime.compact.compressed.wasm ./$artifact_name
- name: Upload wasm artifact
uses: actions/upload-artifact@v3
with:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ffa8a4b977b..9a9f725780da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ variables: &default-vars
ARCH: "x86_64"
CI_IMAGE: "paritytech/ci-linux:production"
# FIXME set to release
- CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.11"
+ CARGO_UNLEASH_INSTALL_PARAMS: "--version 1.0.0-alpha.12"
CARGO_UNLEASH_PKG_DEF: "--skip node node-* pallet-template pallet-example pallet-example-* subkey chain-spec-builder"
default:
@@ -55,9 +55,15 @@ default:
- artifacts/
.kubernetes-env: &kubernetes-env
+ retry:
+ max: 2
+ when:
+ - runner_system_failure
+ - unknown_failure
+ - api_failure
+ interruptible: true
tags:
- kubernetes-parity-build
- interruptible: true
.rust-info-script: &rust-info-script
- rustup show
@@ -97,6 +103,7 @@ default:
- if: $CI_COMMIT_REF_NAME == "master"
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
+ - if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
.test-refs-no-trigger-prs-only: &test-refs-no-trigger-prs-only
rules:
@@ -233,6 +240,14 @@ cargo-deny:
# FIXME: Temorarily allow to fail.
allow_failure: true
+cargo-fmt:
+ stage: test
+ <<: *docker-env
+ <<: *test-refs
+ script:
+ - cargo +nightly fmt --all -- --check
+ allow_failure: true
+
cargo-check-benches:
stage: test
<<: *docker-env
@@ -265,7 +280,7 @@ node-bench-regression-guard:
CI_IMAGE: "paritytech/node-bench-regression-guard:latest"
before_script: [""]
script:
- - 'node-bench-regression-guard --reference artifacts/benches/master-*
+ - 'node-bench-regression-guard --reference artifacts/benches/master-*
--compare-with artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA'
cargo-check-subkey:
@@ -326,14 +341,17 @@ test-linux-stable: &test-linux
unleash-check:
stage: test
<<: *docker-env
- rules:
- - if: $CI_PIPELINE_SOURCE == "pipeline"
- when: never
- - if: $CI_COMMIT_REF_NAME == "master"
- - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
+ <<: *test-refs-no-trigger
script:
- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
+ - cargo unleash de-dev-deps
+ # Reuse build artifacts when running checks (cuts down check time by 3x)
+ # TODO: Implement this optimization in cargo-unleash rather than here
+ - mkdir -p target/unleash
+ - export CARGO_TARGET_DIR=target/unleash
- cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
+ # FIXME: this job must not fail, or unleash-to-crates-io will publish broken stuff
+ allow_failure: true
test-frame-examples-compile-to-wasm:
# into one job
@@ -530,6 +548,7 @@ build-rust-doc:
script:
- RUSTDOCFLAGS="--html-in-header $(pwd)/.maintain/rustdoc-header.html"
time cargo +nightly doc --no-deps --workspace --all-features --verbose
+ - rm -f ./target/doc/.lock
- mv ./target/doc ./crate-docs
- echo "" > ./crate-docs/index.html
- sccache -s
@@ -568,7 +587,7 @@ build-rust-doc:
- buildah push --format=v2s2 "$IMAGE_NAME:latest"
after_script:
- buildah logout "$IMAGE_NAME"
- # pass artifacts to the trigger-simnet job
+ # pass artifacts to the trigger-simnet job
- echo "IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
- IMAGE_TAG="$(cat ./artifacts/$PRODUCT/VERSION)"
- echo "IMAGE_TAG=${IMAGE_TAG}" | tee -a ./artifacts/$PRODUCT/build.env
@@ -642,6 +661,7 @@ publish-s3-doc:
echo "./crate-docs/index.html not present, build:rust:doc:release job not complete";
exit 1
)
+ - ls -lah crate-docs
- aws s3 sync --delete --size-only --only-show-errors
./crate-docs/ s3://${BUCKET}/${PREFIX}/
after_script:
@@ -658,12 +678,14 @@ publish-draft-release:
- ./.maintain/gitlab/publish_draft_release.sh
allow_failure: true
-publish-to-crates-io:
+unleash-to-crates-io:
stage: publish
<<: *docker-env
rules:
- if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
- - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
+ # FIXME: wait until https://github.com/paritytech/cargo-unleash/issues/50 is fixed, also
+ # remove allow_failure: true on the check job
+ # - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
script:
- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
- cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF}
@@ -702,13 +724,13 @@ trigger-simnet:
- if: $CI_COMMIT_REF_NAME == "master"
needs:
- job: publish-docker-substrate
- # `build.env` brings here `$IMAGE_NAME` and `$IMAGE_TAG` (`$VERSION` here,
+ # `build.env` brings here `$IMAGE_NAME` and `$IMAGE_TAG` (`$VERSION` here,
# i.e. `2643-0.8.29-5f689e0a-6b24dc54`).
variables:
TRGR_PROJECT: ${CI_PROJECT_NAME}
TRGR_REF: ${CI_COMMIT_REF_NAME}
- # simnet project ID
+ # Simnet project ID
DWNSTRM_ID: 332
script:
- # API trigger for a simnet job
+ # API trigger for a Simnet job
- .maintain/gitlab/trigger_pipeline.sh --simnet-version=${SIMNET_REF}
diff --git a/.maintain/frame-weight-template.hbs b/.maintain/frame-weight-template.hbs
index 04453d2bfe24..045140d54dff 100644
--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -26,6 +26,7 @@
// {{arg}}
{{/each}}
+#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
@@ -45,8 +46,15 @@ pub trait WeightInfo {
/// Weights for {{pallet}} using the Substrate node and recommended hardware.
pub struct SubstrateWeight(PhantomData);
+{{~#if (eq pallet "frame_system")}}
+impl WeightInfo for SubstrateWeight {
+{{~else}}
impl WeightInfo for SubstrateWeight {
+{{~/if}}
{{~#each benchmarks as |benchmark|}}
+ {{~#each benchmark.comments as |comment|}}
+ // {{comment}}
+ {{~/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
@@ -76,6 +84,9 @@ impl WeightInfo for SubstrateWeight {
// For backwards compatibility and tests
impl WeightInfo for () {
{{~#each benchmarks as |benchmark|}}
+ {{~#each benchmark.comments as |comment|}}
+ // {{comment}}
+ {{~/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
diff --git a/.maintain/gitlab/check_polkadot_companion_build.sh b/.maintain/gitlab/check_polkadot_companion_build.sh
index 89780f082e45..72bfaf715152 100755
--- a/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -88,5 +88,12 @@ fi
# Patch all Substrate crates in Polkadot
diener patch --crates-to-patch ../ --substrate --path Cargo.toml
+# We need to update specifically our patched Substrate crates so that other
+# crates that depend on them (e.g. Polkadot, BEEFY) use this unified version
+# NOTE: There's no way to only update patched crates, so we use a heuristic
+# of updating a crucial Substrate crate (`sp-core`) to minimize the impact of
+# updating unrelated dependencies
+cargo update -p sp-core
+
# Test Polkadot pr or master branch with this Substrate commit.
-time cargo test --all --release --verbose
+time cargo test --workspace --release --verbose --features=runtime-benchmarks
diff --git a/.maintain/kubernetes/Chart.yaml b/.maintain/kubernetes/Chart.yaml
deleted file mode 100644
index 8e000ae09f1c..000000000000
--- a/.maintain/kubernetes/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: substrate
-version: 0.2
-appVersion: 0.9.1
-description: "Substrate: The platform for blockchain innovators"
-home: https://substrate.network/
-icon: https://substrate.network/favicon.ico
-sources:
- - https://github.com/paritytech/substrate/
-maintainers:
- - name: Paritytech Devops Team
- email: devops-team@parity.io
-tillerVersion: ">=2.8.0"
diff --git a/.maintain/kubernetes/README.md b/.maintain/kubernetes/README.md
deleted file mode 100644
index 0f3ec3899037..000000000000
--- a/.maintain/kubernetes/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-# Substrate Kubernetes Helm Chart
-
-This [Helm Chart](https://helm.sh/) can be used for deploying containerized
-**Substrate** to a [Kubernetes](https://kubernetes.io/) cluster.
-
-
-## Prerequisites
-
-- Tested on Kubernetes 1.10.7-gke.6
-
-## Installation
-
-To install the chart with the release name `my-release` into namespace
-`my-namespace` from within this directory:
-
-```console
-$ helm install --namespace my-namespace --name my-release --values values.yaml ./
-```
-
-The command deploys Substrate on the Kubernetes cluster in the configuration
-given in `values.yaml`. When the namespace is omitted it'll be installed in
-the default one.
-
-
-## Removal of the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```console
-$ helm delete --namespace my-namespace my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-
-## Upgrading
-
-Once the chart is installed and a new version should be deployed helm takes
-care of this by
-
-```console
-$ helm upgrade --namespace my-namespace --values values.yaml my-release ./
-```
-
-
diff --git a/.maintain/kubernetes/templates/poddisruptionbudget.yaml b/.maintain/kubernetes/templates/poddisruptionbudget.yaml
deleted file mode 100644
index 56958b1fbafd..000000000000
--- a/.maintain/kubernetes/templates/poddisruptionbudget.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
- name: {{ .Values.GitlabEnvSlug | default .Values.app }}
-spec:
- selector:
- matchLabels:
- app: {{ .Values.GitlabEnvSlug | default .Values.app }}
- maxUnavailable: 1
-
diff --git a/.maintain/kubernetes/templates/secrets.yaml b/.maintain/kubernetes/templates/secrets.yaml
deleted file mode 100644
index 97e73ae7ff03..000000000000
--- a/.maintain/kubernetes/templates/secrets.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- if .Values.validator.keys }}
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ .Values.app }}-secrets
- labels:
- app: {{ .Values.GitlabEnvSlug | default .Values.app }}
-type: Opaque
-data:
- secrets: {{ .Values.validator.keys | default "" }}
-{{- end }}
diff --git a/.maintain/kubernetes/templates/service.yaml b/.maintain/kubernetes/templates/service.yaml
deleted file mode 100644
index b14bb74c10a1..000000000000
--- a/.maintain/kubernetes/templates/service.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# see:
-# https://kubernetes.io/docs/tutorials/services/
-# https://kubernetes.io/docs/concepts/services-networking/service/
-# headless service for rpc
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Values.app }}-rpc
-spec:
- ports:
- - port: 9933
- name: http-rpc
- - port: 9944
- name: websocket-rpc
- selector:
- app: {{ .Values.GitlabEnvSlug | default .Values.app }}
- sessionAffinity: None
- type: ClusterIP
- clusterIP: None
----
-{{- if .Values.listen_node_port }}
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Values.app }}
-spec:
- ports:
- - port: 30333
- name: p2p
- nodePort: 30333
- protocol: TCP
- selector:
- app: {{ .Values.GitlabEnvSlug | default .Values.app }}
- sessionAffinity: None
- type: NodePort
- # don't route external traffic to non-local pods
- externalTrafficPolicy: Local
-{{- else if .Values.validator.keys }}
-{{- $root := . -}}
-{{- range until (int .Values.nodes.replicas) }}
----
-kind: Service
-apiVersion: v1
-metadata:
- name: {{ $root.Values.app }}-{{ . }}
-spec:
- selector:
- statefulset.kubernetes.io/pod-name: {{ $root.Values.app }}-{{ . }}
- ports:
- - port: 30333
- targetPort: 30333
- protocol: TCP
-{{- end }}
-{{- end }}
diff --git a/.maintain/kubernetes/templates/serviceaccount.yaml b/.maintain/kubernetes/templates/serviceaccount.yaml
deleted file mode 100644
index 53d016bffedf..000000000000
--- a/.maintain/kubernetes/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-{{- if .Values.rbac.enable }}
-# service account for substrate pods themselves
-# no permissions for the api are required
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- labels:
- app: {{ .Values.GitlabEnvSlug | default .Values.app }}
- name: {{ .Values.rbac.name }}
-{{- end }}
diff --git a/.maintain/kubernetes/templates/statefulset.yaml b/.maintain/kubernetes/templates/statefulset.yaml
deleted file mode 100644
index 0f34b3507a1d..000000000000
--- a/.maintain/kubernetes/templates/statefulset.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-# https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/
-# https://cloud.google.com/kubernetes-engine/docs/concepts/statefulset
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: {{ .Values.app }}
-spec:
- selector:
- matchLabels:
- app: {{ .Values.GitlabEnvSlug | default .Values.app }}
- serviceName: {{ .Values.app }}
- replicas: {{ .Values.nodes.replicas }}
- updateStrategy:
- type: RollingUpdate
- podManagementPolicy: Parallel
- template:
- metadata:
- labels:
- app: {{ .Values.GitlabEnvSlug | default .Values.app }}
- spec:
- {{- if .Values.rbac.enable }}
- serviceAccountName: {{ .Values.rbac.name }}
- {{- else }}
- serviceAccountName: default
- {{- end }}
- affinity:
- nodeAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- nodeSelectorTerms:
- - matchExpressions:
- - key: node
- operator: In
- values:
- - substrate
- {{- if .Values.listen_node_port }}
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: "app"
- operator: In
- values:
- - {{ .Values.app }}
- topologyKey: "kubernetes.io/hostname"
- {{- end }}
- terminationGracePeriodSeconds: 300
- {{- if .Values.validator.keys }}
- volumes:
- - name: {{ .Values.app }}-validator-secrets
- secret:
- secretName: {{ .Values.app }}-secrets
- initContainers:
- - name: prepare-secrets
- image: busybox
- command: [ "/bin/sh" ]
- args:
- - -c
- - sed -n -r "s/^${POD_NAME}-key ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/key;
- sed -n -r "s/^${POD_NAME}-node-key ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/node-key;
- sed -n -r "s/^${POD_NAME}-name ([^ ]+)$/\1/p" /etc/validator/secrets > {{ .Values.image.basepath }}/name;
- test -s {{ .Values.image.basepath }}/name || echo "${POD_NAME}" > {{ .Values.image.basepath }}/name
- env:
- # from (workaround for hostname)
- # https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- volumeMounts:
- - name: {{ .Values.app }}-validator-secrets
- readOnly: true
- mountPath: "/etc/validator"
- - name: {{ .Values.app }}dir
- mountPath: {{ .Values.image.basepath }}
- {{- end }}
- containers:
- - name: {{ .Values.app }}
- imagePullPolicy: "{{ .Values.image.pullPolicy }}"
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- {{- if .Values.resources }}
- resources:
- requests:
- memory: {{ .Values.resources.memory }}
- cpu: {{ .Values.resources.cpu }}
- {{- end }}
- ports:
- - containerPort: 30333
- name: p2p
- - containerPort: 9933
- name: http-rpc
- - containerPort: 9944
- name: websocket-rpc
- command: ["/bin/sh"]
- args:
- - -c
- - exec /usr/local/bin/substrate
- --base-path {{ .Values.image.basepath }}
- {{- if .Values.validator.keys }}
- --validator
- --name $(cat {{ .Values.image.basepath }}/name)
- --key $(cat {{ .Values.image.basepath }}/key)
- --node-key $(cat {{ .Values.image.basepath }}/node-key)
- {{- else }}
- --name $(POD_NAME)
- {{- end }}
- {{- range .Values.nodes.args }} {{ . }} {{- end }}
- env:
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- volumeMounts:
- - name: {{ .Values.app }}dir
- mountPath: {{ .Values.image.basepath }}
- readinessProbe:
- httpGet:
- path: /health
- port: http-rpc
- initialDelaySeconds: 10
- periodSeconds: 10
- livenessProbe:
- httpGet:
- path: /health
- port: http-rpc
- initialDelaySeconds: 10
- periodSeconds: 10
- securityContext:
- runAsUser: 1000
- fsGroup: 1000
- volumeClaimTemplates:
- - metadata:
- name: {{ .Values.app }}dir
- spec:
- accessModes: [ "ReadWriteOnce" ]
- storageClassName: ssd
- resources:
- requests:
- storage: 32Gi
-
diff --git a/.maintain/kubernetes/values.yaml b/.maintain/kubernetes/values.yaml
deleted file mode 100644
index 4c3cb5c7d702..000000000000
--- a/.maintain/kubernetes/values.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# set tag manually --set image.tag=latest
-image:
- repository: parity/substrate
- tag: latest
- pullPolicy: Always
- basepath: /substrate
-
-
-# if set to true a service account for substrate will be created
-rbac:
- enable: true
- name: substrate
-
-
-# name of the statefulset
-app: substrate
-listen_node_port: true
-
-nodes:
- replicas: 2
- args:
- # name and data directory are set by the chart itself
- # key and node-key may be provided on commandline invocation
- #
- # - --chain
- # - krummelanke
- # serve rpc within the local network
- # - fenced off the world via firewall
- # - used for health checks
- - --rpc-external
- - --ws-external
- # - --log
- # - sub-libp2p=trace
-
-
-validator: {}
- # providing 'keys' string via --set commandline parameter will run the nodes
- # in validator mode (--validator).
- #
- # name, key and node-key can be given in a base64 encoded keyfile string (at
- # validator.keys) which has the following format:
- #
- # substrate-0-name
- # substrate-0-key
- # substrate-0-node-key
- # substrate-1-name
- # substrate-1-key
- # substrate-1-node-key
- #
- # pod names are canonical. changing these or providing different amount of
- # keys than the replicas count will lead to behavior no one ever has
- # experienced before.
-
-
-# maybe adopt resource limits here to the nodes of the pool
-# resources:
-# memory: "5Gi"
-# cpu: "1.5"
-
diff --git a/.maintain/node-template-release/src/main.rs b/.maintain/node-template-release/src/main.rs
index bf37797419bc..7dcb1f0f4d81 100644
--- a/.maintain/node-template-release/src/main.rs
+++ b/.maintain/node-template-release/src/main.rs
@@ -1,8 +1,11 @@
use structopt::StructOpt;
use std::{
- path::{PathBuf, Path}, collections::HashMap, fs::{File, OpenOptions, self}, io::{Read, Write},
- process::Command
+ collections::HashMap,
+ fs::{self, File, OpenOptions},
+ io::{Read, Write},
+ path::{Path, PathBuf},
+ process::Command,
};
use glob;
@@ -40,11 +43,9 @@ fn find_cargo_tomls(path: PathBuf) -> Vec {
let glob = glob::glob(&path).expect("Generates globbing pattern");
let mut result = Vec::new();
- glob.into_iter().for_each(|file| {
- match file {
- Ok(file) => result.push(file),
- Err(e) => println!("{:?}", e),
- }
+ glob.into_iter().for_each(|file| match file {
+ Ok(file) => result.push(file),
+ Err(e) => println!("{:?}", e),
});
if result.is_empty() {
@@ -78,30 +79,44 @@ fn get_git_commit_id(path: &Path) -> String {
/// Parse the given `Cargo.toml` into a `HashMap`
fn parse_cargo_toml(file: &Path) -> CargoToml {
let mut content = String::new();
- File::open(file).expect("Cargo.toml exists").read_to_string(&mut content).expect("Reads file");
+ File::open(file)
+ .expect("Cargo.toml exists")
+ .read_to_string(&mut content)
+ .expect("Reads file");
toml::from_str(&content).expect("Cargo.toml is a valid toml file")
}
/// Replaces all substrate path dependencies with a git dependency.
-fn replace_path_dependencies_with_git(cargo_toml_path: &Path, commit_id: &str, cargo_toml: &mut CargoToml) {
+fn replace_path_dependencies_with_git(
+ cargo_toml_path: &Path,
+ commit_id: &str,
+ cargo_toml: &mut CargoToml,
+) {
let mut cargo_toml_path = cargo_toml_path.to_path_buf();
// remove `Cargo.toml`
cargo_toml_path.pop();
for &table in &["dependencies", "build-dependencies", "dev-dependencies"] {
- let mut dependencies: toml::value::Table = match cargo_toml
- .remove(table)
- .and_then(|v| v.try_into().ok()) {
- Some(deps) => deps,
- None => continue,
- };
+ let mut dependencies: toml::value::Table =
+ match cargo_toml.remove(table).and_then(|v| v.try_into().ok()) {
+ Some(deps) => deps,
+ None => continue,
+ };
let deps_rewritten = dependencies
.iter()
- .filter_map(|(k, v)| v.clone().try_into::().ok().map(move |v| (k, v)))
- .filter(|t| t.1.contains_key("path") && {
- // if the path does not exists, we need to add this as git dependency
- t.1.get("path").unwrap().as_str().map(|path| !cargo_toml_path.join(path).exists()).unwrap_or(false)
+ .filter_map(|(k, v)| {
+ v.clone().try_into::().ok().map(move |v| (k, v))
+ })
+ .filter(|t| {
+ t.1.contains_key("path") && {
+ // if the path does not exists, we need to add this as git dependency
+ t.1.get("path")
+ .unwrap()
+ .as_str()
+ .map(|path| !cargo_toml_path.join(path).exists())
+ .unwrap_or(false)
+ }
})
.map(|(k, mut v)| {
// remove `path` and add `git` and `rev`
@@ -110,7 +125,8 @@ fn replace_path_dependencies_with_git(cargo_toml_path: &Path, commit_id: &str, c
v.insert("rev".into(), commit_id.into());
(k.clone(), v.into())
- }).collect::>();
+ })
+ .collect::>();
dependencies.extend(deps_rewritten.into_iter());
@@ -135,8 +151,9 @@ fn update_top_level_cargo_toml(
cargo_toml.insert("profile".into(), profile.into());
- let members = workspace_members.iter()
- .map(|p|
+ let members = workspace_members
+ .iter()
+ .map(|p| {
p.strip_prefix(node_template_path)
.expect("Workspace member is a child of the node template path!")
.parent()
@@ -145,7 +162,7 @@ fn update_top_level_cargo_toml(
.expect("The given path ends with `Cargo.toml` as file name!")
.display()
.to_string()
- )
+ })
.collect::>();
let mut members_section = toml::value::Table::new();
@@ -163,24 +180,20 @@ fn write_cargo_toml(path: &Path, cargo_toml: CargoToml) {
/// Build and test the generated node-template
fn build_and_test(path: &Path, cargo_tomls: &[PathBuf]) {
// Build node
- assert!(
- Command::new("cargo")
- .args(&["build", "--all"])
- .current_dir(path)
- .status()
- .expect("Compiles node")
- .success()
- );
+ assert!(Command::new("cargo")
+ .args(&["build", "--all"])
+ .current_dir(path)
+ .status()
+ .expect("Compiles node")
+ .success());
// Test node
- assert!(
- Command::new("cargo")
- .args(&["test", "--all"])
- .current_dir(path)
- .status()
- .expect("Tests node")
- .success()
- );
+ assert!(Command::new("cargo")
+ .args(&["test", "--all"])
+ .current_dir(path)
+ .status()
+ .expect("Tests node")
+ .success());
// Remove all `target` directories
for toml in cargo_tomls {
@@ -189,7 +202,8 @@ fn build_and_test(path: &Path, cargo_tomls: &[PathBuf]) {
target_path = target_path.join("target");
if target_path.exists() {
- fs::remove_dir_all(&target_path).expect(&format!("Removes `{}`", target_path.display()));
+ fs::remove_dir_all(&target_path)
+ .expect(&format!("Removes `{}`", target_path.display()));
}
}
}
@@ -219,7 +233,10 @@ fn main() {
// Check if top level Cargo.toml exists. If not, create one in the destination
if !cargo_tomls.contains(&top_level_cargo_toml_path) {
// create the top_level_cargo_toml
- OpenOptions::new().create(true).write(true).open(top_level_cargo_toml_path.clone())
+ OpenOptions::new()
+ .create(true)
+ .write(true)
+ .open(top_level_cargo_toml_path.clone())
.expect("Create root level `Cargo.toml` failed.");
// push into our data structure
@@ -233,9 +250,8 @@ fn main() {
// Check if this is the top level `Cargo.toml`, as this requires some special treatments.
if top_level_cargo_toml_path == *t {
// All workspace member `Cargo.toml` file paths.
- let workspace_members = cargo_tomls.iter()
- .filter(|p| **p != top_level_cargo_toml_path)
- .collect();
+ let workspace_members =
+ cargo_tomls.iter().filter(|p| **p != top_level_cargo_toml_path).collect();
update_top_level_cargo_toml(&mut cargo_toml, workspace_members, &node_template_path);
}
@@ -243,10 +259,21 @@ fn main() {
write_cargo_toml(&t, cargo_toml);
});
+ // adding root rustfmt to node template build path
+ let node_template_rustfmt_toml_path = node_template_path.join("rustfmt.toml");
+ let root_rustfmt_toml =
+ &options.node_template.join("../../rustfmt.toml");
+ if root_rustfmt_toml.exists() {
+ fs::copy(&root_rustfmt_toml, &node_template_rustfmt_toml_path)
+ .expect("Copying rustfmt.toml.");
+ }
+
build_and_test(&node_template_path, &cargo_tomls);
- let output = GzEncoder::new(File::create(&options.output)
- .expect("Creates output file"), Compression::default());
+ let output = GzEncoder::new(
+ File::create(&options.output).expect("Creates output file"),
+ Compression::default(),
+ );
let mut tar = tar::Builder::new(output);
tar.append_dir_all("substrate-node-template", node_template_path)
.expect("Writes substrate-node-template archive");
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb8cad3d65e5..afdc6d9a7db2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [2.23.0]
+### Changed
+- Updated Substrate to polkadot-v0.9.9
+
## [2.22.0]
### Changed
- Updated Substrate to polkadot-v0.9.8
diff --git a/Cargo.lock b/Cargo.lock
index 11f71ce22f22..7383b5b8fc85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -96,6 +96,17 @@ version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
+[[package]]
+name = "ahash"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
+dependencies = [
+ "getrandom 0.2.3",
+ "once_cell",
+ "version_check",
+]
+
[[package]]
name = "aho-corasick"
version = "0.7.15"
@@ -151,9 +162,9 @@ checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
[[package]]
name = "approx"
-version = "0.3.2"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
+checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e"
dependencies = [
"num-traits",
]
@@ -373,9 +384,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
[[package]]
name = "async-trait"
-version = "0.1.48"
+version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
+checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
dependencies = [
"proc-macro2",
"quote",
@@ -454,6 +465,19 @@ dependencies = [
"rustc-demangle",
]
+[[package]]
+name = "bae"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf"
+dependencies = [
+ "heck",
+ "proc-macro-error 0.4.12",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "base-x"
version = "0.2.8"
@@ -1710,7 +1734,7 @@ dependencies = [
"num-traits",
"parity-scale-codec",
"parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -1720,7 +1744,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
dependencies = [
"byteorder",
- "rand 0.8.3",
+ "rand 0.8.4",
"rustc-hex",
"static_assertions",
]
@@ -1769,7 +1793,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
-version = "3.1.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -1777,7 +1801,7 @@ dependencies = [
"linregress",
"log",
"parity-scale-codec",
- "paste 1.0.4",
+ "paste",
"serde",
"sp-api",
"sp-io",
@@ -1789,12 +1813,15 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"Inflector",
"chrono",
"frame-benchmarking",
+ "frame-support",
"handlebars",
+ "linked-hash-map",
+ "log",
"parity-scale-codec",
"sc-cli",
"sc-client-db",
@@ -1811,7 +1838,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -1824,7 +1851,7 @@ dependencies = [
[[package]]
name = "frame-executive"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -1844,7 +1871,7 @@ dependencies = [
[[package]]
name = "frame-metadata"
-version = "13.0.0"
+version = "14.0.0-dev"
dependencies = [
"parity-scale-codec",
"serde",
@@ -1854,7 +1881,7 @@ dependencies = [
[[package]]
name = "frame-support"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"bitflags",
"frame-metadata",
@@ -1862,11 +1889,10 @@ dependencies = [
"frame-system",
"impl-trait-for-tuples",
"log",
- "max-encoded-len",
"once_cell",
"parity-scale-codec",
"parity-util-mem",
- "paste 1.0.4",
+ "paste",
"pretty_assertions 0.6.1",
"serde",
"smallvec 1.6.1",
@@ -1883,7 +1909,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"Inflector",
"frame-support-procedural-tools",
@@ -1894,7 +1920,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate 1.0.0",
@@ -1918,6 +1944,7 @@ version = "3.0.0"
dependencies = [
"frame-metadata",
"frame-support",
+ "frame-support-test-pallet",
"frame-system",
"parity-scale-codec",
"pretty_assertions 0.6.1",
@@ -1931,9 +1958,18 @@ dependencies = [
"trybuild",
]
+[[package]]
+name = "frame-support-test-pallet"
+version = "4.0.0-dev"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+]
+
[[package]]
name = "frame-system"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"criterion",
"frame-support",
@@ -1952,7 +1988,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -1967,7 +2003,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -1975,7 +2011,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2169,7 +2205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
dependencies = [
"gloo-timers",
- "send_wrapper 0.4.0",
+ "send_wrapper",
]
[[package]]
@@ -2209,15 +2245,6 @@ dependencies = [
"typenum",
]
-[[package]]
-name = "generic-array"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
-dependencies = [
- "typenum",
-]
-
[[package]]
name = "generic-array"
version = "0.14.4"
@@ -2392,7 +2419,16 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
dependencies = [
- "ahash",
+ "ahash 0.4.7",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+dependencies = [
+ "ahash 0.7.4",
]
[[package]]
@@ -2721,9 +2757,9 @@ dependencies = [
[[package]]
name = "impl-codec"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed"
+checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
dependencies = [
"parity-scale-codec",
]
@@ -2755,7 +2791,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
dependencies = [
"autocfg",
- "hashbrown",
+ "hashbrown 0.9.1",
"serde",
]
@@ -2990,11 +3026,12 @@ dependencies = [
[[package]]
name = "jsonrpsee-proc-macros"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b4c85cfa6767333f3e5f3b2f2f765dad2727b0033ee270ae07c599bf43ed5ae"
+checksum = "f37924e16300e249a52a22cabb5632f846dc9760b39355f5e8bc70cd23dc6300"
dependencies = [
"Inflector",
+ "bae",
"proc-macro-crate 1.0.0",
"proc-macro2",
"quote",
@@ -3003,9 +3040,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-types"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172"
+checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788"
dependencies = [
"async-trait",
"beef",
@@ -3015,15 +3052,15 @@ dependencies = [
"log",
"serde",
"serde_json 1.0.64",
- "soketto 0.5.0",
+ "soketto 0.6.0",
"thiserror",
]
[[package]]
name = "jsonrpsee-ws-client"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32"
+checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198"
dependencies = [
"async-trait",
"fnv",
@@ -3035,7 +3072,7 @@ dependencies = [
"rustls-native-certs 0.5.0",
"serde",
"serde_json 1.0.64",
- "soketto 0.5.0",
+ "soketto 0.6.0",
"thiserror",
"tokio 0.2.25",
"tokio-rustls 0.15.0",
@@ -3081,9 +3118,9 @@ dependencies = [
[[package]]
name = "kvdb"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8891bd853eff90e33024195d79d578dc984c82f9e0715fcd2b525a0c19d52811"
+checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512"
dependencies = [
"parity-util-mem",
"smallvec 1.6.1",
@@ -3091,9 +3128,9 @@ dependencies = [
[[package]]
name = "kvdb-memorydb"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a0da8e08caf08d384a620ec19bb6c9b85c84137248e202617fb91881f25912"
+checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5"
dependencies = [
"kvdb",
"parity-util-mem",
@@ -3102,9 +3139,9 @@ dependencies = [
[[package]]
name = "kvdb-rocksdb"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34446c373ccc494c2124439281c198c7636ccdc2752c06722bbffd56d459c1e4"
+checksum = "431ca65516efab86e65d96281f750ebb54277dec656fcf6c027f3d1c0cb69e4c"
dependencies = [
"fs-swap",
"kvdb",
@@ -3118,24 +3155,6 @@ dependencies = [
"smallvec 1.6.1",
]
-[[package]]
-name = "kvdb-web"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1e98ba343d0b35f9009a8844cd2b87fa3192f7e79033ac05b00aeae0f3b0b5"
-dependencies = [
- "futures 0.3.15",
- "js-sys",
- "kvdb",
- "kvdb-memorydb",
- "log",
- "parity-util-mem",
- "parking_lot 0.11.1",
- "send_wrapper 0.5.0",
- "wasm-bindgen",
- "web-sys",
-]
-
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -3385,7 +3404,7 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"smallvec 1.6.1",
"socket2 0.4.0",
"void",
@@ -3676,9 +3695,9 @@ dependencies = [
[[package]]
name = "linregress"
-version = "0.4.0"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0ad4b5cc8385a881c561fac3501353d63d2a2b7a357b5064d71815c9a92724"
+checksum = "1e6e407dadb4ca4b31bc69c27aff00e7ca4534fdcee855159b039a7cebb5f395"
dependencies = [
"nalgebra",
"statrs",
@@ -3686,20 +3705,20 @@ dependencies = [
[[package]]
name = "lite-json"
-version = "0.1.3"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0460d985423a026b4d9b828a7c6eed1bcf606f476322f3f9b507529686a61715"
+checksum = "cd0e787ffe1153141a0f6f6d759fdf1cc34b1226e088444523812fd412a5cca2"
dependencies = [
"lite-parser",
]
[[package]]
name = "lite-parser"
-version = "0.1.2"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c50092e40e0ccd1bf2015a10333fde0502ff95b832b0895dc1ca0d7ac6c52f6"
+checksum = "c3d5f9dc37c52d889a21fd701983d02bb6a84f852c5140a6c80ef4557f7dc29e"
dependencies = [
- "paste 0.1.18",
+ "paste",
]
[[package]]
@@ -3736,7 +3755,7 @@ version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba"
dependencies = [
- "hashbrown",
+ "hashbrown 0.9.1",
]
[[package]]
@@ -3786,36 +3805,13 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
[[package]]
name = "matrixmultiply"
-version = "0.2.4"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1"
+checksum = "5a8a15b776d9dfaecd44b03c5828c2199cddff5247215858aac14624f8d6b741"
dependencies = [
"rawpointer",
]
-[[package]]
-name = "max-encoded-len"
-version = "3.0.0"
-dependencies = [
- "frame-support",
- "impl-trait-for-tuples",
- "max-encoded-len-derive",
- "parity-scale-codec",
- "primitive-types",
- "rustversion",
- "trybuild",
-]
-
-[[package]]
-name = "max-encoded-len-derive"
-version = "3.0.0"
-dependencies = [
- "proc-macro-crate 1.0.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "maybe-uninit"
version = "2.0.0"
@@ -3867,12 +3863,12 @@ dependencies = [
[[package]]
name = "memory-db"
-version = "0.26.0"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "814bbecfc0451fc314eeea34f05bbcd5b98a7ad7af37faee088b86a1e633f1d4"
+checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5"
dependencies = [
"hash-db",
- "hashbrown",
+ "hashbrown 0.11.2",
"parity-util-mem",
]
@@ -4041,7 +4037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f"
dependencies = [
"proc-macro-crate 0.1.5",
- "proc-macro-error",
+ "proc-macro-error 1.0.4",
"proc-macro2",
"quote",
"syn",
@@ -4070,22 +4066,33 @@ dependencies = [
[[package]]
name = "nalgebra"
-version = "0.21.1"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486"
+checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120"
dependencies = [
"approx",
- "generic-array 0.13.3",
"matrixmultiply",
+ "nalgebra-macros",
"num-complex",
- "num-rational",
+ "num-rational 0.4.0",
"num-traits",
- "rand 0.7.3",
+ "rand 0.8.4",
"rand_distr",
"simba",
"typenum",
]
+[[package]]
+name = "nalgebra-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "names"
version = "0.11.0"
@@ -4130,7 +4137,7 @@ dependencies = [
[[package]]
name = "node-bench"
-version = "0.8.0"
+version = "0.9.0-dev"
dependencies = [
"derive_more",
"fs_extra",
@@ -4151,6 +4158,7 @@ dependencies = [
"sc-cli",
"sc-client-api",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"serde",
"serde_json 1.0.64",
"sp-consensus",
@@ -4160,7 +4168,6 @@ dependencies = [
"sp-state-machine",
"sp-timestamp",
"sp-tracing",
- "sp-transaction-pool",
"sp-trie",
"structopt",
"tempfile",
@@ -4168,13 +4175,14 @@ dependencies = [
[[package]]
name = "node-browser-testing"
-version = "2.0.0"
+version = "3.0.0-dev"
dependencies = [
"futures 0.3.15",
"futures-timer 3.0.2",
"jsonrpc-core",
"libp2p",
"node-cli",
+ "parking_lot 0.11.1",
"sc-rpc-api",
"serde",
"serde_json 1.0.64",
@@ -4185,7 +4193,7 @@ dependencies = [
[[package]]
name = "node-cli"
-version = "2.0.0"
+version = "3.0.0-dev"
dependencies = [
"assert_cmd",
"async-std",
@@ -4228,16 +4236,17 @@ dependencies = [
"sc-consensus-slots",
"sc-consensus-uncles",
"sc-finality-grandpa",
- "sc-finality-grandpa-warp-sync",
"sc-keystore",
"sc-network",
"sc-offchain",
"sc-rpc",
"sc-service",
"sc-service-test",
+ "sc-sync-state-rpc",
"sc-telemetry",
"sc-tracing",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"serde",
"serde_json 1.0.64",
"soketto 0.4.2",
@@ -4254,6 +4263,7 @@ dependencies = [
"sp-runtime",
"sp-timestamp",
"sp-transaction-pool",
+ "sp-transaction-storage-proof",
"sp-trie",
"structopt",
"substrate-browser-utils",
@@ -4267,7 +4277,7 @@ dependencies = [
[[package]]
name = "node-executor"
-version = "2.0.0"
+version = "3.0.0-dev"
dependencies = [
"criterion",
"frame-benchmarking",
@@ -4304,7 +4314,7 @@ dependencies = [
[[package]]
name = "node-inspect"
-version = "0.8.0"
+version = "0.9.0-dev"
dependencies = [
"derive_more",
"log",
@@ -4333,7 +4343,7 @@ dependencies = [
[[package]]
name = "node-rpc"
-version = "2.0.0"
+version = "3.0.0-dev"
dependencies = [
"jsonrpc-core",
"node-primitives",
@@ -4350,6 +4360,7 @@ dependencies = [
"sc-rpc",
"sc-rpc-api",
"sc-sync-state-rpc",
+ "sc-transaction-pool-api",
"sp-api",
"sp-block-builder",
"sp-blockchain",
@@ -4357,7 +4368,6 @@ dependencies = [
"sp-consensus-babe",
"sp-keystore",
"sp-runtime",
- "sp-transaction-pool",
"substrate-frame-rpc-system",
]
@@ -4376,7 +4386,7 @@ dependencies = [
[[package]]
name = "node-runtime"
-version = "2.0.1"
+version = "3.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -4388,7 +4398,6 @@ dependencies = [
"frame-try-runtime",
"hex-literal",
"log",
- "max-encoded-len",
"node-primitives",
"pallet-authority-discovery",
"pallet-authorship",
@@ -4429,7 +4438,9 @@ dependencies = [
"pallet-tips",
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
+ "pallet-transaction-storage",
"pallet-treasury",
+ "pallet-uniques",
"pallet-utility",
"pallet-vesting",
"parity-scale-codec",
@@ -4455,7 +4466,7 @@ dependencies = [
[[package]]
name = "node-testing"
-version = "2.0.0"
+version = "3.0.0-dev"
dependencies = [
"criterion",
"frame-support",
@@ -4481,6 +4492,7 @@ dependencies = [
"sc-cli",
"sc-client-api",
"sc-client-db",
+ "sc-consensus",
"sc-executor",
"sc-service",
"sp-api",
@@ -4532,11 +4544,10 @@ dependencies = [
[[package]]
name = "num-complex"
-version = "0.2.4"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
+checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
dependencies = [
- "autocfg",
"num-traits",
]
@@ -4562,6 +4573,17 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "num-rational"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
[[package]]
name = "num-traits"
version = "0.2.14"
@@ -4651,12 +4673,11 @@ dependencies = [
[[package]]
name = "pallet-assets"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
- "max-encoded-len",
"pallet-balances",
"parity-scale-codec",
"sp-core",
@@ -4667,7 +4688,7 @@ dependencies = [
[[package]]
name = "pallet-atomic-swap"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -4681,7 +4702,7 @@ dependencies = [
[[package]]
name = "pallet-aura"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -4700,7 +4721,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -4717,7 +4738,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -4733,7 +4754,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -4761,13 +4782,12 @@ dependencies = [
[[package]]
name = "pallet-balances"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"log",
- "max-encoded-len",
"pallet-transaction-payment",
"parity-scale-codec",
"sp-core",
@@ -4778,7 +4798,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4795,7 +4815,7 @@ dependencies = [
[[package]]
name = "pallet-cere-ddc"
-version = "5.1.0"
+version = "6.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -4826,7 +4846,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4843,7 +4863,7 @@ dependencies = [
[[package]]
name = "pallet-contracts"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"assert_matches",
"bitflags",
@@ -4857,11 +4877,12 @@ dependencies = [
"pallet-contracts-proc-macro",
"pallet-randomness-collective-flip",
"pallet-timestamp",
+ "pallet-utility",
"parity-scale-codec",
- "paste 1.0.4",
+ "paste",
"pretty_assertions 0.7.2",
"pwasm-utils",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_pcg 0.3.0",
"serde",
"smallvec 1.6.1",
@@ -4876,7 +4897,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-primitives"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"bitflags",
"parity-scale-codec",
@@ -4888,7 +4909,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"proc-macro2",
"quote",
@@ -4897,7 +4918,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -4916,7 +4937,7 @@ dependencies = [
[[package]]
name = "pallet-contracts-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"pallet-contracts-primitives",
"parity-scale-codec",
@@ -4952,7 +4973,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4972,7 +4993,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -4983,7 +5004,7 @@ dependencies = [
"pallet-balances",
"parity-scale-codec",
"parking_lot 0.11.1",
- "paste 1.0.4",
+ "paste",
"rand 0.7.3",
"sp-arithmetic",
"sp-core",
@@ -4998,7 +5019,7 @@ dependencies = [
[[package]]
name = "pallet-elections"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5013,7 +5034,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
-version = "4.0.0"
+version = "5.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5068,7 +5089,7 @@ dependencies = [
[[package]]
name = "pallet-example"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5084,7 +5105,7 @@ dependencies = [
[[package]]
name = "pallet-example-parallel"
-version = "2.0.1"
+version = "3.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5099,7 +5120,7 @@ dependencies = [
[[package]]
name = "pallet-gilt"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5115,7 +5136,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
-version = "3.1.0"
+version = "4.0.0-dev"
dependencies = [
"finality-grandpa",
"frame-benchmarking",
@@ -5144,7 +5165,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5160,7 +5181,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5179,7 +5200,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5195,7 +5216,7 @@ dependencies = [
[[package]]
name = "pallet-lottery"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5212,7 +5233,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5227,7 +5248,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"ckb-merkle-mountain-range",
"env_logger 0.8.3",
@@ -5245,7 +5266,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-primitives"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5279,7 +5300,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5294,7 +5315,7 @@ dependencies = [
[[package]]
name = "pallet-nicks"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5308,7 +5329,7 @@ dependencies = [
[[package]]
name = "pallet-node-authorization"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5322,7 +5343,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5339,7 +5360,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5365,12 +5386,11 @@ dependencies = [
[[package]]
name = "pallet-proxy"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
- "max-encoded-len",
"pallet-balances",
"pallet-utility",
"parity-scale-codec",
@@ -5382,7 +5402,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5396,7 +5416,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"enumflags2",
"frame-support",
@@ -5411,7 +5431,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5427,7 +5447,7 @@ dependencies = [
[[package]]
name = "pallet-scored-pool"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5441,7 +5461,7 @@ dependencies = [
[[package]]
name = "pallet-session"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5462,7 +5482,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5485,7 +5505,7 @@ dependencies = [
[[package]]
name = "pallet-society"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-support-test",
@@ -5501,7 +5521,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5516,7 +5536,7 @@ dependencies = [
"pallet-timestamp",
"parity-scale-codec",
"parking_lot 0.11.1",
- "paste 1.0.4",
+ "paste",
"rand_chacha 0.2.2",
"serde",
"sp-application-crypto",
@@ -5533,7 +5553,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@@ -5544,7 +5564,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"log",
"sp-arithmetic",
@@ -5552,7 +5572,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5565,7 +5585,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5583,7 +5603,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5601,7 +5621,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -5619,7 +5639,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -5635,7 +5655,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -5645,7 +5665,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-storage"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5665,7 +5685,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5683,7 +5703,7 @@ dependencies = [
[[package]]
name = "pallet-uniques"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5698,7 +5718,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5713,7 +5733,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5743,7 +5763,7 @@ dependencies = [
"log",
"memmap2",
"parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -5766,24 +5786,25 @@ dependencies = [
[[package]]
name = "parity-scale-codec"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f518afaa5a47d0d6386229b0a6e01e86427291d643aa4cabb4992219f504f8"
+checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9"
dependencies = [
"arrayvec 0.7.0",
"bitvec",
"byte-slice-cast",
+ "impl-trait-for-tuples",
"parity-scale-codec-derive",
"serde",
]
[[package]]
name = "parity-scale-codec-derive"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44c5f94427bd0b5076e8f7e15ca3f60a4d8ac0077e4793884e6fdfd8915344e"
+checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09"
dependencies = [
- "proc-macro-crate 0.1.5",
+ "proc-macro-crate 1.0.0",
"proc-macro2",
"quote",
"syn",
@@ -5816,12 +5837,12 @@ dependencies = [
[[package]]
name = "parity-util-mem"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664a8c6b8e62d8f9f2f937e391982eb433ab285b4cd9545b342441e04a906e42"
+checksum = "7ad6f1acec69b95caf435bbd158d486e5a0a44fcf51531e84922c59ff09e8457"
dependencies = [
"cfg-if 1.0.0",
- "hashbrown",
+ "hashbrown 0.11.2",
"impl-trait-for-tuples",
"parity-util-mem-derive",
"parking_lot 0.11.1",
@@ -5957,28 +5978,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
-dependencies = [
- "paste-impl",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
-
-[[package]]
-name = "paste-impl"
-version = "0.1.18"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
-dependencies = [
- "proc-macro-hack",
-]
+checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
[[package]]
name = "pbkdf2"
@@ -6266,9 +6268,9 @@ dependencies = [
[[package]]
name = "primitive-types"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2415937401cb030a2a0a4d922483f945fa068f52a7dbb22ce0fe5f2b6f6adace"
+checksum = "e90f6931e6b3051e208a449c342246cb7c786ef300789b95619f46f1dd75d9b0"
dependencies = [
"fixed-hash",
"impl-codec",
@@ -6295,16 +6297,42 @@ dependencies = [
"toml",
]
+[[package]]
+name = "proc-macro-error"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
+dependencies = [
+ "proc-macro-error-attr 0.4.12",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
- "proc-macro-error-attr",
+ "proc-macro-error-attr 1.0.4",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
+dependencies = [
"proc-macro2",
"quote",
"syn",
+ "syn-mid",
"version_check",
]
@@ -6333,9 +6361,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
[[package]]
name = "proc-macro2"
-version = "1.0.26"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
dependencies = [
"unicode-xid",
]
@@ -6416,9 +6444,9 @@ dependencies = [
[[package]]
name = "pwasm-utils"
-version = "0.18.0"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0e517f47d9964362883182404b68d0b6949382c0baa40aa5ffca94f5f1e3481"
+checksum = "f0c1a2f10b47d446372a4f397c58b329aaea72b2daf9395a623a411cb8ccb54f"
dependencies = [
"byteorder",
"log",
@@ -6445,7 +6473,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
dependencies = [
"env_logger 0.8.3",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -6513,9 +6541,9 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
dependencies = [
"libc",
"rand_chacha 0.3.0",
@@ -6578,11 +6606,12 @@ dependencies = [
[[package]]
name = "rand_distr"
-version = "0.2.2"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2"
+checksum = "051b398806e42b9cd04ad9ec8f81e355d0a382c543ac6672c62f5a5b452ef142"
dependencies = [
- "rand 0.7.3",
+ "num-traits",
+ "rand 0.8.4",
]
[[package]]
@@ -6771,7 +6800,7 @@ dependencies = [
[[package]]
name = "remote-externalities"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"env_logger 0.8.3",
"frame-support",
@@ -6831,9 +6860,9 @@ dependencies = [
[[package]]
name = "rocksdb"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6"
+checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3"
dependencies = [
"libc",
"librocksdb-sys",
@@ -7000,18 +7029,17 @@ dependencies = [
[[package]]
name = "sc-allocator"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"log",
"sp-core",
- "sp-std",
"sp-wasm-interface",
"thiserror",
]
[[package]]
name = "sc-authority-discovery"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"derive_more",
@@ -7043,7 +7071,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"futures 0.3.15",
"futures-timer 3.0.2",
@@ -7055,20 +7083,20 @@ dependencies = [
"sc-proposer-metrics",
"sc-telemetry",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"sp-api",
"sp-blockchain",
"sp-consensus",
"sp-core",
"sp-inherents",
"sp-runtime",
- "sp-transaction-pool",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
]
[[package]]
name = "sc-block-builder"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -7085,26 +7113,22 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
"sc-chain-spec-derive",
- "sc-consensus-babe",
- "sc-consensus-epochs",
- "sc-finality-grandpa",
"sc-network",
"sc-telemetry",
"serde",
"serde_json 1.0.64",
- "sp-consensus-babe",
"sp-core",
"sp-runtime",
]
[[package]]
name = "sc-chain-spec-derive"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@@ -7114,7 +7138,7 @@ dependencies = [
[[package]]
name = "sc-cli"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"chrono",
"fdlimit",
@@ -7152,7 +7176,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"derive_more",
"fnv",
@@ -7165,6 +7189,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
"sc-executor",
+ "sc-transaction-pool-api",
"sp-api",
"sp-blockchain",
"sp-consensus",
@@ -7178,7 +7203,6 @@ dependencies = [
"sp-std",
"sp-storage",
"sp-test-primitives",
- "sp-transaction-pool",
"sp-trie",
"sp-utils",
"sp-version",
@@ -7189,7 +7213,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"blake2-rfc",
"hash-db",
@@ -7208,7 +7232,6 @@ dependencies = [
"sc-state-db",
"sp-arithmetic",
"sp-blockchain",
- "sp-consensus",
"sp-core",
"sp-database",
"sp-keyring",
@@ -7223,19 +7246,32 @@ dependencies = [
[[package]]
name = "sc-consensus"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
+ "futures 0.3.15",
+ "futures-timer 3.0.2",
+ "libp2p",
+ "log",
"parking_lot 0.11.1",
"sc-client-api",
+ "serde",
+ "sp-api",
"sp-blockchain",
"sp-consensus",
+ "sp-core",
"sp-runtime",
+ "sp-state-machine",
+ "sp-test-primitives",
+ "sp-utils",
+ "substrate-prometheus-endpoint",
+ "thiserror",
+ "wasm-timer",
]
[[package]]
name = "sc-consensus-aura"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"derive_more",
@@ -7247,6 +7283,7 @@ dependencies = [
"parking_lot 0.11.1",
"sc-block-builder",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-slots",
"sc-executor",
"sc-keystore",
@@ -7277,7 +7314,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"derive_more",
@@ -7287,7 +7324,7 @@ dependencies = [
"log",
"merlin",
"num-bigint",
- "num-rational",
+ "num-rational 0.2.4",
"num-traits",
"parity-scale-codec",
"parking_lot 0.11.1",
@@ -7297,6 +7334,7 @@ dependencies = [
"retain_mut",
"sc-block-builder",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-epochs",
"sc-consensus-slots",
"sc-consensus-uncles",
@@ -7333,7 +7371,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"derive_more",
"futures 0.3.15",
@@ -7362,7 +7400,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -7374,7 +7412,7 @@ dependencies = [
[[package]]
name = "sc-consensus-manual-seal"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"assert_matches",
"async-trait",
@@ -7388,9 +7426,11 @@ dependencies = [
"parking_lot 0.11.1",
"sc-basic-authorship",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-babe",
"sc-consensus-epochs",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"serde",
"sp-api",
"sp-blockchain",
@@ -7403,7 +7443,6 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"sp-timestamp",
- "sp-transaction-pool",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
@@ -7413,7 +7452,7 @@ dependencies = [
[[package]]
name = "sc-consensus-pow"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"derive_more",
@@ -7423,6 +7462,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
"sc-client-api",
+ "sc-consensus",
"sp-api",
"sp-block-builder",
"sp-blockchain",
@@ -7436,7 +7476,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"futures 0.3.15",
@@ -7445,6 +7485,7 @@ dependencies = [
"log",
"parity-scale-codec",
"sc-client-api",
+ "sc-consensus",
"sc-telemetry",
"sp-api",
"sp-application-crypto",
@@ -7464,7 +7505,7 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"sc-client-api",
"sp-authorship",
@@ -7474,7 +7515,7 @@ dependencies = [
[[package]]
name = "sc-executor"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"assert_matches",
"derive_more",
@@ -7485,7 +7526,7 @@ dependencies = [
"parity-scale-codec",
"parity-wasm 0.42.2",
"parking_lot 0.11.1",
- "paste 1.0.4",
+ "paste",
"regex",
"sc-executor-common",
"sc-executor-wasmi",
@@ -7496,6 +7537,7 @@ dependencies = [
"sp-core",
"sp-externalities",
"sp-io",
+ "sp-maybe-compressed-blob",
"sp-panic-handler",
"sp-runtime",
"sp-runtime-interface",
@@ -7515,7 +7557,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"derive_more",
"parity-scale-codec",
@@ -7531,7 +7573,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"log",
"parity-scale-codec",
@@ -7545,7 +7587,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"assert_matches",
"cfg-if 1.0.0",
@@ -7553,18 +7595,22 @@ dependencies = [
"log",
"parity-scale-codec",
"parity-wasm 0.42.2",
+ "pwasm-utils",
"sc-allocator",
"sc-executor-common",
+ "sc-runtime-test",
"scoped-tls",
"sp-core",
+ "sp-io",
"sp-runtime-interface",
"sp-wasm-interface",
"wasmtime",
+ "wat",
]
[[package]]
name = "sc-finality-grandpa"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"assert_matches",
"async-trait",
@@ -7579,7 +7625,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
"pin-project 1.0.5",
- "rand 0.7.3",
+ "rand 0.8.4",
"sc-block-builder",
"sc-client-api",
"sc-consensus",
@@ -7613,7 +7659,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"derive_more",
"finality-grandpa",
@@ -7641,35 +7687,9 @@ dependencies = [
"substrate-test-runtime-client",
]
-[[package]]
-name = "sc-finality-grandpa-warp-sync"
-version = "0.9.0"
-dependencies = [
- "derive_more",
- "finality-grandpa",
- "futures 0.3.15",
- "log",
- "num-traits",
- "parity-scale-codec",
- "parking_lot 0.11.1",
- "prost",
- "rand 0.8.3",
- "sc-block-builder",
- "sc-client-api",
- "sc-finality-grandpa",
- "sc-network",
- "sc-service",
- "sp-blockchain",
- "sp-consensus",
- "sp-finality-grandpa",
- "sp-keyring",
- "sp-runtime",
- "substrate-test-runtime-client",
-]
-
[[package]]
name = "sc-informant"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"ansi_term 0.12.1",
"futures 0.3.15",
@@ -7678,15 +7698,15 @@ dependencies = [
"parity-util-mem",
"sc-client-api",
"sc-network",
+ "sc-transaction-pool-api",
"sp-blockchain",
"sp-runtime",
- "sp-transaction-pool",
"wasm-timer",
]
[[package]]
name = "sc-keystore"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"async-trait",
"derive_more",
@@ -7706,7 +7726,7 @@ dependencies = [
[[package]]
name = "sc-light"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"hash-db",
"lazy_static",
@@ -7724,7 +7744,7 @@ dependencies = [
[[package]]
name = "sc-network"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"assert_matches",
"async-std",
@@ -7758,6 +7778,7 @@ dependencies = [
"rand 0.7.3",
"sc-block-builder",
"sc-client-api",
+ "sc-consensus",
"sc-peerset",
"serde",
"serde_json 1.0.64",
@@ -7766,6 +7787,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-core",
+ "sp-finality-grandpa",
"sp-keyring",
"sp-runtime",
"sp-test-primitives",
@@ -7784,7 +7806,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-std",
"futures 0.3.15",
@@ -7832,7 +7854,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"bytes 0.5.6",
"fnv",
@@ -7853,13 +7875,13 @@ dependencies = [
"sc-keystore",
"sc-network",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"sp-api",
"sp-consensus",
"sp-core",
"sp-offchain",
"sp-runtime",
"sp-tracing",
- "sp-transaction-pool",
"sp-utils",
"substrate-test-runtime-client",
"threadpool",
@@ -7868,7 +7890,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"futures 0.3.15",
"libp2p",
@@ -7889,7 +7911,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"assert_matches",
"futures 0.1.31",
@@ -7911,9 +7933,11 @@ dependencies = [
"sc-rpc-api",
"sc-tracing",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"serde_json 1.0.64",
"sp-api",
"sp-blockchain",
+ "sp-consensus",
"sp-core",
"sp-io",
"sp-keystore",
@@ -7923,7 +7947,6 @@ dependencies = [
"sp-session",
"sp-state-machine",
"sp-tracing",
- "sp-transaction-pool",
"sp-utils",
"sp-version",
"substrate-test-runtime-client",
@@ -7932,7 +7955,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"derive_more",
"futures 0.3.15",
@@ -7944,19 +7967,19 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
"sc-chain-spec",
+ "sc-transaction-pool-api",
"serde",
"serde_json 1.0.64",
"sp-core",
"sp-rpc",
"sp-runtime",
"sp-tracing",
- "sp-transaction-pool",
"sp-version",
]
[[package]]
name = "sc-rpc-server"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"futures 0.1.31",
"jsonrpc-core",
@@ -7975,7 +7998,6 @@ dependencies = [
name = "sc-runtime-test"
version = "2.0.0"
dependencies = [
- "sc-allocator",
"sp-core",
"sp-io",
"sp-runtime",
@@ -7987,7 +8009,7 @@ dependencies = [
[[package]]
name = "sc-service"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-std",
"async-trait",
@@ -8010,6 +8032,7 @@ dependencies = [
"sc-chain-spec",
"sc-client-api",
"sc-client-db",
+ "sc-consensus",
"sc-executor",
"sc-finality-grandpa",
"sc-informant",
@@ -8022,6 +8045,7 @@ dependencies = [
"sc-telemetry",
"sc-tracing",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"serde",
"serde_json 1.0.64",
"sp-api",
@@ -8071,10 +8095,12 @@ dependencies = [
"sc-block-builder",
"sc-client-api",
"sc-client-db",
+ "sc-consensus",
"sc-executor",
"sc-light",
"sc-network",
"sc-service",
+ "sc-transaction-pool-api",
"sp-api",
"sp-blockchain",
"sp-consensus",
@@ -8085,7 +8111,6 @@ dependencies = [
"sp-state-machine",
"sp-storage",
"sp-tracing",
- "sp-transaction-pool",
"sp-trie",
"substrate-test-runtime",
"substrate-test-runtime-client",
@@ -8095,7 +8120,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"log",
"parity-scale-codec",
@@ -8109,17 +8134,19 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
+ "parity-scale-codec",
"sc-chain-spec",
"sc-client-api",
"sc-consensus-babe",
"sc-consensus-epochs",
"sc-finality-grandpa",
"sc-rpc-api",
+ "serde",
"serde_json 1.0.64",
"sp-blockchain",
"sp-runtime",
@@ -8128,7 +8155,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"chrono",
"futures 0.3.15",
@@ -8147,7 +8174,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"ansi_term 0.12.1",
"atty",
@@ -8183,7 +8210,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@@ -8192,59 +8219,53 @@ dependencies = [
]
[[package]]
-name = "sc-transaction-graph"
-version = "3.0.0"
+name = "sc-transaction-pool"
+version = "4.0.0-dev"
dependencies = [
"assert_matches",
"criterion",
"derive_more",
"futures 0.3.15",
+ "hex",
+ "intervalier",
"linked-hash-map",
"log",
"parity-scale-codec",
"parity-util-mem",
"parking_lot 0.11.1",
"retain_mut",
+ "sc-block-builder",
+ "sc-client-api",
+ "sc-transaction-pool-api",
"serde",
+ "sp-api",
"sp-blockchain",
+ "sp-consensus",
"sp-core",
"sp-runtime",
+ "sp-tracing",
"sp-transaction-pool",
"sp-utils",
+ "substrate-prometheus-endpoint",
"substrate-test-runtime",
+ "substrate-test-runtime-client",
+ "substrate-test-runtime-transaction-pool",
"thiserror",
"wasm-timer",
]
[[package]]
-name = "sc-transaction-pool"
-version = "3.0.0"
+name = "sc-transaction-pool-api"
+version = "4.0.0-dev"
dependencies = [
- "assert_matches",
+ "derive_more",
"futures 0.3.15",
- "hex",
- "intervalier",
"log",
"parity-scale-codec",
- "parity-util-mem",
- "parking_lot 0.11.1",
- "sc-block-builder",
- "sc-client-api",
- "sc-transaction-graph",
- "sp-api",
+ "serde",
"sp-blockchain",
- "sp-consensus",
- "sp-core",
- "sp-keyring",
"sp-runtime",
- "sp-tracing",
- "sp-transaction-pool",
- "sp-utils",
- "substrate-prometheus-endpoint",
- "substrate-test-runtime-client",
- "substrate-test-runtime-transaction-pool",
"thiserror",
- "wasm-timer",
]
[[package]]
@@ -8287,26 +8308,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-[[package]]
-name = "scroll"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
-dependencies = [
- "scroll_derive",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "sct"
version = "0.6.0"
@@ -8421,17 +8422,11 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
-[[package]]
-name = "send_wrapper"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7"
-
[[package]]
name = "serde"
-version = "1.0.124"
+version = "1.0.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
dependencies = [
"serde_derive",
]
@@ -8448,9 +8443,9 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.124"
+version = "1.0.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
dependencies = [
"proc-macro2",
"quote",
@@ -8582,14 +8577,14 @@ checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68"
[[package]]
name = "simba"
-version = "0.1.5"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2"
+checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c"
dependencies = [
"approx",
"num-complex",
"num-traits",
- "paste 0.1.18",
+ "paste",
]
[[package]]
@@ -8679,22 +8674,22 @@ dependencies = [
[[package]]
name = "soketto"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa"
+checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f"
dependencies = [
"base64 0.13.0",
"bytes 1.0.1",
"futures 0.3.15",
"httparse",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"sha-1 0.9.4",
]
[[package]]
name = "sp-api"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"hash-db",
"log",
@@ -8711,7 +8706,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"blake2-rfc",
"proc-macro-crate 1.0.0",
@@ -8744,9 +8739,8 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
- "max-encoded-len",
"parity-scale-codec",
"serde",
"sp-core",
@@ -8768,7 +8762,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"criterion",
"integer-sqrt",
@@ -8796,7 +8790,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -8807,7 +8801,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -8818,7 +8812,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -8829,7 +8823,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"futures 0.3.15",
"log",
@@ -8846,12 +8840,11 @@ dependencies = [
[[package]]
name = "sp-consensus"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"futures 0.3.15",
"futures-timer 3.0.2",
- "libp2p",
"log",
"parity-scale-codec",
"parking_lot 0.11.1",
@@ -8873,7 +8866,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -8889,7 +8882,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"merlin",
@@ -8910,7 +8903,7 @@ dependencies = [
[[package]]
name = "sp-consensus-pow"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -8921,7 +8914,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"parity-scale-codec",
"sp-arithmetic",
@@ -8930,7 +8923,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -8941,7 +8934,7 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"base58",
"blake2-rfc",
@@ -8958,7 +8951,6 @@ dependencies = [
"lazy_static",
"libsecp256k1",
"log",
- "max-encoded-len",
"merlin",
"num-traits",
"parity-scale-codec",
@@ -8991,7 +8983,7 @@ dependencies = [
[[package]]
name = "sp-database"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"kvdb",
"parking_lot 0.11.1",
@@ -9008,7 +9000,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -9018,7 +9010,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"finality-grandpa",
"log",
@@ -9034,7 +9026,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"async-trait",
"futures 0.3.15",
@@ -9048,7 +9040,7 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"futures 0.3.15",
"hash-db",
@@ -9072,7 +9064,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"lazy_static",
"sp-core",
@@ -9082,7 +9074,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"async-trait",
"derive_more",
@@ -9100,7 +9092,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"ruzstd",
"zstd",
@@ -9108,7 +9100,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"parity-scale-codec",
"rand 0.7.3",
@@ -9123,7 +9115,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections-compact"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"parity-scale-codec",
"proc-macro-crate 1.0.0",
@@ -9151,7 +9143,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"sp-api",
"sp-core",
@@ -9168,7 +9160,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"rustc-hash",
"serde",
@@ -9179,16 +9171,15 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"either",
"hash256-std-hasher",
"impl-trait-for-tuples",
"log",
- "max-encoded-len",
"parity-scale-codec",
"parity-util-mem",
- "paste 1.0.4",
+ "paste",
"rand 0.7.3",
"serde",
"serde_json 1.0.64",
@@ -9205,7 +9196,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -9227,7 +9218,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"Inflector",
"proc-macro-crate 1.0.0",
@@ -9277,7 +9268,7 @@ dependencies = [
[[package]]
name = "sp-sandbox"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"assert_matches",
"parity-scale-codec",
@@ -9299,7 +9290,7 @@ dependencies = [
[[package]]
name = "sp-session"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -9311,7 +9302,7 @@ dependencies = [
[[package]]
name = "sp-staking"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -9320,7 +9311,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"hash-db",
"hex-literal",
@@ -9345,11 +9336,11 @@ dependencies = [
[[package]]
name = "sp-std"
-version = "3.0.0"
+version = "4.0.0-dev"
[[package]]
name = "sp-storage"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -9361,7 +9352,7 @@ dependencies = [
[[package]]
name = "sp-tasks"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"log",
"parity-scale-codec",
@@ -9386,7 +9377,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"async-trait",
"futures-timer 3.0.2",
@@ -9402,7 +9393,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"erased-serde",
"log",
@@ -9419,22 +9410,15 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
- "derive_more",
- "futures 0.3.15",
- "log",
- "parity-scale-codec",
- "serde",
"sp-api",
- "sp-blockchain",
"sp-runtime",
- "thiserror",
]
[[package]]
name = "sp-transaction-storage-proof"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"async-trait",
"log",
@@ -9448,7 +9432,7 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"criterion",
"hash-db",
@@ -9466,7 +9450,7 @@ dependencies = [
[[package]]
name = "sp-utils"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"futures 0.3.15",
"futures-core",
@@ -9477,19 +9461,21 @@ dependencies = [
[[package]]
name = "sp-version"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"impl-serde",
"parity-scale-codec",
+ "parity-wasm 0.42.2",
"serde",
"sp-runtime",
"sp-std",
"sp-version-proc-macro",
+ "thiserror",
]
[[package]]
name = "sp-version-proc-macro"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"parity-scale-codec",
"proc-macro-crate 1.0.0",
@@ -9501,7 +9487,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -9529,11 +9515,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "statrs"
-version = "0.12.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce16f6de653e88beca7bd13780d08e09d4489dbca1f9210e041bc4852481382"
+checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05"
dependencies = [
- "rand 0.7.3",
+ "approx",
+ "lazy_static",
+ "nalgebra",
+ "num-traits",
+ "rand 0.8.4",
]
[[package]]
@@ -9579,7 +9569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
dependencies = [
"heck",
- "proc-macro-error",
+ "proc-macro-error 1.0.4",
"proc-macro2",
"quote",
"syn",
@@ -9629,7 +9619,7 @@ dependencies = [
[[package]]
name = "substrate-browser-utils"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"chrono",
"console_error_panic_hook",
@@ -9638,7 +9628,7 @@ dependencies = [
"futures-timer 3.0.2",
"getrandom 0.2.3",
"js-sys",
- "kvdb-web",
+ "kvdb-memorydb",
"libp2p-wasm-ext",
"log",
"rand 0.7.3",
@@ -9661,7 +9651,7 @@ dependencies = [
[[package]]
name = "substrate-frame-cli"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-support",
"frame-system",
@@ -9689,7 +9679,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"frame-system-rpc-runtime-api",
"futures 0.3.15",
@@ -9701,6 +9691,7 @@ dependencies = [
"sc-client-api",
"sc-rpc-api",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"serde",
"sp-api",
"sp-block-builder",
@@ -9708,7 +9699,6 @@ dependencies = [
"sp-core",
"sp-runtime",
"sp-tracing",
- "sp-transaction-pool",
"substrate-test-runtime-client",
]
@@ -9775,6 +9765,7 @@ dependencies = [
"sp-api",
"sp-application-crypto",
"sp-block-builder",
+ "sp-consensus",
"sp-consensus-aura",
"sp-consensus-babe",
"sp-core",
@@ -9825,16 +9816,16 @@ dependencies = [
"futures 0.3.15",
"parity-scale-codec",
"parking_lot 0.11.1",
- "sc-transaction-graph",
+ "sc-transaction-pool",
+ "sc-transaction-pool-api",
"sp-blockchain",
"sp-runtime",
- "sp-transaction-pool",
"substrate-test-runtime-client",
]
[[package]]
name = "substrate-test-utils"
-version = "3.0.0"
+version = "4.0.0-dev"
dependencies = [
"futures 0.3.15",
"sc-service",
@@ -9845,7 +9836,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"proc-macro-crate 1.0.0",
"quote",
@@ -9863,7 +9854,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
-version = "4.0.0"
+version = "5.0.0-dev"
dependencies = [
"ansi_term 0.12.1",
"atty",
@@ -9899,6 +9890,17 @@ dependencies = [
"unicode-xid",
]
+[[package]]
+name = "syn-mid"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "synstructure"
version = "0.12.4"
@@ -9937,7 +9939,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "rand 0.8.3",
+ "rand 0.8.4",
"redox_syscall 0.2.5",
"remove_dir_all",
"winapi 0.3.9",
@@ -9956,31 +9958,35 @@ dependencies = [
name = "test-runner"
version = "0.9.0"
dependencies = [
- "env_logger 0.7.1",
"frame-system",
"futures 0.3.15",
"jsonrpc-core",
"log",
+ "num-traits",
"sc-basic-authorship",
"sc-cli",
"sc-client-api",
+ "sc-consensus",
+ "sc-consensus-babe",
"sc-consensus-manual-seal",
"sc-executor",
+ "sc-finality-grandpa",
"sc-informant",
"sc-network",
"sc-rpc",
"sc-rpc-server",
"sc-service",
- "sc-transaction-graph",
"sc-transaction-pool",
+ "sc-transaction-pool-api",
"sp-api",
"sp-block-builder",
"sp-blockchain",
"sp-consensus",
+ "sp-consensus-babe",
"sp-core",
"sp-externalities",
+ "sp-finality-grandpa",
"sp-inherents",
- "sp-io",
"sp-keyring",
"sp-keystore",
"sp-offchain",
@@ -10174,7 +10180,6 @@ dependencies = [
"libc",
"memchr",
"mio",
- "mio-named-pipes",
"mio-uds",
"num_cpus",
"pin-project-lite 0.1.12",
@@ -10544,9 +10549,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
[[package]]
name = "trie-bench"
-version = "0.27.0"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568257edb909a5c532b1f4ab38ee6b5dedfbf8775be6a55a29020513ebe3e072"
+checksum = "4edd9bdf0c2e08fd77c0fb2608179cac7ebed997ae18f58d47a2d96425ff51f0"
dependencies = [
"criterion",
"hash-db",
@@ -10560,12 +10565,12 @@ dependencies = [
[[package]]
name = "trie-db"
-version = "0.22.5"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd81fe0c8bc2b528a51c9d2c31dae4483367a26a723a3c9a4a8120311d7774e3"
+checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
dependencies = [
"hash-db",
- "hashbrown",
+ "hashbrown 0.11.2",
"log",
"rustc-hex",
"smallvec 1.6.1",
@@ -10607,7 +10612,7 @@ dependencies = [
"ipnet",
"lazy_static",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"smallvec 1.6.1",
"thiserror",
"tinyvec",
@@ -10641,7 +10646,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
-version = "0.9.0"
+version = "0.10.0-dev"
dependencies = [
"frame-try-runtime",
"log",
@@ -10657,7 +10662,6 @@ dependencies = [
"sp-blockchain",
"sp-core",
"sp-externalities",
- "sp-io",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
@@ -10666,9 +10670,9 @@ dependencies = [
[[package]]
name = "trybuild"
-version = "1.0.42"
+version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1768998d9a3b179411618e377dbb134c58a88cda284b0aa71c42c40660127d46"
+checksum = "c02c413315329fc96167f922b46fd0caa3a43f4697b7a7896b183c7142635832"
dependencies = [
"dissimilar",
"glob",
@@ -10884,9 +10888,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]]
name = "walkdir"
-version = "2.3.1"
+version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
dependencies = [
"same-file",
"winapi 0.3.9",
@@ -11054,7 +11058,7 @@ dependencies = [
"errno",
"libc",
"memory_units",
- "num-rational",
+ "num-rational 0.2.4",
"num-traits",
"parity-wasm 0.42.2",
"wasmi-validation",
@@ -11090,7 +11094,7 @@ dependencies = [
"lazy_static",
"libc",
"log",
- "paste 1.0.4",
+ "paste",
"psm",
"region",
"rustc-demangle",
@@ -11100,11 +11104,9 @@ dependencies = [
"wasmparser",
"wasmtime-cache",
"wasmtime-environ",
- "wasmtime-fiber",
"wasmtime-jit",
"wasmtime-profiling",
"wasmtime-runtime",
- "wat",
"winapi 0.3.9",
]
@@ -11179,17 +11181,6 @@ dependencies = [
"wasmparser",
]
-[[package]]
-name = "wasmtime-fiber"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a089d44cd7e2465d41a53b840a5b4fca1bf6d1ecfebc970eac9592b34ea5f0b3"
-dependencies = [
- "cc",
- "libc",
- "winapi 0.3.9",
-]
-
[[package]]
name = "wasmtime-jit"
version = "0.27.0"
@@ -11245,11 +11236,8 @@ checksum = "e24364d522dcd67c897c8fffc42e5bdfc57207bbb6d7eeade0da9d4a7d70105b"
dependencies = [
"anyhow",
"cfg-if 1.0.0",
- "gimli 0.24.0",
"lazy_static",
"libc",
- "object 0.24.0",
- "scroll",
"serde",
"target-lexicon",
"wasmtime-environ",
@@ -11273,11 +11261,10 @@ dependencies = [
"mach",
"memoffset 0.6.1",
"more-asserts",
- "rand 0.8.3",
+ "rand 0.8.4",
"region",
"thiserror",
"wasmtime-environ",
- "wasmtime-fiber",
"winapi 0.3.9",
]
@@ -11442,7 +11429,7 @@ dependencies = [
"log",
"nohash-hasher",
"parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
"static_assertions",
]
diff --git a/Cargo.toml b/Cargo.toml
index 1796c0d629a5..a779b894b683 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,6 @@ members = [
"client/executor/wasmi",
"client/executor/wasmtime",
"client/finality-grandpa",
- "client/finality-grandpa-warp-sync",
"client/informant",
"client/keystore",
"client/light",
@@ -59,7 +58,7 @@ members = [
"client/tracing",
"client/tracing/proc-macro",
"client/transaction-pool",
- "client/transaction-pool/graph",
+ "client/transaction-pool/api",
"frame/assets",
"frame/atomic-swap",
"frame/aura",
@@ -202,9 +201,6 @@ members = [
"utils/frame/rpc/system",
"utils/prometheus",
"utils/wasm-builder",
- # temp deps
- "max-encoded-len",
- "max-encoded-len/derive",
]
# The list of dependencies below (which can be both direct and indirect dependencies) are crates
diff --git a/Dockerfile b/Dockerfile
index 85b933c0ac45..f51abdb9b428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && \
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
export PATH=$PATH:$HOME/.cargo/bin && \
scripts/init.sh && \
- cargo +nightly-2021-03-14 build --$PROFILE
+ RUSTC_BOOTSTRAP=1 cargo +stable-2021-06-17 build --$PROFILE
# ===== SECOND STAGE ======
FROM phusion/baseimage:0.11
diff --git a/Dockerfile.tests b/Dockerfile.tests
index 9106dd6c22fa..8183d00e9b02 100644
--- a/Dockerfile.tests
+++ b/Dockerfile.tests
@@ -21,5 +21,5 @@ RUN apt-get update && \
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
export PATH=$PATH:$HOME/.cargo/bin && \
scripts/init.sh && \
- TRYBUILD=overwrite cargo +nightly-2021-03-14 test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml && \
- WASM_BUILD_NO_COLOR=1 SUBSTRATE_TEST_TIMEOUT=1 cargo +nightly-2021-03-14 test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
+ TRYBUILD=overwrite RUSTC_BOOTSTRAP=1 cargo +stable-2021-06-17 test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml && \
+ WASM_BUILD_NO_COLOR=1 SUBSTRATE_TEST_TIMEOUT=1 cargo +stable-2021-06-17 test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 93ee35d98f98..ac643a1109c5 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "node-bench"
-version = "0.8.0"
+version = "0.9.0-dev"
authors = ["Parity Technologies "]
description = "Substrate node integration benchmarks."
edition = "2018"
@@ -11,33 +11,33 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
log = "0.4.8"
node-primitives = { version = "2.0.0", path = "../primitives" }
-node-testing = { version = "2.0.0", path = "../testing" }
-node-runtime = { version = "2.0.0", path = "../runtime" }
-sc-cli = { version = "0.9.0", path = "../../../client/cli" }
-sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
-sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-state-machine = { version = "0.9.0", path = "../../../primitives/state-machine" }
-serde = "1.0.101"
+node-testing = { version = "3.0.0-dev", path = "../testing" }
+node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
+sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
+sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
+serde = "1.0.126"
serde_json = "1.0.41"
structopt = "0.3"
derive_more = "0.99.2"
-kvdb = "0.9.0"
-kvdb-rocksdb = "0.11.0"
-sp-trie = { version = "3.0.0", path = "../../../primitives/trie" }
-sp-core = { version = "3.0.0", path = "../../../primitives/core" }
-sp-consensus = { version = "0.9.0", path = "../../../primitives/consensus/common" }
-sp-transaction-pool = { version = "3.0.0", path = "../../../primitives/transaction-pool" }
-sc-basic-authorship = { version = "0.9.0", path = "../../../client/basic-authorship" }
-sp-inherents = { version = "3.0.0", path = "../../../primitives/inherents" }
-sp-timestamp = { version = "3.0.0", default-features = false, path = "../../../primitives/timestamp" }
-sp-tracing = { version = "3.0.0", path = "../../../primitives/tracing" }
+kvdb = "0.10.0"
+kvdb-rocksdb = "0.12.0"
+sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
+sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
+sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
+sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/timestamp" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
hash-db = "0.15.2"
tempfile = "3.1.0"
fs_extra = "1"
hex = "0.4.0"
rand = { version = "0.7.2", features = ["small_rng"] }
lazy_static = "1.4.0"
-parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
+parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] }
parity-db = { version = "0.2.4" }
-sc-transaction-pool = { version = "3.0.0", path = "../../../client/transaction-pool" }
+sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
+sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
futures = { version = "0.3.4", features = ["thread-pool"] }
diff --git a/bin/node/bench/src/construct.rs b/bin/node/bench/src/construct.rs
index 3dce8966f7a1..eeeb833c1ff1 100644
--- a/bin/node/bench/src/construct.rs
+++ b/bin/node/bench/src/construct.rs
@@ -24,36 +24,22 @@
//! DO NOT depend on user input). Thus transaction generation should be
//! based on randomized data.
-use std::{
- borrow::Cow,
- collections::HashMap,
- pin::Pin,
- sync::Arc,
-};
use futures::Future;
+use std::{borrow::Cow, collections::HashMap, pin::Pin, sync::Arc};
use node_primitives::Block;
-use node_testing::bench::{BenchDb, Profile, BlockType, KeyTypes, DatabaseType};
-use sp_runtime::{
- generic::BlockId,
- traits::NumberFor,
- OpaqueExtrinsic,
-};
-use sp_transaction_pool::{
- ImportNotificationStream,
- PoolFuture,
- PoolStatus,
- TransactionFor,
- TransactionSource,
- TransactionStatusStreamFor,
- TxHash,
+use node_testing::bench::{BenchDb, BlockType, DatabaseType, KeyTypes, Profile};
+use sc_transaction_pool_api::{
+ ImportNotificationStream, PoolFuture, PoolStatus, TransactionFor, TransactionSource,
+ TransactionStatusStreamFor, TxHash,
};
use sp_consensus::{Environment, Proposer};
use sp_inherents::InherentDataProvider;
+use sp_runtime::{generic::BlockId, traits::NumberFor, OpaqueExtrinsic};
use crate::{
common::SizeType,
- core::{self, Path, Mode},
+ core::{self, Mode, Path},
};
pub struct ConstructionBenchmarkDescription {
@@ -72,7 +58,6 @@ pub struct ConstructionBenchmark {
impl core::BenchmarkDescription for ConstructionBenchmarkDescription {
fn path(&self) -> Path {
-
let mut path = Path::new(&["node", "proposer"]);
match self.profile {
@@ -104,11 +89,7 @@ impl core::BenchmarkDescription for ConstructionBenchmarkDescription {
fn setup(self: Box) -> Box {
let mut extrinsics: Vec> = Vec::new();
- let mut bench_db = BenchDb::with_key_types(
- self.database_type,
- 50_000,
- self.key_types
- );
+ let mut bench_db = BenchDb::with_key_types(self.database_type, 50_000, self.key_types);
let client = bench_db.client();
@@ -127,11 +108,9 @@ impl core::BenchmarkDescription for ConstructionBenchmarkDescription {
fn name(&self) -> Cow<'static, str> {
format!(
"Block construction ({:?}/{}, {:?}, {:?} backend)",
- self.block_type,
- self.size,
- self.profile,
- self.database_type,
- ).into()
+ self.block_type, self.size, self.profile, self.database_type,
+ )
+ .into()
}
}
@@ -139,7 +118,9 @@ impl core::Benchmark for ConstructionBenchmark {
fn run(&mut self, mode: Mode) -> std::time::Duration {
let context = self.database.create_context(self.profile);
- let _ = context.client.runtime_version_at(&BlockId::Number(0))
+ let _ = context
+ .client
+ .runtime_version_at(&BlockId::Number(0))
.expect("Failed to get runtime version")
.spec_version;
@@ -158,20 +139,25 @@ impl core::Benchmark for ConstructionBenchmark {
let start = std::time::Instant::now();
- let proposer = futures::executor::block_on(proposer_factory.init(
- &context.client.header(&BlockId::number(0))
- .expect("Database error querying block #0")
- .expect("Block #0 should exist"),
- )).expect("Proposer initialization failed");
-
- let _block = futures::executor::block_on(
- proposer.propose(
- timestamp_provider.create_inherent_data().expect("Create inherent data failed"),
- Default::default(),
- std::time::Duration::from_secs(20),
- None,
+ let proposer = futures::executor::block_on(
+ proposer_factory.init(
+ &context
+ .client
+ .header(&BlockId::number(0))
+ .expect("Database error querying block #0")
+ .expect("Block #0 should exist"),
),
- ).map(|r| r.block).expect("Proposing failed");
+ )
+ .expect("Proposer initialization failed");
+
+ let _block = futures::executor::block_on(proposer.propose(
+ timestamp_provider.create_inherent_data().expect("Create inherent data failed"),
+ Default::default(),
+ std::time::Duration::from_secs(20),
+ None,
+ ))
+ .map(|r| r.block)
+ .expect("Proposing failed");
let elapsed = start.elapsed();
@@ -191,14 +177,11 @@ pub struct PoolTransaction {
impl From for PoolTransaction {
fn from(e: OpaqueExtrinsic) -> Self {
- PoolTransaction {
- data: e,
- hash: node_primitives::Hash::zero(),
- }
+ PoolTransaction { data: e, hash: node_primitives::Hash::zero() }
}
}
-impl sp_transaction_pool::InPoolTransaction for PoolTransaction {
+impl sc_transaction_pool_api::InPoolTransaction for PoolTransaction {
type Transaction = OpaqueExtrinsic;
type Hash = node_primitives::Hash;
@@ -210,25 +193,35 @@ impl sp_transaction_pool::InPoolTransaction for PoolTransaction {
&self.hash
}
- fn priority(&self) -> &u64 { unimplemented!() }
+ fn priority(&self) -> &u64 {
+ unimplemented!()
+ }
- fn longevity(&self) -> &u64 { unimplemented!() }
+ fn longevity(&self) -> &u64 {
+ unimplemented!()
+ }
- fn requires(&self) -> &[Vec] { unimplemented!() }
+ fn requires(&self) -> &[Vec] {
+ unimplemented!()
+ }
- fn provides(&self) -> &[Vec] { unimplemented!() }
+ fn provides(&self) -> &[Vec] {
+ unimplemented!()
+ }
- fn is_propagable(&self) -> bool { unimplemented!() }
+ fn is_propagable(&self) -> bool {
+ unimplemented!()
+ }
}
#[derive(Clone, Debug)]
pub struct Transactions(Vec>);
-impl sp_transaction_pool::TransactionPool for Transactions {
+impl sc_transaction_pool_api::TransactionPool for Transactions {
type Block = Block;
type Hash = node_primitives::Hash;
type InPoolTransaction = PoolTransaction;
- type Error = sp_transaction_pool::error::Error;
+ type Error = sc_transaction_pool_api::error::Error;
/// Returns a future that imports a bunch of unverified transactions to the pool.
fn submit_at(
@@ -236,7 +229,7 @@ impl sp_transaction_pool::TransactionPool for Transactions {
_at: &BlockId,
_source: TransactionSource,
_xts: Vec>,
- ) -> PoolFuture>, Self::Error> {
+ ) -> PoolFuture>, Self::Error> {
unimplemented!()
}
@@ -259,14 +252,21 @@ impl sp_transaction_pool::TransactionPool for Transactions {
unimplemented!()
}
- fn ready_at(&self, _at: NumberFor)
- -> Pin> + Send>> + Send>>
- {
- let iter: Box> + Send> = Box::new(self.0.clone().into_iter());
+ fn ready_at(
+ &self,
+ _at: NumberFor,
+ ) -> Pin<
+ Box<
+ dyn Future