diff --git a/.config/cargo_spellcheck.toml b/.config/cargo_spellcheck.toml
index 2fee7330572..c57328b4352 100644
--- a/.config/cargo_spellcheck.toml
+++ b/.config/cargo_spellcheck.toml
@@ -66,4 +66,4 @@ allow_dashed = false
[Reflow]
# Reflows doc comments to adhere to adhere to a given maximum line width limit.
-max_line_length = 80
\ No newline at end of file
+max_line_length = 80
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..eb5a316cbd1
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+target
diff --git a/.github/workflows/Picasso-release.yml b/.github/workflows/Picasso-release.yml
deleted file mode 100644
index 49ba6616eba..00000000000
--- a/.github/workflows/Picasso-release.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: "Picasso Community Release"
-
-on:
- push:
- tags:
- - 'picasso-*'
-env:
- CHAIN: "picasso"
-
-jobs:
- build-and-publish:
- runs-on:
- - self-hosted
- - linux
- - x64
- - sre
- steps:
- - uses: actions/checkout@v2
- with:
- fetch-depth: 0
- ref: picasso
-
- - name: Set env
- run: |
- echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^picasso-[0-9]' | tail -1 )" >> $GITHUB_ENV
- make version
-
- - name: Build and Push Artifacts to gcloud
- run: |
- /home/runner/.cargo/bin/cargo build --release --bins
- tar -czvf composable-${{ env.RELEASE_VERSION }}.tar.gz target/release/composable
- tar -czvf picasso_runtime.compact.wasm-${RELEASE_VERSION}.tar.gz target/release/wbuild/picasso-runtime/picasso_runtime.compact.wasm
- tar -czvf parachain-utils-${RELEASE_VERSION}.tar.gz target/release/parachain
- gsutil mv *.tar.gz gs://composable-binaries/community-releases/${RELEASE_VERSION}
- - name: Login to DockerHub
- uses: docker/login-action@v1
- with:
- username: ${{ secrets.DOCKER_HUB_USERNAME }}
- password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
- - name: Build Docker image
- run: make containerize-release
- - name: Docker push
- run: make push-release
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 114b1112abb..9a0e0cd60ea 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -50,7 +50,7 @@ jobs:
GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }}
if: env.RUNTIME_CHECK == 1
id: run_benchmarks
- run: .maintain/run_benchmarks.sh
+ run: .maintain/run_benchmarks.sh 50 20
- uses: EndBug/add-and-commit@v8
with:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 31dc82e6511..9e27f80b68d 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -3,6 +3,9 @@ name: CI Check
# please update docker, toolchain toml and github action with toolchain at same time
on:
+ push:
+ branches:
+ - main
pull_request:
branches:
- main
@@ -63,16 +66,13 @@ jobs:
- name: Rustup show
run: |
/home/runner/.cargo/bin/rustup show
- - uses: actions/checkout@v2
- name: Run Test (with coverage)
run: |
- # integration tests can't be compiled with --feature=runtime-benchmarks
- # TODO: https://github.com/ComposableFi/composable/issues/535
- /home/runner/.cargo/bin/cargo install -f cargo-llvm-cov
+ /home/runner/.cargo/bin/cargo +nightly-2021-11-08 install -f cargo-llvm-cov
/home/runner/.cargo/bin/rustup component add llvm-tools-preview --toolchain=nightly-2021-11-08
SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo +nightly-2021-11-08 llvm-cov --workspace --locked --release --verbose --features=runtime-benchmarks --lcov --output-path lcov.info
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@v1
+ uses: codecov/codecov-action@v2
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: lcov.info
@@ -101,16 +101,21 @@ jobs:
docker system prune --force --all --volumes
- uses: actions/checkout@v2
- - name: Check for runtime changes
- env:
- BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
- GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }}
- id: check_runtime
- run: .maintain/check_runtime.sh
+ - name: Get branch name
+ id: branch-name
+ uses: tj-actions/branch-names@v5.1
+
+ # FIXME: actually broken: https://github.com/ComposableFi/composable/runs/5570301249?check_suite_focus=true
+ # - name: Check for runtime changes
+ # env:
+ # BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+ # GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }}
+ # id: check_runtime
+ # run: .maintain/check_runtime.sh
- name: Run single pass benchmarking
# only run this step if there are runtime changes
- if: env.RUNTIME_CHECK == 1
+ # if: env.RUNTIME_CHECK == 1
env:
RUST_BACKTRACE: full
run: |
@@ -123,7 +128,6 @@ jobs:
--extrinsic='*' \
--steps=1 \
--repeat=1 \
- --raw \
--log error
@@ -177,9 +181,20 @@ jobs:
with:
node-version: 14.x
- - name: Cargo fmt
+ - name: Cargo format (Rust)
run: |
cargo +nightly fmt --all -- --check
+
+ - name: Taplo format (Toml)
+ run: |
+ cargo install taplo-cli
+ taplo lint --warn-as-error
+ taplo fmt --warn-as-error
+ if ! git diff-index HEAD; then
+ exit 1
+ else
+ echo "Everything is fine!"
+ fi
- name: Hadolint
env:
@@ -215,7 +230,7 @@ jobs:
- name: Cargo clippy
run: |
- SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets
+ SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets --tests -- -D warnings
- name: Cargo Single Depedency
# description: Speed up builds and reduced security check surface
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
new file mode 100644
index 00000000000..3e440635dda
--- /dev/null
+++ b/.github/workflows/ci-linux.yml
@@ -0,0 +1,49 @@
+name: "ci-linux Docker image"
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - ci-linux
+
+env:
+ DOCKER_USER_OPTION: '$UID:$GID'
+ SCCACHE_GCS_BUCKET: 'composable-build-artefacts'
+ RUSTC_WRAPPER: "/home/runner/.cargo/bin/sccache"
+ SCCACHE_GCS_RW_MODE: "READ_WRITE"
+
+jobs:
+ build-and-publish:
+ runs-on:
+ - self-hosted
+ - linux
+ - x64
+ - sre
+ concurrency:
+ group: docker-${{ github.ref }}
+ cancel-in-progress: true
+ strategy:
+ fail-fast: true
+
+ steps:
+ - name: Clean up
+ continue-on-error: true
+ run: |
+ sudo chown -R $USER:$USER $GITHUB_WORKSPACE
+ docker system prune --force --all --volumes
+
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+
+ - name: Login to DockerHub
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKER_HUB_USERNAME }}
+ password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+ - name: Build Docker image
+ run: make containerize-ci-linux
+
+ - name: Docker push
+ run: make push-ci-linux
diff --git a/.github/workflows/composable-sandbox.yml b/.github/workflows/composable-sandbox.yml
new file mode 100644
index 00000000000..a242cbbb69e
--- /dev/null
+++ b/.github/workflows/composable-sandbox.yml
@@ -0,0 +1,49 @@
+name: "composable-sandbox Docker image"
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - composable-sandbox
+
+env:
+ DOCKER_USER_OPTION: '$UID:$GID'
+ SCCACHE_GCS_BUCKET: 'composable-build-artefacts'
+ RUSTC_WRAPPER: "/home/runner/.cargo/bin/sccache"
+ SCCACHE_GCS_RW_MODE: "READ_WRITE"
+
+jobs:
+ build-and-publish:
+ runs-on:
+ - self-hosted
+ - linux
+ - x64
+ - sre
+ concurrency:
+ group: docker-${{ github.ref }}
+ cancel-in-progress: true
+ strategy:
+ fail-fast: true
+
+ steps:
+ - name: Clean up
+ continue-on-error: true
+ run: |
+ sudo chown -R $USER:$USER $GITHUB_WORKSPACE
+ docker system prune --force --all --volumes
+
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+
+ - name: Login to DockerHub
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKER_HUB_USERNAME }}
+ password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+ - name: Build Docker image
+ run: make containerize-composable-sandbox
+
+ - name: Docker push
+ run: make push-composable-sandbox
diff --git a/.github/workflows/devnet-release.yml b/.github/workflows/devnet-release.yml
index 6f47088b2a2..0f6d7d9d038 100644
--- a/.github/workflows/devnet-release.yml
+++ b/.github/workflows/devnet-release.yml
@@ -22,8 +22,6 @@ jobs:
- uses: actions/setup-python@v2
- uses: cachix/install-nix-action@v16
- with:
- nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v10
with:
@@ -43,14 +41,18 @@ jobs:
- name: Install latest Nightly
uses: actions-rs/toolchain@v1
with:
- toolchain: nightly
+ toolchain: nightly-2022-02-01
target: wasm32-unknown-unknown
+ - uses: Swatinem/rust-cache@v1
+
- name: Push artifact
run: |
cargo build --release
- tar -czvf composable-picasso-${{ env.RELEASE_VERSION }}.tar.gz target/release/composable
+ cargo doc --release
+ tar -czvf composable-picasso-${{ env.RELEASE_VERSION }}.tar.gz target/release/composable target/doc
gsutil mv *.tar.gz gs://composable-binaries/community-releases/picasso/
+ rm -rf target
- name: Load state
run: |
diff --git a/.github/workflows/mmr-polkadot.yml b/.github/workflows/mmr-polkadot.yml
new file mode 100644
index 00000000000..70cfefbaf11
--- /dev/null
+++ b/.github/workflows/mmr-polkadot.yml
@@ -0,0 +1,49 @@
+name: "mmr-polkadot Docker image"
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - mmr-polkadot
+
+env:
+ DOCKER_USER_OPTION: '$UID:$GID'
+ SCCACHE_GCS_BUCKET: 'composable-build-artefacts'
+ RUSTC_WRAPPER: "/home/runner/.cargo/bin/sccache"
+ SCCACHE_GCS_RW_MODE: "READ_WRITE"
+
+jobs:
+ build-and-publish:
+ runs-on:
+ - self-hosted
+ - linux
+ - x64
+ - sre
+ concurrency:
+ group: docker-${{ github.ref }}
+ cancel-in-progress: true
+ strategy:
+ fail-fast: true
+
+ steps:
+ - name: Clean up
+ continue-on-error: true
+ run: |
+ sudo chown -R $USER:$USER $GITHUB_WORKSPACE
+ docker system prune --force --all --volumes
+
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+
+ - name: Login to DockerHub
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKER_HUB_USERNAME }}
+ password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+ - name: Build Docker image
+ run: make containerize-mmr-polkadot
+
+ - name: Docker push
+ run: make push-mmr-polkadot
diff --git a/.gitignore b/.gitignore
index 31e4914a423..e2f5eb34100 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,6 @@ target
node_modules/
**/yarn-error.log
**/.yarn/
-rust-toolchain.toml
\ No newline at end of file
+rust-toolchain.toml
+
+.benchmarkRun
\ No newline at end of file
diff --git a/.maintain/playbooks/delete-db-directory.yml b/.maintain/playbooks/delete-db-directory.yml
deleted file mode 100644
index 1a2f29a6680..00000000000
--- a/.maintain/playbooks/delete-db-directory.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- name: Delete DB Directory for Dali
- hosts: all
- become: runner
- tasks:
- - name: Run Backup Script
- become: true
- shell: |
- #!/bin/bash
- sudo supervisorctl stop composable
- sudo rm -rf /var/lib/composable-data
- args:
- executable: /bin/bash
- register: stdout
-
- - name: Copy runner config Script
- copy:
- src: composable-rococo.conf
- dest: /etc/supervisor/conf.d/composable.conf
- owner: composable
- group: 0755
\ No newline at end of file
diff --git a/.maintain/playbooks/run-integration-tests.yml b/.maintain/playbooks/run-integration-tests.yml
index e75431d6796..5d9aefedb33 100644
--- a/.maintain/playbooks/run-integration-tests.yml
+++ b/.maintain/playbooks/run-integration-tests.yml
@@ -130,7 +130,7 @@
dest: "/home/{{ user }}/basilisk"
- url: https://storage.googleapis.com/composable-binaries/testnet-releases/picasso/composable-latest.tar.gz
dest: "/home/{{ user }}/composable-latest.tar.gz"
- - url: https://github.com/paritytech/polkadot/releases/download/v0.9.16/polkadot
+ - url: https://github.com/paritytech/polkadot/releases/download/v0.9.17/polkadot
dest: "/home/{{ user }}/polkadot"
- name: Clone composable repo
diff --git a/.maintain/run_benchmarks.sh b/.maintain/run_benchmarks.sh
index a6b792b5165..65c53b0f2ed 100755
--- a/.maintain/run_benchmarks.sh
+++ b/.maintain/run_benchmarks.sh
@@ -13,8 +13,8 @@ VERSIONS_FILES=(
"runtime/composable/src/weights,composable-dev,composable"
)
-steps=50
-repeat=20
+steps=$1
+repeat=$2
/home/runner/.cargo/bin/rustup install nightly
/home/runner/.cargo/bin/rustup target add wasm32-unknown-unknown --toolchain nightly
@@ -35,7 +35,6 @@ run_benchmarks() {
--extrinsic='*' \
--steps=$steps \
--repeat=$repeat \
- --raw \
--output="$OUTPUT" \
--log error
# ToDO: Setup gpg signing and create a bot account for pushing
diff --git a/.maintain/run_simnode.sh b/.maintain/run_simnode.sh
index a5d124d3c13..81d7824f6ec 100755
--- a/.maintain/run_simnode.sh
+++ b/.maintain/run_simnode.sh
@@ -11,7 +11,7 @@ set -e # fail on any error
VERSIONS_FILES=(
"picasso,picasso"
"dali-rococo,dali"
- # "composable,composable" # TODO: add simnode suppport for composable
+ "composable,composable"
)
/home/runner/.cargo/bin/rustup update nightly
@@ -28,7 +28,7 @@ run_simnode() {
GS_BUCKET="$CHAIN-data-store"
sudo gsutil cp gs://$GS_BUCKET/"$FILENAME" .
sudo unzip -o "$FILENAME" -d /tmp/db
- ./target/release/simnode-tests --chain="$CHAIN" --base-path=/tmp/db/var/lib/composable-data/ --pruning=archive --execution=wasm
+ sudo ./target/release/simnode-tests --chain="$CHAIN" --base-path=/tmp/db/var/lib/composable-data/ --pruning=archive --execution=wasm
}
# shellcheck disable=SC2039
diff --git a/.taplo.toml b/.taplo.toml
new file mode 100644
index 00000000000..7c65b90cb24
--- /dev/null
+++ b/.taplo.toml
@@ -0,0 +1,30 @@
+include = ["Cargo.toml", "**/*.toml"]
+
+[formatting]
+# Align consecutive entries vertically.
+align_entries = false
+# Append trailing commas for multi-line arrays.
+array_trailing_comma = true
+# Expand arrays to multiple lines that exceed the maximum column width.
+array_auto_expand = true
+# Collapse arrays that don't exceed the maximum column width and don't contain comments.
+array_auto_collapse = true
+# Omit white space padding from single-line arrays
+compact_arrays = true
+# Omit white space padding from the start and end of inline tables.
+compact_inline_tables = false
+# Maximum column width in characters, affects array expansion and collapse, this doesn't take whitespace into account.
+# Note that this is not set in stone, and works on a best-effort basis.
+column_width = 80
+# Indent based on tables and arrays of tables and their subtables, subtables out of order are not indented.
+indent_tables = false
+# The substring that is used for indentation, should be tabs or spaces (but technically can be anything).
+indent_string = ' '
+# Add trailing newline at the end of the file if not present.
+trailing_newline = true
+# Alphabetically reorder keys that are not separated by empty lines.
+reorder_keys = true
+# Maximum amount of allowed consecutive blank lines. This does not affect the whitespace at the end of the document, as it is always stripped.
+allowed_blank_lines = 2
+# Use CRLF for line endings.
+crlf = false
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index e9dad145c8d..b4374fb83b6 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -9,9 +9,16 @@ The Composable project consists of a blockchain, various utility applications, d
# Runtimes
When building the chain, we use different names to target different [relay chain](https://wiki.polkadot.network/docs/learn-architecture):
-- the **Dali** chain is deployed for **Westend/Rococo/Chachacha**
-- the **Picasso** chain is deployed for **Kusama**
-- the **Composable** chain is deployed for **Polkadot**
+
+| Chain and Runtime | Deployed to | Relayer Native Currency | Link | Docs |
+| ----------------- | ----------------- | ----------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------- |
+| Dali | Devnet(own Relay) | KSM | https://polkadot.js.org/apps/?rpc=wss://dali.devnets.composablefinance.ninja/parachain/alice#/explorer | https://dali.devnets.composablefinance.ninja/ |
+| Picasso | Devnet(own Relay) | KSM | https://polkadot.js.org/apps/?rpc=wss://picasso.devnets.composablefinance.ninja/parachain/alice#/explorer |
+| Dali | Westend | WND(DOT) |
+| Dali | Rococo | | https://polkadot.js.org/apps/?rpc=wss://rpc.composablefinance.ninja |
+| Dali | Chachacha | |
+| Picasso | Kusama | KSM | https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fpicasso-rpc.composable.finance#/explorer |
+| Composable | Polkadot | DOT |
The runtimes can be found under the `runtime` directory.
The chain specs are located in `node/src/chain_spec`.
diff --git a/Cargo.lock b/Cargo.lock
index e2afc1f8073..50d49f29d80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -128,7 +128,7 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.5",
"once_cell",
"version_check 0.9.4",
]
@@ -159,9 +159,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.53"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
+checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
[[package]]
name = "approx"
@@ -211,6 +211,32 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
+[[package]]
+name = "assets-rpc"
+version = "0.0.1"
+dependencies = [
+ "assets-runtime-api",
+ "composable-support",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-blockchain",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "assets-runtime-api"
+version = "0.0.1"
+dependencies = [
+ "composable-support",
+ "parity-scale-codec",
+ "sp-api",
+]
+
[[package]]
name = "async-attributes"
version = "1.1.2"
@@ -218,7 +244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
dependencies = [
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -258,9 +284,9 @@ dependencies = [
[[package]]
name = "async-global-executor"
-version = "2.0.2"
+version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6"
+checksum = "c026b7e44f1316b567ee750fea85103f87fcb80792b860e979f221259796ca0a"
dependencies = [
"async-channel",
"async-executor",
@@ -310,9 +336,9 @@ dependencies = [
[[package]]
name = "async-lock"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
+checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
dependencies = [
"event-listener",
]
@@ -390,7 +416,7 @@ dependencies = [
"async-io",
"async-lock",
"async-process",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.8",
"futures-channel",
"futures-core",
"futures-io",
@@ -423,9 +449,9 @@ dependencies = [
[[package]]
name = "async-task"
-version = "4.1.0"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8"
+checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9"
[[package]]
name = "async-trait"
@@ -435,7 +461,7 @@ checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -470,7 +496,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
]
[[package]]
@@ -492,15 +518,18 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "0.1.7"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
+dependencies = [
+ "autocfg 1.1.0",
+]
[[package]]
name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
@@ -572,11 +601,11 @@ dependencies = [
[[package]]
name = "beefy-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"beefy-primitives",
"fnv",
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
"parity-scale-codec",
"parking_lot 0.11.2",
@@ -601,12 +630,11 @@ dependencies = [
[[package]]
name = "beefy-gadget-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"beefy-gadget",
"beefy-primitives",
- "derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -625,12 +653,12 @@ dependencies = [
[[package]]
name = "beefy-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
[[package]]
name = "beefy-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -807,9 +835,9 @@ dependencies = [
[[package]]
name = "block-buffer"
-version = "0.10.0"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
dependencies = [
"generic-array 0.14.5",
]
@@ -831,9 +859,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
name = "blocking"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427"
+checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
dependencies = [
"async-channel",
"async-task",
@@ -855,7 +883,7 @@ dependencies = [
[[package]]
name = "bp-header-chain"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"finality-grandpa",
"frame-support",
@@ -871,7 +899,7 @@ dependencies = [
[[package]]
name = "bp-message-dispatch"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bp-runtime",
"frame-support",
@@ -883,7 +911,7 @@ dependencies = [
[[package]]
name = "bp-messages"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bitvec",
"bp-runtime",
@@ -899,7 +927,7 @@ dependencies = [
[[package]]
name = "bp-polkadot-core"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bp-messages",
"bp-runtime",
@@ -917,7 +945,7 @@ dependencies = [
[[package]]
name = "bp-rococo"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bp-messages",
"bp-polkadot-core",
@@ -934,7 +962,7 @@ dependencies = [
[[package]]
name = "bp-runtime"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-support",
"hash-db",
@@ -952,7 +980,7 @@ dependencies = [
[[package]]
name = "bp-test-utils"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bp-header-chain",
"ed25519-dalek",
@@ -967,7 +995,7 @@ dependencies = [
[[package]]
name = "bp-wococo"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bp-messages",
"bp-polkadot-core",
@@ -982,7 +1010,7 @@ dependencies = [
[[package]]
name = "bridge-runtime-common"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bp-message-dispatch",
"bp-messages",
@@ -1044,9 +1072,9 @@ checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
[[package]]
name = "byte-slice-cast"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d30c751592b77c499e7bce34d99d67c2c11bdc0574e9a488ddade14150a4698"
+checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e"
[[package]]
name = "byte-tools"
@@ -1056,9 +1084,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
[[package]]
name = "bytemuck"
-version = "1.7.3"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"
+checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead"
[[package]]
name = "byteorder"
@@ -1108,22 +1136,22 @@ dependencies = [
[[package]]
name = "cargo_metadata"
-version = "0.14.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12"
+checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
dependencies = [
"camino",
"cargo-platform",
- "semver 1.0.4",
+ "semver 1.0.6",
"serde",
"serde_json",
]
[[package]]
name = "cc"
-version = "1.0.72"
+version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
dependencies = [
"jobserver",
]
@@ -1260,9 +1288,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.0.14"
+version = "3.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62"
+checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123"
dependencies = [
"atty",
"bitflags",
@@ -1272,20 +1300,20 @@ dependencies = [
"os_str_bytes",
"strsim 0.10.0",
"termcolor",
- "textwrap 0.14.2",
+ "textwrap 0.15.0",
]
[[package]]
name = "clap_derive"
-version = "3.0.14"
+version = "3.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1132dc3944b31c20dd8b906b3a9f0a5d0243e092d59171414969657ac6aa85"
+checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16"
dependencies = [
"heck 0.4.0",
"proc-macro-error",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -1311,11 +1339,8 @@ name = "collator-sidecar"
version = "0.1.0"
dependencies = [
"async-std",
- "common",
"env_logger 0.8.4",
- "jsonrpc-core-client",
- "picasso-runtime",
- "sc-rpc",
+ "jsonrpsee 0.9.0",
"serde",
"structopt",
"tide",
@@ -1368,22 +1393,45 @@ dependencies = [
"sp-io",
"sp-runtime",
"sp-std",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
]
[[package]]
name = "composable"
-version = "1.0.9"
+version = "1.0.0"
dependencies = [
"color-eyre",
"composable-node",
]
+[[package]]
+name = "composable-maths"
+version = "0.0.1"
+dependencies = [
+ "composable-traits",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "rust_decimal",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "composable-node"
-version = "1.0.9"
+version = "1.0.0"
dependencies = [
+ "assets-rpc",
+ "assets-runtime-api",
+ "clap 3.1.6",
"common",
"composable-runtime",
+ "crowdloan-rewards-rpc",
+ "crowdloan-rewards-runtime-api",
"cumulus-client-cli",
"cumulus-client-collator",
"cumulus-client-consensus-aura",
@@ -1400,6 +1448,8 @@ dependencies = [
"hex",
"jsonrpc-core",
"log 0.4.14",
+ "pallet-assets",
+ "pallet-crowdloan-rewards",
"pallet-transaction-payment-rpc",
"pallet-transaction-payment-rpc-runtime-api",
"parity-scale-codec",
@@ -1408,6 +1458,7 @@ dependencies = [
"polkadot-parachain",
"polkadot-primitives",
"polkadot-service",
+ "primitives",
"sc-basic-authorship",
"sc-chain-spec",
"sc-cli",
@@ -1442,7 +1493,6 @@ dependencies = [
"sp-timestamp",
"sp-transaction-pool",
"sp-trie",
- "structopt",
"substrate-build-script-utils",
"substrate-frame-rpc-system",
"substrate-prometheus-endpoint",
@@ -1452,8 +1502,11 @@ dependencies = [
name = "composable-runtime"
version = "0.1.0"
dependencies = [
+ "assets-runtime-api",
"common",
+ "composable-support",
"composable-traits",
+ "crowdloan-rewards-runtime-api",
"cumulus-pallet-aura-ext",
"cumulus-pallet-dmp-queue",
"cumulus-pallet-parachain-system",
@@ -1483,6 +1536,7 @@ dependencies = [
"pallet-call-filter",
"pallet-collator-selection",
"pallet-collective",
+ "pallet-crowdloan-rewards",
"pallet-currency-factory",
"pallet-democracy 4.0.0-dev",
"pallet-governance-registry",
@@ -1506,6 +1560,7 @@ dependencies = [
"polkadot-parachain",
"primitives",
"scale-info",
+ "simnode-runtime-apis",
"smallvec 1.8.0",
"sp-api",
"sp-block-builder",
@@ -1532,7 +1587,7 @@ dependencies = [
"frame-system",
"is_sorted",
"parity-scale-codec",
- "proptest 1.0.0",
+ "proptest",
"scale-info",
"serde",
"serde_json",
@@ -1563,10 +1618,9 @@ dependencies = [
"composable-support",
"frame-support",
"frame-system",
- "orml-traits",
"parity-scale-codec",
"plotters",
- "proptest 1.0.0",
+ "proptest",
"scale-info",
"serde",
"sp-arithmetic",
@@ -1613,7 +1667,7 @@ dependencies = [
"hkdf",
"hmac 0.10.1",
"percent-encoding 2.1.0",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha2 0.9.9",
"time 0.2.27",
"version_check 0.9.4",
@@ -1621,9 +1675,9 @@ dependencies = [
[[package]]
name = "core-foundation"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1707,18 +1761,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
[[package]]
name = "cranelift-bforest"
-version = "0.80.0"
+version = "0.80.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9516ba6b2ba47b4cbf63b713f75b432fafa0a0e0464ec8381ec76e6efe931ab3"
+checksum = "62fc68cdb867b7d27b5f33cd65eb11376dfb41a2d09568a1a2c2bc1dc204f4ef"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
-version = "0.80.0"
+version = "0.80.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489e5d0081f7edff6be12d71282a8bf387b5df64d5592454b75d662397f2d642"
+checksum = "31253a44ab62588f8235a996cc9b0636d98a299190069ced9628b8547329b47a"
dependencies = [
"cranelift-bforest",
"cranelift-codegen-meta",
@@ -1733,33 +1787,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.80.0"
+version = "0.80.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36ee1140371bb0f69100e734b30400157a4adf7b86148dee8b0a438763ead48"
+checksum = "7a20ab4627d30b702fb1b8a399882726d216b8164d3b3fa6189e3bf901506afe"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
-version = "0.80.0"
+version = "0.80.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "981da52d8f746af1feb96290c83977ff8d41071a7499e991d8abae0d4869f564"
+checksum = "6687d9668dacfed4468361f7578d86bded8ca4db978f734d9b631494bebbb5b8"
[[package]]
name = "cranelift-entity"
-version = "0.80.0"
+version = "0.80.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2906740053dd3bcf95ce53df0fd9b5649c68ae4bd9adada92b406f059eae461"
+checksum = "c77c5d72db97ba2cb36f69037a709edbae0d29cb25503775891e7151c5c874bf"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
-version = "0.80.0"
+version = "0.80.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7cb156de1097f567d46bf57a0cd720a72c3e15e1a2bd8b1041ba2fc894471b7"
+checksum = "426dca83f63c7c64ea459eb569aadc5e0c66536c0042ed5d693f91830e8750d0"
dependencies = [
"cranelift-codegen",
"log 0.4.14",
@@ -1769,9 +1823,9 @@ dependencies = [
[[package]]
name = "cranelift-native"
-version = "0.80.0"
+version = "0.80.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166028ca0343a6ee7bddac0e70084e142b23f99c701bd6f6ea9123afac1a7a46"
+checksum = "8007864b5d0c49b026c861a15761785a2871124e401630c03ef1426e6d0d559e"
dependencies = [
"cranelift-codegen",
"libc",
@@ -1780,9 +1834,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.80.0"
+version = "0.80.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5012a1cde0c8b3898770b711490d803018ae9bec2d60674ba0e5b2058a874f80"
+checksum = "94cf12c071415ba261d897387ae5350c4d83c238376c8c5a96514ecfa2ea66a3"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -1796,21 +1850,21 @@ dependencies = [
[[package]]
name = "crc32fast"
-version = "1.3.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "crossbeam-channel"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
+checksum = "fdbfe11fe19ff083c48923cf179540e8cd0535903dc35e178a1fdeeb59aef51f"
dependencies = [
"cfg-if 1.0.0",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.8",
]
[[package]]
@@ -1821,17 +1875,18 @@ checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-epoch",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.8",
]
[[package]]
name = "crossbeam-epoch"
-version = "0.9.6"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
+checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
dependencies = [
+ "autocfg 1.1.0",
"cfg-if 1.0.0",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.8",
"lazy_static",
"memoffset",
"scopeguard",
@@ -1843,21 +1898,49 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"cfg-if 0.1.10",
"lazy_static",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.6"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
+checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
dependencies = [
"cfg-if 1.0.0",
"lazy_static",
]
+[[package]]
+name = "crowdloan-rewards-rpc"
+version = "0.0.1"
+dependencies = [
+ "composable-support",
+ "composable-traits",
+ "crowdloan-rewards-runtime-api",
+ "frame-support",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-blockchain",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "crowdloan-rewards-runtime-api"
+version = "0.0.1"
+dependencies = [
+ "composable-support",
+ "parity-scale-codec",
+ "sp-api",
+]
+
[[package]]
name = "crunchy"
version = "0.2.2"
@@ -1866,11 +1949,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-common"
-version = "0.1.1"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
dependencies = [
"generic-array 0.14.5",
+ "typenum",
]
[[package]]
@@ -1909,7 +1993,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
dependencies = [
- "sct",
+ "sct 0.6.1",
]
[[package]]
@@ -1919,7 +2003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa"
dependencies = [
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -1954,23 +2038,23 @@ dependencies = [
[[package]]
name = "cumulus-client-cli"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
+ "clap 3.1.6",
"sc-cli",
"sc-service",
- "structopt",
]
[[package]]
name = "cumulus-client-collator"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-client-consensus-common",
"cumulus-client-network",
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
- "futures 0.3.19",
+ "futures 0.3.21",
"parity-scale-codec",
"parking_lot 0.10.2",
"polkadot-node-primitives",
@@ -1988,12 +2072,12 @@ dependencies = [
[[package]]
name = "cumulus-client-consensus-aura"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"async-trait",
"cumulus-client-consensus-common",
"cumulus-primitives-core",
- "futures 0.3.19",
+ "futures 0.3.21",
"parity-scale-codec",
"sc-client-api",
"sc-consensus",
@@ -2017,12 +2101,12 @@ dependencies = [
[[package]]
name = "cumulus-client-consensus-common"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"async-trait",
"cumulus-relay-chain-interface",
"dyn-clone",
- "futures 0.3.19",
+ "futures 0.3.21",
"parity-scale-codec",
"polkadot-primitives",
"sc-client-api",
@@ -2038,15 +2122,15 @@ dependencies = [
[[package]]
name = "cumulus-client-network"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"async-trait",
"cumulus-relay-chain-interface",
"derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"parity-scale-codec",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.0",
"polkadot-node-primitives",
"polkadot-parachain",
"polkadot-primitives",
@@ -2063,18 +2147,18 @@ dependencies = [
[[package]]
name = "cumulus-client-pov-recovery"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"parity-scale-codec",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-overseer",
"polkadot-primitives",
- "rand 0.8.4",
+ "rand 0.8.5",
"sc-client-api",
"sc-consensus",
"sp-api",
@@ -2087,7 +2171,7 @@ dependencies = [
[[package]]
name = "cumulus-client-service"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-client-collator",
"cumulus-client-consensus-common",
@@ -2095,7 +2179,7 @@ dependencies = [
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
"parity-scale-codec",
- "parking_lot 0.10.2",
+ "parking_lot 0.12.0",
"polkadot-overseer",
"polkadot-primitives",
"sc-chain-spec",
@@ -2116,7 +2200,7 @@ dependencies = [
[[package]]
name = "cumulus-pallet-aura-ext"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"frame-executive",
"frame-support",
@@ -2134,7 +2218,7 @@ dependencies = [
[[package]]
name = "cumulus-pallet-dmp-queue"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-primitives-core",
"frame-support",
@@ -2152,7 +2236,7 @@ dependencies = [
[[package]]
name = "cumulus-pallet-parachain-system"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-pallet-parachain-system-proc-macro",
"cumulus-primitives-core",
@@ -2182,18 +2266,18 @@ dependencies = [
[[package]]
name = "cumulus-pallet-parachain-system-proc-macro"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "cumulus-pallet-session-benchmarking"
version = "3.0.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2207,7 +2291,7 @@ dependencies = [
[[package]]
name = "cumulus-pallet-xcm"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-primitives-core",
"frame-support",
@@ -2224,7 +2308,7 @@ dependencies = [
[[package]]
name = "cumulus-pallet-xcmp-queue"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-primitives-core",
"frame-support",
@@ -2242,7 +2326,7 @@ dependencies = [
[[package]]
name = "cumulus-primitives-core"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2258,7 +2342,7 @@ dependencies = [
[[package]]
name = "cumulus-primitives-parachain-inherent"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"async-trait",
"cumulus-primitives-core",
@@ -2281,7 +2365,7 @@ dependencies = [
[[package]]
name = "cumulus-primitives-timestamp"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-primitives-core",
"sp-inherents",
@@ -2292,7 +2376,7 @@ dependencies = [
[[package]]
name = "cumulus-primitives-utility"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-primitives-core",
"frame-support",
@@ -2309,13 +2393,13 @@ dependencies = [
[[package]]
name = "cumulus-relay-chain-interface"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"async-trait",
"cumulus-primitives-core",
"derive_more",
- "futures 0.3.19",
- "parking_lot 0.11.2",
+ "futures 0.3.21",
+ "parking_lot 0.12.0",
"polkadot-overseer",
"sc-client-api",
"sc-service",
@@ -2330,14 +2414,14 @@ dependencies = [
[[package]]
name = "cumulus-relay-chain-local"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"async-trait",
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.0",
"polkadot-client",
"polkadot-service",
"sc-client-api",
@@ -2358,7 +2442,7 @@ dependencies = [
[[package]]
name = "cumulus-test-relay-sproof-builder"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-primitives-core",
"parity-scale-codec",
@@ -2404,8 +2488,11 @@ checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
name = "dali-runtime"
version = "0.1.0"
dependencies = [
+ "assets-runtime-api",
"common",
+ "composable-support",
"composable-traits",
+ "crowdloan-rewards-runtime-api",
"cumulus-pallet-aura-ext",
"cumulus-pallet-dmp-queue",
"cumulus-pallet-parachain-system",
@@ -2438,12 +2525,15 @@ dependencies = [
"pallet-collective",
"pallet-crowdloan-rewards",
"pallet-currency-factory",
+ "pallet-curve-amm",
"pallet-democracy 4.0.0-dev",
"pallet-dutch-auction",
"pallet-governance-registry",
"pallet-identity",
"pallet-indices",
+ "pallet-lending",
"pallet-liquidations",
+ "pallet-liquidity-bootstrapping",
"pallet-membership",
"pallet-mosaic",
"pallet-multisig",
@@ -2457,6 +2547,7 @@ dependencies = [
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
"pallet-treasury",
+ "pallet-uniswap-v2",
"pallet-utility",
"pallet-vault",
"pallet-vesting 0.0.1",
@@ -2518,7 +2609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
dependencies = [
"data-encoding",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -2539,7 +2630,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -2552,7 +2643,7 @@ dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
"rustc_version 0.4.0",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -2575,13 +2666,12 @@ dependencies = [
[[package]]
name = "digest"
-version = "0.10.1"
+version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
dependencies = [
- "block-buffer 0.10.0",
+ "block-buffer 0.10.2",
"crypto-common",
- "generic-array 0.14.5",
]
[[package]]
@@ -2693,7 +2783,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -2704,9 +2794,9 @@ checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
[[package]]
name = "ed25519"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e1069e39f1454367eb2de793ed062fac4c35c2934b76a81d90dd9abcd28816"
+checksum = "eed12bbf7b5312f8da1c2722bc06d8c6b12c2d86a7fb35a194c7f3e6fc2bbe39"
dependencies = [
"signature",
]
@@ -2742,14 +2832,14 @@ dependencies = [
[[package]]
name = "enum-as-inner"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
+checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4"
dependencies = [
- "heck 0.3.3",
+ "heck 0.4.0",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -2775,7 +2865,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -2786,20 +2876,7 @@ checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log 0.4.14",
- "regex",
- "termcolor",
+ "syn 1.0.88",
]
[[package]]
@@ -2809,7 +2886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
dependencies = [
"atty",
- "humantime 2.1.0",
+ "humantime",
"log 0.4.14",
"regex",
"termcolor",
@@ -2822,7 +2899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
dependencies = [
"atty",
- "humantime 2.1.0",
+ "humantime",
"log 0.4.14",
"regex",
"termcolor",
@@ -2834,6 +2911,15 @@ version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797"
+[[package]]
+name = "envy"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "errno"
version = "0.2.8"
@@ -2864,33 +2950,6 @@ dependencies = [
"version_check 0.9.4",
]
-[[package]]
-name = "ethbloom"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "tiny-keccak",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf"
-dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "primitive-types",
- "uint",
-]
-
[[package]]
name = "event-listener"
version = "2.5.2"
@@ -2903,7 +2962,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
]
[[package]]
@@ -2918,9 +2977,9 @@ dependencies = [
[[package]]
name = "eyre"
-version = "0.6.6"
+version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc225d8f637923fe585089fcf03e705c222131232d2c1fb622e84ecf725d0eb8"
+checksum = "9289ed2c0440a6536e65119725cf91fc2c6b5e513bfd2e36e1134d7cca6ca12f"
dependencies = [
"indenter",
"once_cell",
@@ -2974,11 +3033,11 @@ dependencies = [
[[package]]
name = "file-per-thread-logger"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126"
+checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f"
dependencies = [
- "env_logger 0.7.1",
+ "env_logger 0.9.0",
"log 0.4.14",
]
@@ -2989,7 +3048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a"
dependencies = [
"either",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"log 0.4.14",
"num-traits",
@@ -3005,7 +3064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
dependencies = [
"byteorder",
- "rand 0.8.4",
+ "rand 0.8.5",
"rustc-hex",
"static_assertions",
]
@@ -3084,7 +3143,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
]
@@ -3102,7 +3161,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -3111,6 +3170,7 @@ dependencies = [
"parity-scale-codec",
"paste 1.0.6",
"scale-info",
+ "serde",
"sp-api",
"sp-application-crypto",
"sp-io",
@@ -3123,10 +3183,11 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"Inflector",
"chrono",
+ "clap 3.1.6",
"frame-benchmarking",
"frame-support",
"handlebars",
@@ -3138,18 +3199,18 @@ dependencies = [
"sc-executor",
"sc-service",
"serde",
+ "serde_json",
"sp-core",
"sp-externalities",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
- "structopt",
]
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -3163,7 +3224,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -3191,7 +3252,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"bitflags",
"frame-metadata",
@@ -3220,41 +3281,41 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"Inflector",
"frame-support-procedural-tools",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support-procedural-tools-derive",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"log 0.4.14",
@@ -3271,7 +3332,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3286,7 +3347,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -3295,7 +3356,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"sp-api",
@@ -3326,9 +3387,9 @@ dependencies = [
[[package]]
name = "fs-err"
-version = "2.6.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0"
+checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e"
[[package]]
name = "fs-swap"
@@ -3388,9 +3449,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
[[package]]
name = "futures"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
+checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
dependencies = [
"futures-channel",
"futures-core",
@@ -3403,9 +3464,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
dependencies = [
"futures-core",
"futures-sink",
@@ -3413,15 +3474,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
[[package]]
name = "futures-executor"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
+checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
dependencies = [
"futures-core",
"futures-task",
@@ -3431,9 +3492,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
[[package]]
name = "futures-lite"
@@ -3452,13 +3513,13 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -3468,21 +3529,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b"
dependencies = [
"futures-io",
- "rustls",
- "webpki",
+ "rustls 0.19.1",
+ "webpki 0.21.4",
]
[[package]]
name = "futures-sink"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
[[package]]
name = "futures-task"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
[[package]]
name = "futures-timer"
@@ -3492,9 +3553,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.19"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
dependencies = [
"futures 0.1.31",
"futures-channel",
@@ -3543,9 +3604,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
+checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -3626,9 +3687,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.11"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e"
+checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b"
dependencies = [
"bytes 1.1.0",
"fnv",
@@ -3645,9 +3706,9 @@ dependencies = [
[[package]]
name = "handlebars"
-version = "4.2.1"
+version = "4.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25546a65e5cf1f471f3438796fc634650b31d7fcde01d444c309aeb28b92e3a8"
+checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b"
dependencies = [
"log 0.4.14",
"pest",
@@ -3692,9 +3753,9 @@ dependencies = [
[[package]]
name = "headers"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84c647447a07ca16f5fbd05b633e535cc41a08d2d74ab1e08648df53be9cb89"
+checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
dependencies = [
"base64 0.13.0",
"bitflags",
@@ -3703,7 +3764,7 @@ dependencies = [
"http",
"httpdate",
"mime 0.3.16",
- "sha-1 0.9.8",
+ "sha-1 0.10.0",
]
[[package]]
@@ -3878,9 +3939,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.5.1"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
+checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
[[package]]
name = "httpdate"
@@ -3888,15 +3949,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error 1.2.3",
-]
-
[[package]]
name = "humantime"
version = "2.1.0"
@@ -3924,9 +3976,9 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.14.16"
+version = "0.14.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55"
+checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd"
dependencies = [
"bytes 1.1.0",
"futures-channel",
@@ -3937,7 +3989,7 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
- "itoa 0.4.8",
+ "itoa 1.0.1",
"pin-project-lite 0.2.8",
"socket2 0.4.4",
"tokio",
@@ -3954,13 +4006,29 @@ checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
dependencies = [
"ct-logs",
"futures-util",
- "hyper 0.14.16",
+ "hyper 0.14.17",
"log 0.4.14",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.19.1",
+ "rustls-native-certs 0.5.0",
"tokio",
- "tokio-rustls",
- "webpki",
+ "tokio-rustls 0.22.0",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
+dependencies = [
+ "http",
+ "hyper 0.14.17",
+ "log 0.4.14",
+ "rustls 0.20.4",
+ "rustls-native-certs 0.6.1",
+ "tokio",
+ "tokio-rustls 0.23.2",
+ "webpki-roots 0.22.2",
]
[[package]]
@@ -3970,7 +4038,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes 1.1.0",
- "hyper 0.14.16",
+ "hyper 0.14.17",
"native-tls",
"tokio",
"tokio-native-tls",
@@ -4026,7 +4094,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179"
dependencies = [
"async-io",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-lite",
"if-addrs",
"ipnet",
@@ -4060,15 +4128,6 @@ dependencies = [
"parity-scale-codec",
]
-[[package]]
-name = "impl-rlp"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
-dependencies = [
- "rlp",
-]
-
[[package]]
name = "impl-serde"
version = "0.3.2"
@@ -4080,13 +4139,13 @@ dependencies = [
[[package]]
name = "impl-trait-for-tuples"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -4101,7 +4160,7 @@ version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"hashbrown 0.11.2",
"serde",
]
@@ -4123,9 +4182,9 @@ dependencies = [
[[package]]
name = "integer-encoding"
-version = "3.0.2"
+version = "3.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8"
+checksum = "0e85a1509a128c855368e135cffcde7eac17d8e1083f41e2b98c58bc1a5074be"
[[package]]
name = "integer-sqrt"
@@ -4174,9 +4233,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.3.1"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
+checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c"
[[package]]
name = "is_sorted"
@@ -4236,8 +4295,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a"
dependencies = [
"derive_more",
- "futures 0.3.19",
- "hyper 0.14.16",
+ "futures 0.3.21",
+ "hyper 0.14.17",
"hyper-tls",
"jsonrpc-core",
"jsonrpc-pubsub",
@@ -4255,7 +4314,7 @@ version = "18.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-executor",
"futures-util",
"log 0.4.14",
@@ -4270,7 +4329,7 @@ version = "18.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-client-transports",
]
@@ -4283,7 +4342,7 @@ dependencies = [
"proc-macro-crate 0.1.5",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -4292,8 +4351,8 @@ version = "18.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff"
dependencies = [
- "futures 0.3.19",
- "hyper 0.14.16",
+ "futures 0.3.21",
+ "hyper 0.14.17",
"jsonrpc-core",
"jsonrpc-server-utils",
"log 0.4.14",
@@ -4308,7 +4367,7 @@ version = "18.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-server-utils",
"log 0.4.14",
@@ -4323,7 +4382,7 @@ version = "18.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"lazy_static",
"log 0.4.14",
@@ -4339,7 +4398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
dependencies = [
"bytes 1.1.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"globset",
"jsonrpc-core",
"lazy_static",
@@ -4356,7 +4415,7 @@ version = "18.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-server-utils",
"log 0.4.14",
@@ -4371,23 +4430,140 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5"
dependencies = [
- "jsonrpsee-proc-macros",
- "jsonrpsee-types",
+ "jsonrpsee-types 0.4.1",
"jsonrpsee-utils",
- "jsonrpsee-ws-client",
+ "jsonrpsee-ws-client 0.4.1",
+]
+
+[[package]]
+name = "jsonrpsee"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9"
+dependencies = [
+ "jsonrpsee-core 0.8.0",
+ "jsonrpsee-proc-macros 0.8.0",
+ "jsonrpsee-types 0.8.0",
+ "jsonrpsee-ws-client 0.8.0",
+]
+
+[[package]]
+name = "jsonrpsee"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d0b8cc1959f8c05256ace093b2317482da9127f1d9227564f47e7e6bf9bda8"
+dependencies = [
+ "jsonrpsee-core 0.9.0",
+ "jsonrpsee-http-client",
+ "jsonrpsee-proc-macros 0.9.0",
+ "jsonrpsee-types 0.9.0",
+]
+
+[[package]]
+name = "jsonrpsee-client-transport"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5"
+dependencies = [
+ "futures 0.3.21",
+ "http",
+ "jsonrpsee-core 0.8.0",
+ "jsonrpsee-types 0.8.0",
+ "pin-project 1.0.10",
+ "rustls-native-certs 0.6.1",
+ "soketto",
+ "thiserror",
+ "tokio",
+ "tokio-rustls 0.23.2",
+ "tokio-util",
+ "tracing",
+ "webpki-roots 0.22.2",
+]
+
+[[package]]
+name = "jsonrpsee-core"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f220b5a238dc7992b90f1144fbf6eaa585872c9376afe6fe6863ffead6191bf3"
+dependencies = [
+ "anyhow",
+ "arrayvec 0.7.2",
+ "async-trait",
+ "beef",
+ "futures-channel",
+ "futures-util",
+ "hyper 0.14.17",
+ "jsonrpsee-types 0.8.0",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "soketto",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "jsonrpsee-core"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22abc3274b265dcefe2e26c4beecf9fda4fffa48cf94930443a6c73678f020d5"
+dependencies = [
+ "anyhow",
+ "arrayvec 0.7.2",
+ "async-trait",
+ "beef",
+ "futures-channel",
+ "futures-util",
+ "hyper 0.14.17",
+ "jsonrpsee-types 0.9.0",
+ "serde",
+ "serde_json",
+ "soketto",
+ "thiserror",
+]
+
+[[package]]
+name = "jsonrpsee-http-client"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d31b837273d09dd80051eefa57d337769dff6c3266108c43a3544ac7ffed9d68"
+dependencies = [
+ "async-trait",
+ "hyper 0.14.17",
+ "hyper-rustls 0.23.0",
+ "jsonrpsee-core 0.9.0",
+ "jsonrpsee-types 0.9.0",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
]
[[package]]
name = "jsonrpsee-proc-macros"
-version = "0.4.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d802063f7a3c867456955f9d2f15eb3ee0edb5ec9ec2b5526324756759221c0f"
+checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8"
dependencies = [
- "log 0.4.14",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
+]
+
+[[package]]
+name = "jsonrpsee-proc-macros"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e171d8071079c8ccdce1b4ab34411c5afa6158d57db7963311ad3c6d073cb1"
+dependencies = [
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.88",
]
[[package]]
@@ -4399,14 +4575,42 @@ dependencies = [
"anyhow",
"async-trait",
"beef",
- "futures-channel",
- "futures-util",
- "hyper 0.14.16",
- "log 0.4.14",
+ "futures-channel",
+ "futures-util",
+ "hyper 0.14.17",
+ "log 0.4.14",
+ "serde",
+ "serde_json",
+ "soketto",
+ "thiserror",
+]
+
+[[package]]
+name = "jsonrpsee-types"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b3f601bbbe45cd63f5407b6f7d7950e08a7d4f82aa699ff41a4a5e9e54df58"
+dependencies = [
+ "anyhow",
+ "beef",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "jsonrpsee-types"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f4c45d2e2aa1db4c7d7d7dbaabc10a5b5258d99cd9d42fbfd5260b76f80c324"
+dependencies = [
+ "anyhow",
+ "beef",
"serde",
"serde_json",
- "soketto",
"thiserror",
+ "tracing",
]
[[package]]
@@ -4417,7 +4621,7 @@ checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c"
dependencies = [
"arrayvec 0.7.2",
"beef",
- "jsonrpsee-types",
+ "jsonrpsee-types 0.4.1",
]
[[package]]
@@ -4429,21 +4633,32 @@ dependencies = [
"arrayvec 0.7.2",
"async-trait",
"fnv",
- "futures 0.3.19",
+ "futures 0.3.21",
"http",
- "jsonrpsee-types",
+ "jsonrpsee-types 0.4.1",
"log 0.4.14",
"pin-project 1.0.10",
- "rustls-native-certs",
+ "rustls-native-certs 0.5.0",
"serde",
"serde_json",
"soketto",
"thiserror",
"tokio",
- "tokio-rustls",
+ "tokio-rustls 0.22.0",
"tokio-util",
]
+[[package]]
+name = "jsonrpsee-ws-client"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5"
+dependencies = [
+ "jsonrpsee-client-transport",
+ "jsonrpsee-core 0.8.0",
+ "jsonrpsee-types 0.8.0",
+]
+
[[package]]
name = "keccak"
version = "0.1.0"
@@ -4462,8 +4677,8 @@ dependencies = [
[[package]]
name = "kusama-runtime"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -4550,8 +4765,8 @@ dependencies = [
[[package]]
name = "kusama-runtime-constants"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -4628,9 +4843,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.117"
+version = "0.2.120"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
+checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09"
[[package]]
name = "libloading"
@@ -4654,9 +4869,9 @@ dependencies = [
[[package]]
name = "libm"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
+checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
[[package]]
name = "libp2p"
@@ -4666,7 +4881,7 @@ checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d"
dependencies = [
"atomic",
"bytes 1.1.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"lazy_static",
"libp2p-core",
"libp2p-deflate",
@@ -4701,17 +4916,18 @@ dependencies = [
[[package]]
name = "libp2p-core"
-version = "0.30.0"
+version = "0.30.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef22d9bba1e8bcb7ec300073e6802943fe8abb8190431842262b5f1c30abba1"
+checksum = "86aad7d54df283db817becded03e611137698a6509d4237a96881976a162340c"
dependencies = [
"asn1_der",
"bs58",
"ed25519-dalek",
"either",
"fnv",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
+ "instant",
"lazy_static",
"libsecp256k1",
"log 0.4.14",
@@ -4722,7 +4938,7 @@ dependencies = [
"pin-project 1.0.10",
"prost",
"prost-build",
- "rand 0.8.4",
+ "rand 0.8.5",
"ring",
"rw-stream-sink",
"sha2 0.9.9",
@@ -4740,7 +4956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197"
dependencies = [
"flate2",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
]
@@ -4751,7 +4967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498"
dependencies = [
"async-std-resolver",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"log 0.4.14",
"smallvec 1.8.0",
@@ -4766,7 +4982,7 @@ checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f"
dependencies = [
"cuckoofilter",
"fnv",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"libp2p-swarm",
"log 0.4.14",
@@ -4787,7 +5003,7 @@ dependencies = [
"byteorder",
"bytes 1.1.0",
"fnv",
- "futures 0.3.19",
+ "futures 0.3.21",
"hex_fmt",
"libp2p-core",
"libp2p-swarm",
@@ -4808,7 +5024,7 @@ version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"libp2p-swarm",
"log 0.4.14",
@@ -4830,7 +5046,7 @@ dependencies = [
"bytes 1.1.0",
"either",
"fnv",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"libp2p-swarm",
"log 0.4.14",
@@ -4854,13 +5070,13 @@ dependencies = [
"async-io",
"data-encoding",
"dns-parser",
- "futures 0.3.19",
+ "futures 0.3.21",
"if-watch",
"lazy_static",
"libp2p-core",
"libp2p-swarm",
"log 0.4.14",
- "rand 0.8.4",
+ "rand 0.8.5",
"smallvec 1.8.0",
"socket2 0.4.4",
"void",
@@ -4888,7 +5104,7 @@ checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf"
dependencies = [
"asynchronous-codec 0.6.0",
"bytes 1.1.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"log 0.4.14",
"nohash-hasher",
@@ -4906,13 +5122,13 @@ checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a"
dependencies = [
"bytes 1.1.0",
"curve25519-dalek 3.2.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"lazy_static",
"libp2p-core",
"log 0.4.14",
"prost",
"prost-build",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha2 0.9.9",
"snow",
"static_assertions",
@@ -4926,7 +5142,7 @@ version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"libp2p-swarm",
"log 0.4.14",
@@ -4943,7 +5159,7 @@ checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a"
dependencies = [
"asynchronous-codec 0.6.0",
"bytes 1.1.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"log 0.4.14",
"prost",
@@ -4958,7 +5174,7 @@ version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
"pin-project 1.0.10",
"rand 0.7.3",
@@ -4974,7 +5190,7 @@ checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3"
dependencies = [
"asynchronous-codec 0.6.0",
"bytes 1.1.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"libp2p-core",
"libp2p-swarm",
@@ -4997,13 +5213,13 @@ checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5"
dependencies = [
"asynchronous-codec 0.6.0",
"bimap",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"libp2p-swarm",
"log 0.4.14",
"prost",
"prost-build",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha2 0.9.9",
"thiserror",
"unsigned-varint 0.7.1",
@@ -5019,11 +5235,11 @@ checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8"
dependencies = [
"async-trait",
"bytes 1.1.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"libp2p-swarm",
"log 0.4.14",
- "lru 0.7.2",
+ "lru 0.7.3",
"rand 0.7.3",
"smallvec 1.8.0",
"unsigned-varint 0.7.1",
@@ -5037,7 +5253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9"
dependencies = [
"either",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"log 0.4.14",
"rand 0.7.3",
@@ -5053,7 +5269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "072c290f727d39bdc4e9d6d1c847978693d25a673bd757813681e33e5f6c00c2"
dependencies = [
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -5063,7 +5279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b"
dependencies = [
"async-io",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"if-watch",
"ipnet",
@@ -5080,7 +5296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973"
dependencies = [
"async-std",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"log 0.4.14",
]
@@ -5091,7 +5307,7 @@ version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"js-sys",
"libp2p-core",
"parity-send-wrapper",
@@ -5106,7 +5322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf"
dependencies = [
"either",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-rustls",
"libp2p-core",
"log 0.4.14",
@@ -5114,7 +5330,7 @@ dependencies = [
"rw-stream-sink",
"soketto",
"url 2.2.2",
- "webpki-roots",
+ "webpki-roots 0.21.1",
]
[[package]]
@@ -5123,7 +5339,7 @@ version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p-core",
"parking_lot 0.11.2",
"thiserror",
@@ -5155,7 +5371,7 @@ dependencies = [
"libsecp256k1-core",
"libsecp256k1-gen-ecmult",
"libsecp256k1-gen-genmult",
- "rand 0.8.4",
+ "rand 0.8.5",
"serde",
"sha2 0.9.9",
"typenum",
@@ -5192,9 +5408,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.3"
+version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
+checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859"
dependencies = [
"cc",
"pkg-config",
@@ -5250,6 +5466,89 @@ dependencies = [
"paste 0.1.18",
]
+[[package]]
+name = "local-integration-tests"
+version = "0.1.0"
+dependencies = [
+ "common",
+ "composable-traits",
+ "cumulus-pallet-aura-ext",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-session-benchmarking",
+ "cumulus-pallet-xcm",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-timestamp",
+ "cumulus-primitives-utility",
+ "dali-runtime",
+ "env_logger 0.9.0",
+ "frame-benchmarking",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "hex-literal",
+ "kusama-runtime",
+ "num-traits",
+ "orml-tokens",
+ "orml-traits",
+ "orml-xtokens",
+ "pallet-assets",
+ "pallet-assets-registry",
+ "pallet-aura",
+ "pallet-authorship",
+ "pallet-balances",
+ "pallet-call-filter",
+ "pallet-collator-selection",
+ "pallet-collective",
+ "pallet-currency-factory",
+ "pallet-democracy 4.0.0-dev",
+ "pallet-governance-registry",
+ "pallet-indices",
+ "pallet-membership",
+ "pallet-oracle",
+ "pallet-randomness-collective-flip",
+ "pallet-scheduler",
+ "pallet-session",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-treasury",
+ "pallet-utility",
+ "pallet-vault",
+ "pallet-xcm",
+ "parachain-info",
+ "parity-scale-codec",
+ "paste 1.0.6",
+ "picasso-runtime",
+ "polkadot-core-primitives",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "polkadot-runtime-parachains",
+ "primitives",
+ "scale-info",
+ "smallvec 1.8.0",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "xcm",
+ "xcm-builder",
+ "xcm-emulator",
+ "xcm-executor",
+]
+
[[package]]
name = "lock_api"
version = "0.3.4"
@@ -5298,9 +5597,9 @@ dependencies = [
[[package]]
name = "lru"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "274353858935c992b13c0ca408752e2121da852d07dec7ce5f108c77dfa14d1f"
+checksum = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb"
dependencies = [
"hashbrown 0.11.2",
]
@@ -5316,9 +5615,9 @@ dependencies = [
[[package]]
name = "lz4"
-version = "1.23.2"
+version = "1.23.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
+checksum = "4edcb94251b1c375c459e5abe9fb0168c1c826c3370172684844f8f3f8d1a885"
dependencies = [
"libc",
"lz4-sys",
@@ -5326,9 +5625,9 @@ dependencies = [
[[package]]
name = "lz4-sys"
-version = "1.9.2"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
+checksum = "d7be8908e2ed6f31c02db8a9fa962f03e36c53fbfde437363eae3306b85d7e17"
dependencies = [
"cc",
"libc",
@@ -5402,9 +5701,9 @@ dependencies = [
[[package]]
name = "memmap2"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe3179b85e1fd8b14447cbebadb75e45a1002f541b925f0bfec366d56a81c56d"
+checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f"
dependencies = [
"libc",
]
@@ -5415,7 +5714,7 @@ version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
]
[[package]]
@@ -5458,11 +5757,11 @@ dependencies = [
[[package]]
name = "metered-channel"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"thiserror",
"tracing",
@@ -5470,12 +5769,12 @@ dependencies = [
[[package]]
name = "mick-jaeger"
-version = "0.1.7"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd2c2cc134e57461f0898b0e921f0a7819b5e3f3a4335b9aa390ce81a5f36fb9"
+checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532"
dependencies = [
- "futures 0.3.19",
- "rand 0.8.4",
+ "futures 0.3.21",
+ "rand 0.8.5",
"thrift",
]
@@ -5496,9 +5795,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
[[package]]
name = "mime_guess"
-version = "2.0.3"
+version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
dependencies = [
"mime 0.3.16",
"unicase 2.6.0",
@@ -5526,7 +5825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
]
[[package]]
@@ -5550,14 +5849,15 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.7.14"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+checksum = "7ba42135c6a5917b9db9cd7b293e5409e1c6b041e6f9825e92e55a894c63b6f8"
dependencies = [
"libc",
"log 0.4.14",
"miow 0.3.7",
"ntapi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"winapi 0.3.9",
]
@@ -5665,11 +5965,11 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro-error",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
"synstructure",
]
@@ -5691,7 +5991,7 @@ dependencies = [
"mime 0.3.16",
"mime_guess",
"quick-error 1.2.3",
- "rand 0.8.4",
+ "rand 0.8.5",
"safemem",
"tempfile",
"twoway",
@@ -5704,7 +6004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab"
dependencies = [
"bytes 1.1.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
"pin-project 1.0.10",
"smallvec 1.8.0",
@@ -5723,7 +6023,7 @@ dependencies = [
"num-complex",
"num-rational 0.4.0",
"num-traits",
- "rand 0.8.4",
+ "rand 0.8.5",
"rand_distr",
"simba",
"typenum",
@@ -5737,7 +6037,7 @@ checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -5746,7 +6046,7 @@ version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775"
dependencies = [
- "rand 0.8.4",
+ "rand 0.8.5",
]
[[package]]
@@ -5792,20 +6092,19 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]]
name = "nom"
-version = "7.1.0"
+version = "7.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
dependencies = [
"memchr",
"minimal-lexical",
- "version_check 0.9.4",
]
[[package]]
name = "ntapi"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
dependencies = [
"winapi 0.3.9",
]
@@ -5816,7 +6115,7 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"num-integer",
"num-traits",
]
@@ -5836,7 +6135,7 @@ version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"num-traits",
]
@@ -5846,7 +6145,7 @@ version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"num-integer",
"num-traits",
]
@@ -5857,7 +6156,7 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"num-bigint",
"num-integer",
"num-traits",
@@ -5869,7 +6168,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"num-integer",
"num-traits",
]
@@ -5880,7 +6179,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"num-integer",
"num-traits",
]
@@ -5891,7 +6190,7 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"libm",
]
@@ -5918,9 +6217,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.9.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
[[package]]
name = "opaque-debug"
@@ -5954,7 +6253,7 @@ checksum = "a15c83b586f00268c619c1cb3340ec1a6f59dd9ba1d9833a273a68e6d5cd8ffc"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -5983,7 +6282,7 @@ version = "0.9.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"cc",
"libc",
"pkg-config",
@@ -6002,7 +6301,7 @@ dependencies = [
[[package]]
name = "orml-tokens"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6#2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=9e041dc9d213f843b18b3008f32f3acabb287dcb#9e041dc9d213f843b18b3008f32f3acabb287dcb"
dependencies = [
"frame-support",
"frame-system",
@@ -6017,7 +6316,7 @@ dependencies = [
[[package]]
name = "orml-traits"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6#2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=9e041dc9d213f843b18b3008f32f3acabb287dcb#9e041dc9d213f843b18b3008f32f3acabb287dcb"
dependencies = [
"frame-support",
"impl-trait-for-tuples",
@@ -6035,7 +6334,7 @@ dependencies = [
[[package]]
name = "orml-unknown-tokens"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6#2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=9e041dc9d213f843b18b3008f32f3acabb287dcb#9e041dc9d213f843b18b3008f32f3acabb287dcb"
dependencies = [
"frame-support",
"frame-system",
@@ -6050,7 +6349,7 @@ dependencies = [
[[package]]
name = "orml-utilities"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6#2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=9e041dc9d213f843b18b3008f32f3acabb287dcb#9e041dc9d213f843b18b3008f32f3acabb287dcb"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -6064,7 +6363,7 @@ dependencies = [
[[package]]
name = "orml-xcm-support"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6#2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=9e041dc9d213f843b18b3008f32f3acabb287dcb#9e041dc9d213f843b18b3008f32f3acabb287dcb"
dependencies = [
"frame-support",
"orml-traits",
@@ -6078,7 +6377,7 @@ dependencies = [
[[package]]
name = "orml-xtokens"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6#2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=9e041dc9d213f843b18b3008f32f3acabb287dcb#9e041dc9d213f843b18b3008f32f3acabb287dcb"
dependencies = [
"cumulus-primitives-core",
"frame-support",
@@ -6134,8 +6433,9 @@ dependencies = [
"pallet-balances",
"pallet-governance-registry",
"parity-scale-codec",
- "proptest 0.9.6",
+ "proptest",
"scale-info",
+ "sp-api",
"sp-arithmetic",
"sp-core",
"sp-io",
@@ -6165,7 +6465,7 @@ dependencies = [
[[package]]
name = "pallet-aura"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -6181,7 +6481,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -6197,7 +6497,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -6212,7 +6512,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6236,7 +6536,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6256,7 +6556,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6271,7 +6571,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"beefy-primitives",
"frame-support",
@@ -6287,7 +6587,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"beefy-merkle-tree",
"beefy-primitives",
@@ -6313,6 +6613,7 @@ dependencies = [
name = "pallet-bonded-finance"
version = "0.0.1"
dependencies = [
+ "composable-support",
"composable-tests-helpers",
"composable-traits",
"frame-benchmarking",
@@ -6320,9 +6621,10 @@ dependencies = [
"frame-system",
"orml-tokens",
"orml-traits",
+ "pallet-timestamp",
"pallet-vesting 0.0.1",
"parity-scale-codec",
- "proptest 1.0.0",
+ "proptest",
"proptest-derive",
"scale-info",
"serde",
@@ -6336,7 +6638,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6354,7 +6656,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-dispatch"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bp-message-dispatch",
"bp-runtime",
@@ -6371,7 +6673,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-grandpa"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bp-header-chain",
"bp-runtime",
@@ -6393,7 +6695,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-messages"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bitvec",
"bp-message-dispatch",
@@ -6432,7 +6734,7 @@ dependencies = [
[[package]]
name = "pallet-collator-selection"
version = "3.0.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6441,7 +6743,7 @@ dependencies = [
"pallet-authorship",
"pallet-session",
"parity-scale-codec",
- "rand 0.7.3",
+ "rand 0.8.5",
"scale-info",
"serde",
"sp-runtime",
@@ -6452,7 +6754,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6470,6 +6772,7 @@ dependencies = [
name = "pallet-crowdloan-rewards"
version = "0.0.1"
dependencies = [
+ "composable-traits",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -6477,6 +6780,7 @@ dependencies = [
"hex-literal",
"libsecp256k1",
"pallet-balances",
+ "pallet-timestamp",
"parity-scale-codec",
"rustc-hex",
"scale-info",
@@ -6501,7 +6805,7 @@ dependencies = [
"frame-system",
"pallet-balances",
"parity-scale-codec",
- "proptest 0.9.6",
+ "proptest",
"scale-info",
"sp-arithmetic",
"sp-core",
@@ -6514,6 +6818,7 @@ dependencies = [
name = "pallet-curve-amm"
version = "0.0.1"
dependencies = [
+ "composable-tests-helpers",
"composable-traits",
"frame-benchmarking",
"frame-support",
@@ -6522,13 +6827,12 @@ dependencies = [
"num-traits",
"orml-tokens",
"orml-traits",
- "pallet-balances",
"pallet-currency-factory",
"pallet-oracle",
"pallet-vault",
"parity-scale-codec",
"plotters",
- "proptest 0.9.6",
+ "proptest",
"scale-info",
"serde",
"sp-arithmetic",
@@ -6564,7 +6868,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6581,6 +6885,7 @@ dependencies = [
name = "pallet-dex-router"
version = "0.0.1"
dependencies = [
+ "composable-tests-helpers",
"composable-traits",
"frame-support",
"frame-system",
@@ -6618,7 +6923,7 @@ dependencies = [
"pallet-currency-factory",
"pallet-timestamp",
"parity-scale-codec",
- "proptest 1.0.0",
+ "proptest",
"scale-info",
"serde",
"smallvec 1.8.0",
@@ -6632,7 +6937,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6649,14 +6954,13 @@ dependencies = [
"sp-runtime",
"sp-std",
"static_assertions",
- "strum 0.22.0",
- "strum_macros 0.23.1",
+ "strum",
]
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#4aeb95f7f38fcd519e2628f32f79044a8fef99d5"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6674,7 +6978,7 @@ dependencies = [
[[package]]
name = "pallet-gilt"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6707,7 +7011,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6730,7 +7034,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -6746,7 +7050,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6766,7 +7070,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6806,7 +7110,7 @@ dependencies = [
"pallet-vault",
"parity-scale-codec",
"plotters",
- "proptest 0.9.6",
+ "proptest",
"scale-info",
"serde",
"smallvec 1.8.0",
@@ -6836,7 +7140,7 @@ dependencies = [
"pallet-dutch-auction",
"pallet-timestamp",
"parity-scale-codec",
- "proptest 1.0.0",
+ "proptest",
"scale-info",
"smallvec 1.8.0",
"sp-arithmetic",
@@ -6846,10 +7150,36 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-liquidity-bootstrapping"
+version = "0.0.1"
+dependencies = [
+ "composable-maths",
+ "composable-support",
+ "composable-tests-helpers",
+ "composable-traits",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "orml-tokens",
+ "orml-traits",
+ "pallet-currency-factory",
+ "parity-scale-codec",
+ "plotters",
+ "proptest",
+ "rust_decimal",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6866,7 +7196,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"ckb-merkle-mountain-range",
"frame-benchmarking",
@@ -6884,7 +7214,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -6900,7 +7230,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-rpc"
version = "3.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -6918,6 +7248,7 @@ dependencies = [
name = "pallet-mosaic"
version = "0.1.0"
dependencies = [
+ "composable-support",
"composable-tests-helpers",
"composable-traits",
"frame-benchmarking",
@@ -6929,7 +7260,7 @@ dependencies = [
"orml-traits",
"parity-scale-codec",
"plotters",
- "proptest 0.9.6",
+ "proptest",
"scale-info",
"sp-core",
"sp-io",
@@ -6941,7 +7272,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6956,7 +7287,7 @@ dependencies = [
[[package]]
name = "pallet-nicks"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -6970,7 +7301,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -6987,7 +7318,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -7011,6 +7342,7 @@ dependencies = [
name = "pallet-oracle"
version = "1.0.0"
dependencies = [
+ "composable-support",
"composable-traits",
"frame-benchmarking",
"frame-support",
@@ -7030,6 +7362,32 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-pablo"
+version = "0.0.1"
+dependencies = [
+ "composable-maths",
+ "composable-support",
+ "composable-tests-helpers",
+ "composable-traits",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "orml-tokens",
+ "orml-traits",
+ "pallet-currency-factory",
+ "parity-scale-codec",
+ "plotters",
+ "proptest",
+ "rust_decimal",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-ping"
version = "0.1.0"
@@ -7049,7 +7407,7 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7082,7 +7440,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7097,7 +7455,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -7111,7 +7469,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -7125,7 +7483,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7141,7 +7499,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -7162,7 +7520,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7178,7 +7536,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -7192,7 +7550,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -7215,18 +7573,18 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"log 0.4.14",
"sp-arithmetic",
@@ -7235,7 +7593,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -7249,7 +7607,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7267,7 +7625,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7286,7 +7644,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-support",
"frame-system",
@@ -7303,7 +7661,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -7320,7 +7678,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -7331,7 +7689,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7349,6 +7707,8 @@ dependencies = [
name = "pallet-uniswap-v2"
version = "0.0.1"
dependencies = [
+ "composable-maths",
+ "composable-tests-helpers",
"composable-traits",
"frame-benchmarking",
"frame-support",
@@ -7357,12 +7717,10 @@ dependencies = [
"num-traits",
"orml-tokens",
"orml-traits",
- "pallet-balances",
"pallet-currency-factory",
- "pallet-oracle",
- "pallet-vault",
"parity-scale-codec",
"plotters",
+ "proptest",
"scale-info",
"serde",
"sp-arithmetic",
@@ -7375,7 +7733,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7393,6 +7751,7 @@ name = "pallet-vault"
version = "0.0.1"
dependencies = [
"bitflags",
+ "composable-support",
"composable-tests-helpers",
"composable-traits",
"frame-benchmarking",
@@ -7405,7 +7764,7 @@ dependencies = [
"orml-traits",
"pallet-balances",
"parity-scale-codec",
- "proptest 0.9.6",
+ "proptest",
"scale-info",
"serde",
"sp-arithmetic",
@@ -7420,10 +7779,12 @@ name = "pallet-vesting"
version = "0.0.1"
dependencies = [
"composable-traits",
+ "frame-benchmarking",
"frame-support",
"frame-system",
"orml-tokens",
"orml-traits",
+ "pallet-timestamp",
"parity-scale-codec",
"scale-info",
"serde",
@@ -7436,7 +7797,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7450,8 +7811,8 @@ dependencies = [
[[package]]
name = "pallet-xcm"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-support",
"frame-system",
@@ -7468,8 +7829,8 @@ dependencies = [
[[package]]
name = "pallet-xcm-benchmarks"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -7486,7 +7847,7 @@ dependencies = [
[[package]]
name = "parachain-info"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#86f76c5619c64d1300315612695ad4b4fcd0f562"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.17#db11baacc325537be74ad34517fcb28ed9ded6c6"
dependencies = [
"cumulus-primitives-core",
"frame-support",
@@ -7496,11 +7857,39 @@ dependencies = [
"serde",
]
+[[package]]
+name = "parachain-utils"
+version = "0.1.0"
+dependencies = [
+ "common",
+ "cumulus-pallet-parachain-system",
+ "dali-runtime",
+ "derive_more",
+ "env_logger 0.8.4",
+ "envy",
+ "frame-system",
+ "hex",
+ "jsonrpc-core-client",
+ "log 0.4.14",
+ "pallet-transaction-payment",
+ "parity-scale-codec",
+ "picasso-runtime",
+ "sc-rpc",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "structopt",
+ "substrate-xt",
+ "tokio",
+ "url 1.7.2",
+]
+
[[package]]
name = "parity-db"
-version = "0.3.6"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68de01cff53da5574397233383dd7f5c15ee958c348245765ea8cb09f2571e6b"
+checksum = "865edee5b792f537356d9e55cbc138e7f4718dc881a7ea45a18b37bf61c21e3d"
dependencies = [
"blake2-rfc",
"crc32fast",
@@ -7511,7 +7900,7 @@ dependencies = [
"lz4",
"memmap2 0.2.3",
"parking_lot 0.11.2",
- "rand 0.8.4",
+ "rand 0.8.5",
"snap",
]
@@ -7535,10 +7924,10 @@ version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -7553,7 +7942,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"libc",
"log 0.4.14",
"rand 0.7.3",
@@ -7568,10 +7957,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770"
dependencies = [
"cfg-if 1.0.0",
- "ethereum-types",
"hashbrown 0.11.2",
"impl-trait-for-tuples",
- "lru 0.6.6",
"parity-util-mem-derive",
"parking_lot 0.11.2",
"primitive-types",
@@ -7586,7 +7973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
dependencies = [
"proc-macro2 1.0.36",
- "syn 1.0.86",
+ "syn 1.0.88",
"synstructure",
]
@@ -7661,6 +8048,16 @@ dependencies = [
"parking_lot_core 0.8.5",
]
+[[package]]
+name = "parking_lot"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+dependencies = [
+ "lock_api 0.4.6",
+ "parking_lot_core 0.9.1",
+]
+
[[package]]
name = "parking_lot_core"
version = "0.6.2"
@@ -7699,11 +8096,24 @@ dependencies = [
"cfg-if 1.0.0",
"instant",
"libc",
- "redox_syscall 0.2.10",
+ "redox_syscall 0.2.11",
"smallvec 1.8.0",
"winapi 0.3.9",
]
+[[package]]
+name = "parking_lot_core"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall 0.2.11",
+ "smallvec 1.8.0",
+ "windows-sys",
+]
+
[[package]]
name = "paste"
version = "0.1.18"
@@ -7813,7 +8223,7 @@ dependencies = [
"pest_meta",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -7841,8 +8251,11 @@ dependencies = [
name = "picasso-runtime"
version = "0.1.0"
dependencies = [
+ "assets-runtime-api",
"common",
+ "composable-support",
"composable-traits",
+ "crowdloan-rewards-runtime-api",
"cumulus-pallet-aura-ext",
"cumulus-pallet-dmp-queue",
"cumulus-pallet-parachain-system",
@@ -7865,6 +8278,7 @@ dependencies = [
"orml-xcm-support",
"orml-xtokens",
"pallet-assets",
+ "pallet-assets-registry",
"pallet-aura",
"pallet-authorship",
"pallet-balances",
@@ -7942,7 +8356,7 @@ checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -7953,7 +8367,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -8046,10 +8460,10 @@ dependencies = [
[[package]]
name = "polkadot-approval-distribution"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -8060,10 +8474,10 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"polkadot-node-network-protocol",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
@@ -8073,12 +8487,12 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"derive_more",
- "futures 0.3.19",
- "lru 0.7.2",
+ "futures 0.3.21",
+ "lru 0.7.3",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -8086,7 +8500,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.4",
+ "rand 0.8.5",
"sp-core",
"sp-keystore",
"thiserror",
@@ -8095,11 +8509,11 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
- "lru 0.7.2",
+ "futures 0.3.21",
+ "lru 0.7.3",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -8107,7 +8521,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.4",
+ "rand 0.8.5",
"sc-network",
"thiserror",
"tracing",
@@ -8115,11 +8529,12 @@ dependencies = [
[[package]]
name = "polkadot-cli"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
+ "clap 3.1.6",
"frame-benchmarking-cli",
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
"polkadot-node-core-pvf",
"polkadot-node-metrics",
@@ -8130,7 +8545,6 @@ dependencies = [
"sc-tracing",
"sp-core",
"sp-trie",
- "structopt",
"substrate-build-script-utils",
"thiserror",
"try-runtime-cli",
@@ -8138,8 +8552,8 @@ dependencies = [
[[package]]
name = "polkadot-client"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"beefy-primitives",
"frame-benchmarking",
@@ -8169,12 +8583,12 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"always-assert",
"derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
@@ -8190,8 +8604,8 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -8203,12 +8617,12 @@ dependencies = [
[[package]]
name = "polkadot-dispute-distribution"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"derive_more",
- "futures 0.3.19",
- "lru 0.7.2",
+ "futures 0.3.21",
+ "lru 0.7.3",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -8225,8 +8639,8 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"parity-scale-codec",
"polkadot-node-primitives",
@@ -8239,16 +8653,16 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"polkadot-node-network-protocol",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.4",
+ "rand 0.8.5",
"rand_chacha 0.3.1",
"sc-network",
"sp-application-crypto",
@@ -8259,11 +8673,11 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"async-trait",
- "futures 0.3.19",
+ "futures 0.3.21",
"parity-scale-codec",
"parking_lot 0.11.2",
"polkadot-node-network-protocol",
@@ -8278,10 +8692,10 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-primitives",
@@ -8296,15 +8710,15 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bitvec",
"derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"kvdb",
- "lru 0.7.2",
+ "lru 0.7.3",
"merlin",
"parity-scale-codec",
"polkadot-node-jaeger",
@@ -8324,11 +8738,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bitvec",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"kvdb",
"parity-scale-codec",
@@ -8344,11 +8758,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bitvec",
- "futures 0.3.19",
+ "futures 0.3.21",
"polkadot-erasure-coding",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -8362,10 +8776,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
@@ -8377,11 +8791,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"async-trait",
- "futures 0.3.19",
+ "futures 0.3.21",
"parity-scale-codec",
"polkadot-node-core-pvf",
"polkadot-node-primitives",
@@ -8395,10 +8809,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
@@ -8410,10 +8824,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-selection"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"kvdb",
"parity-scale-codec",
@@ -8427,12 +8841,12 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"kvdb",
- "lru 0.7.2",
+ "lru 0.7.3",
"parity-scale-codec",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -8445,11 +8859,11 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"async-trait",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"polkadot-node-subsystem",
"polkadot-primitives",
@@ -8462,38 +8876,38 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bitvec",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.4",
+ "rand 0.8.5",
"thiserror",
"tracing",
]
[[package]]
name = "polkadot-node-core-pvf"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"always-assert",
"assert_matches",
"async-process",
"async-std",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"parity-scale-codec",
"pin-project 1.0.10",
"polkadot-core-primitives",
"polkadot-node-subsystem-util",
"polkadot-parachain",
- "rand 0.8.4",
+ "rand 0.8.5",
"sc-executor",
"sc-executor-common",
"sc-executor-wasmtime",
@@ -8509,10 +8923,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf-checker"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
@@ -8525,10 +8939,10 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"memory-lru",
"parity-util-mem",
"polkadot-node-subsystem",
@@ -8543,8 +8957,8 @@ dependencies = [
[[package]]
name = "polkadot-node-jaeger"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"async-std",
"lazy_static",
@@ -8561,11 +8975,11 @@ dependencies = [
[[package]]
name = "polkadot-node-metrics"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bs58",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"log 0.4.14",
"metered-channel",
@@ -8580,29 +8994,29 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"async-trait",
"derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"parity-scale-codec",
"polkadot-node-jaeger",
"polkadot-node-primitives",
"polkadot-primitives",
"sc-authority-discovery",
"sc-network",
- "strum 0.23.0",
+ "strum",
"thiserror",
]
[[package]]
name = "polkadot-node-primitives"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bounded-vec",
- "futures 0.3.19",
+ "futures 0.3.21",
"parity-scale-codec",
"polkadot-parachain",
"polkadot-primitives",
@@ -8620,8 +9034,8 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -8630,11 +9044,11 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-types"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"polkadot-node-jaeger",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
@@ -8649,14 +9063,14 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-util"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"async-trait",
"derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"itertools",
- "lru 0.7.2",
+ "lru 0.7.3",
"metered-channel",
"parity-scale-codec",
"pin-project 1.0.10",
@@ -8667,7 +9081,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-overseer",
"polkadot-primitives",
- "rand 0.8.4",
+ "rand 0.8.5",
"sp-application-crypto",
"sp-core",
"sp-keystore",
@@ -8677,12 +9091,12 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
- "lru 0.7.2",
+ "lru 0.7.3",
"parity-util-mem",
"parking_lot 0.11.2",
"polkadot-node-metrics",
@@ -8698,11 +9112,11 @@ dependencies = [
[[package]]
name = "polkadot-overseer-gen"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"async-trait",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"metered-channel",
"pin-project 1.0.10",
@@ -8715,19 +9129,19 @@ dependencies = [
[[package]]
name = "polkadot-overseer-gen-proc-macro"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "polkadot-parachain"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"derive_more",
"frame-support",
@@ -8743,8 +9157,8 @@ dependencies = [
[[package]]
name = "polkadot-performance-test"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"env_logger 0.9.0",
"kusama-runtime",
@@ -8758,8 +9172,8 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bitvec",
"frame-system",
@@ -8788,8 +9202,8 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"beefy-gadget",
"beefy-gadget-rpc",
@@ -8819,8 +9233,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -8903,8 +9317,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -8950,8 +9364,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime-constants"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -8962,8 +9376,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime-metrics"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bs58",
"parity-scale-codec",
@@ -8974,8 +9388,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"bitflags",
"bitvec",
@@ -8995,7 +9409,7 @@ dependencies = [
"parity-scale-codec",
"polkadot-primitives",
"polkadot-runtime-metrics",
- "rand 0.8.4",
+ "rand 0.8.5",
"rand_chacha 0.3.1",
"rustc-hex",
"scale-info",
@@ -9009,25 +9423,26 @@ dependencies = [
"sp-session",
"sp-staking",
"sp-std",
+ "static_assertions",
"xcm",
"xcm-executor",
]
[[package]]
name = "polkadot-service"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"async-trait",
"beefy-gadget",
"beefy-primitives",
"frame-system-rpc-runtime-api",
- "futures 0.3.19",
+ "futures 0.3.21",
"hex-literal",
"kusama-runtime",
"kvdb",
"kvdb-rocksdb",
- "lru 0.7.2",
+ "lru 0.7.3",
"pallet-babe",
"pallet-im-online",
"pallet-mmr-primitives",
@@ -9116,12 +9531,12 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"arrayvec 0.5.2",
"derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"indexmap",
"parity-scale-codec",
"polkadot-node-network-protocol",
@@ -9137,8 +9552,8 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -9204,11 +9619,11 @@ version = "0.1.0"
dependencies = [
"binance",
"chrono",
- "clap 3.0.14",
+ "clap 3.1.6",
"custom_derive",
"enum_derive",
"env_logger 0.9.0",
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-client-transports",
"jsonrpc-core",
"lazy_static",
@@ -9231,7 +9646,6 @@ checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
dependencies = [
"fixed-hash",
"impl-codec",
- "impl-rlp",
"impl-serde",
"scale-info",
"uint",
@@ -9241,6 +9655,7 @@ dependencies = [
name = "primitives"
version = "0.1.0"
dependencies = [
+ "composable-support",
"composable-traits",
"parity-scale-codec",
"scale-info",
@@ -9260,9 +9675,9 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "1.1.0"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
dependencies = [
"thiserror",
"toml",
@@ -9277,7 +9692,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
"version_check 0.9.4",
]
@@ -9330,26 +9745,6 @@ dependencies = [
"thiserror",
]
-[[package]]
-name = "proptest"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c477819b845fe023d33583ebf10c9f62518c8d79a0960ba5c36d6ac8a55a5b"
-dependencies = [
- "bit-set",
- "bitflags",
- "byteorder",
- "lazy_static",
- "num-traits",
- "quick-error 1.2.3",
- "rand 0.6.5",
- "rand_chacha 0.1.1",
- "rand_xorshift 0.1.1",
- "regex-syntax",
- "rusty-fork 0.2.2",
- "tempfile",
-]
-
[[package]]
name = "proptest"
version = "1.0.0"
@@ -9362,11 +9757,11 @@ dependencies = [
"lazy_static",
"num-traits",
"quick-error 2.0.1",
- "rand 0.8.4",
+ "rand 0.8.5",
"rand_chacha 0.3.1",
"rand_xorshift 0.3.0",
"regex-syntax",
- "rusty-fork 0.3.0",
+ "rusty-fork",
"tempfile",
]
@@ -9421,7 +9816,7 @@ dependencies = [
"itertools",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -9436,9 +9831,9 @@ dependencies = [
[[package]]
name = "psm"
-version = "0.1.16"
+version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"
+checksum = "6eca0fa5dd7c4c96e184cec588f0b1db1ee3165e678db21c09793105acb17e6f"
dependencies = [
"cc",
]
@@ -9496,7 +9891,7 @@ version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
"libc",
"rand_chacha 0.1.1",
"rand_core 0.4.2",
@@ -9525,14 +9920,13 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha 0.3.1",
"rand_core 0.6.3",
- "rand_hc 0.3.1",
]
[[package]]
@@ -9541,7 +9935,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
"rand_core 0.3.1",
]
@@ -9595,7 +9989,7 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.5",
]
[[package]]
@@ -9605,7 +9999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
dependencies = [
"num-traits",
- "rand 0.8.4",
+ "rand 0.8.5",
]
[[package]]
@@ -9623,16 +10017,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.3",
+ "rand_core 0.5.1",
]
[[package]]
@@ -9675,7 +10060,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
"rand_core 0.4.2",
]
@@ -9718,7 +10103,7 @@ version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
"crossbeam-deque",
"either",
"rayon-core",
@@ -9732,7 +10117,7 @@ checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.8",
"lazy_static",
"num_cpus",
]
@@ -9754,9 +10139,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "redox_syscall"
-version = "0.2.10"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
dependencies = [
"bitflags",
]
@@ -9767,8 +10152,8 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
dependencies = [
- "getrandom 0.2.4",
- "redox_syscall 0.2.10",
+ "getrandom 0.2.5",
+ "redox_syscall 0.2.11",
]
[[package]]
@@ -9801,7 +10186,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -9817,9 +10202,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.5.4"
+version = "1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
dependencies = [
"aho-corasick",
"memchr",
@@ -9856,10 +10241,10 @@ dependencies = [
[[package]]
name = "remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"env_logger 0.9.0",
- "jsonrpsee",
+ "jsonrpsee 0.8.0",
"log 0.4.14",
"parity-scale-codec",
"serde",
@@ -9881,9 +10266,9 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.11.9"
+version = "0.11.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525"
+checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
dependencies = [
"base64 0.13.0",
"bytes 1.1.0",
@@ -9893,7 +10278,7 @@ dependencies = [
"h2",
"http",
"http-body",
- "hyper 0.14.16",
+ "hyper 0.14.17",
"hyper-tls",
"ipnet",
"js-sys",
@@ -9912,7 +10297,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "winreg 0.7.0",
+ "winreg 0.10.1",
]
[[package]]
@@ -9927,9 +10312,9 @@ dependencies = [
[[package]]
name = "retain_mut"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51dd4445360338dab5116712bee1388dc727991d51969558a8882ab552e6db30"
+checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086"
[[package]]
name = "ring"
@@ -9946,16 +10331,6 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "rlp"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5"
-dependencies = [
- "bytes 1.1.0",
- "rustc-hex",
-]
-
[[package]]
name = "rocksdb"
version = "0.17.0"
@@ -9968,8 +10343,8 @@ dependencies = [
[[package]]
name = "rococo-runtime"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"beefy-primitives",
"bp-messages",
@@ -10043,8 +10418,8 @@ dependencies = [
[[package]]
name = "rococo-runtime-constants"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -10069,6 +10444,16 @@ dependencies = [
"winapi 0.3.9",
]
+[[package]]
+name = "rust_decimal"
+version = "1.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d37baa70cf8662d2ba1c1868c5983dda16ef32b105cce41fb5c47e72936a90b3"
+dependencies = [
+ "arrayvec 0.7.2",
+ "num-traits",
+]
+
[[package]]
name = "rustc-demangle"
version = "0.1.21"
@@ -10111,7 +10496,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.4",
+ "semver 1.0.6",
]
[[package]]
@@ -10137,8 +10522,20 @@ dependencies = [
"base64 0.13.0",
"log 0.4.14",
"ring",
- "sct",
- "webpki",
+ "sct 0.6.1",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921"
+dependencies = [
+ "log 0.4.14",
+ "ring",
+ "sct 0.7.0",
+ "webpki 0.22.0",
]
[[package]]
@@ -10148,29 +10545,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
dependencies = [
"openssl-probe",
- "rustls",
+ "rustls 0.19.1",
"schannel",
"security-framework",
]
[[package]]
-name = "rustversion"
-version = "1.0.6"
+name = "rustls-native-certs"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
+]
[[package]]
-name = "rusty-fork"
-version = "0.2.2"
+name = "rustls-pemfile"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dd93264e10c577503e926bd1430193eeb5d21b059148910082245309b424fae"
+checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
dependencies = [
- "fnv",
- "quick-error 1.2.3",
- "tempfile",
- "wait-timeout",
+ "base64 0.13.0",
]
+[[package]]
+name = "rustversion"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+
[[package]]
name = "rusty-fork"
version = "0.3.0"
@@ -10189,7 +10595,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"pin-project 0.4.29",
"static_assertions",
]
@@ -10236,7 +10642,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"log 0.4.14",
"sp-core",
@@ -10247,11 +10653,10 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"ip_network",
"libp2p",
@@ -10269,14 +10674,15 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"substrate-prometheus-endpoint",
+ "thiserror",
]
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"log 0.4.14",
"parity-scale-codec",
@@ -10297,7 +10703,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -10313,10 +10719,10 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"impl-trait-for-tuples",
- "memmap2 0.5.2",
+ "memmap2 0.5.3",
"parity-scale-codec",
"sc-chain-spec-derive",
"sc-network",
@@ -10330,22 +10736,23 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"chrono",
+ "clap 3.1.6",
"fdlimit",
- "futures 0.3.19",
+ "futures 0.3.21",
"hex",
"libp2p",
"log 0.4.14",
@@ -10370,7 +10777,6 @@ dependencies = [
"sp-panic-handler",
"sp-runtime",
"sp-version",
- "structopt",
"thiserror",
"tiny-bip39",
"tokio",
@@ -10379,10 +10785,10 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"fnv",
- "futures 0.3.19",
+ "futures 0.3.21",
"hash-db",
"log 0.4.14",
"parity-scale-codec",
@@ -10407,7 +10813,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"hash-db",
"kvdb",
@@ -10432,10 +10838,10 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"libp2p",
"log 0.4.14",
@@ -10456,11 +10862,10 @@ dependencies = [
[[package]]
name = "sc-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
"parity-scale-codec",
"sc-block-builder",
@@ -10480,17 +10885,17 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"substrate-prometheus-endpoint",
+ "thiserror",
]
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "derive_more",
"fork-tree",
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
"merlin",
"num-bigint",
@@ -10523,15 +10928,15 @@ dependencies = [
"sp-runtime",
"sp-version",
"substrate-prometheus-endpoint",
+ "thiserror",
]
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -10547,12 +10952,13 @@ dependencies = [
"sp-core",
"sp-keystore",
"sp-runtime",
+ "thiserror",
]
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -10565,12 +10971,11 @@ dependencies = [
[[package]]
name = "sc-consensus-manual-seal"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"assert_matches",
"async-trait",
- "derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -10596,15 +11001,16 @@ dependencies = [
"sp-runtime",
"sp-timestamp",
"substrate-prometheus-endpoint",
+ "thiserror",
]
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"log 0.4.14",
"parity-scale-codec",
@@ -10626,7 +11032,7 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"sc-client-api",
"sp-authorship",
@@ -10637,7 +11043,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"lazy_static",
"libsecp256k1",
@@ -10665,9 +11071,8 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "derive_more",
"environmental",
"parity-scale-codec",
"sc-allocator",
@@ -10683,7 +11088,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"log 0.4.14",
"parity-scale-codec",
@@ -10699,7 +11104,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -10717,19 +11122,18 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "derive_more",
"dyn-clone",
"finality-grandpa",
"fork-tree",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"log 0.4.14",
"parity-scale-codec",
"parking_lot 0.11.2",
- "rand 0.8.4",
+ "rand 0.8.5",
"sc-block-builder",
"sc-chain-spec",
"sc-client-api",
@@ -10750,16 +11154,16 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"substrate-prometheus-endpoint",
+ "thiserror",
]
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "derive_more",
"finality-grandpa",
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -10774,15 +11178,16 @@ dependencies = [
"sp-blockchain",
"sp-core",
"sp-runtime",
+ "thiserror",
]
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"ansi_term",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"log 0.4.14",
"parity-util-mem",
@@ -10796,22 +11201,22 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "derive_more",
"hex",
"parking_lot 0.11.2",
"serde_json",
"sp-application-crypto",
"sp-core",
"sp-keystore",
+ "thiserror",
]
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-std",
"async-trait",
@@ -10819,11 +11224,10 @@ dependencies = [
"bitflags",
"bytes 1.1.0",
"cid",
- "derive_more",
"either",
"fnv",
"fork-tree",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"hex",
"ip_network",
@@ -10831,7 +11235,7 @@ dependencies = [
"linked-hash-map",
"linked_hash_set",
"log 0.4.14",
- "lru 0.7.2",
+ "lru 0.7.3",
"parity-scale-codec",
"parking_lot 0.11.2",
"pin-project 1.0.10",
@@ -10862,13 +11266,13 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"libp2p",
"log 0.4.14",
- "lru 0.7.2",
+ "lru 0.7.3",
"sc-network",
"sp-runtime",
"substrate-prometheus-endpoint",
@@ -10878,15 +11282,15 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"bytes 1.1.0",
"fnv",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"hex",
- "hyper 0.14.16",
- "hyper-rustls",
+ "hyper 0.14.17",
+ "hyper-rustls 0.22.1",
"num_cpus",
"once_cell",
"parity-scale-codec",
@@ -10906,9 +11310,9 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p",
"log 0.4.14",
"sc-utils",
@@ -10919,7 +11323,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"log 0.4.14",
"substrate-prometheus-endpoint",
@@ -10928,9 +11332,9 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"hash-db",
"jsonrpc-core",
"jsonrpc-pubsub",
@@ -10959,9 +11363,9 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -10984,9 +11388,9 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-http-server",
"jsonrpc-ipc-server",
@@ -11001,12 +11405,12 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
"directories",
"exit-future",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"hash-db",
"jsonrpc-core",
@@ -11065,7 +11469,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"log 0.4.14",
"parity-scale-codec",
@@ -11079,7 +11483,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -11101,10 +11505,10 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"chrono",
- "futures 0.3.19",
+ "futures 0.3.21",
"libp2p",
"log 0.4.14",
"parking_lot 0.11.2",
@@ -11119,7 +11523,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"ansi_term",
"atty",
@@ -11150,20 +11554,20 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"linked-hash-map",
"log 0.4.14",
@@ -11188,10 +11592,9 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
"serde",
"sp-blockchain",
@@ -11202,9 +11605,9 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"lazy_static",
"parking_lot 0.11.2",
@@ -11231,10 +11634,10 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -11287,6 +11690,16 @@ dependencies = [
"untrusted",
]
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
[[package]]
name = "secrecy"
version = "0.8.0"
@@ -11298,9 +11711,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.6.0"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fed7948b6c68acbb6e20c334f55ad635dc0f75506963de4464289fbd3b051ac"
+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
dependencies = [
"bitflags",
"core-foundation",
@@ -11311,9 +11724,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.6.0"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57321bf8bc2362081b2599912d2961fe899c0efadf1b4b2f8d48b3e253bb96c"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
dependencies = [
"core-foundation-sys",
"libc",
@@ -11348,9 +11761,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.4"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
+checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d"
dependencies = [
"serde",
]
@@ -11387,14 +11800,14 @@ checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "serde_json"
-version = "1.0.78"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085"
+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
dependencies = [
"itoa 1.0.1",
"ryu",
@@ -11470,6 +11883,17 @@ dependencies = [
"opaque-debug 0.3.0",
]
+[[package]]
+name = "sha-1"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures 0.2.1",
+ "digest 0.10.3",
+]
+
[[package]]
name = "sha1"
version = "0.6.1"
@@ -11512,13 +11936,13 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec"
+checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures 0.2.1",
- "digest 0.10.1",
+ "digest 0.10.3",
]
[[package]]
@@ -11603,11 +12027,14 @@ version = "0.1.0"
dependencies = [
"common",
"composable-node",
+ "composable-runtime",
"cumulus-primitives-parachain-inherent",
"dali-runtime",
"derive_more",
"frame-benchmarking",
+ "frame-system",
"jsonrpc-core",
+ "pallet-transaction-payment",
"picasso-runtime",
"sc-cli",
"sc-consensus",
@@ -11637,7 +12064,7 @@ dependencies = [
[[package]]
name = "simnode-runtime-apis"
version = "0.1.0"
-source = "git+https://github.com/polytope-labs/substrate-simnode?branch=master#7e2453df89dac7ae6800186a121d2d0c335728f6"
+source = "git+https://github.com/polytope-labs/substrate-simnode?branch=master#a5bc46c664884bac71ab13aa1669693e62fd99fd"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -11650,6 +12077,7 @@ version = "0.1.0"
dependencies = [
"common",
"composable-node",
+ "composable-runtime",
"cumulus-pallet-parachain-system",
"dali-runtime",
"frame-benchmarking",
@@ -11693,8 +12121,8 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
[[package]]
name = "slot-range-helper"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -11742,7 +12170,7 @@ dependencies = [
"aes-gcm 0.9.4",
"blake2",
"chacha20poly1305",
- "rand 0.8.4",
+ "rand 0.8.5",
"rand_core 0.6.3",
"ring",
"rustc_version 0.3.3",
@@ -11781,10 +12209,10 @@ dependencies = [
"base64 0.13.0",
"bytes 1.1.0",
"flate2",
- "futures 0.3.19",
+ "futures 0.3.21",
"httparse",
"log 0.4.14",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha-1 0.9.8",
]
@@ -11797,7 +12225,7 @@ checksum = "4210e1a17d165a0c1d4a233af1e3b36fb21b1359042767a4d2c73554f5f8c2aa"
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"hash-db",
"log 0.4.14",
@@ -11814,19 +12242,19 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"blake2-rfc",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "sp-application-crypto"
-version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11839,7 +12267,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -11854,7 +12282,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11867,7 +12295,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -11879,7 +12307,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -11891,11 +12319,11 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
- "lru 0.7.2",
+ "lru 0.7.3",
"parity-scale-codec",
"parking_lot 0.11.2",
"sp-api",
@@ -11909,10 +12337,10 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "futures 0.3.19",
+ "futures 0.3.21",
"futures-timer",
"log 0.4.14",
"parity-scale-codec",
@@ -11928,7 +12356,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -11946,7 +12374,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
"merlin",
@@ -11969,7 +12397,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11981,7 +12409,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -11992,8 +12420,8 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "4.1.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"base58",
"bitflags",
@@ -12001,7 +12429,7 @@ dependencies = [
"byteorder",
"dyn-clonable",
"ed25519-dalek",
- "futures 0.3.19",
+ "futures 0.3.21",
"hash-db",
"hash256-std-hasher",
"hex",
@@ -12021,7 +12449,7 @@ dependencies = [
"schnorrkel",
"secrecy",
"serde",
- "sha2 0.10.1",
+ "sha2 0.10.2",
"sp-core-hashing",
"sp-debug-derive",
"sp-externalities",
@@ -12041,11 +12469,11 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"blake2-rfc",
"byteorder",
- "sha2 0.10.1",
+ "sha2 0.10.2",
"sp-std",
"tiny-keccak",
"twox-hash",
@@ -12054,18 +12482,18 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
"sp-core-hashing",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"kvdb",
"parking_lot 0.11.2",
@@ -12074,17 +12502,17 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "sp-externalities"
-version = "0.10.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "0.11.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -12095,7 +12523,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"finality-grandpa",
"log 0.4.14",
@@ -12113,7 +12541,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -12126,10 +12554,10 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"hash-db",
"libsecp256k1",
"log 0.4.14",
@@ -12150,23 +12578,22 @@ dependencies = [
[[package]]
name = "sp-keyring"
-version = "4.1.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"lazy_static",
"sp-core",
"sp-runtime",
- "strum 0.22.0",
+ "strum",
]
[[package]]
name = "sp-keystore"
-version = "0.10.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "0.11.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
- "derive_more",
- "futures 0.3.19",
+ "futures 0.3.21",
"merlin",
"parity-scale-codec",
"parking_lot 0.11.2",
@@ -12174,20 +12601,22 @@ dependencies = [
"serde",
"sp-core",
"sp-externalities",
+ "thiserror",
]
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
+ "thiserror",
"zstd",
]
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -12202,18 +12631,18 @@ dependencies = [
[[package]]
name = "sp-npos-elections-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"sp-api",
"sp-core",
@@ -12223,7 +12652,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"backtrace",
"lazy_static",
@@ -12232,8 +12661,8 @@ dependencies = [
[[package]]
name = "sp-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"rustc-hash",
"serde",
@@ -12242,8 +12671,8 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "4.1.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"either",
"hash256-std-hasher",
@@ -12264,8 +12693,8 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "4.1.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -12282,19 +12711,19 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"Inflector",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "sp-serializer"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"serde",
"serde_json",
@@ -12303,7 +12732,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -12317,7 +12746,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -12327,8 +12756,8 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.10.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "0.11.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"hash-db",
"log 0.4.14",
@@ -12351,12 +12780,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
[[package]]
name = "sp-storage"
-version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -12369,7 +12798,7 @@ dependencies = [
[[package]]
name = "sp-tasks"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"log 0.4.14",
"sp-core",
@@ -12382,7 +12811,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
"futures-timer",
@@ -12398,7 +12827,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -12410,7 +12839,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"sp-api",
"sp-runtime",
@@ -12419,7 +12848,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-trait",
"log 0.4.14",
@@ -12434,8 +12863,8 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "4.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"hash-db",
"memory-db",
@@ -12450,7 +12879,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -12467,18 +12896,18 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"parity-scale-codec",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "sp-wasm-interface"
-version = "4.1.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"impl-trait-for-tuples",
"log 0.4.14",
@@ -12496,9 +12925,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "ss58-registry"
-version = "1.12.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a"
+checksum = "2f9799e6d412271cb2414597581128b03f3285f260ea49f5363d07df6a332b3e"
dependencies = [
"Inflector",
"proc-macro2 1.0.36",
@@ -12551,7 +12980,7 @@ dependencies = [
"memchr",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -12564,7 +12993,7 @@ dependencies = [
"lazy_static",
"nalgebra",
"num-traits",
- "rand 0.8.4",
+ "rand 0.8.5",
]
[[package]]
@@ -12591,7 +13020,7 @@ dependencies = [
"quote 1.0.15",
"serde",
"serde_derive",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -12607,7 +13036,7 @@ dependencies = [
"serde_derive",
"serde_json",
"sha1",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -12649,16 +13078,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
-]
-
-[[package]]
-name = "strum"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e"
-dependencies = [
- "strum_macros 0.22.0",
+ "syn 1.0.88",
]
[[package]]
@@ -12667,19 +13087,7 @@ version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
dependencies = [
- "strum_macros 0.23.1",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2 1.0.36",
- "quote 1.0.15",
- "syn 1.0.86",
+ "strum_macros",
]
[[package]]
@@ -12692,7 +13100,7 @@ dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
"rustversion",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -12711,7 +13119,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"platforms",
]
@@ -12719,10 +13127,10 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"frame-system-rpc-runtime-api",
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"jsonrpc-core-client",
"jsonrpc-derive",
@@ -12741,27 +13149,28 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"async-std",
- "derive_more",
"futures-util",
- "hyper 0.14.16",
+ "hyper 0.14.17",
"log 0.4.14",
"prometheus",
+ "thiserror",
"tokio",
]
[[package]]
name = "substrate-simnode"
version = "0.1.0"
-source = "git+https://github.com/polytope-labs/substrate-simnode?branch=master#7e2453df89dac7ae6800186a121d2d0c335728f6"
+source = "git+https://github.com/polytope-labs/substrate-simnode?branch=master#a5bc46c664884bac71ab13aa1669693e62fd99fd"
dependencies = [
+ "clap 3.1.6",
"cumulus-pallet-parachain-system",
"cumulus-primitives-parachain-inherent",
"cumulus-test-relay-sproof-builder",
"frame-system",
- "futures 0.3.19",
+ "futures 0.3.21",
"jsonrpc-core",
"log 0.4.14",
"num-traits",
@@ -12809,18 +13218,40 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
"ansi_term",
"build-helper",
"cargo_metadata",
"sp-maybe-compressed-blob",
+ "strum",
"tempfile",
"toml",
"walkdir",
"wasm-gc-api",
]
+[[package]]
+name = "substrate-xt"
+version = "0.1.0"
+source = "git+https://github.com/polytope-labs/substrate-xt?branch=master#0f174b36742c22431ee673dbdc4cc4aea8c9de77"
+dependencies = [
+ "frame-system",
+ "futures 0.3.21",
+ "jsonrpsee 0.8.0",
+ "parity-scale-codec",
+ "sc-client-api",
+ "sc-rpc-api",
+ "sc-transaction-pool-api",
+ "sp-core",
+ "sp-externalities",
+ "sp-io",
+ "sp-runtime",
+ "sp-storage",
+ "thiserror",
+ "tokio",
+]
+
[[package]]
name = "subtle"
version = "2.4.1"
@@ -12846,9 +13277,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.86"
+version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+checksum = "ebd69e719f31e88618baa1eaa6ee2de5c9a1c004f1e9ecdb58e8352a13f20a01"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
@@ -12863,7 +13294,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
"unicode-xid 0.2.2",
]
@@ -12888,16 +13319,16 @@ dependencies = [
"cfg-if 1.0.0",
"fastrand",
"libc",
- "redox_syscall 0.2.10",
+ "redox_syscall 0.2.11",
"remove_dir_all",
"winapi 0.3.9",
]
[[package]]
name = "termcolor"
-version = "1.1.2"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
dependencies = [
"winapi-util",
]
@@ -12913,9 +13344,9 @@ dependencies = [
[[package]]
name = "textwrap"
-version = "0.14.2"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
[[package]]
name = "thiserror"
@@ -12934,7 +13365,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -13037,7 +13468,7 @@ dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
"standback",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -13085,19 +13516,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.16.1"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
dependencies = [
"bytes 1.1.0",
"libc",
"memchr",
- "mio 0.7.14",
+ "mio 0.8.1",
"num_cpus",
"once_cell",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.0",
"pin-project-lite 0.2.8",
"signal-hook-registry",
+ "socket2 0.4.4",
"tokio-macros",
"winapi 0.3.9",
]
@@ -13142,7 +13574,7 @@ checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -13180,9 +13612,20 @@ version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [
- "rustls",
+ "rustls 0.19.1",
+ "tokio",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b"
+dependencies = [
+ "rustls 0.20.4",
"tokio",
- "webpki",
+ "webpki 0.22.0",
]
[[package]]
@@ -13276,9 +13719,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
-version = "0.1.30"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9"
+checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
dependencies = [
"cfg-if 1.0.0",
"log 0.4.14",
@@ -13289,20 +13732,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.19"
+version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716"
+checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
name = "tracing-core"
-version = "0.1.22"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23"
+checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c"
dependencies = [
"lazy_static",
"valuable",
@@ -13331,9 +13774,9 @@ dependencies = [
[[package]]
name = "tracing-serde"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
dependencies = [
"serde",
"tracing-core",
@@ -13349,7 +13792,7 @@ dependencies = [
"chrono",
"lazy_static",
"matchers",
- "parking_lot 0.10.2",
+ "parking_lot 0.11.2",
"regex",
"serde",
"serde_json",
@@ -13407,7 +13850,7 @@ dependencies = [
"ipnet",
"lazy_static",
"log 0.4.14",
- "rand 0.8.4",
+ "rand 0.8.5",
"smallvec 1.8.0",
"thiserror",
"tinyvec",
@@ -13442,9 +13885,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.16#d78e92de5aeaea1b4df48c639eb88d5b93cf19ef"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e"
dependencies = [
- "jsonrpsee",
+ "clap 3.1.6",
+ "jsonrpsee 0.4.1",
"log 0.4.14",
"parity-scale-codec",
"remote-externalities",
@@ -13460,7 +13904,6 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-version",
- "structopt",
"zstd",
]
@@ -13488,7 +13931,7 @@ dependencies = [
"http",
"httparse",
"log 0.4.14",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha-1 0.9.8",
"thiserror",
"url 2.2.2",
@@ -13508,7 +13951,7 @@ dependencies = [
"httparse",
"log 0.4.14",
"native-tls",
- "rand 0.8.4",
+ "rand 0.8.5",
"sha-1 0.9.8",
"thiserror",
"url 2.2.2",
@@ -13531,7 +13974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0"
dependencies = [
"cfg-if 1.0.0",
- "rand 0.8.4",
+ "rand 0.8.5",
"static_assertions",
]
@@ -13600,9 +14043,9 @@ dependencies = [
[[package]]
name = "unicode-segmentation"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
[[package]]
name = "unicode-width"
@@ -13792,7 +14235,7 @@ dependencies = [
"futures-util",
"headers",
"http",
- "hyper 0.14.16",
+ "hyper 0.14.17",
"log 0.4.14",
"mime 0.3.16",
"mime_guess",
@@ -13823,6 +14266,12 @@ version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
[[package]]
name = "wasm-bindgen"
version = "0.2.79"
@@ -13846,7 +14295,7 @@ dependencies = [
"log 0.4.14",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
"wasm-bindgen-shared",
]
@@ -13880,7 +14329,7 @@ checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -13917,7 +14366,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"js-sys",
"parking_lot 0.11.2",
"pin-utils",
@@ -13958,9 +14407,9 @@ checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc"
[[package]]
name = "wasmtime"
-version = "0.33.0"
+version = "0.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414be1bc5ca12e755ffd3ff7acc3a6d1979922f8237fc34068b2156cebcc3270"
+checksum = "4c9c724da92e39a85d2231d4c2a942c8be295211441dbca581c6c3f3f45a9f00"
dependencies = [
"anyhow",
"backtrace",
@@ -13990,9 +14439,9 @@ dependencies = [
[[package]]
name = "wasmtime-cache"
-version = "0.33.0"
+version = "0.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9b4cd1949206fda9241faf8c460a7d797aa1692594d3dd6bc1cbfa57ee20d0"
+checksum = "da4439d99100298344567c0eb6916ad5864e99e54760b8177c427e529077fb30"
dependencies = [
"anyhow",
"base64 0.13.0",
@@ -14010,9 +14459,9 @@ dependencies = [
[[package]]
name = "wasmtime-cranelift"
-version = "0.33.0"
+version = "0.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4693d33725773615a4c9957e4aa731af57b27dca579702d1d8ed5750760f1a9"
+checksum = "1762765dd69245f00e5d9783b695039e449a7be0f9c5383e4c78465dd6131aeb"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -14032,9 +14481,9 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
-version = "0.33.0"
+version = "0.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b17e47116a078b9770e6fb86cff8b9a660826623cebcfff251b047c8d8993ef"
+checksum = "c4468301d95ec71710bb6261382efe27d1296447711645e3dbabaea6e4de3504"
dependencies = [
"anyhow",
"cranelift-entity",
@@ -14052,9 +14501,9 @@ dependencies = [
[[package]]
name = "wasmtime-jit"
-version = "0.33.0"
+version = "0.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60ea5b380bdf92e32911400375aeefb900ac9d3f8e350bb6ba555a39315f2ee7"
+checksum = "ab0ae6e581ff014b470ec35847ea3c0b4c3ace89a55df5a04c802a11f4574e7d"
dependencies = [
"addr2line",
"anyhow",
@@ -14074,9 +14523,9 @@ dependencies = [
[[package]]
name = "wasmtime-runtime"
-version = "0.33.0"
+version = "0.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abc7cd79937edd6e238b337608ebbcaf9c086a8457f01dfd598324f7fa56d81a"
+checksum = "6d9c28877ae37a367cda7b52b8887589816152e95dde9b7c80cc686f52761961"
dependencies = [
"anyhow",
"backtrace",
@@ -14089,7 +14538,7 @@ dependencies = [
"mach",
"memoffset",
"more-asserts",
- "rand 0.8.4",
+ "rand 0.8.5",
"region",
"rustix",
"thiserror",
@@ -14099,9 +14548,9 @@ dependencies = [
[[package]]
name = "wasmtime-types"
-version = "0.33.0"
+version = "0.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9e5e51a461a2cf2b69e1fc48f325b17d78a8582816e18479e8ead58844b23f8"
+checksum = "395726e8f5dd8c57cb0db445627b842343f7e29ed7489467fdf7953ed9d3cd4f"
dependencies = [
"cranelift-entity",
"serde",
@@ -14129,13 +14578,32 @@ dependencies = [
"untrusted",
]
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
[[package]]
name = "webpki-roots"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
dependencies = [
- "webpki",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449"
+dependencies = [
+ "webpki 0.22.0",
]
[[package]]
@@ -14196,8 +14664,8 @@ dependencies = [
[[package]]
name = "westend-runtime"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -14282,8 +14750,8 @@ dependencies = [
[[package]]
name = "westend-runtime-constants"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -14352,6 +14820,49 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "windows-sys"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
+
[[package]]
name = "winreg"
version = "0.6.2"
@@ -14363,9 +14874,9 @@ dependencies = [
[[package]]
name = "winreg"
-version = "0.7.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
"winapi 0.3.9",
]
@@ -14408,8 +14919,8 @@ dependencies = [
[[package]]
name = "xcm"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"derivative",
"impl-trait-for-tuples",
@@ -14421,8 +14932,8 @@ dependencies = [
[[package]]
name = "xcm-builder"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-support",
"frame-system",
@@ -14439,10 +14950,34 @@ dependencies = [
"xcm-executor",
]
+[[package]]
+name = "xcm-emulator"
+version = "0.1.0"
+source = "git+https://github.com/shaunxw/xcm-simulator?rev=24ccbce563d1f99019b4cdfa2f3af4e99bac0dfc#24ccbce563d1f99019b4cdfa2f3af4e99bac0dfc"
+dependencies = [
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
+ "cumulus-test-relay-sproof-builder",
+ "frame-support",
+ "frame-system",
+ "parachain-info",
+ "parity-scale-codec",
+ "paste 1.0.6",
+ "polkadot-primitives",
+ "polkadot-runtime-parachains",
+ "sp-io",
+ "sp-std",
+ "xcm",
+ "xcm-executor",
+]
+
[[package]]
name = "xcm-executor"
-version = "0.9.16"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -14460,12 +14995,12 @@ dependencies = [
[[package]]
name = "xcm-procedural"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#41ab002d7451766324a9f314fee11c9c53314350"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
dependencies = [
"Inflector",
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
]
[[package]]
@@ -14474,32 +15009,32 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
dependencies = [
- "futures 0.3.19",
+ "futures 0.3.21",
"log 0.4.14",
"nohash-hasher",
"parking_lot 0.11.2",
- "rand 0.8.4",
+ "rand 0.8.5",
"static_assertions",
]
[[package]]
name = "zeroize"
-version = "1.5.2"
+version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c88870063c39ee00ec285a2f8d6a966e5b6fb2becc4e8dac77ed0d370ed6006"
+checksum = "50344758e2f40e3a1fcfc8f6f91aa57b5f8ebd8d27919fe6451f15aaaf9ee608"
dependencies = [
"zeroize_derive",
]
[[package]]
name = "zeroize_derive"
-version = "1.3.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb"
+checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.15",
- "syn 1.0.86",
+ "syn 1.0.88",
"synstructure",
]
@@ -14531,3 +15066,103 @@ dependencies = [
"cc",
"libc",
]
+
+[[patch.unused]]
+name = "polkadot"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "polkadot-node-subsystem-test-helpers"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "polkadot-primitives-test-helpers"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "polkadot-test-client"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "polkadot-test-malus"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "polkadot-test-runtime"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "polkadot-test-service"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "polkadot-voter-bags"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "remote-ext-tests-bags-list"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "staking-miner"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "test-parachain-adder"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "test-parachain-adder-collator"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "test-parachain-halt"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "test-parachains"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "test-runtime-constants"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "xcm-executor-integration-tests"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "xcm-simulator"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "xcm-simulator-example"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "xcm-simulator-fuzzer"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
+
+[[patch.unused]]
+name = "zombienet-backchannel"
+version = "0.9.17"
+source = "git+https://github.com/composableFi/polkadot?branch=release-v0.9.17#1db48fed44a2b28648b464e6c3696fb40604dba0"
diff --git a/Cargo.toml b/Cargo.toml
index a15d7819a2a..2ff38226d79 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,208 +1,150 @@
-[[bin]]
-name = "composable"
-path = "src/main.rs"
-
[package]
-name = "composable"
-version = "1.0.9"
authors = ["Composable Developers"]
-homepage = "https://composable.finance"
edition = "2018"
+homepage = "https://composable.finance"
+name = "composable"
+version = "1.0.0"
+
+[[bin]]
+name = "composable"
+path = "src/main.rs"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-composable-node = { path = "node", features = [ "composable", "dali" ] }
color-eyre = { version = "0.5.11", default-features = false }
+composable-node = { path = "node", features = ["composable", "dali"] }
[features]
-runtime-benchmarks = [ "composable-node/runtime-benchmarks" ]
-std = [ "composable-node/std" ]
-
-
+dali = []
+local-integration-tests = []
+picasso = []
+runtime-benchmarks = ["composable-node/runtime-benchmarks"]
+std = ["composable-node/std"]
[workspace]
exclude = ["frame/transaction-fee"]
members = [
- "runtime/common",
- "runtime/primitives",
- "frame/*",
- "node",
- "runtime/picasso",
- "runtime/dali",
- "runtime/composable",
- "utils/price-feed",
- "utils/collator-sidecar",
- "integration-tests/simnode/simnode-node",
- "integration-tests/simnode/simnode-tests",
- "integration-tests/simnode/common",
+ "frame/*",
+ "integration-tests/local-integration-tests",
+ "node",
+
+ "runtime/common",
+ "runtime/primitives",
+ "runtime/picasso",
+ "runtime/dali",
+ "runtime/composable",
+
+ "utils/parachain-utils",
+ "utils/price-feed",
+ "utils/collator-sidecar",
+ "simnode/simnode-node",
+ "simnode/simnode-tests",
+ "simnode/common",
]
[profile.release]
# Polkadot runtime requires unwinding.
+lto = false
panic = "unwind"
[profile.production]
inherits = "release"
lto = true
-[patch."https://github.com/paritytech/substrate"]
-frame-benchmarking ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-support ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-support-procedural ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-support-procedural-tools ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-support-procedural-tools-derive ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-arithmetic ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-debug-derive ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-std ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-core ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-core-hashing ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-externalities ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-storage ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-runtime-interface ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-runtime-interface-proc-macro ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-tracing ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-wasm-interface ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-io ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-keystore ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-state-machine ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-panic-handler ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-trie ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-runtime ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-application-crypto ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-api ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-api-proc-macro ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-version ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-version-proc-macro ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-block-builder ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-client-api ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-substrate-prometheus-endpoint ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-executor ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-executor-common ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-allocator ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-maybe-compressed-blob ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-serializer ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-executor-wasmi ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-executor-wasmtime ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-tasks ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-substrate-wasm-builder ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-core-hashing-proc-macro ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-tracing ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-rpc-server ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-tracing-proc-macro ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-blockchain ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-consensus ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-inherents ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-database ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-rpc ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-system ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-system-rpc-runtime-api ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-babe ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-authorship ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-authorship ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-session ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-timestamp ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-timestamp ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-session ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-staking ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-consensus-babe ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-consensus-slots ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-consensus-vrf ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-election-provider-support ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-npos-elections ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-npos-elections-solution-type ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-service ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-chain-spec ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-chain-spec-derive ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-network ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-fork-tree ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-consensus ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-utils ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-peerset ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-finality-grandpa ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-telemetry ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-client-db ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-state-db ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-informant ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-transaction-pool-api ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-keystore ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-offchain ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-offchain ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-transaction-pool ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-transaction-pool ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-rpc ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-rpc-api ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-block-builder ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-transaction-storage-proof ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-balances ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-transaction-payment ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-offences ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-staking ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-bags-list ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-staking-reward-curve ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-consensus-aura ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-keyring ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-benchmarking-cli ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-cli ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-executive ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-system-benchmarking ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-aura ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-grandpa ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-randomness-collective-flip ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-sudo ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-transaction-payment-rpc-runtime-api ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-transaction-payment-rpc ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-basic-authorship ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-proposer-metrics ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-consensus-aura ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-consensus-slots ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-finality-grandpa ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-network-gossip ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-substrate-frame-rpc-system ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-substrate-build-script-utils ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-frame-try-runtime ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-authority-discovery ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sp-authority-discovery ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-bounties ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-treasury ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-collective ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-utility ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-democracy ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-scheduler ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-election-provider-multi-phase ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-gilt ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-identity ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-im-online ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-indices ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-membership ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-mmr ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-preimage ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-mmr-primitives ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-multisig ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-offences-benchmarking ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-proxy ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-recovery ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-session-benchmarking ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-society ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-tips ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-vesting ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-mmr-rpc ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-consensus-babe ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-consensus-epochs ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-consensus-babe-rpc ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-finality-grandpa-rpc ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-sync-state-rpc ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-authority-discovery ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-consensus-uncles ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-try-runtime-cli ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-remote-externalities ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-beefy-gadget ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-beefy-primitives ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-beefy-gadget-rpc ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-sc-consensus-manual-seal ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-beefy ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-beefy-mmr ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-beefy-merkle-tree ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-nicks ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
-pallet-staking-reward-fn ={git = "https://github.com/composableFi/substrate" ,branch = "polkadot-v0.9.16" }
+[patch."https://github.com/paritytech/polkadot"]
+bp-header-chain = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+bp-message-dispatch = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+bp-messages = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+bp-polkadot-core = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+bp-rococo = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+bp-runtime = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+bp-test-utils = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+bp-wococo = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+bridge-runtime-common = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+kusama-runtime = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+kusama-runtime-constants = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+metered-channel = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+pallet-bridge-dispatch = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+pallet-bridge-grandpa = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+pallet-bridge-messages = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+pallet-xcm = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+pallet-xcm-benchmarks = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-approval-distribution = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-availability-bitfield-distribution = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-availability-distribution = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-availability-recovery = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-cli = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-client = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-collator-protocol = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-core-primitives = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-dispute-distribution = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-erasure-coding = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-gossip-support = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-network-bridge = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-collation-generation = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-approval-voting = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-av-store = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-backing = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-bitfield-signing = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-candidate-validation = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-chain-api = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-chain-selection = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-dispute-coordinator = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-parachains-inherent = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-provisioner = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-pvf = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-pvf-checker = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-core-runtime-api = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-jaeger = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-metrics = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-network-protocol = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-primitives = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-subsystem = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-subsystem-test-helpers = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-subsystem-types = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-node-subsystem-util = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-overseer = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-overseer-gen = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-overseer-gen-proc-macro = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-parachain = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-performance-test = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-primitives = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-primitives-test-helpers = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-rpc = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-runtime = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-runtime-common = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-runtime-constants = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-runtime-metrics = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-runtime-parachains = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-service = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-statement-distribution = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-statement-table = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-test-client = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-test-malus = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-test-runtime = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-test-service = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+polkadot-voter-bags = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+remote-ext-tests-bags-list = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+rococo-runtime = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+rococo-runtime-constants = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+slot-range-helper = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+staking-miner = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+test-parachain-adder = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+test-parachain-adder-collator = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+test-parachain-halt = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+test-parachains = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+test-runtime-constants = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+westend-runtime = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+westend-runtime-constants = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+xcm = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+xcm-builder = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+xcm-executor = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+xcm-executor-integration-tests = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+xcm-procedural = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+xcm-simulator = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+xcm-simulator-example = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+xcm-simulator-fuzzer = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
+zombienet-backchannel = { git = "https://github.com/composableFi/polkadot", branch = "release-v0.9.17" }
diff --git a/Makefile b/Makefile
index a77219d3452..c065192ae5e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ style-check:
style:
@rustup component add rustfmt 2> /dev/null
- cargo +nightly fmt --all
+ cargo install taplo-cli 2> /dev/null
+ cargo +nightly fmt --all && taplo fmt
lint:
@rustup component add clippy 2> /dev/null
@@ -56,10 +57,10 @@ version:
.PHONY: containerize-release
containerize-release: version containerize
-containerize:
+containerize:
@docker build \
--build-arg SERVICE_DIR=${INSTALL_DIR} --build-arg VERSION=${RELEASE_VERSION} \
- -f ${INSTALL_DIR}/Dockerfile \
+ -f ${INSTALL_DIR}/Dockerfile \
-t ${IMAGE_WITH_COMMIT} \
-t ${IMAGE_WITH_RELEASE_VERSION} \
-t ${IMAGE_WITH_BRANCH} \
@@ -75,6 +76,32 @@ push:
push-release:
@docker push ${IMAGE_WITH_RELEASE_VERSION}
+containerize-composable-sandbox:
+ @docker build -f docker/composable-sandbox.dockerfile \
+ -t ${REPO}/composable-sandbox:${COMMIT_SHA} \
+ -t ${REPO}/composable-sandbox:latest \
+ .
+
+push-composable-sandbox:
+ @docker push ${REPO}/composable-sandbox:${COMMIT_SHA}
+ @docker push ${REPO}/composable-sandbox:latest
+
+containerize-mmr-polkadot:
+ @docker build -f docker/mmr-polkadot.dockerfile \
+ -t ${REPO}/mmr-polkadot:latest \
+ .
+
+push-mmr-polkadot:
+ @docker push ${REPO}/mmr-polkadot:latest
+
+containerize-ci-linux:
+ @docker build -f docker/ci-linux.dockerfile \
+ -t ${REPO}/ci-linux:production \
+ .
+
+push-ci-linux:
+ @docker push ${REPO}/ci-linux:production
+
stop:
@docker-compose down
@@ -88,7 +115,8 @@ endif
.PHONY: build test docs style-check lint udeps containerize dev push install stop containerize-release push-release
-
+.PHONY: containerize-composable-sandbox push-composable-sandbox containerize-mmr-polkadot push-mmr-polkadot
+.PHONY: containerize-ci-linux push-ci-linux
#----------------------------------------------------------------------
# UTILITY FUNCTIONS TO remove
diff --git a/Makefile.toml b/Makefile.toml
index aaa1f7870ef..4633dfb3917 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -3,29 +3,68 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
[tasks.fmt]
-workspace = false
script = '''
cargo +nightly fmt
'''
+workspace = false
[tasks.build]
-workspace = false
args = ["build", "--release"]
+workspace = false
[tasks.polkadot]
-workspace = false
script = '''
if [ ! -d "../polkadot" ] ; then
- git clone -b v0.9.16 https://github.com/paritytech/polkadot ../polkadot
+ git clone -b v0.9.17 https://github.com/paritytech/polkadot ../polkadot
fi
cd ../polkadot && cargo build --release
'''
-
-[tasks.devnet]
workspace = false
-dependencies = ["build", "polkadot"]
+
+[tasks.start-devnet]
+dependencies = ["build", "git-polkadot"]
script = '''
cargo run --release -- --version
cd ../polkadot && cargo run --release -- --version && pwd && cd ../composable
cd scripts/polkadot-launch && yarn && yarn composable
-'''
\ No newline at end of file
+'''
+workspace = false
+
+[tasks.start-devnet-docker]
+dependencies = []
+script = '''
+docker run --rm -ti -u$(id -u):$(id -g) -p9944:9944 -p9988:9988 -p9998:9998 composablefi/composable-sandbox:latest
+'''
+workspace = false
+
+[tasks.remove-composable-sandbox-image]
+dependencies = []
+script = '''
+docker rmi composablefi/composable-sandbox:latest
+'''
+workspace = false
+
+[tasks.run-local-integration-tests]
+script = '''
+# we cannot use toolchain setting as different parts of codebase require different compiler
+cargo +stable test --package local-integration-tests --features local-integration-tests --no-default-features
+'''
+workspace = false
+
+[tasks.run-local-integration-tests-debug]
+script = '''
+RUST_BACKTRACE=full RUST_LOG=trace,parity-db=warn,trie=warn,runtime=trace,substrate-relay=trace,bridge=trace,xcmp=trace cargo +stable test --package local-integration-tests --features local-integration-tests --features picasso --no-default-features -- --nocapture --test-threads=1
+'''
+workspace = false
+
+[tasks.check-ci]
+script = '''
+SKIP_WASM_BUILD=1 cargo +nightly check --benches --all # checks all rust crates with default-features, tests, benchmarks
+'''
+workspace = false
+
+[tasks.build-benchmarks]
+script = '''
+cargo build --release --features runtime-benchmarks
+'''
+workspace = false
diff --git a/clippy.toml b/clippy.toml
index 09c4e1c8419..afb52b4117b 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,6 +1,6 @@
disallowed-methods = [
- "core::result::Result::unwrap", # { path = "core::result::Result::unwrap", reason = "Errors should be handled properly. If panicking is valid in this context, make sure to write a comment explaining why." },
- "core::option::Option::unwrap", # { path = "core::option::Option::unwrap", reason = "Errors should be handled properly. If panicking is valid in this context, make sure to write a comment explaining why." },
+ "core::result::Result::unwrap", # { path = "core::result::Result::unwrap", reason = "Errors should be handled properly. If panicking is valid in this context, make sure to write a comment explaining why." },
+ "core::option::Option::unwrap", # { path = "core::option::Option::unwrap", reason = "Errors should be handled properly. If panicking is valid in this context, make sure to write a comment explaining why." },
]
disallowed-types = ["frame_support::storage::types::ValueQuery"]
diff --git a/deny.toml b/deny.toml
index 02e7f9a52c0..9a4fbe081e7 100644
--- a/deny.toml
+++ b/deny.toml
@@ -22,13 +22,13 @@
# dependencies not shared by any other crates, would be ignored, as the target
# list here is effectively saying which targets you are building for.
targets = [
- # The triple can be any string, but only the target triples built in to
- # rustc (as of 1.40) can be checked against actual config expressions
- #{ triple = "x86_64-unknown-linux-musl" },
- # You can also specify which target_features you promise are enabled for a
- # particular target. target_features are currently not validated against
- # the actual valid features supported by the target architecture.
- #{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
+ # The triple can be any string, but only the target triples built in to
+ # rustc (as of 1.40) can be checked against actual config expressions
+ #{ triple = "x86_64-unknown-linux-musl" },
+ # You can also specify which target_features you promise are enabled for a
+ # particular target. target_features are currently not validated against
+ # the actual valid features supported by the target architecture.
+ #{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
]
# This section is considered when running `cargo deny check advisories`
@@ -52,7 +52,7 @@ notice = "warn"
# A list of advisory IDs to ignore. Note that ignored advisories will still
# output a note when they are encountered.
ignore = [
- #"RUSTSEC-0000-0000",
+ #"RUSTSEC-0000-0000",
]
# Threshold for security vulnerabilities, any vulnerability with a CVSS score
# lower than the range specified will be ignored. Note that ignored advisories
@@ -74,15 +74,15 @@ unlicensed = "deny"
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
allow = [
- #"MIT",
- #"Apache-2.0",
- #"Apache-2.0 WITH LLVM-exception",
+ #"MIT",
+ #"Apache-2.0",
+ #"Apache-2.0 WITH LLVM-exception",
]
# List of explicitly disallowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
deny = [
- #"Nokia",
+ #"Nokia",
]
# Lint level for licenses considered copyleft
copyleft = "warn"
@@ -106,9 +106,9 @@ confidence-threshold = 0.8
# Allow 1 or more licenses on a per-crate basis, so that particular licenses
# aren't accepted for every possible crate as with the normal allow list
exceptions = [
- # Each entry is the crate and version constraint, and its specific allow
- # list
- #{ allow = ["Zlib"], name = "adler32", version = "*" },
+ # Each entry is the crate and version constraint, and its specific allow
+ # list
+ #{ allow = ["Zlib"], name = "adler32", version = "*" },
]
# Some crates don't have (easily) machine readable licensing information,
@@ -127,8 +127,8 @@ exceptions = [
# and the crate will be checked normally, which may produce warnings or errors
# depending on the rest of your configuration
#license-files = [
- # Each entry is a crate relative path, and the (opaque) hash of its contents
- #{ path = "LICENSE", hash = 0xbd0eed23 }
+# Each entry is a crate relative path, and the (opaque) hash of its contents
+#{ path = "LICENSE", hash = 0xbd0eed23 }
#]
[licenses.private]
@@ -141,7 +141,7 @@ ignore = false
# is only published to private registries, and ignore is true, the crate will
# not have its license(s) checked
registries = [
- #"https://sekretz.com/registry
+ #"https://sekretz.com/registry
]
# This section is considered when running `cargo deny check bans`.
@@ -161,38 +161,38 @@ wildcards = "allow"
highlight = "lowest-version"
# List of crates that are allowed. Use with care!
allow = [
- #{ name = "ansi_term", version = "=0.11.0" },
+ #{ name = "ansi_term", version = "=0.11.0" },
]
# List of crates to deny
deny = [
- # Each entry the name of a crate and a version range. If version is
- # not specified, all versions will be matched.
- #{ name = "ansi_term", version = "=0.11.0" },
- #
- # Wrapper crates can optionally be specified to allow the crate when it
- # is a direct dependency of the otherwise banned crate
- #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
+ # Each entry the name of a crate and a version range. If version is
+ # not specified, all versions will be matched.
+ #{ name = "ansi_term", version = "=0.11.0" },
+ #
+ # Wrapper crates can optionally be specified to allow the crate when it
+ # is a direct dependency of the otherwise banned crate
+ #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
]
# Certain crates/versions that will be skipped when doing duplicate detection.
skip = [
- # unfortunately substrate itself depends on several versions, to allow for it
- { name = "wasi", version = "=0.10.0+wasi-snapshot-preview1" },
- { name = "smallvec", version = "=0.6.14" },
- { name = "sha2", version = "=0.9.9" },
- { name = "semver", version = "=1.0.4" },
- { name = "rustc_version", version = "=0.4.0" },
- { name = "redox_syscall", version = "=0.2.10" },
- { name = "pbkdf2", version = "=0.8.0" },
- { name = "rand_xorshift", version = "=0.3.0" },
- { name = "rand_pcg", version = "=0.2.1" },
- { name = "opaque-debug", version = "=0.3.0" },
+ # unfortunately substrate itself depends on several versions, to allow for it
+ { name = "wasi", version = "=0.10.0+wasi-snapshot-preview1" },
+ { name = "smallvec", version = "=0.6.14" },
+ { name = "sha2", version = "=0.9.9" },
+ { name = "semver", version = "=1.0.4" },
+ { name = "rustc_version", version = "=0.4.0" },
+ { name = "redox_syscall", version = "=0.2.10" },
+ { name = "pbkdf2", version = "=0.8.0" },
+ { name = "rand_xorshift", version = "=0.3.0" },
+ { name = "rand_pcg", version = "=0.2.1" },
+ { name = "opaque-debug", version = "=0.3.0" },
]
# Similarly to `skip` allows you to skip certain crates during duplicate
# detection. Unlike skip, it also includes the entire tree of transitive
# dependencies starting at the specified crate, up to a certain depth, which is
# by default infinite
skip-tree = [
- #{ name = "ansi_term", version = "=0.11.0", depth = 20 },
+ #{ name = "ansi_term", version = "=0.11.0", depth = 20 },
]
# This section is considered when running `cargo deny check sources`.
diff --git a/docker/ci-linux.dockerfile b/docker/ci-linux.dockerfile
new file mode 100644
index 00000000000..32034a0c56c
--- /dev/null
+++ b/docker/ci-linux.dockerfile
@@ -0,0 +1,7 @@
+FROM paritytech/ci-linux:production
+
+RUN rustup toolchain uninstall nightly-2021-11-08 && \
+ rustup toolchain uninstall nightly && \
+ rustup toolchain install nightly-2021-11-29 && \
+ rustup target install wasm32-unknown-unknown --toolchain nightly-2021-11-29 && \
+ ln -s "${RUSTUP_HOME}/toolchains/nightly-2021-11-29-x86_64-unknown-linux-gnu" "${RUSTUP_HOME}/toolchains/nightly-x86_64-unknown-linux-gnu"
diff --git a/docker/composable-sandbox.dockerfile b/docker/composable-sandbox.dockerfile
new file mode 100644
index 00000000000..cde2f3439c4
--- /dev/null
+++ b/docker/composable-sandbox.dockerfile
@@ -0,0 +1,53 @@
+FROM debian:11-slim as builder
+LABEL description="Docker image with Composable"
+
+ARG NIGHTLY_VERSION=nightly
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY . /build
+WORKDIR /build
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN apt-get update && apt-get install -y --no-install-recommends apt-utils ca-certificates clang curl git libssl-dev llvm libudev-dev && \
+ curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+ export PATH="$PATH:$HOME/.cargo/bin" && \
+ rustup default stable && \
+ rustup update && \
+ rustup update ${NIGHTLY_VERSION} && \
+ rustup target add wasm32-unknown-unknown --toolchain ${NIGHTLY_VERSION} && \
+ cargo build --release
+
+# ===== SECOND STAGE ======
+
+FROM composablefi/mmr-polkadot:latest as mmr-polkadot
+
+FROM debian:11-slim
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN groupadd -g 1000 service && useradd -m -s /bin/sh -g 1000 -G service service && \
+ mkdir -p /apps/composable/scripts /apps/composable/target/release /apps/Basilisk-node/target/release /apps/polkadot/target/release && \
+ apt-get update && apt-get install -y --no-install-recommends apt-utils ca-certificates curl git && \
+ curl -fsSL https://deb.nodesource.com/setup_17.x | bash - && \
+ apt-get update && apt-get install -y --no-install-recommends nodejs && \
+ npm install --global npm yarn && \
+ curl https://github.com/galacticcouncil/Basilisk-node/releases/download/v7.0.0/basilisk -Lo /apps/Basilisk-node/target/release/basilisk && \
+ chmod +x /apps/Basilisk-node/target/release/basilisk && \
+ apt-get clean && \
+ find /var/lib/apt/lists/ -type f -not -name lock -delete;
+
+COPY --from=builder /build/target/release/composable /apps/composable/target/release/
+COPY --from=mmr-polkadot /polkadot /apps/polkadot/target/release/
+COPY ./scripts/polkadot-launch /apps/composable/scripts/polkadot-launch
+
+WORKDIR /apps/composable/scripts/polkadot-launch
+
+RUN chown -R service /apps/composable/scripts/polkadot-launch && \
+ yarn && \
+ sed -i 's/"--rpc-cors=all"/"--rpc-cors=all", "--ws-external", "--unsafe-rpc-external", "--rpc-methods=unsafe"/' composable_and_basilisk.json
+
+USER service
+EXPOSE 9945 9988 9998
+ENTRYPOINT ["yarn", "composable_and_basilisk"]
diff --git a/docker/mmr-polkadot.dockerfile b/docker/mmr-polkadot.dockerfile
new file mode 100644
index 00000000000..cf49fc6df71
--- /dev/null
+++ b/docker/mmr-polkadot.dockerfile
@@ -0,0 +1,26 @@
+FROM debian:11-slim as builder
+
+ARG NIGHTLY_VERSION=nightly
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN apt-get update && apt-get install -y --no-install-recommends apt-utils build-essential ca-certificates clang curl git libclang-dev libudev-dev llvm pkg-config && \
+ curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+ export PATH="$PATH:$HOME/.cargo/bin" && \
+ rustup default stable && \
+ rustup update && \
+ rustup update ${NIGHTLY_VERSION} && \
+ rustup target add wasm32-unknown-unknown --toolchain ${NIGHTLY_VERSION} && \
+ git clone -b mmr-polkadot-v0.9.17 https://github.com/composableFi/polkadot
+
+WORKDIR /polkadot
+
+RUN export PATH="$PATH:$HOME/.cargo/bin" && \
+ cargo build --release
+
+# ===== SECOND STAGE ======
+
+FROM debian:11-slim
+
+COPY --from=builder /polkadot/target/release/polkadot /
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index a514bb30fa7..e0ee003074f 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -4,7 +4,7 @@ We have a few guidelines and requirements to ensure correct workflows are follow
## First Things First
Before contributing, go through the documentation found in `~/docs/`. Specifically:
-* [rust-setup.md](./rust-setup.md) ― A walkthrough for installing and configuring Rust and other tools in your develop ment environment
+* [rust-setup.md](./rust-setup.md) ― A walkthrough for installing and configuring Rust and other tools in your development environment
* [proptest.md](./proptest.md) ― A guide to our approach and philosophy for automated testing
* [benchmarking.md](./benchmarking.md) ― A guide for benchmarking pallet changes
diff --git a/docs/benchmarking.md b/docs/benchmarking.md
index e9ab9e34d0e..a58f7f1d6f2 100644
--- a/docs/benchmarking.md
+++ b/docs/benchmarking.md
@@ -170,7 +170,7 @@ add_benchmark!(params, batches, balances, Balances);
// ...
```
-or [define_benchmarks](https://github.com/paritytech/substrate/blob/master/frame/benchmarking/src/lib.rs#L1834-L1869) macro (it's available starting with `polkadot-v0.9.16` branch):
+or [define_benchmarks](https://github.com/paritytech/substrate/blob/master/frame/benchmarking/src/lib.rs#L1834-L1869) macro (it's available starting with `polkadot-v0.9.17` branch):
```rust
define_benchmarks!(
@@ -185,15 +185,14 @@ https://github.com/paritytech/substrate/blob/master/frame/benchmarking/src/lib.r
https://crates.io/crates/frame-benchmarking
Extra:
-If we are running the latest version of the frame-benchmarking dependency we can also add our pallet to the [benchmark_metadata](https://github.com/paritytech/substrate/blob/polkadot-v0.9.16/frame/benchmarking/src/utils.rs#L150) function.
+If we are running the latest version of the frame-benchmarking dependency we can also add our pallet to the [benchmark_metadata](https://github.com/paritytech/substrate/blob/polkadot-v0.9.17/frame/benchmarking/src/utils.rs#L150) function.
## Compile and run
-Now when we have everything we need, we want to build it and enable
-the runtime-benchmarks features, which are optional.
+Now when we have everything we need, we want to build it:
```shell
-$ cargo build --release --features runtime-benchmarks
+cargo make build-benchmarks
```
## Run the benchmarks
@@ -216,4 +215,3 @@ https://www.shawntabrizi.com/substrate-graph-benchmarks/docs/#/
https://substrate.dev/docs/en/knowledgebase/runtime/benchmarking
https://crates.io/crates/frame-benchmarking
https://github.com/paritytech/substrate/tree/polkadot-v0.9.8/frame/benchmarking
-
diff --git a/docs/custom-rpcs.md b/docs/custom-rpcs.md
new file mode 100644
index 00000000000..5db30c00f42
--- /dev/null
+++ b/docs/custom-rpcs.md
@@ -0,0 +1,383 @@
+# Adding an RPC interface to a pallet
+
+Create 2 new crates beside the `src/` folder of the pallet you want to add the RPC to:
+
+```plaintext
+frame
+ pallet
+ src
+ Cargo.toml
+ rpc
+ src
+ Cargo.toml
+ runtime-api
+ src
+ Cargo.toml
+```
+
+## Runtime API Crate
+
+### In `Cargo.toml`
+
+```toml
+[package]
+name = "pallet-name-runtime-api"
+version = "0.0.1"
+authors = ["Composable Developers"]
+homepage = "https://composable.finance"
+edition = "2021"
+rust-version = "1.56"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" }
+
+# ...any other dependencies, as per usual
+
+[features]
+default = ["std"]
+std = ["sp-api/std"]
+
+```
+
+### In `lib.rs`
+
+```rust
+#![cfg_attr(not(feature = "std"), no_std)]
+#![allow(clippy::too_many_arguments)] // REVIEW: I'm not sure if these are actually necessary
+#![allow(clippy::unnecessary_mut_passed)] // REVIEW: I'm not sure if these are actually necessary
+
+sp_api::decl_runtime_apis! {
+ pub trait PalletNameRuntimeApi* ...any generic parameters... */>
+ where
+ GENERIC_PARAMETER: codec::Codec, // all parameters must implement `Codec`
+ {
+ fn rpc_function_name(/* ...parameters... */) -> ReturnType;
+
+ // as many rpcs as are needed for the pallet can all be defined here in the same trait
+ }
+}
+```
+
+## RPC Crate
+
+### In `Cargo.toml`
+
+```toml
+[package]
+name = "PALLET-NAME-rpc"
+version = "0.0.1"
+authors = ["Composable Developers"]
+homepage = "https://composable.finance"
+edition = "2021"
+rust-version = "1.56"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+# substrate primitives
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+
+# SCALE
+scale-info = { version = "1.0", features = ["derive"] }
+codec = { version = "2.0.0", package = "parity-scale-codec", features = ["derive"] }
+
+# local
+pallet-name-runtime-api = { path = "../runtime-api" }
+
+# rpc
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
+```
+
+Note that this crate will only be included in the node and not the runtime, so there is no need for a `std` feature.
+
+### In `lib.rs`
+
+Required imports:
+
+```rust
+use pallet_name_runtime_api::PalletNameRuntimeApi;
+use codec::Codec;
+use jsonrpc_core::{Error as RpcError, ErrorCode, Result as RpcResult};
+use jsonrpc_derive::rpc;
+use sp_api::ProvideRuntimeApi;
+use sp_blockchain::HeaderBackend;
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
+use sp_std::{sync::Arc, marker::PhantomData};
+```
+
+This defines the RPC itself. The name of the RPC needs to follow the pattern of `moduleName_functionName`.
+
+**Note**: Any types that either are or are a wrapper type around `u128/i128` will need to be wrapped in `composable_support::rpc_helpers::SafeRpcWrapper`.
+
+```rust
+#[rpc]
+pub trait PalletNameApi
+where
+ GENERIC_PARAMETER: Codec, // if the type is a u128/i128, this should be SafeRpcWrapperType instead of Codec (Codec is a supertrait of SafeRpcWrapperType)
+{
+ // the name of the rpc must be moduleName_functionName, where both module
+ // and function are camelCase and are seperated by an underscore.
+ #[rpc(name = "palletName_rpcFunctionName")]
+ fn rpc_function_name(
+ &self,
+ // any additional parameters here
+ // if the type is or wraps a 128 bit integer, it should be declared as follows:
+ u128_ish: SafeRpcWrapper* whatever the type is */>
+ at: Option, // `at` should be last
+ ) -> RpcResult;
+}
+```
+
+This is a struct that will implement the above API. It contains the client to make the RPC calls.
+
+If there are more generics, instead of adding more parameters (`PalletName`), just use a tuple instead: `PalletName {
+ client: Arc,
+ _marker: PhantomData,
+}
+
+impl PalletName {
+ pub fn new(client: Arc) -> Self {
+ Self { client, _marker: Default::default() }
+ }
+}
+```
+
+```rust
+impl
+ PalletNameApi<::Hash, /* ...any generic parameters... */>
+ for PalletName
+where
+ Block: BlockT,
+ // all generic parameters must have at least these bounds
+ // if the type is a u128/i128, this should be SafeRpcWrapperType instead of Codec (Codec is a supertrait of SafeRpcWrapperType)
+ GENERIC_PARAMETER: Codec + Send + Sync + 'static,
+ C: Send + Sync + 'static,
+ C: ProvideRuntimeApi,
+ C: HeaderBackend,
+ C::Api: PalletNameRuntimeApi,
+{
+ fn rpc_function_name(
+ &self,
+ // any additional parameters here
+ // if the type is or wraps a 128 bit integer, it should be declared as follows:
+ u128_ish: SafeRpcWrapper* whatever the type is */>
+ at: Option<::Hash>, // `at` should be last
+ ) -> RpcResult {
+ let api = self.client.runtime_api();
+ let at = BlockId::hash(at.unwrap_or_else(|| {
+ // If the block hash is not supplied assume the best block.
+ self.client.info().best_hash
+ }));
+
+ let runtime_api_result = api.rpc_function_name(&at, asset_id, account_id);
+ // TODO(benluelo): Review what error message & code to use
+ runtime_api_result.map_err(|e| {
+ RpcError {
+ code: ErrorCode::ServerError(9876), // No real reason for this value
+ message: "Something wrong".into(),
+ data: Some(format!("{:?}", e).into()),
+ }
+ })
+ }
+}
+```
+
+## In `node/`
+
+The RPC needs to be added to the node in order to be called. First, add both the above crates to `node/Cargo.toml`:
+
+```toml
+[dependencies]
+# ...stub...
+pallet-name-rpc = { path = "../frame/pallet-name/rpc" }
+pallet-name-runtime-api = { path = "../frame/pallet-name/runtime-api" }
+```
+
+Then, in `node/src/runtime.rs`, add a bound in both the definition and blanket impl for `HostRuntimeApis`:
+
+```rust
+pub trait HostRuntimeApis:
+ // ...stub...
+ + pallet_name_runtime_api::PalletNameRuntimeApi,
+ // ...stub...
+
+impl HostRuntimeApis for Api
+where
+ Api: // ...stub...
+ + pallet_name_runtime_api::PalletNameRuntimeApi,
+ // ...stub...
+```
+
+Then, in `node/src/rpc.rs`, in `fn create(...)`, add a bound to `C::Api`, and then within the function, add the RPC to the runtime:
+
+```rust
+pub fn create(deps: FullDeps) -> jsonrpc_core::IoHandler
+where
+ // ...stub...
+ C::Api: pallet_name_runtime_api::PalletNameRuntimeApi,
+ // ...stub...
+{
+ // ...stub...
+ io.extend_with(CrowdloanRewardsApi::to_delegate(CrowdloanRewards::new(client)));
+
+ io
+}
+```
+
+## Add to runtimes
+
+Within each runtime's `Cargo.toml`, add the runtime-api dependency:
+
+```toml
+# ...stub...
+[dependencies]
+pallet-name-runtime-api = { path = '../../frame/pallet-name/runtime-api', default-features = false }
+# ...stub...
+```
+
+And then in each runtime's `lib.rs`, in the `impl_runtime_apis!` macro, implement the API:
+
+```rust
+impl_runtime_apis! {
+ impl pallet_name_runtime_api::PalletNameRuntimeApi for Runtime {
+ fn rpc_function_name(/* ...rpc parameters... */) -> ReturnType {
+ // actual implementation here
+ }
+ }
+ // ...stub...
+}
+```
+
+Note that this assumes that the pallet has already been added to the runtime and the pallet's `Config` already implemented.
+
+## Integration Tests
+
+/home/ben/codeprojects/composable/integration-tests/runtime-tests/src/types/interfaces/definitions.ts
+
+### Type Definitions
+
+Create a folder here: `integration-tests/runtime-tests/src/types/interfaces/pallet-name`
+
+And then within that folder, create a file `defintions.ts` with the following structure:
+
+```typescript
+export default {
+ rpc: {
+ // the functionName part of the RPC call as defined in the `#[rpc(name="")]` annotation on the rust definition
+ rpcFunctionName: {
+ description: "Provide a short description of the RPC here.",
+ params: [
+ // define the paramaters in the same order as defined in the rust RPC
+ {
+ name: "parameter_name",
+ type: "ParameterType"
+ },
+ // see note below
+ {
+ name: "at",
+ type: "Hash",
+ isOptional: true,
+ },
+ ],
+ type: "ReturnType"
+ },
+ // if there are multiple RPCs, they can all be defined here
+ },
+ types: {
+ // define any custom types for the pallet here
+ // see the note below for more information
+ },
+};
+```
+
+Then, in `integration-tests/runtime-tests/src/types/interfaces/definitions.ts`, add the following line:
+
+```typescript
+export { default as palletName } from "./palletName/definitions";
+```
+
+Notes:
+
+* `at` is mandatory, and is defined as the last parameter in the rust RPC definition for a reason:
+ Most of the time when calling an RPC the block hash can be omitted, and the best hash will be assumed if one is not provided.
+
+ Having it as the last parameter makes calling the RPC simpler:
+
+ ```typescript
+ palletName.rpcFunctionName(param1, param2)
+ ```
+
+ Instead of:
+
+ ```typescript
+ palletName.rpcFunctionName(null, param1, param2)
+ ```
+
+ If `at` were defined first.
+
+ Technically, it is possible to define `at` anywhere in the RPC definition, but putting it last for all of them makes the RPCs simpler and more consistent.
+
+* If this is a preexisting pallet, the types for it are most likely already defined in the type definitions for `crowdloanRewards` (for reasons that don't need to be covered in this document) and can just be moved over to this file.
+
+ Even if there are no types to declare, still define an empty object or else everything will explode.
+
+### Tests
+
+Create a folder here (if it doesn't already exist): `integration-tests/runtime-tests/test/tests/pallet-name`
+
+And then within that folder, create a file `rpcPalletNameTests.ts` with the following structure:
+
+```typescript
+/* eslint-disable no-trailing-spaces */
+import { /* any custom defined types that are needed for the RPC */ } from '@composable/types/interfaces';
+import { expect } from 'chai';
+
+
+describe('query.palletName.account Tests', function() {
+ // Set timeout to 1 minute.
+ this.timeout(60*1000); // <- increaase this if tests are timing out
+
+ // repeat this block as needed for every test case defined in the class below.
+ it('rpc.palletName.functionName Tests', async function() {
+ await RpcPalletNameTests.rpcPalletNameFunctionNameTest();
+ });
+});
+
+
+export class RpcPalletNameTests {
+ /**
+ *
+ */
+ public static async rpcPalletNameFunctionNameTest() {
+ // api is a global variable
+ const result = await api.rpc.palletName.functionName(/* parameters */);
+
+ // see note below about bignumbers
+ // (this is just an example assertion)
+ expect(result).to.be.a["bignumber"].that.equals('0');
+ }
+}
+```
+
+Notes:
+
+* If the type being compared against is a `u128`/`i128` on the rust side and has been wrapped in `SafeRpcWrapper`, it will be a bn.js `BN` (big number) here. `chai-bn` is used for asssertions with `BN`s but typescript can't quite figure out that it's being used; using `["bignumber"]` instead of `.bignumber` circumvents the typechecker a bit and allows it to pass without a `@ts-ignore` comment.
+
+ Thanks Dominik for figuring this one out!
+
+## Additional Resources
+
+For a good overview of how custom RPCs work, see .
diff --git a/docs/glossary.md b/docs/glossary.md
new file mode 100644
index 00000000000..d5255ef8e89
--- /dev/null
+++ b/docs/glossary.md
@@ -0,0 +1,3 @@
+
+
+ED - existential deposit
\ No newline at end of file
diff --git a/docs/runtime-testing.md b/docs/runtime-testing.md
new file mode 100644
index 00000000000..682215e44c5
--- /dev/null
+++ b/docs/runtime-testing.md
@@ -0,0 +1,17 @@
+# Overview
+
+Runtime testing involves running parachain code to ensure quality.
+Unlike type system or static analysis (unluding basic linting).
+Here is hierarchy of testing you may find in this parachain
+
+| Name | Runtime | Warp | Start from real state | Serde |
+| ------------- | --------- | ---- | --------------------- | ----- |
+| Unit | no | yes | no | no |
+| Runtime Unit | mock | yes | yes |
+| Property test | mock | yes |
+| Benchmark | mock/real | yes |
+| Visualization | no/mock | yes |
+| Simulation | real | yes | yes |
+| Simnode | real | yes | yes |
+| Local Relay | real | no | |
+| Deployment | real | no | |
\ No newline at end of file
diff --git a/frame/assets-registry/Cargo.toml b/frame/assets-registry/Cargo.toml
index cfe68c5ab31..cd7b3246a23 100644
--- a/frame/assets-registry/Cargo.toml
+++ b/frame/assets-registry/Cargo.toml
@@ -1,9 +1,9 @@
[package]
-name = "pallet-assets-registry"
-version = "0.1.0"
authors = ["Composable Developers"]
-homepage = "https://composable.finance"
edition = "2021"
+homepage = "https://composable.finance"
+name = "pallet-assets-registry"
+version = "0.1.0"
[package.metadata.docs.rs]
@@ -21,40 +21,42 @@ version = "2.0.0"
[dependencies]
composable-traits = { path = "../composable-traits", default-features = false }
-frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.16" }
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
+frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" }
log = { version = "0.4.14", default-features = false }
-scale-info = { version = "1.0", default-features = false, features = ["derive"] }
+scale-info = { version = "1.0", default-features = false, features = [
+ "derive",
+] }
[dev-dependencies]
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
[features]
default = ["std"]
std = [
- "codec/std",
- "log/std",
- "composable-traits/std",
- "scale-info/std",
- "frame-support/std",
- "frame-system/std",
- "sp-runtime/std",
- "sp-io/std",
- "sp-core/std",
- "sp-std/std",
- "xcm/std",
+ "codec/std",
+ "log/std",
+ "composable-traits/std",
+ "scale-info/std",
+ "frame-support/std",
+ "frame-system/std",
+ "sp-runtime/std",
+ "sp-io/std",
+ "sp-core/std",
+ "sp-std/std",
+ "xcm/std",
]
runtime-benchmarks = [
- 'frame-benchmarking',
- 'frame-support/runtime-benchmarks',
- 'frame-system/runtime-benchmarks',
+ 'frame-benchmarking',
+ 'frame-support/runtime-benchmarks',
+ 'frame-system/runtime-benchmarks',
]
diff --git a/frame/assets-registry/local-mapping.plantuml b/frame/assets-registry/local-mapping.plantuml
index 7da062033fd..c76f0acb418 100644
--- a/frame/assets-registry/local-mapping.plantuml
+++ b/frame/assets-registry/local-mapping.plantuml
@@ -21,14 +21,15 @@ note across: Bob can approve an asset mapping candidate
...
-alice -> assets_registry_pallet: Approve an asset mapping candidate with local_asset_id = x and foreign_asset_id = y
+alice -> assets_registry_pallet: Approve an asset mapping candidate with local_asset_id = x, foreign_asset_id = y and decimals = z
...
-bob -> assets_registry_pallet: Approve an asset mapping candidate with local_asset_id = x and foreign_asset_id = y
+bob -> assets_registry_pallet: Approve an asset mapping candidate with local_asset_id = x, foreign_asset_id = y and decimals = z
note over assets_registry_pallet
-asset mapping for local_asset_id = x
-and foreign_asset_id = y stored
+asset mapping for local_asset_id = x,
+foreign_asset_id = y and decimals = z
+stored
end note
note across: Alice and Bob can set metadata of asset mapping for local_asset_id = x and foreign_asset_id = y
diff --git a/frame/assets-registry/src/lib.rs b/frame/assets-registry/src/lib.rs
index 1be8ad00380..f15a2168f25 100644
--- a/frame/assets-registry/src/lib.rs
+++ b/frame/assets-registry/src/lib.rs
@@ -54,6 +54,16 @@ pub mod pallet {
+ Default
+ TypeInfo;
type ForeignAssetId: FullCodec
+ + Eq
+ + PartialEq
+ + Copy
+ + MaybeSerializeDeserialize
+ + From
+ + Into
+ + Debug
+ + Default
+ + TypeInfo;
+ type Location: FullCodec
+ Eq
+ PartialEq
// we wrap non serde type, so until written custom serde, cannot handle that
@@ -116,6 +126,18 @@ pub mod pallet {
OptionQuery,
>;
+ #[pallet::storage]
+ #[pallet::getter(fn foreign_asset_location)]
+ /// Mapping foreign asset to foreign location.
+ pub type ForeignAssetLocation =
+ StorageMap<_, Blake2_128Concat, T::LocalAssetId, T::Location, OptionQuery>;
+
+ #[pallet::storage]
+ #[pallet::getter(fn from_foreign_asset_location)]
+ /// Mapping foreign location to foreign asset.
+ pub type FromForeignAssetLocation =
+ StorageMap<_, Blake2_128Concat, T::Location, T::LocalAssetId, OptionQuery>;
+
#[pallet::storage]
#[pallet::getter(fn foreign_asset_metadata)]
/// Mapping local asset to foreign asset metadata.
@@ -126,6 +148,11 @@ pub mod pallet {
pub struct GenesisConfig {
local_admin: Option,
foreign_admin: Option,
+ // TODO: split this into 2 pairs
+ // 1. (xcm location -> local asset id as used in our tuntime), so that when others send our
+ // id to our chain we can trust them 2. (local qasset id - > remote location -> remote
+ // asset id) so then when we send our local asset to remote chain we know what id we should
+ // envode.
asset_pairs: Vec<(T::LocalAssetId, XcmAssetLocation)>,
}
@@ -177,10 +204,12 @@ pub mod pallet {
LocalAssetIdAlreadyUsed,
ForeignAssetIdAlreadyUsed,
LocalAssetIdNotFound,
+ ForeignAssetIdNotFound,
}
#[pallet::call]
impl Pallet {
+ // TODO: bench this
#[pallet::weight(10_000)]
pub fn set_local_admin(
origin: OriginFor,
@@ -208,6 +237,8 @@ pub mod pallet {
origin: OriginFor,
local_asset_id: T::LocalAssetId,
foreign_asset_id: T::ForeignAssetId,
+ location: T::Location,
+ decimals: u8,
) -> DispatchResultWithPostInfo {
let who = ensure_signed(origin.clone())?;
Self::ensure_admins_only(origin)?;
@@ -216,10 +247,10 @@ pub mod pallet {
Error::::LocalAssetIdAlreadyUsed
);
ensure!(
- !>::contains_key(foreign_asset_id.clone()),
+ !>::contains_key(foreign_asset_id),
Error::::ForeignAssetIdAlreadyUsed
);
- Self::approve_candidate(who, local_asset_id, foreign_asset_id.clone())?;
+ Self::approve_candidate(who, local_asset_id, foreign_asset_id, location, decimals)?;
Self::deposit_event(Event::AssetsMappingCandidateUpdated {
local_asset_id,
foreign_asset_id,
@@ -249,23 +280,23 @@ pub mod pallet {
impl RemoteAssetRegistry for Pallet {
type AssetId = T::LocalAssetId;
- type AssetNativeLocation = T::ForeignAssetId;
+ type AssetNativeLocation = T::Location;
fn set_location(
local_asset_id: Self::AssetId,
- foreign_asset_id: Self::AssetNativeLocation,
+ location: Self::AssetNativeLocation,
) -> DispatchResult {
- >::insert(local_asset_id, foreign_asset_id.clone());
- >::insert(foreign_asset_id, local_asset_id);
+ >::insert(local_asset_id, location.clone());
+ >::insert(location, local_asset_id);
Ok(())
}
fn asset_to_location(local_asset_id: Self::AssetId) -> Option {
- >::get(local_asset_id)
+ >::get(local_asset_id)
}
- fn location_to_asset(foreign_asset_id: Self::AssetNativeLocation) -> Option {
- >::get(foreign_asset_id)
+ fn location_to_asset(location: Self::AssetNativeLocation) -> Option {
+ >::get(location)
}
}
@@ -285,9 +316,11 @@ pub mod pallet {
who: T::AccountId,
local_asset_id: T::LocalAssetId,
foreign_asset_id: T::ForeignAssetId,
+ location: T::Location,
+ decimals: u8,
) -> DispatchResultWithPostInfo {
let current_candidate_status =
- >::get((local_asset_id, foreign_asset_id.clone()));
+ >::get((local_asset_id, foreign_asset_id));
let local_admin = >::get();
let foreign_admin = >::get();
match current_candidate_status {
@@ -305,17 +338,39 @@ pub mod pallet {
},
Some(CandidateStatus::LocalAdminApproved) =>
if Some(who) == foreign_admin {
- Self::set_location(local_asset_id, foreign_asset_id.clone())?;
- >::remove((local_asset_id, foreign_asset_id));
+ Self::promote_candidate(
+ local_asset_id,
+ foreign_asset_id,
+ location,
+ decimals,
+ )?;
},
Some(CandidateStatus::ForeignAdminApproved) =>
if Some(who) == local_admin {
- Self::set_location(local_asset_id, foreign_asset_id.clone())?;
- >::remove((local_asset_id, foreign_asset_id));
+ Self::promote_candidate(
+ local_asset_id,
+ foreign_asset_id,
+ location,
+ decimals,
+ )?;
},
};
Ok(().into())
}
+
+ fn promote_candidate(
+ local_asset_id: T::LocalAssetId,
+ foreign_asset_id: T::ForeignAssetId,
+ location: T::Location,
+ decimals: u8,
+ ) -> DispatchResult {
+ Self::set_location(local_asset_id, location)?;
+ >::insert(local_asset_id, foreign_asset_id);
+ >::insert(foreign_asset_id, local_asset_id);
+ >::insert(local_asset_id, ForeignMetadata { decimals });
+ >::remove((local_asset_id, foreign_asset_id));
+ Ok(())
+ }
}
pub struct EnsureLocalAdmin(PhantomData);
diff --git a/frame/assets-registry/src/mock.rs b/frame/assets-registry/src/mock.rs
index 9b606b0cbc1..19fe0195907 100644
--- a/frame/assets-registry/src/mock.rs
+++ b/frame/assets-registry/src/mock.rs
@@ -1,4 +1,5 @@
use crate as pallet_assets_registry;
+pub use composable_traits::assets::XcmAssetLocation;
use frame_support::{ord_parameter_types, parameter_types, traits::Everything};
use frame_system as system;
use frame_system::EnsureSignedBy;
@@ -17,6 +18,8 @@ pub const ALICE: AccountId = 1_u32;
pub const BOB: AccountId = 2_u32;
pub const CHARLIE: AccountId = 3_u32;
+pub const DECIMALS: u8 = 12;
+
// Configure a mock runtime to test the pallet.
frame_support::construct_runtime!(
pub enum Test where
@@ -69,6 +72,7 @@ impl pallet_assets_registry::Config for Test {
type Event = Event;
type LocalAssetId = u128;
type ForeignAssetId = u128;
+ type Location = XcmAssetLocation;
type UpdateAdminOrigin = EnsureSignedBy;
type LocalAdminOrigin = pallet_assets_registry::EnsureLocalAdmin;
type ForeignAdminOrigin = pallet_assets_registry::EnsureForeignAdmin;
diff --git a/frame/assets-registry/src/tests.rs b/frame/assets-registry/src/tests.rs
index 60e97941e2b..1dac29ebf17 100644
--- a/frame/assets-registry/src/tests.rs
+++ b/frame/assets-registry/src/tests.rs
@@ -28,6 +28,7 @@ fn set_foreign_admin_tests() {
fn approve_assets_mapping_candidate_tests() {
new_test_ext().execute_with(|| {
let (local_asset_id, foreign_asset_id) = (0, 100);
+ let location = XcmAssetLocation::LOCAL_NATIVE;
assert_eq!(AssetsRegistry::from_local_asset(local_asset_id), None);
assert_eq!(AssetsRegistry::from_local_asset(foreign_asset_id), None);
assert_ok!(AssetsRegistry::set_local_admin(Origin::signed(ROOT), ALICE));
@@ -35,7 +36,9 @@ fn approve_assets_mapping_candidate_tests() {
assert_ok!(AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(ALICE),
local_asset_id,
- foreign_asset_id
+ foreign_asset_id,
+ location.clone(),
+ DECIMALS,
));
assert_eq!(
>::get((local_asset_id, foreign_asset_id)),
@@ -44,17 +47,25 @@ fn approve_assets_mapping_candidate_tests() {
assert_ok!(AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(BOB),
local_asset_id,
- foreign_asset_id
+ foreign_asset_id,
+ location.clone(),
+ DECIMALS,
));
assert_eq!(AssetsRegistry::from_local_asset(local_asset_id), Some(foreign_asset_id));
assert_eq!(AssetsRegistry::from_foreign_asset(foreign_asset_id), Some(local_asset_id));
+ assert_eq!(
+ AssetsRegistry::foreign_asset_metadata(local_asset_id).unwrap(),
+ ForeignMetadata { decimals: DECIMALS }
+ );
let (other_local_asset_id, other_foreign_asset_id) = (1, 101);
assert_noop!(
AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(ALICE),
other_local_asset_id,
- foreign_asset_id
+ foreign_asset_id,
+ location.clone(),
+ DECIMALS,
),
Error::::ForeignAssetIdAlreadyUsed,
);
@@ -62,7 +73,9 @@ fn approve_assets_mapping_candidate_tests() {
AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(ALICE),
local_asset_id,
- other_foreign_asset_id
+ other_foreign_asset_id,
+ location.clone(),
+ DECIMALS,
),
Error::::LocalAssetIdAlreadyUsed,
);
@@ -71,7 +84,9 @@ fn approve_assets_mapping_candidate_tests() {
AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(CHARLIE),
other_local_asset_id,
- other_foreign_asset_id
+ other_foreign_asset_id,
+ location.clone(),
+ DECIMALS,
),
Error::::OnlyAllowedForAdmins,
);
@@ -81,7 +96,9 @@ fn approve_assets_mapping_candidate_tests() {
assert_ok!(AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(BOB),
other_local_asset_id,
- other_foreign_asset_id
+ other_foreign_asset_id,
+ location.clone(),
+ DECIMALS,
));
assert_eq!(
>::get((other_local_asset_id, other_foreign_asset_id)),
@@ -90,7 +107,9 @@ fn approve_assets_mapping_candidate_tests() {
assert_ok!(AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(ALICE),
other_local_asset_id,
- other_foreign_asset_id
+ other_foreign_asset_id,
+ location,
+ DECIMALS,
));
assert_eq!(
AssetsRegistry::from_local_asset(other_local_asset_id),
@@ -100,6 +119,10 @@ fn approve_assets_mapping_candidate_tests() {
AssetsRegistry::from_foreign_asset(other_foreign_asset_id),
Some(other_local_asset_id)
);
+ assert_eq!(
+ AssetsRegistry::foreign_asset_metadata(local_asset_id).unwrap(),
+ ForeignMetadata { decimals: DECIMALS }
+ )
})
}
@@ -107,6 +130,7 @@ fn approve_assets_mapping_candidate_tests() {
fn set_metadata_tests() {
new_test_ext().execute_with(|| {
let (local_asset_id, foreign_asset_id) = (0, 100);
+ let location = XcmAssetLocation::LOCAL_NATIVE;
assert_ok!(AssetsRegistry::set_local_admin(Origin::signed(ROOT), ALICE));
assert_ok!(AssetsRegistry::set_foreign_admin(Origin::signed(ROOT), BOB));
@@ -122,17 +146,25 @@ fn set_metadata_tests() {
assert_ok!(AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(ALICE),
local_asset_id,
- foreign_asset_id
+ foreign_asset_id,
+ location.clone(),
+ DECIMALS,
));
assert_ok!(AssetsRegistry::approve_assets_mapping_candidate(
Origin::signed(BOB),
local_asset_id,
- foreign_asset_id
+ foreign_asset_id,
+ location,
+ DECIMALS,
));
assert_ok!(AssetsRegistry::set_metadata(
Origin::signed(ALICE),
local_asset_id,
- ForeignMetadata { decimals: 12 }
+ ForeignMetadata { decimals: DECIMALS }
));
+ assert_eq!(
+ AssetsRegistry::foreign_asset_metadata(local_asset_id).unwrap(),
+ ForeignMetadata { decimals: DECIMALS }
+ )
})
}
diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml
index bc5256bf813..203d1d44861 100644
--- a/frame/assets/Cargo.toml
+++ b/frame/assets/Cargo.toml
@@ -1,59 +1,62 @@
[package]
-name = "pallet-assets"
-version = "0.0.1"
authors = ["Composable Developers"]
-homepage = "https://composable.finance"
edition = "2021"
-
+homepage = "https://composable.finance"
+name = "pallet-assets"
+version = "0.0.1"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.16' }
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-
-composable-traits = { path = "../composable-traits", default-features = false }
-
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6", default-features = false }
+frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+
+sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+
+# local
+composable-traits = { path = "../composable-traits", default-features = false }
+
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "9e041dc9d213f843b18b3008f32f3acabb287dcb", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = [
+ "derive",
+] }
+
+# misc
+codec = { default-features = false, features = [
+ "derive",
+], package = "parity-scale-codec", version = "2.0.0" }
num-traits = { version = "0.2.14", default-features = false }
-scale-info = { version = "1.0", default-features = false, features = ["derive"] }
-
-[dependencies.codec]
-default-features = false
-features = ["derive"]
-package = "parity-scale-codec"
-version = "2.0.0"
[dev-dependencies]
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6", default-features = false }
-governance-registry = { package = "pallet-governance-registry", path = "../governance-registry", default-features = false }
-proptest = "0.9.6"
-composable-tests-helpers = { path = "../composable-tests-helpers", default-features = false }
+composable-tests-helpers = { path = "../composable-tests-helpers" }
+governance-registry = { package = "pallet-governance-registry", path = "../governance-registry" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "9e041dc9d213f843b18b3008f32f3acabb287dcb" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+proptest = "1.0"
[package.metadata.cargo-udeps.ignore]
development = ["governance-registry"]
[features]
default = ["std"]
-std = [
- "composable-traits/std",
- "codec/std",
- "frame-support/std",
- "sp-runtime/std",
- "orml-traits/std",
- "num-traits/std",
-]
runtime-benchmarks = [
- "frame-benchmarking",
- "frame-support/runtime-benchmarks",
- "frame-system/runtime-benchmarks",
+ "frame-benchmarking",
+ "frame-support/runtime-benchmarks",
+ "frame-system/runtime-benchmarks",
+]
+std = [
+ "composable-traits/std",
+ "codec/std",
+ "frame-support/std",
+ "sp-runtime/std",
+ "sp-api/std",
+ "orml-traits/std",
+ "num-traits/std",
]
diff --git a/frame/assets/rpc/Cargo.toml b/frame/assets/rpc/Cargo.toml
new file mode 100644
index 00000000000..d0618f8130c
--- /dev/null
+++ b/frame/assets/rpc/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+authors = ["Composable Developers"]
+edition = "2021"
+homepage = "https://composable.finance"
+name = "assets-rpc"
+rust-version = "1.56"
+version = "0.0.1"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+# substrate primitives
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+
+# local
+assets-runtime-api = { path = "../runtime-api" }
+composable-support = { path = "../../composable-support" }
+
+# SCALE
+codec = { default-features = false, features = [
+ "derive",
+], package = "parity-scale-codec", version = "2.0.0" }
+scale-info = { version = "1.0", default-features = false, features = [
+ "derive",
+] }
+
+# rpc
+jsonrpc-core = "18.0.0"
+jsonrpc-core-client = "18.0.0"
+jsonrpc-derive = "18.0.0"
diff --git a/frame/assets/rpc/src/lib.rs b/frame/assets/rpc/src/lib.rs
new file mode 100644
index 00000000000..f18f9fc7bfb
--- /dev/null
+++ b/frame/assets/rpc/src/lib.rs
@@ -0,0 +1,73 @@
+use assets_runtime_api::AssetsRuntimeApi;
+use codec::Codec;
+use composable_support::rpc_helpers::{SafeRpcWrapper, SafeRpcWrapperType};
+use jsonrpc_core::{Error as RpcError, ErrorCode, Result as RpcResult};
+use jsonrpc_derive::rpc;
+use sp_api::ProvideRuntimeApi;
+use sp_blockchain::HeaderBackend;
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
+use sp_std::sync::Arc;
+
+#[rpc]
+pub trait AssetsApi
+where
+ AssetId: SafeRpcWrapperType,
+ Balance: SafeRpcWrapperType,
+{
+ #[rpc(name = "assets_balanceOf")]
+ fn balance_of(
+ &self,
+ currency: SafeRpcWrapper,
+ account: AccountId,
+ at: Option,
+ ) -> RpcResult>;
+}
+
+pub struct Assets {
+ client: Arc,
+ _marker: sp_std::marker::PhantomData,
+}
+
+impl Assets {
+ pub fn new(client: Arc) -> Self {
+ Self { client, _marker: Default::default() }
+ }
+}
+
+impl
+ AssetsApi<::Hash, AssetId, AccountId, Balance>
+ for Assets
+where
+ Block: BlockT,
+ AssetId: Codec + Send + Sync + 'static + SafeRpcWrapperType,
+ AccountId: Codec + Send + Sync + 'static,
+ Balance: Send + Sync + 'static + SafeRpcWrapperType,
+ C: Send + Sync + 'static,
+ C: ProvideRuntimeApi,
+ C: HeaderBackend,
+ C::Api: AssetsRuntimeApi,
+{
+ fn balance_of(
+ &self,
+ asset_id: SafeRpcWrapper,
+ account_id: AccountId,
+ at: Option<::Hash>,
+ ) -> RpcResult> {
+ let api = self.client.runtime_api();
+
+ let at = BlockId::hash(at.unwrap_or_else(|| {
+ // If the block hash is not supplied assume the best block.
+ self.client.info().best_hash
+ }));
+
+ let runtime_api_result = api.balance_of(&at, asset_id, account_id);
+ // TODO(benluelo): Review what error message & code to use
+ runtime_api_result.map_err(|e| {
+ RpcError {
+ code: ErrorCode::ServerError(9876), // No real reason for this value
+ message: "Something wrong".into(),
+ data: Some(format!("{:?}", e).into()),
+ }
+ })
+ }
+}
diff --git a/frame/assets/runtime-api/Cargo.toml b/frame/assets/runtime-api/Cargo.toml
new file mode 100644
index 00000000000..26a28fabd30
--- /dev/null
+++ b/frame/assets/runtime-api/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+authors = ["Composable Developers"]
+edition = "2021"
+homepage = "https://composable.finance"
+name = "assets-runtime-api"
+rust-version = "1.56"
+version = "0.0.1"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { default-features = false, features = [
+ "derive",
+], package = "parity-scale-codec", version = "2.0.0" }
+composable-support = { path = "../../composable-support", default-features = false }
+sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+
+[features]
+default = ["std"]
+std = ["sp-api/std", "codec/std", "composable-support/std"]
diff --git a/frame/assets/runtime-api/src/lib.rs b/frame/assets/runtime-api/src/lib.rs
new file mode 100644
index 00000000000..8229caec12e
--- /dev/null
+++ b/frame/assets/runtime-api/src/lib.rs
@@ -0,0 +1,20 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+#![allow(clippy::too_many_arguments)]
+#![allow(clippy::unnecessary_mut_passed)]
+
+use codec::Codec;
+use composable_support::rpc_helpers::{SafeRpcWrapper, SafeRpcWrapperType};
+
+// Here we declare the runtime API. It is implemented it the `impl` block in
+// runtime amalgamator file (the `runtime/src/lib.rs`)
+sp_api::decl_runtime_apis! {
+ // REVIEW(benluelo): Should the AssetId type parameter be removed and then just use CurencyId directly?
+ pub trait AssetsRuntimeApi
+ where
+ AssetId: SafeRpcWrapperType,
+ AccountId: Codec,
+ Balance: SafeRpcWrapperType,
+ {
+ fn balance_of(asset_id: SafeRpcWrapper, account_id: AccountId) -> SafeRpcWrapper /* Balance */;
+ }
+}
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index cf9f2f396c5..4c7943158f6 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -105,6 +105,7 @@ pub mod pallet {
/// currency id
type AssetId: AssetIdLike;
type Balance: BalanceLike;
+ #[pallet::constant]
type NativeAssetId: Get;
type GenerateCurrencyId: CurrencyFactory;
type NativeCurrency;
@@ -122,7 +123,6 @@ pub mod pallet {
#[pallet::error]
pub enum Error {
- BadOrigin,
CannotSetNewCurrencyToRegistry,
}
@@ -351,11 +351,11 @@ pub mod pallet {
match T::GovernanceRegistry::get(asset_id) {
Ok(SignedRawOrigin::Root) => Ok(()),
Ok(SignedRawOrigin::Signed(acc)) if acc == account => Ok(()),
- _ => Err(Error::::BadOrigin.into()),
+ _ => Err(DispatchError::BadOrigin),
}
},
Ok(frame_system::RawOrigin::Root) => Ok(()),
- _ => Err(Error::::BadOrigin.into()),
+ _ => Err(DispatchError::BadOrigin),
}
}
diff --git a/frame/assets/src/mocks.rs b/frame/assets/src/mocks.rs
index e5ddcf330fc..a5d1a2c0ce3 100644
--- a/frame/assets/src/mocks.rs
+++ b/frame/assets/src/mocks.rs
@@ -80,6 +80,10 @@ impl Config for Test {
type AdminOrigin = EnsureRoot;
}
+parameter_types! {
+ pub const MaxLocks: u32 = 256;
+}
+
impl orml_tokens::Config for Test {
type Event = Event;
type Balance = Balance;
@@ -88,7 +92,7 @@ impl orml_tokens::Config for Test {
type WeightInfo = ();
type ExistentialDeposits = ExistentialDeposits;
type OnDust = ();
- type MaxLocks = ();
+ type MaxLocks = MaxLocks;
type DustRemovalWhitelist = Everything;
}
diff --git a/frame/assets/src/tests/traits.rs b/frame/assets/src/tests/traits.rs
index 63827889dc5..eead2235e48 100644
--- a/frame/assets/src/tests/traits.rs
+++ b/frame/assets/src/tests/traits.rs
@@ -399,21 +399,20 @@ mod multicurrency {
prop_assert_ok!( as MultiReservableCurrency>::reserve(asset_id, &account, third));
prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account), 0);
- //
- let mut remaining = as MultiReservableCurrency>::unreserve(asset_id, &account, first);
+
+ let remaining = as MultiReservableCurrency>::unreserve(asset_id, &account, first);
prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account), first - remaining);
- let mut free_balance = as MultiCurrency>::free_balance(asset_id,&account);
- remaining = as MultiReservableCurrency>::unreserve(asset_id, &account, second);
+ let free_balance = as MultiCurrency>::free_balance(asset_id,&account);
+ let remaining = as MultiReservableCurrency>::unreserve(asset_id, &account, second);
prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account), free_balance + ( second - remaining));
- let mut free_balance = as MultiCurrency>::free_balance(asset_id,&account);
- remaining = as MultiReservableCurrency>::unreserve(asset_id, &account, third);
+ let free_balance = as MultiCurrency>::free_balance(asset_id,&account);
+ let remaining = as MultiReservableCurrency>::unreserve(asset_id, &account, third);
prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account), free_balance + ( third - remaining));
- //lock
- free_balance = as MultiCurrency>::free_balance(asset_id,&account);
- as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, first);
- prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account), first + second + third);
+
+ prop_assert_ok!( as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, first));
+ prop_assert_eq!( as MultiCurrency>::free_balance(asset_id, &account), first + second + third);
Ok(())
})?;
@@ -439,17 +438,17 @@ mod lockable_multicurrency {
prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account),0);
prop_assert_ok!( as MultiCurrency>::deposit(asset_id, &account,first + second + third));
- as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, first);
+ prop_assert_ok!( as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, first));
prop_assert_ok!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, second + third ));
prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second + third).is_err());
// ensure set_lock updates lock with same id
- as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, second);
+ prop_assert_ok!( as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, second));
prop_assert_ok!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + third ));
prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second + third).is_err());
// ensure set_lock updates lock with same id
- as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, third);
+ prop_assert_ok!( as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, third));
prop_assert_ok!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second ));
prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second + third).is_err());
@@ -468,15 +467,15 @@ mod lockable_multicurrency {
prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account),0);
prop_assert_ok!( as MultiCurrency>::deposit(asset_id, &account,first + second + third));
- as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, first);
+ prop_assert_ok!( as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, first));
prop_assert_ok!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, second + third ));
prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second + third).is_err());
- as MultiLockableCurrency>::extend_lock(*b"prelocks", asset_id, &account, second);
+ prop_assert_ok!( as MultiLockableCurrency>::extend_lock(*b"prelocks", asset_id, &account, second));
prop_assert_ok!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, third ));
prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second + third).is_err());
- as MultiLockableCurrency>::extend_lock(*b"prelocks", asset_id, &account, third);
+ prop_assert_ok!( as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, third));
prop_assert_ok!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second));
prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second + third).is_err());
Ok(())
@@ -490,19 +489,15 @@ mod lockable_multicurrency {
(first, second, _) in valid_amounts_without_overflow_3()) {
new_test_ext_multi_currency().execute_with(|| {
-
- prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account),0);
- prop_assert_ok!( as MultiCurrency>::deposit(asset_id, &account,first + second));
-
- as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, first + second);
- prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second).is_err());
- prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first ).is_err());
- prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, second ).is_err());
-
- prop_assert_ok!( as MultiLockableCurrency>::remove_lock(*b"prelocks", asset_id, &account));
- prop_assert_ok!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second));
-
- Ok(())
+ prop_assert_eq!( as MultiCurrency>::free_balance(asset_id,&account),0);
+ prop_assert_ok!( as MultiCurrency>::deposit(asset_id, &account, first + second));
+ prop_assert_ok!( as MultiLockableCurrency>::set_lock(*b"prelocks", asset_id, &account, first + second));
+ prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second).is_err());
+ prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first ).is_err());
+ prop_assert!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, second ).is_err());
+ prop_assert_ok!( as MultiLockableCurrency>::remove_lock(*b"prelocks", asset_id, &account));
+ prop_assert_ok!( as MultiCurrency>::ensure_can_withdraw(asset_id, &account, first + second));
+ Ok(())
})?;
}
@@ -596,7 +591,7 @@ mod reservable_multicurrency {
fn test_repariate_reserve_implementation(
(account_1, account_2) in accounts_2(),
asset_id in asset(),
- (first, second, third) in valid_amounts_without_overflow_3()
+ (first, second, _) in valid_amounts_without_overflow_3()
) {
new_test_ext_multi_currency().execute_with(|| {
diff --git a/frame/bonded-finance/Cargo.toml b/frame/bonded-finance/Cargo.toml
index 06eced116ba..dc1b9f536e5 100644
--- a/frame/bonded-finance/Cargo.toml
+++ b/frame/bonded-finance/Cargo.toml
@@ -1,9 +1,9 @@
[package]
-name = "pallet-bonded-finance"
-version = "0.0.1"
authors = ["Composable Developers"]
-homepage = "https://composable.finance"
edition = "2021"
+homepage = "https://composable.finance"
+name = "pallet-bonded-finance"
+version = "0.0.1"
[package.metadata.docs.rs]
@@ -16,48 +16,52 @@ package = "parity-scale-codec"
version = "2.0.0"
[dependencies]
-frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
-scale-info = { version = "1.0", default-features = false, features = ["derive"] }
+frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+scale-info = { version = "1.0", default-features = false, features = [
+ "derive",
+] }
+sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+composable-support = { default-features = false, path = "../composable-support" }
composable-traits = { path = "../../frame/composable-traits", default-features = false }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6", default-features = false }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "9e041dc9d213f843b18b3008f32f3acabb287dcb", default-features = false }
[dev-dependencies]
+composable-tests-helpers = { path = "../composable-tests-helpers" }
composable-traits = { path = "../../frame/composable-traits" }
+orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "9e041dc9d213f843b18b3008f32f3acabb287dcb" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+pallet-vesting = { path = "../../frame/vesting" }
proptest = "1.0"
proptest-derive = "0.3"
serde = { version = "1.0.130" }
-orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "2b1c9fb367ccb8e13601b2da43d1c5d9737b93c6", default-features = false }
-pallet-vesting = { path = "../../frame/vesting" }
-composable-tests-helpers = { path = "../composable-tests-helpers", default-features = false }
[features]
default = ["std"]
std = [
- "codec/std",
- "frame-support/std",
- "frame-system/std",
- "sp-runtime/std",
- "sp-io/std",
- "sp-core/std",
- "sp-std/std",
- "sp-arithmetic/std",
- "composable-traits/std",
- "scale-info/std",
+ "codec/std",
+ "frame-support/std",
+ "frame-system/std",
+ "sp-runtime/std",
+ "sp-io/std",
+ "sp-core/std",
+ "sp-std/std",
+ "sp-arithmetic/std",
+ "composable-traits/std",
+ "scale-info/std",
]
runtime-benchmarks = [
- "frame-benchmarking",
- "frame-support/runtime-benchmarks",
- "frame-system/runtime-benchmarks"
+ "frame-benchmarking",
+ "frame-support/runtime-benchmarks",
+ "frame-system/runtime-benchmarks",
]
[package.metadata.cargo-udeps.ignore]
-normal = ["orml-traits"]
\ No newline at end of file
+normal = ["orml-traits"]
diff --git a/frame/bonded-finance/proptest-regressions/tests.txt b/frame/bonded-finance/proptest-regressions/tests.txt
new file mode 100644
index 00000000000..17e8802a547
--- /dev/null
+++ b/frame/bonded-finance/proptest-regressions/tests.txt
@@ -0,0 +1,9 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 35820e14563de841f5eda240ea61961e3c4d920b9aceda728dac1e0fa94677e1 # shrinks to offer = BondOffer { beneficiary: 1, asset: BTC, bond_price: 1000000, nb_of_bonds: 1, maturity: BondDuration::Infinite, reward: BondOfferReward { asset: ETH, amount: 1000000, maturity: 1 } }
+cc 101ee1a90f927af96e09f0ba0009aab288692d1d15941e07f6ee521371c3c59d # shrinks to offer = BondOffer { beneficiary: 1, asset: BTC, bond_price: 1000000, nb_of_bonds: 2, maturity: BondDuration::Infinite, reward: BondOfferReward { asset: ETH, amount: 2000000, maturity: 1 } }
+cc 7b071ed45fc65b0f4a10540fe45e768cbc7861a0ff586bb86192d4bee4f2bb85 # shrinks to offer = BondOffer { beneficiary: 1, asset: BTC, bond_price: 1000000, nb_of_bonds: 2, maturity: BondDuration::Infinite, reward: BondOfferReward { asset: ETH, amount: 2000000, maturity: 1 } }
diff --git a/frame/bonded-finance/src/benchmarks.rs b/frame/bonded-finance/src/benchmarks.rs
index ad66a26cebd..09b991481ad 100644
--- a/frame/bonded-finance/src/benchmarks.rs
+++ b/frame/bonded-finance/src/benchmarks.rs
@@ -2,23 +2,21 @@
#[cfg(test)]
use crate::Pallet as BondedFinance;
-use crate::{
- utils::MIN_VESTED_TRANSFER, AssetIdOf, BalanceOf, BlockNumberOf, BondOfferOf, Call, Config,
- Pallet,
-};
+use crate::{AssetIdOf, BalanceOf, BlockNumberOf, BondOfferOf, Call, Config, Pallet};
use codec::Decode;
-use composable_traits::{
- bonded_finance::{BondDuration, BondOffer, BondOfferReward},
- math::WrappingNext,
-};
-use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller, Zero};
+use composable_support::validation::Validated;
+use composable_traits::bonded_finance::{BondDuration, BondOffer, BondOfferReward};
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
use frame_support::{
dispatch::UnfilteredDispatchable,
traits::{fungible::Mutate as _, fungibles::Mutate as _},
};
use frame_system::RawOrigin;
+use sp_runtime::traits::One;
+
+const MIN_VESTED_TRANSFER: u128 = 1000 * 1_000_000_000_000;
+const BALANCE: u128 = 1_000_000 * 1_000_000_000_000;
-const BALANCE: u64 = 10 * 1_000_000_000_000;
fn assets() -> [AssetIdOf; 2]
where
T: Config,
@@ -31,13 +29,14 @@ where
fn bond_offer(bond_asset: AssetIdOf, reward_asset: AssetIdOf) -> BondOfferOf
where
T: Config,
+ BalanceOf: From,
{
BondOffer {
beneficiary: whitelisted_caller(),
asset: bond_asset,
bond_price: BalanceOf::::from(MIN_VESTED_TRANSFER),
maturity: BondDuration::Finite { return_in: BlockNumberOf::::from(1u32) },
- nb_of_bonds: BalanceOf::::from(1u32),
+ nb_of_bonds: BalanceOf::::from(1u128),
reward: BondOfferReward {
amount: BalanceOf::::from(MIN_VESTED_TRANSFER),
asset: reward_asset,
@@ -51,9 +50,10 @@ where
T: Config,
{
let offer_account_id = Pallet::::account_id(offer_id);
+ let keep_alive = false;
T::NativeCurrency::mint_into(&offer_account_id, <_>::try_from(BALANCE).unwrap_or_default())
.unwrap();
- Call::::bond { nb_of_bonds, offer_id }
+ Call::::bond { nb_of_bonds, offer_id, keep_alive }
.dispatch_bypass_filter(RawOrigin::Signed(caller.clone()).into())
.unwrap();
}
@@ -62,7 +62,9 @@ fn call_offer(bond_offer: BondOfferOf, caller: &T::AccountId)
where
T: Config,
{
- Call::::offer { offer: bond_offer }
+ let keep_alive = false;
+ let validated_bond_offer = Validated::new(bond_offer).unwrap();
+ Call::::offer { offer: validated_bond_offer, keep_alive }
.dispatch_bypass_filter(RawOrigin::Signed(caller.clone()).into())
.unwrap();
}
@@ -78,33 +80,38 @@ where
}
benchmarks! {
+ where_clause {
+ where BalanceOf: From
+ }
+
+ offer {
+ let [bond_asset, reward_asset] = assets::();
+ let caller: T::AccountId = account("caller", 0, 0xCAFEBABE);
+ initial_mint::(bond_asset, &caller, reward_asset);
+ let bond_offer = bond_offer::(bond_asset, reward_asset);
+ let validated_bond_offer = Validated::new(bond_offer).unwrap();
+ }: _(RawOrigin::Signed(caller), validated_bond_offer, false)
+
bond {
let [bond_asset, reward_asset] = assets::();
- let caller: T::AccountId = whitelisted_caller();
+ let caller: T::AccountId = account("caller", 0, 0xCAFEBABE);
initial_mint::(bond_asset, &caller, reward_asset);
let bond_offer = bond_offer::(bond_asset, reward_asset);
let nb_of_bonds = bond_offer.nb_of_bonds;
call_offer::(bond_offer, &caller);
- let offer_id = T::BondOfferId::zero().next();
- }: _(RawOrigin::Signed(caller), offer_id, nb_of_bonds)
+ let offer_id = T::BondOfferId::one();
+ }: _(RawOrigin::Signed(caller), offer_id, nb_of_bonds, false)
cancel {
let [bond_asset, reward_asset] = assets::();
- let caller: T::AccountId = whitelisted_caller();
+ let caller: T::AccountId = account("caller", 0, 0xCAFEBABE);
initial_mint::