diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..512de3b3e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,20 @@
+
+
+### What does it do?
+
+### What important points should reviewers know?
+
+### Is there something left for follow-up PRs?
+
+### What alternative implementations were considered?
+
+### Are there relevant PRs or issues?
+
+
+
+
+
+
+
+### References
+
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index e39b9c046..30b81bdff 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -33,12 +33,8 @@ jobs:
uses: actions/checkout@v2
if: github.event_name == 'workflow_dispatch'
- # TODO(#839): `rustup show` installs the rustc version specified in the `rust-toolchain` file
- # according to https://rust-lang.github.io/rustup/overrides.html. We don't use actions-rs due
- # to the lack of support of `rust-toolchain` files with TOML syntax:
- # https://github.com/actions-rs/toolchain/issues/126.
- - name: Install rust toolchain
- run: rustup show
+ - name: Install build tools
+ run: ./scripts/init.sh
- name: Cache dependencies
uses: Swatinem/rust-cache@v1
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
new file mode 100644
index 000000000..4087b70ee
--- /dev/null
+++ b/.github/workflows/coverage.yml
@@ -0,0 +1,56 @@
+name: Coverage
+
+on:
+ push:
+ branches: [ main ]
+ pull_request:
+ branches: [ main ]
+
+env:
+ CARGO_TERM_COLOR: always
+
+jobs:
+ coverage:
+ name: Coverage
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ - name: Install rust toolchain
+ run: rustup show
+
+ - uses: actions-rs/install@v0.1
+ with:
+ crate: grcov
+ use-tool-cache: true
+
+ # No disk space: https://github.com/zeitgeistpm/zeitgeist/actions/runs/5085081984/jobs/9144298675?pr=1006
+ # Workaround: https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
+ - name: Free up disk space on GitHub hosted runners
+ run: |
+ # Ensure context is GitHub hosted runner
+ # https://docs.github.com/en/actions/learn-github-actions/contexts#runner-context
+ if [[ "${{ runner.name }}" == "GitHub Actions"* ]]; then
+ echo "Freeing up space in GitHub hosted runner"
+ sudo rm -rf /usr/share/dotnet
+ sudo rm -rf /opt/ghc
+ sudo rm -rf "/usr/local/share/boost"
+ sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+ fi
+
+ - name: Cache Dependencies
+ uses: Swatinem/rust-cache@v1
+
+ - name: Generate coverage report
+ run: ./scripts/tests/coverage.sh
+
+ - name: Upload to codecov.io
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ files: ${{ runner.temp }}/zeitgeist-test-coverage.lcov
+ fail_ci_if_error: true
+ flags: tests
+ verbose: true
+ name: unit-tests
\ No newline at end of file
diff --git a/.github/workflows/docker-hub-parachain.yml b/.github/workflows/docker-hub-parachain.yml
index ec6769c3e..278d0c8bb 100644
--- a/.github/workflows/docker-hub-parachain.yml
+++ b/.github/workflows/docker-hub-parachain.yml
@@ -25,7 +25,7 @@ jobs:
images: |
zeitgeistpm/zeitgeist-node-parachain
tags: |
- type=ref
+ type=semver,pattern={{version}}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/migration.yml b/.github/workflows/migration.yml
index 02b4857cd..967dc6510 100644
--- a/.github/workflows/migration.yml
+++ b/.github/workflows/migration.yml
@@ -14,11 +14,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
- # TODO(#839): `rustup show` installs the rustc version specified in the `rust-toolchain` file
- # according to https://rust-lang.github.io/rustup/overrides.html. We don't use actions-rs due
- # to the lack of support of `rust-toolchain` files with TOML syntax:
- # https://github.com/actions-rs/toolchain/issues/126.
- - name: Install rust toolchain
- run: rustup show
+ - name: Install build tools
+ run: ./scripts/init.sh
- run: ./scripts/runtime-upgrade/test_runtime_upgrade.sh ${{ github.event.inputs.block }}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 20dc806f4..a943202c1 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -17,12 +17,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
- # TODO(#839): `rustup show` installs the rustc version specified in the `rust-toolchain` file
- # according to https://rust-lang.github.io/rustup/overrides.html. We don't use actions-rs due
- # to the lack of support of `rust-toolchain` files with TOML syntax:
- # https://github.com/actions-rs/toolchain/issues/126.
- - name: Install rust toolchain
- run: rustup show
+ - name: Install build tools
+ run: ./scripts/init.sh
- uses: actions-rs/install@v0.1
with:
@@ -34,6 +30,26 @@ jobs:
- name: Format
run: ./scripts/tests/format.sh --check
+ copyright:
+ name: Copyright Notices
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+ - name: Setup Python
+ uses: actions/setup-python@v2
+ - name: Install check-license and dependencies
+ run: |
+ pip install scripts/check-license
+ pip install -r scripts/check-license/requirements.txt
+ - name: Query files changed
+ id: files_changed
+ uses: Ana06/get-changed-files@v1.2
+ with:
+ filter: '*.rs$'
+ - name: Check copyright notices
+ run: check-license ${{ steps.files_changed.outputs.added_modified }}
+
checks:
name: Checks
runs-on: ubuntu-latest
@@ -48,14 +64,15 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
- - name: Install rust toolchain
- run: rustup show
+ - name: Install build tools
+ run: ./scripts/init.sh
- name: Cache Dependencies
- uses: Swatinem/rust-cache@v1
+ uses: Swatinem/rust-cache@v2
- name: Checks
run: ./scripts/tests/${{ matrix.scripts }}.sh
+
benchmark:
name: Quick check benchmarks
runs-on: ubuntu-latest
@@ -63,47 +80,70 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
- - name: Install rust toolchain
- run: rustup show
+ - name: Install build tools
+ run: ./scripts/init.sh
- run: ./scripts/benchmarks/quick_check.sh
- tests:
- name: Tests
+ test_standalone:
+ name: Test standalone build
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- - name: Install rust toolchain
- uses: actions-rs/toolchain@v1
- with:
- toolchain: nightly
- target: wasm32-unknown-unknown
- default: true
- override: true
- profile: minimal
- components: rustfmt, clippy, llvm-tools-preview
-
- - uses: actions-rs/install@v0.1
- with:
- crate: grcov
- use-tool-cache: true
+ - name: Install build tools
+ run: ./scripts/init.sh
+
+ # No disk space: https://github.com/zeitgeistpm/zeitgeist/actions/runs/5085081984/jobs/9144298675?pr=1006
+ # Workaround: https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
+ - name: Free up disk space on GitHub hosted runners
+ run: |
+ # Ensure context is GitHub hosted runner
+ # https://docs.github.com/en/actions/learn-github-actions/contexts#runner-context
+ if [[ "${{ runner.name }}" == "GitHub Actions"* ]]; then
+ echo "Freeing up space in GitHub hosted runner"
+ sudo rm -rf /usr/share/dotnet
+ sudo rm -rf /opt/ghc
+ sudo rm -rf "/usr/local/share/boost"
+ sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+ fi
- name: Cache Dependencies
uses: Swatinem/rust-cache@v1
- name: Tests
- run: ./scripts/tests/misc.sh
+ run: ./scripts/tests/test_standalone.sh
- - name: Upload to codecov.io
- uses: codecov/codecov-action@v3
- with:
- files: ${{ runner.temp }}/zeitgeist-test-coverage.lcov
- fail_ci_if_error: true
- flags: tests
- verbose: true
- name: unit-tests
+ test_parachain:
+ name: Test parachain build
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ - name: Install build tools
+ run: ./scripts/init.sh
+
+ # No disk space: https://github.com/zeitgeistpm/zeitgeist/actions/runs/5085081984/jobs/9144298675?pr=1006
+ # Workaround: https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
+ - name: Free up disk space on GitHub hosted runners
+ run: |
+ # Ensure context is GitHub hosted runner
+ # https://docs.github.com/en/actions/learn-github-actions/contexts#runner-context
+ if [[ "${{ runner.name }}" == "GitHub Actions"* ]]; then
+ echo "Freeing up space in GitHub hosted runner"
+ sudo rm -rf /usr/share/dotnet
+ sudo rm -rf /opt/ghc
+ sudo rm -rf "/usr/local/share/boost"
+ sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+ fi
+
+ - name: Cache Dependencies
+ uses: Swatinem/rust-cache@v1
+
+ - name: Tests
+ run: ./scripts/tests/test_parachain.sh
fuzz:
name: Fuzz
@@ -112,8 +152,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
- - name: Install rust toolchain
- run: rustup show
+ - name: Install build tools
+ run: ./scripts/init.sh
- uses: actions-rs/install@v0.1
with:
@@ -123,4 +163,4 @@ jobs:
- name: Cache Dependencies
uses: Swatinem/rust-cache@v1
- - run: ./scripts/tests/fuzz.sh
+ - run: ./scripts/tests/fuzz.sh --verbose
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
new file mode 100644
index 000000000..39e776a07
--- /dev/null
+++ b/.github/workflows/tag.yml
@@ -0,0 +1,36 @@
+name: Try Runtime on New Tags
+
+on:
+ push:
+ tags:
+ - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+ try_runtime_battery_station:
+ name: Test Try Runtime
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ - name: Install build tools
+ run: ./scripts/init.sh
+
+ - name: Cache Dependencies
+ uses: Swatinem/rust-cache@v2
+
+ - run: make try-runtime-upgrade-battery-station
+ try_runtime_zeitgeist:
+ name: Test Try Runtime
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ - name: Install build tools
+ run: ./scripts/init.sh
+
+ - name: Cache Dependencies
+ uses: Swatinem/rust-cache@v2
+
+ - run: make try-runtime-upgrade-zeitgeist
diff --git a/.gitignore b/.gitignore
index 8a30b968d..cd3eee9c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,138 @@
**/node_modules/
# Visual Studio Code
-.vscode
\ No newline at end of file
+.vscode
+
+##############################
+# GitHub's Python .gitignore #
+##############################
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+# Usually these files are written by a python script from a template
+# before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+# However, in case of collaboration, if having platform-specific dependencies or dependencies
+# having no cross-platform support, pipenv may install dependencies that don't work, or not
+# install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 000000000..000207e07
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,25 @@
+pull_request_rules:
+ - name: Auto merge
+ conditions:
+ - base=main
+ - "#approved-reviews-by>=1"
+ - "#changes-requested-reviews-by=0"
+ - check-success=format
+ - check-success=tests
+ - check-success=fuzz
+ - check-success=benchmark
+ - label=s:accepted
+ actions:
+ label:
+ remove:
+ - s:in-progress
+ - s:review-needed
+ merge:
+ method: squash
+ - name: ask to resolve conflict
+ conditions:
+ - conflict
+ actions:
+ comment:
+ message: This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
+
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..b48c5e381
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,15 @@
+# When a part of the project is modified that is owned by a code owner,
+# the code owner has to be included in the respective PR's reviewer list.
+# The code owner has the right to delegate the responsibility to review.
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+/node/ @sea212
+/runtime/ @sea212
+/zrml/authorized/ @Chralt98
+/zrml/court/ @Chralt98
+/zrml/global-disputes/ @Chralt98
+/zrml/prediction-markets/ @maltekliemann
+/zrml/rikiddo/ @sea212
+/zrml/simple-disputes/ @Chralt98
+/zrml/styx/ @yornaath
+/zrml/swaps/ @maltekliemann
diff --git a/Cargo.lock b/Cargo.lock
index f9d02c5c5..d9589ea46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,7 +18,16 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
dependencies = [
- "gimli",
+ "gimli 0.26.2",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli 0.27.1",
]
[[package]]
@@ -43,7 +52,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
dependencies = [
"cfg-if 1.0.0",
- "cipher 0.3.0",
+ "cipher",
"cpufeatures",
"opaque-debug 0.3.0",
]
@@ -56,7 +65,7 @@ checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
dependencies = [
"aead",
"aes",
- "cipher 0.3.0",
+ "cipher",
"ctr",
"ghash",
"subtle",
@@ -108,9 +117,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
[[package]]
name = "approx"
@@ -123,13 +132,19 @@ dependencies = [
[[package]]
name = "arbitrary"
-version = "1.2.0"
+version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d47fbf90d5149a107494b15a7dc8d69b351be2db3bb9691740e88ec17fd880"
+checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad"
dependencies = [
"derive_arbitrary",
]
+[[package]]
+name = "array-bytes"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
+
[[package]]
name = "arrayref"
version = "0.3.6"
@@ -198,7 +213,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
dependencies = [
"async-lock",
"async-task",
- "concurrent-queue 2.0.0",
+ "concurrent-queue 2.1.0",
"fastrand",
"futures-lite",
"slab",
@@ -297,9 +312,9 @@ dependencies = [
[[package]]
name = "async-std-resolver"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8"
+checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723"
dependencies = [
"async-std",
"async-trait",
@@ -318,9 +333,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
[[package]]
name = "async-trait"
-version = "0.1.58"
+version = "0.1.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c"
+checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
dependencies = [
"proc-macro2",
"quote",
@@ -342,9 +357,9 @@ dependencies = [
[[package]]
name = "atomic-waker"
-version = "1.0.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
[[package]]
name = "atty"
@@ -352,7 +367,7 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
"libc",
"winapi",
]
@@ -379,16 +394,16 @@ dependencies = [
[[package]]
name = "backtrace"
-version = "0.3.66"
+version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
dependencies = [
- "addr2line",
+ "addr2line 0.19.0",
"cc",
"cfg-if 1.0.0",
"libc",
- "miniz_oxide",
- "object 0.29.0",
+ "miniz_oxide 0.6.2",
+ "object 0.30.3",
"rustc-demangle",
]
@@ -416,9 +431,21 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+[[package]]
+name = "base64"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+
+[[package]]
+name = "base64ct"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
+
[[package]]
name = "battery-station-runtime"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"cfg-if 1.0.0",
"common-runtime",
@@ -437,7 +464,6 @@ dependencies = [
"frame-system-rpc-runtime-api",
"frame-try-runtime",
"hex-literal",
- "kusama-runtime",
"log",
"nimbus-primitives",
"orml-asset-registry",
@@ -455,7 +481,8 @@ dependencies = [
"pallet-balances",
"pallet-bounties",
"pallet-collective",
- "pallet-crowdloan-rewards",
+ "pallet-contracts",
+ "pallet-contracts-primitives",
"pallet-democracy",
"pallet-grandpa",
"pallet-identity",
@@ -479,6 +506,7 @@ dependencies = [
"polkadot-parachain",
"polkadot-primitives",
"polkadot-runtime-parachains",
+ "rococo-runtime",
"scale-info",
"session-keys-primitives",
"sp-api",
@@ -491,10 +519,12 @@ dependencies = [
"sp-offchain",
"sp-runtime",
"sp-session",
+ "sp-std",
"sp-transaction-pool",
"sp-version",
"substrate-fixed",
"substrate-wasm-builder",
+ "test-case",
"xcm",
"xcm-builder",
"xcm-emulator",
@@ -525,21 +555,24 @@ dependencies = [
[[package]]
name = "beefy-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
+ "async-trait",
"beefy-primitives",
"fnv",
"futures 0.3.25",
"futures-timer",
- "hex",
"log",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-chain-spec",
"sc-client-api",
+ "sc-consensus",
"sc-finality-grandpa",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-network-gossip",
"sc-utils",
"sp-api",
@@ -559,7 +592,7 @@ dependencies = [
[[package]]
name = "beefy-gadget-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"beefy-gadget",
"beefy-primitives",
@@ -579,32 +612,30 @@ dependencies = [
[[package]]
name = "beefy-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"beefy-primitives",
"sp-api",
+ "sp-runtime",
]
[[package]]
name = "beefy-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"scale-info",
+ "serde",
"sp-api",
"sp-application-crypto",
"sp-core",
+ "sp-io",
+ "sp-mmr-primitives",
"sp-runtime",
"sp-std",
]
-[[package]]
-name = "bimap"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b"
-
[[package]]
name = "bincode"
version = "1.3.3"
@@ -616,9 +647,9 @@ dependencies = [
[[package]]
name = "bindgen"
-version = "0.59.2"
+version = "0.60.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
dependencies = [
"bitflags",
"cexpr",
@@ -653,9 +684,9 @@ dependencies = [
[[package]]
name = "blake2"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
dependencies = [
"digest 0.10.6",
]
@@ -776,11 +807,12 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
[[package]]
name = "bstr"
-version = "0.2.17"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
dependencies = [
"memchr",
+ "serde",
]
[[package]]
@@ -794,9 +826,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.11.1"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
name = "byte-slice-cast"
@@ -841,9 +873,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
[[package]]
name = "camino"
-version = "1.1.1"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
+checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055"
dependencies = [
"serde",
]
@@ -865,16 +897,16 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
dependencies = [
"camino",
"cargo-platform",
- "semver 1.0.14",
+ "semver 1.0.16",
"serde",
"serde_json",
]
[[package]]
name = "cc"
-version = "1.0.77"
+version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
dependencies = [
"jobserver",
]
@@ -888,6 +920,15 @@ dependencies = [
"nom",
]
+[[package]]
+name = "cfg-expr"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+dependencies = [
+ "smallvec",
+]
+
[[package]]
name = "cfg-if"
version = "0.1.10"
@@ -913,7 +954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
dependencies = [
"cfg-if 1.0.0",
- "cipher 0.3.0",
+ "cipher",
"cpufeatures",
"zeroize",
]
@@ -926,7 +967,7 @@ checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
dependencies = [
"aead",
"chacha20",
- "cipher 0.3.0",
+ "cipher",
"poly1305",
"zeroize",
]
@@ -968,16 +1009,6 @@ dependencies = [
"generic-array 0.14.6",
]
-[[package]]
-name = "cipher"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
[[package]]
name = "ckb-merkle-mountain-range"
version = "0.3.2"
@@ -995,33 +1026,31 @@ checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
dependencies = [
"glob",
"libc",
- "libloading 0.7.4",
+ "libloading",
]
[[package]]
name = "clap"
-version = "3.2.23"
+version = "4.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
dependencies = [
- "atty",
"bitflags",
"clap_derive",
"clap_lex",
- "indexmap",
+ "is-terminal",
"once_cell",
"strsim",
"termcolor",
- "textwrap",
]
[[package]]
name = "clap_derive"
-version = "3.2.18"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
dependencies = [
- "heck 0.4.0",
+ "heck",
"proc-macro-error",
"proc-macro2",
"quote",
@@ -1030,22 +1059,13 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.2.4"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
dependencies = [
"os_str_bytes",
]
-[[package]]
-name = "cmake"
-version = "0.1.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "coarsetime"
version = "0.1.22"
@@ -1070,18 +1090,18 @@ dependencies = [
[[package]]
name = "comfy-table"
-version = "5.0.1"
+version = "6.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e"
+checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d"
dependencies = [
- "strum 0.23.0",
- "strum_macros 0.23.1",
+ "strum",
+ "strum_macros",
"unicode-width",
]
[[package]]
name = "common-runtime"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"cfg-if 1.0.0",
"cumulus-pallet-xcmp-queue",
@@ -1095,6 +1115,8 @@ dependencies = [
"pallet-balances",
"pallet-bounties",
"pallet-collective",
+ "pallet-contracts",
+ "pallet-contracts-primitives",
"pallet-democracy",
"pallet-identity",
"pallet-membership",
@@ -1123,9 +1145,9 @@ dependencies = [
[[package]]
name = "concurrent-queue"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b"
+checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
dependencies = [
"crossbeam-utils",
]
@@ -1199,25 +1221,27 @@ dependencies = [
[[package]]
name = "cranelift-bforest"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8"
+checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea"
+checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74"
dependencies = [
+ "arrayvec 0.7.2",
+ "bumpalo",
"cranelift-bforest",
"cranelift-codegen-meta",
"cranelift-codegen-shared",
"cranelift-entity",
"cranelift-isle",
- "gimli",
+ "gimli 0.26.2",
"log",
"regalloc2",
"smallvec",
@@ -1226,33 +1250,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6"
+checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2"
+checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc"
[[package]]
name = "cranelift-entity"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d"
+checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c"
+checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a"
dependencies = [
"cranelift-codegen",
"log",
@@ -1262,15 +1286,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b"
+checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470"
[[package]]
name = "cranelift-native"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6"
+checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318"
dependencies = [
"cranelift-codegen",
"libc",
@@ -1279,9 +1303,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.85.3"
+version = "0.88.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54"
+checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -1380,7 +1404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
"generic-array 0.14.6",
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1403,40 +1427,19 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn",
-]
-
[[package]]
name = "ctr"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
dependencies = [
- "cipher 0.3.0",
-]
-
-[[package]]
-name = "cuckoofilter"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18"
-dependencies = [
- "byteorder",
- "fnv",
- "rand 0.7.3",
+ "cipher",
]
[[package]]
name = "cumulus-client-cli"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"clap",
"parity-scale-codec",
@@ -1451,12 +1454,11 @@ dependencies = [
[[package]]
name = "cumulus-client-collator"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-client-consensus-common",
"cumulus-client-network",
"cumulus-primitives-core",
- "cumulus-relay-chain-interface",
"futures 0.3.25",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -1475,7 +1477,7 @@ dependencies = [
[[package]]
name = "cumulus-client-consensus-common"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"async-trait",
"cumulus-relay-chain-interface",
@@ -1485,7 +1487,6 @@ dependencies = [
"polkadot-primitives",
"sc-client-api",
"sc-consensus",
- "sp-api",
"sp-blockchain",
"sp-consensus",
"sp-runtime",
@@ -1496,7 +1497,7 @@ dependencies = [
[[package]]
name = "cumulus-client-consensus-relay-chain"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"async-trait",
"cumulus-client-consensus-common",
@@ -1504,7 +1505,6 @@ dependencies = [
"cumulus-relay-chain-interface",
"futures 0.3.25",
"parking_lot 0.12.1",
- "sc-client-api",
"sc-consensus",
"sp-api",
"sp-block-builder",
@@ -1520,11 +1520,10 @@ dependencies = [
[[package]]
name = "cumulus-client-network"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"async-trait",
"cumulus-relay-chain-interface",
- "derive_more",
"futures 0.3.25",
"futures-timer",
"parity-scale-codec",
@@ -1533,7 +1532,6 @@ dependencies = [
"polkadot-parachain",
"polkadot-primitives",
"sc-client-api",
- "sp-api",
"sp-blockchain",
"sp-consensus",
"sp-core",
@@ -1545,7 +1543,7 @@ dependencies = [
[[package]]
name = "cumulus-client-pov-recovery"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
@@ -1559,7 +1557,6 @@ dependencies = [
"rand 0.8.5",
"sc-client-api",
"sc-consensus",
- "sp-api",
"sp-consensus",
"sp-maybe-compressed-blob",
"sp-runtime",
@@ -1569,7 +1566,7 @@ dependencies = [
[[package]]
name = "cumulus-client-service"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-client-cli",
"cumulus-client-collator",
@@ -1578,26 +1575,21 @@ dependencies = [
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
"parking_lot 0.12.1",
- "polkadot-overseer",
"polkadot-primitives",
"sc-client-api",
"sc-consensus",
- "sc-consensus-babe",
"sc-service",
- "sc-telemetry",
- "sc-tracing",
"sp-api",
"sp-blockchain",
"sp-consensus",
"sp-core",
"sp-runtime",
- "tracing",
]
[[package]]
name = "cumulus-pallet-dmp-queue"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-primitives-core",
"frame-support",
@@ -1609,14 +1601,14 @@ dependencies = [
"sp-runtime",
"sp-std",
"xcm",
- "xcm-executor",
]
[[package]]
name = "cumulus-pallet-parachain-system"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
+ "bytes",
"cumulus-pallet-parachain-system-proc-macro",
"cumulus-primitives-core",
"cumulus-primitives-parachain-inherent",
@@ -1625,11 +1617,9 @@ dependencies = [
"frame-system",
"impl-trait-for-tuples",
"log",
- "pallet-balances",
"parity-scale-codec",
"polkadot-parachain",
"scale-info",
- "serde",
"sp-core",
"sp-externalities",
"sp-inherents",
@@ -1639,13 +1629,12 @@ dependencies = [
"sp-std",
"sp-trie",
"sp-version",
- "xcm",
]
[[package]]
name = "cumulus-pallet-parachain-system-proc-macro"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -1656,14 +1645,13 @@ dependencies = [
[[package]]
name = "cumulus-pallet-xcm"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-primitives-core",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
- "serde",
"sp-io",
"sp-runtime",
"sp-std",
@@ -1673,7 +1661,7 @@ dependencies = [
[[package]]
name = "cumulus-pallet-xcmp-queue"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-primitives-core",
"frame-benchmarking",
@@ -1692,9 +1680,8 @@ dependencies = [
[[package]]
name = "cumulus-primitives-core"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
- "frame-support",
"parity-scale-codec",
"polkadot-core-primitives",
"polkadot-parachain",
@@ -1708,7 +1695,7 @@ dependencies = [
[[package]]
name = "cumulus-primitives-parachain-inherent"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"async-trait",
"cumulus-primitives-core",
@@ -1731,7 +1718,7 @@ dependencies = [
[[package]]
name = "cumulus-primitives-timestamp"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-primitives-core",
"futures 0.3.25",
@@ -1744,69 +1731,59 @@ dependencies = [
[[package]]
name = "cumulus-primitives-utility"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-primitives-core",
"frame-support",
+ "log",
"parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain",
- "polkadot-primitives",
"sp-runtime",
"sp-std",
- "sp-trie",
"xcm",
+ "xcm-builder",
+ "xcm-executor",
]
[[package]]
name = "cumulus-relay-chain-inprocess-interface"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"async-trait",
"cumulus-primitives-core",
"cumulus-relay-chain-interface",
"futures 0.3.25",
"futures-timer",
- "parking_lot 0.12.1",
"polkadot-cli",
"polkadot-client",
"polkadot-service",
"sc-cli",
"sc-client-api",
- "sc-consensus-babe",
- "sc-network",
"sc-sysinfo",
"sc-telemetry",
"sc-tracing",
"sp-api",
- "sp-blockchain",
"sp-consensus",
"sp-core",
"sp-runtime",
"sp-state-machine",
- "tracing",
]
[[package]]
name = "cumulus-relay-chain-interface"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"async-trait",
"cumulus-primitives-core",
- "derive_more",
"futures 0.3.25",
"jsonrpsee-core",
"parity-scale-codec",
- "parking_lot 0.12.1",
"polkadot-overseer",
"polkadot-service",
"sc-client-api",
"sp-api",
"sp-blockchain",
- "sp-core",
- "sp-runtime",
"sp-state-machine",
"thiserror",
]
@@ -1814,7 +1791,7 @@ dependencies = [
[[package]]
name = "cumulus-relay-chain-rpc-interface"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"async-trait",
"backoff",
@@ -1824,15 +1801,17 @@ dependencies = [
"futures-timer",
"jsonrpsee",
"parity-scale-codec",
- "parking_lot 0.12.1",
"polkadot-service",
"sc-client-api",
"sc-rpc-api",
"sp-api",
+ "sp-authority-discovery",
+ "sp-consensus-babe",
"sp-core",
"sp-runtime",
"sp-state-machine",
"sp-storage",
+ "tokio",
"tracing",
"url",
]
@@ -1840,7 +1819,7 @@ dependencies = [
[[package]]
name = "cumulus-test-relay-sproof-builder"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-primitives-core",
"parity-scale-codec",
@@ -1878,22 +1857,23 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-pre.1"
+version = "4.0.0-pre.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f"
dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.6.4",
+ "cfg-if 1.0.0",
+ "fiat-crypto",
+ "packed_simd_2",
+ "platforms 3.0.2",
"subtle",
"zeroize",
]
[[package]]
name = "cxx"
-version = "1.0.82"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
+checksum = "b61a7545f753a88bcbe0a70de1fcc0221e10bfc752f576754fa91e663db1622e"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1903,9 +1883,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.82"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
+checksum = "f464457d494b5ed6905c63b0c4704842aba319084a0a3561cdc1359536b53200"
dependencies = [
"cc",
"codespan-reporting",
@@ -1918,15 +1898,15 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
-version = "1.0.82"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
+checksum = "43c7119ce3a3701ed81aca8410b9acf6fc399d2629d057b87e2efa4e63a3aaea"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.82"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
+checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
dependencies = [
"proc-macro2",
"quote",
@@ -1935,9 +1915,9 @@ dependencies = [
[[package]]
name = "data-encoding"
-version = "2.3.2"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
[[package]]
name = "data-encoding-macro"
@@ -1981,9 +1961,9 @@ dependencies = [
[[package]]
name = "derive_arbitrary"
-version = "1.2.0"
+version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903dff04948f22033ca30232ab8eca2c3fc4c913a8b6a34ee5199699814817f"
+checksum = "8beee4701e2e229e8098bbdecdca12449bc3e322f137d269182fa1291e20bd00"
dependencies = [
"proc-macro2",
"quote",
@@ -2003,6 +1983,12 @@ dependencies = [
"syn",
]
+[[package]]
+name = "difflib"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
+
[[package]]
name = "digest"
version = "0.8.1"
@@ -2083,6 +2069,12 @@ dependencies = [
"quick-error",
]
+[[package]]
+name = "downcast"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+
[[package]]
name = "downcast-rs"
version = "1.2.0"
@@ -2091,9 +2083,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
name = "dtoa"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa"
+checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313"
[[package]]
name = "dyn-clonable"
@@ -2118,9 +2110,9 @@ dependencies = [
[[package]]
name = "dyn-clone"
-version = "1.0.9"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
+checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"
[[package]]
name = "ecdsa"
@@ -2136,9 +2128,9 @@ dependencies = [
[[package]]
name = "ed25519"
-version = "1.5.2"
+version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
dependencies = [
"signature",
]
@@ -2157,6 +2149,20 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "ed25519-zebra"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
+dependencies = [
+ "curve25519-dalek 3.2.0",
+ "hashbrown 0.12.3",
+ "hex",
+ "rand_core 0.6.4",
+ "sha2 0.9.9",
+ "zeroize",
+]
+
[[package]]
name = "either"
version = "1.8.0"
@@ -2183,11 +2189,11 @@ dependencies = [
[[package]]
name = "enum-as-inner"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
+checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
dependencies = [
- "heck 0.4.0",
+ "heck",
"proc-macro2",
"quote",
"syn",
@@ -2215,9 +2221,9 @@ dependencies = [
[[package]]
name = "enumn"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2"
+checksum = "e88bcb3a067a6555d577aba299e75eff9942da276e6506fc6274327daa026132"
dependencies = [
"proc-macro2",
"quote",
@@ -2237,6 +2243,19 @@ dependencies = [
"termcolor",
]
+[[package]]
+name = "env_logger"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
[[package]]
name = "environmental"
version = "1.1.3"
@@ -2369,21 +2388,27 @@ dependencies = [
"subtle",
]
+[[package]]
+name = "fiat-crypto"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90"
+
[[package]]
name = "file-per-thread-logger"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f"
+checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
dependencies = [
- "env_logger",
+ "env_logger 0.10.0",
"log",
]
[[package]]
name = "filetime"
-version = "0.2.18"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -2393,9 +2418,9 @@ dependencies = [
[[package]]
name = "finality-grandpa"
-version = "0.16.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5"
+checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34"
dependencies = [
"either",
"futures 0.3.25",
@@ -2409,9 +2434,9 @@ dependencies = [
[[package]]
name = "fixed-hash"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
dependencies = [
"byteorder",
"rand 0.8.5",
@@ -2433,7 +2458,16 @@ checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
dependencies = [
"crc32fast",
"libz-sys",
- "miniz_oxide",
+ "miniz_oxide 0.5.4",
+]
+
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+dependencies = [
+ "num-traits",
]
[[package]]
@@ -2445,7 +2479,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
]
@@ -2459,10 +2493,16 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "fragile"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
+
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -2474,6 +2514,7 @@ dependencies = [
"serde",
"sp-api",
"sp-application-crypto",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-runtime-interface",
@@ -2484,9 +2525,10 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"Inflector",
+ "array-bytes",
"chrono",
"clap",
"comfy-table",
@@ -2496,7 +2538,6 @@ dependencies = [
"gethostname",
"handlebars",
"hash-db",
- "hex",
"itertools",
"kvdb",
"lazy_static",
@@ -2535,7 +2576,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2546,7 +2587,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2562,10 +2603,11 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
+ "frame-try-runtime",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -2590,7 +2632,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"bitflags",
"frame-metadata",
@@ -2604,6 +2646,7 @@ dependencies = [
"scale-info",
"serde",
"smallvec",
+ "sp-api",
"sp-arithmetic",
"sp-core",
"sp-core-hashing-proc-macro",
@@ -2614,16 +2657,19 @@ dependencies = [
"sp-state-machine",
"sp-std",
"sp-tracing",
+ "sp-weights",
"tt-call",
]
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"Inflector",
+ "cfg-expr",
"frame-support-procedural-tools",
+ "itertools",
"proc-macro2",
"quote",
"syn",
@@ -2632,7 +2678,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -2644,7 +2690,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"proc-macro2",
"quote",
@@ -2654,7 +2700,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"log",
@@ -2666,12 +2712,13 @@ dependencies = [
"sp-runtime",
"sp-std",
"sp-version",
+ "sp-weights",
]
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2686,7 +2733,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2695,9 +2742,10 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
+ "parity-scale-codec",
"sp-api",
"sp-runtime",
"sp-std",
@@ -2709,18 +2757,6 @@ version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
-[[package]]
-name = "fs-swap"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5"
-dependencies = [
- "lazy_static",
- "libc",
- "libloading 0.5.2",
- "winapi",
-]
-
[[package]]
name = "fs2"
version = "0.4.3"
@@ -2887,7 +2923,7 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
dependencies = [
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -2896,7 +2932,7 @@ version = "0.14.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
dependencies = [
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"version_check",
]
@@ -2955,17 +2991,23 @@ dependencies = [
"stable_deref_trait",
]
+[[package]]
+name = "gimli"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec"
+
[[package]]
name = "glob"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
-version = "0.4.9"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
+checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
dependencies = [
"aho-corasick",
"bstr",
@@ -2976,9 +3018,9 @@ dependencies = [
[[package]]
name = "gloo-timers"
-version = "0.2.4"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
dependencies = [
"futures-channel",
"futures-core",
@@ -3018,9 +3060,9 @@ dependencies = [
[[package]]
name = "handlebars"
-version = "4.3.5"
+version = "4.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd"
+checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a"
dependencies = [
"log",
"pest",
@@ -3063,15 +3105,6 @@ dependencies = [
"ahash",
]
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
[[package]]
name = "heck"
version = "0.4.0"
@@ -3087,6 +3120,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -3099,12 +3141,6 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
-[[package]]
-name = "hex_fmt"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
-
[[package]]
name = "hmac"
version = "0.8.1"
@@ -3213,9 +3249,9 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.23.1"
+version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d"
+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
dependencies = [
"http",
"hyper",
@@ -3283,9 +3319,9 @@ dependencies = [
[[package]]
name = "if-watch"
-version = "1.1.1"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791"
+checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd"
dependencies = [
"async-io",
"core-foundation",
@@ -3310,9 +3346,9 @@ dependencies = [
[[package]]
name = "impl-serde"
-version = "0.3.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
dependencies = [
"serde",
]
@@ -3339,15 +3375,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array 0.14.6",
-]
-
[[package]]
name = "instant"
version = "0.1.12"
@@ -3372,18 +3399,22 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "io-lifetimes"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6"
-
[[package]]
name = "io-lifetimes"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
+[[package]]
+name = "io-lifetimes"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+dependencies = [
+ "libc",
+ "windows-sys 0.42.0",
+]
+
[[package]]
name = "ip_network"
version = "0.4.1"
@@ -3404,9 +3435,21 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.5.1"
+version = "2.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
+checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "io-lifetimes 1.0.4",
+ "rustix 0.36.7",
+ "windows-sys 0.42.0",
+]
[[package]]
name = "itertools"
@@ -3419,9 +3462,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
[[package]]
name = "jobserver"
@@ -3443,9 +3486,9 @@ dependencies = [
[[package]]
name = "jsonrpsee"
-version = "0.14.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1"
+checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a"
dependencies = [
"jsonrpsee-core",
"jsonrpsee-http-server",
@@ -3458,9 +3501,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-client-transport"
-version = "0.14.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111"
+checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74"
dependencies = [
"futures-util",
"http",
@@ -3479,9 +3522,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-core"
-version = "0.14.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b"
+checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca"
dependencies = [
"anyhow",
"arrayvec 0.7.2",
@@ -3492,6 +3535,7 @@ dependencies = [
"futures-timer",
"futures-util",
"globset",
+ "http",
"hyper",
"jsonrpsee-types",
"lazy_static",
@@ -3504,14 +3548,15 @@ dependencies = [
"thiserror",
"tokio",
"tracing",
+ "tracing-futures",
"unicase",
]
[[package]]
name = "jsonrpsee-http-server"
-version = "0.14.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03"
+checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117"
dependencies = [
"futures-channel",
"futures-util",
@@ -3522,13 +3567,14 @@ dependencies = [
"serde_json",
"tokio",
"tracing",
+ "tracing-futures",
]
[[package]]
name = "jsonrpsee-proc-macros"
-version = "0.14.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada"
+checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -3538,9 +3584,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-types"
-version = "0.14.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86"
+checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d"
dependencies = [
"anyhow",
"beef",
@@ -3552,10 +3598,11 @@ dependencies = [
[[package]]
name = "jsonrpsee-ws-client"
-version = "0.14.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a"
+checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff"
dependencies = [
+ "http",
"jsonrpsee-client-transport",
"jsonrpsee-core",
"jsonrpsee-types",
@@ -3563,12 +3610,13 @@ dependencies = [
[[package]]
name = "jsonrpsee-ws-server"
-version = "0.14.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a"
+checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325"
dependencies = [
"futures-channel",
"futures-util",
+ "http",
"jsonrpsee-core",
"jsonrpsee-types",
"serde_json",
@@ -3577,6 +3625,7 @@ dependencies = [
"tokio-stream",
"tokio-util",
"tracing",
+ "tracing-futures",
]
[[package]]
@@ -3602,8 +3651,8 @@ dependencies = [
[[package]]
name = "kusama-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -3626,10 +3675,12 @@ dependencies = [
"pallet-bounties",
"pallet-child-bounties",
"pallet-collective",
+ "pallet-conviction-voting",
"pallet-democracy",
"pallet-election-provider-multi-phase",
"pallet-election-provider-support-benchmarking",
"pallet-elections-phragmen",
+ "pallet-fast-unstake",
"pallet-gilt",
"pallet-grandpa",
"pallet-identity",
@@ -3639,11 +3690,14 @@ dependencies = [
"pallet-multisig",
"pallet-nomination-pools",
"pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
"pallet-offences",
"pallet-offences-benchmarking",
"pallet-preimage",
"pallet-proxy",
+ "pallet-ranked-collective",
"pallet-recovery",
+ "pallet-referenda",
"pallet-scheduler",
"pallet-session",
"pallet-session-benchmarking",
@@ -3657,6 +3711,7 @@ dependencies = [
"pallet-treasury",
"pallet-utility",
"pallet-vesting",
+ "pallet-whitelist",
"pallet-xcm",
"pallet-xcm-benchmarks",
"parity-scale-codec",
@@ -3694,14 +3749,16 @@ dependencies = [
[[package]]
name = "kusama-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
@@ -3715,9 +3772,9 @@ dependencies = [
[[package]]
name = "kvdb"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86"
+checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b"
dependencies = [
"parity-util-mem",
"smallvec",
@@ -3725,9 +3782,9 @@ dependencies = [
[[package]]
name = "kvdb-memorydb"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357"
+checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873"
dependencies = [
"kvdb",
"parity-util-mem",
@@ -3736,15 +3793,13 @@ dependencies = [
[[package]]
name = "kvdb-rocksdb"
-version = "0.15.2"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1"
+checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597"
dependencies = [
- "fs-swap",
"kvdb",
"log",
"num_cpus",
- "owning_ref",
"parity-util-mem",
"parking_lot 0.12.1",
"regex",
@@ -3766,9 +3821,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.137"
+version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "libfuzzer-sys"
@@ -3781,16 +3836,6 @@ dependencies = [
"once_cell",
]
-[[package]]
-name = "libloading"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-dependencies = [
- "cc",
- "winapi",
-]
-
[[package]]
name = "libloading"
version = "0.7.4"
@@ -3801,6 +3846,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "libm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+
[[package]]
name = "libm"
version = "0.2.6"
@@ -3809,9 +3860,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
[[package]]
name = "libp2p"
-version = "0.46.1"
+version = "0.49.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d"
+checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1"
dependencies = [
"bytes",
"futures 0.3.25",
@@ -3819,12 +3870,8 @@ dependencies = [
"getrandom 0.2.8",
"instant",
"lazy_static",
- "libp2p-autonat",
"libp2p-core",
- "libp2p-deflate",
"libp2p-dns",
- "libp2p-floodsub",
- "libp2p-gossipsub",
"libp2p-identify",
"libp2p-kad",
"libp2p-mdns",
@@ -3832,49 +3879,24 @@ dependencies = [
"libp2p-mplex",
"libp2p-noise",
"libp2p-ping",
- "libp2p-plaintext",
- "libp2p-pnet",
- "libp2p-relay",
- "libp2p-rendezvous",
"libp2p-request-response",
"libp2p-swarm",
"libp2p-swarm-derive",
"libp2p-tcp",
- "libp2p-uds",
"libp2p-wasm-ext",
"libp2p-websocket",
"libp2p-yamux",
"multiaddr",
"parking_lot 0.12.1",
"pin-project",
- "rand 0.7.3",
"smallvec",
]
-[[package]]
-name = "libp2p-autonat"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9"
-dependencies = [
- "async-trait",
- "futures 0.3.25",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-request-response",
- "libp2p-swarm",
- "log",
- "prost",
- "prost-build",
- "rand 0.8.5",
-]
-
[[package]]
name = "libp2p-core"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6"
+checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d"
dependencies = [
"asn1_der",
"bs58",
@@ -3885,7 +3907,6 @@ dependencies = [
"futures-timer",
"instant",
"lazy_static",
- "libsecp256k1",
"log",
"multiaddr",
"multihash",
@@ -3895,7 +3916,6 @@ dependencies = [
"prost",
"prost-build",
"rand 0.8.5",
- "ring",
"rw-stream-sink",
"sha2 0.10.6",
"smallvec",
@@ -3905,22 +3925,11 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "libp2p-deflate"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71"
-dependencies = [
- "flate2",
- "futures 0.3.25",
- "libp2p-core",
-]
-
[[package]]
name = "libp2p-dns"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5"
+checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720"
dependencies = [
"async-std-resolver",
"futures 0.3.25",
@@ -3931,57 +3940,11 @@ dependencies = [
"trust-dns-resolver",
]
-[[package]]
-name = "libp2p-floodsub"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231"
-dependencies = [
- "cuckoofilter",
- "fnv",
- "futures 0.3.25",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "smallvec",
-]
-
-[[package]]
-name = "libp2p-gossipsub"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0"
-dependencies = [
- "asynchronous-codec",
- "base64",
- "byteorder",
- "bytes",
- "fnv",
- "futures 0.3.25",
- "hex_fmt",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "prometheus-client",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "regex",
- "sha2 0.10.6",
- "smallvec",
- "unsigned-varint",
- "wasm-timer",
-]
-
[[package]]
name = "libp2p-identify"
-version = "0.37.0"
+version = "0.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06"
+checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b"
dependencies = [
"asynchronous-codec",
"futures 0.3.25",
@@ -3989,7 +3952,7 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "lru 0.7.8",
+ "lru 0.8.1",
"prost",
"prost-build",
"prost-codec",
@@ -4000,9 +3963,9 @@ dependencies = [
[[package]]
name = "libp2p-kad"
-version = "0.38.0"
+version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851"
+checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22"
dependencies = [
"arrayvec 0.7.2",
"asynchronous-codec",
@@ -4017,7 +3980,7 @@ dependencies = [
"log",
"prost",
"prost-build",
- "rand 0.7.3",
+ "rand 0.8.5",
"sha2 0.10.6",
"smallvec",
"thiserror",
@@ -4028,16 +3991,15 @@ dependencies = [
[[package]]
name = "libp2p-mdns"
-version = "0.38.0"
+version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2"
+checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15"
dependencies = [
"async-io",
"data-encoding",
"dns-parser",
"futures 0.3.25",
"if-watch",
- "lazy_static",
"libp2p-core",
"libp2p-swarm",
"log",
@@ -4049,25 +4011,23 @@ dependencies = [
[[package]]
name = "libp2p-metrics"
-version = "0.7.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c"
+checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9"
dependencies = [
"libp2p-core",
- "libp2p-gossipsub",
"libp2p-identify",
"libp2p-kad",
"libp2p-ping",
- "libp2p-relay",
"libp2p-swarm",
"prometheus-client",
]
[[package]]
name = "libp2p-mplex"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2"
+checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89"
dependencies = [
"asynchronous-codec",
"bytes",
@@ -4076,16 +4036,16 @@ dependencies = [
"log",
"nohash-hasher",
"parking_lot 0.12.1",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"unsigned-varint",
]
[[package]]
name = "libp2p-noise"
-version = "0.37.0"
+version = "0.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f"
+checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f"
dependencies = [
"bytes",
"curve25519-dalek 3.2.0",
@@ -4105,9 +4065,9 @@ dependencies = [
[[package]]
name = "libp2p-ping"
-version = "0.37.0"
+version = "0.40.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925"
+checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91"
dependencies = [
"futures 0.3.25",
"futures-timer",
@@ -4115,95 +4075,15 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "rand 0.7.3",
- "void",
-]
-
-[[package]]
-name = "libp2p-plaintext"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "futures 0.3.25",
- "libp2p-core",
- "log",
- "prost",
- "prost-build",
- "unsigned-varint",
- "void",
-]
-
-[[package]]
-name = "libp2p-pnet"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5a702574223aa55d8878bdc8bf55c84a6086f87ddaddc28ce730b4caa81538"
-dependencies = [
- "futures 0.3.25",
- "log",
- "pin-project",
"rand 0.8.5",
- "salsa20",
- "sha3",
-]
-
-[[package]]
-name = "libp2p-relay"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "either",
- "futures 0.3.25",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "pin-project",
- "prost",
- "prost-build",
- "prost-codec",
- "rand 0.8.5",
- "smallvec",
- "static_assertions",
- "thiserror",
- "void",
-]
-
-[[package]]
-name = "libp2p-rendezvous"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e"
-dependencies = [
- "asynchronous-codec",
- "bimap",
- "futures 0.3.25",
- "futures-timer",
- "instant",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "prost",
- "prost-build",
- "rand 0.8.5",
- "sha2 0.10.6",
- "thiserror",
- "unsigned-varint",
"void",
]
[[package]]
name = "libp2p-request-response"
-version = "0.19.0"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843"
+checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1"
dependencies = [
"async-trait",
"bytes",
@@ -4212,16 +4092,16 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"unsigned-varint",
]
[[package]]
name = "libp2p-swarm"
-version = "0.37.0"
+version = "0.40.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114"
+checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf"
dependencies = [
"either",
"fnv",
@@ -4231,7 +4111,7 @@ dependencies = [
"libp2p-core",
"log",
"pin-project",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"thiserror",
"void",
@@ -4239,48 +4119,36 @@ dependencies = [
[[package]]
name = "libp2p-swarm-derive"
-version = "0.28.0"
+version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76"
+checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32"
dependencies = [
+ "heck",
"quote",
"syn",
]
[[package]]
name = "libp2p-tcp"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b"
+checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92"
dependencies = [
"async-io",
"futures 0.3.25",
"futures-timer",
"if-watch",
- "ipnet",
"libc",
"libp2p-core",
"log",
"socket2",
]
-[[package]]
-name = "libp2p-uds"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d"
-dependencies = [
- "async-std",
- "futures 0.3.25",
- "libp2p-core",
- "log",
-]
-
[[package]]
name = "libp2p-wasm-ext"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a"
+checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97"
dependencies = [
"futures 0.3.25",
"js-sys",
@@ -4292,9 +4160,9 @@ dependencies = [
[[package]]
name = "libp2p-websocket"
-version = "0.36.0"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818"
+checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4"
dependencies = [
"either",
"futures 0.3.25",
@@ -4311,12 +4179,13 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
-version = "0.38.0"
+version = "0.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c"
+checksum = "0d6874d66543c4f7e26e3b8ca9a6bead351563a13ab4fafd43c7927f7c0d6c12"
dependencies = [
"futures 0.3.25",
"libp2p-core",
+ "log",
"parking_lot 0.12.1",
"thiserror",
"yamux",
@@ -4324,9 +4193,9 @@ dependencies = [
[[package]]
name = "librocksdb-sys"
-version = "0.6.1+6.28.2"
+version = "0.8.0+7.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291"
+checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d"
dependencies = [
"bindgen",
"bzip2-sys",
@@ -4344,7 +4213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
dependencies = [
"arrayref",
- "base64",
+ "base64 0.13.1",
"digest 0.9.0",
"hmac-drbg",
"libsecp256k1-core",
@@ -4353,7 +4222,7 @@ dependencies = [
"rand 0.8.5",
"serde",
"sha2 0.9.9",
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -4398,9 +4267,9 @@ dependencies = [
[[package]]
name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
dependencies = [
"cc",
]
@@ -4432,15 +4301,15 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.0.42"
+version = "0.0.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7"
+checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
[[package]]
name = "linux-raw-sys"
-version = "0.0.46"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
[[package]]
name = "lock_api"
@@ -4454,11 +4323,10 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
dependencies = [
- "cfg-if 1.0.0",
"value-bag",
]
@@ -4535,9 +4403,9 @@ dependencies = [
[[package]]
name = "matches"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "matrixmultiply"
@@ -4556,11 +4424,11 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memfd"
-version = "0.4.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a"
+checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb"
dependencies = [
- "libc",
+ "rustix 0.36.7",
]
[[package]]
@@ -4592,9 +4460,9 @@ dependencies = [
[[package]]
name = "memory-db"
-version = "0.29.0"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a"
+checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269"
dependencies = [
"hash-db",
"hashbrown 0.12.3",
@@ -4612,9 +4480,9 @@ dependencies = [
[[package]]
name = "memory_units"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
+checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
[[package]]
name = "merlin"
@@ -4654,6 +4522,15 @@ dependencies = [
"adler",
]
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
[[package]]
name = "mio"
version = "0.8.5"
@@ -4666,10 +4543,37 @@ dependencies = [
"windows-sys 0.42.0",
]
+[[package]]
+name = "mockall"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326"
+dependencies = [
+ "cfg-if 1.0.0",
+ "downcast",
+ "fragile",
+ "lazy_static",
+ "mockall_derive",
+ "predicates",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall_derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0"
+dependencies = [
+ "cfg-if 1.0.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "moonbeam-vrf"
version = "0.1.0"
-source = "git+https://github.com/zeitgeistpm/moonbeam?branch=polkadot-v0.9.26#5d24d606a8a2cfeb75a3ab95b77087ebe6522cb0"
+source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126"
dependencies = [
"nimbus-primitives",
"parity-scale-codec",
@@ -4757,9 +4661,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
[[package]]
name = "multistream-select"
-version = "0.11.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b"
+checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a"
dependencies = [
"bytes",
"futures 0.3.25",
@@ -4784,7 +4688,7 @@ dependencies = [
"rand 0.8.5",
"rand_distr",
"simba",
- "typenum 1.15.0",
+ "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -4868,9 +4772,9 @@ dependencies = [
[[package]]
name = "netlink-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027"
+checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b"
dependencies = [
"async-io",
"bytes",
@@ -4882,7 +4786,7 @@ dependencies = [
[[package]]
name = "nimbus-consensus"
version = "0.9.0"
-source = "git+https://github.com/zeitgeistpm/nimbus?branch=polkadot-v0.9.26#34792127cfe1a3a446b097b52fcd41830cdd24c5"
+source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126"
dependencies = [
"async-trait",
"cumulus-client-consensus-common",
@@ -4913,7 +4817,7 @@ dependencies = [
[[package]]
name = "nimbus-primitives"
version = "0.9.0"
-source = "git+https://github.com/zeitgeistpm/nimbus?branch=polkadot-v0.9.26#34792127cfe1a3a446b097b52fcd41830cdd24c5"
+source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126"
dependencies = [
"async-trait",
"frame-benchmarking",
@@ -4943,29 +4847,55 @@ dependencies = [
name = "nodrop"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
+name = "normalize-line-endings"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
-name = "nom"
-version = "7.1.1"
+name = "num-bigint"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
dependencies = [
- "memchr",
- "minimal-lexical",
+ "autocfg",
+ "num-integer",
+ "num-traits",
]
[[package]]
name = "num-bigint"
-version = "0.2.6"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
dependencies = [
"autocfg",
"num-integer",
@@ -4974,9 +4904,9 @@ dependencies = [
[[package]]
name = "num-complex"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
dependencies = [
"num-traits",
]
@@ -5008,7 +4938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
dependencies = [
"autocfg",
- "num-bigint",
+ "num-bigint 0.2.6",
"num-integer",
"num-traits",
]
@@ -5020,6 +4950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
dependencies = [
"autocfg",
+ "num-bigint 0.4.3",
"num-integer",
"num-traits",
]
@@ -5031,45 +4962,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg",
- "libm",
+ "libm 0.2.6",
]
[[package]]
name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
"libc",
]
[[package]]
name = "object"
-version = "0.28.4"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
dependencies = [
"crc32fast",
- "hashbrown 0.11.2",
+ "hashbrown 0.12.3",
"indexmap",
"memchr",
]
[[package]]
name = "object"
-version = "0.29.0"
+version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.16.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]]
name = "opaque-debug"
@@ -5091,8 +5022,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "orchestra"
-version = "0.0.1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aab54694ddaa8a9b703724c6ef04272b2d27bc32d2c855aae5cdd1857216b43"
dependencies = [
"async-trait",
"dyn-clonable",
@@ -5107,8 +5039,9 @@ dependencies = [
[[package]]
name = "orchestra-proc-macro"
-version = "0.0.1"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a702b2f6bf592b3eb06c00d80d05afaf7a8eff6b41bb361e397d799acc21b45a"
dependencies = [
"expander 0.0.6",
"itertools",
@@ -5131,7 +5064,7 @@ dependencies = [
[[package]]
name = "orml-asset-registry"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"frame-support",
"frame-system",
@@ -5150,7 +5083,7 @@ dependencies = [
[[package]]
name = "orml-benchmarking"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5170,7 +5103,7 @@ dependencies = [
[[package]]
name = "orml-currencies"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"frame-support",
"frame-system",
@@ -5187,7 +5120,7 @@ dependencies = [
[[package]]
name = "orml-tokens"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"frame-support",
"frame-system",
@@ -5202,7 +5135,7 @@ dependencies = [
[[package]]
name = "orml-traits"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"frame-support",
"impl-trait-for-tuples",
@@ -5220,7 +5153,7 @@ dependencies = [
[[package]]
name = "orml-unknown-tokens"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"frame-support",
"frame-system",
@@ -5235,7 +5168,7 @@ dependencies = [
[[package]]
name = "orml-utilities"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -5249,7 +5182,7 @@ dependencies = [
[[package]]
name = "orml-xcm-support"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"frame-support",
"orml-traits",
@@ -5263,7 +5196,7 @@ dependencies = [
[[package]]
name = "orml-xtokens"
version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f"
dependencies = [
"cumulus-primitives-core",
"frame-support",
@@ -5288,18 +5221,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
[[package]]
-name = "owning_ref"
-version = "0.4.1"
+name = "packed_simd_2"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
dependencies = [
- "stable_deref_trait",
+ "cfg-if 1.0.0",
+ "libm 0.1.4",
]
[[package]]
name = "pallet-aura"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -5315,7 +5249,7 @@ dependencies = [
[[package]]
name = "pallet-author-inherent"
version = "0.9.0"
-source = "git+https://github.com/zeitgeistpm/nimbus?branch=polkadot-v0.9.26#34792127cfe1a3a446b097b52fcd41830cdd24c5"
+source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5335,7 +5269,7 @@ dependencies = [
[[package]]
name = "pallet-author-mapping"
version = "2.0.5"
-source = "git+https://github.com/zeitgeistpm/moonbeam?branch=polkadot-v0.9.26#5d24d606a8a2cfeb75a3ab95b77087ebe6522cb0"
+source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5353,7 +5287,7 @@ dependencies = [
[[package]]
name = "pallet-author-slot-filter"
version = "0.9.0"
-source = "git+https://github.com/zeitgeistpm/nimbus?branch=polkadot-v0.9.26#34792127cfe1a3a446b097b52fcd41830cdd24c5"
+source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5371,7 +5305,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -5387,7 +5321,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -5402,7 +5336,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5426,7 +5360,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5446,7 +5380,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5461,7 +5395,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"beefy-primitives",
"frame-support",
@@ -5477,13 +5411,13 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
"beefy-merkle-tree",
"beefy-primitives",
"frame-support",
"frame-system",
- "hex",
"log",
"pallet-beefy",
"pallet-mmr",
@@ -5500,7 +5434,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5518,7 +5452,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5537,7 +5471,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5552,38 +5486,86 @@ dependencies = [
]
[[package]]
-name = "pallet-crowdloan-rewards"
-version = "0.6.0"
-source = "git+https://github.com/zeitgeistpm/crowdloan-rewards?branch=polkadot-v0.9.26#1dab0b1971f80c707e3fa4ae59d597d099f23980"
+name = "pallet-contracts"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
- "ed25519-dalek",
+ "bitflags",
"frame-benchmarking",
"frame-support",
"frame-system",
+ "impl-trait-for-tuples",
"log",
- "pallet-balances",
- "pallet-utility",
+ "pallet-contracts-primitives",
+ "pallet-contracts-proc-macro",
"parity-scale-codec",
+ "rand 0.8.5",
+ "rand_pcg 0.3.1",
"scale-info",
"serde",
+ "smallvec",
+ "sp-api",
"sp-core",
"sp-io",
"sp-runtime",
+ "sp-sandbox",
+ "sp-std",
+ "wasm-instrument",
+ "wasmi-validation",
+]
+
+[[package]]
+name = "pallet-contracts-primitives"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "bitflags",
+ "parity-scale-codec",
+ "sp-runtime",
+ "sp-std",
+ "sp-weights",
+]
+
+[[package]]
+name = "pallet-contracts-proc-macro"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pallet-conviction-voting"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "assert_matches",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-io",
+ "sp-runtime",
"sp-std",
- "sp-trie",
]
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
"serde",
+ "sp-core",
"sp-io",
"sp-runtime",
"sp-std",
@@ -5592,13 +5574,14 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
"frame-support",
"frame-system",
"log",
+ "pallet-election-provider-support-benchmarking",
"parity-scale-codec",
"rand 0.7.3",
"scale-info",
@@ -5609,13 +5592,13 @@ dependencies = [
"sp-runtime",
"sp-std",
"static_assertions",
- "strum 0.23.0",
+ "strum",
]
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5628,7 +5611,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5643,10 +5626,31 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-fast-unstake"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "frame-benchmarking",
+ "frame-election-provider-support",
+ "frame-support",
+ "frame-system",
+ "log",
+ "pallet-balances",
+ "pallet-staking",
+ "pallet-timestamp",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-io",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
+]
+
[[package]]
name = "pallet-gilt"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5661,7 +5665,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5684,7 +5688,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5700,7 +5704,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5720,7 +5724,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5737,7 +5741,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5754,7 +5758,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"ckb-merkle-mountain-range",
"frame-benchmarking",
@@ -5772,7 +5776,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-rpc"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -5787,11 +5791,12 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
"sp-io",
@@ -5802,7 +5807,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -5819,7 +5824,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5831,14 +5836,25 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"sp-runtime",
+ "sp-runtime-interface",
"sp-staking",
"sp-std",
]
+[[package]]
+name = "pallet-nomination-pools-runtime-api"
+version = "1.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "parity-scale-codec",
+ "sp-api",
+ "sp-std",
+]
+
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -5855,7 +5871,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5878,7 +5894,7 @@ dependencies = [
[[package]]
name = "pallet-parachain-staking"
version = "3.0.0"
-source = "git+https://github.com/zeitgeistpm/moonbeam?branch=polkadot-v0.9.26#5d24d606a8a2cfeb75a3ab95b77087ebe6522cb0"
+source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5896,11 +5912,12 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -5912,7 +5929,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5927,7 +5944,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -5938,16 +5955,52 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-ranked-collective"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-referenda"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "assert_matches",
"frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
+ "serde",
+ "sp-arithmetic",
"sp-io",
"sp-runtime",
"sp-std",
@@ -5956,7 +6009,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5972,7 +6025,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -5993,7 +6046,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6009,7 +6062,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -6023,7 +6076,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6046,7 +6099,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -6057,7 +6110,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"log",
"sp-arithmetic",
@@ -6066,7 +6119,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -6080,7 +6133,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6098,7 +6151,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6117,7 +6170,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-support",
"frame-system",
@@ -6133,7 +6186,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -6143,23 +6196,25 @@ dependencies = [
"sp-core",
"sp-rpc",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
"sp-api",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6176,7 +6231,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6192,7 +6247,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6204,10 +6259,25 @@ dependencies = [
"sp-std",
]
+[[package]]
+name = "pallet-whitelist"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
[[package]]
name = "pallet-xcm"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-support",
"frame-system",
@@ -6224,8 +6294,8 @@ dependencies = [
[[package]]
name = "pallet-xcm-benchmarks"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6242,14 +6312,13 @@ dependencies = [
[[package]]
name = "parachain-info"
version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#be9e23c377555cabb867326ace51e0ab72bee1b9"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77"
dependencies = [
"cumulus-primitives-core",
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
- "serde",
]
[[package]]
@@ -6273,13 +6342,14 @@ dependencies = [
[[package]]
name = "parity-scale-codec"
-version = "3.2.1"
+version = "3.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a"
+checksum = "e7ab01d0f889e957861bc65888d5ccbe82c158d0270136ba46820d43837cdf72"
dependencies = [
"arrayvec 0.7.2",
"bitvec",
"byte-slice-cast",
+ "bytes",
"impl-trait-for-tuples",
"parity-scale-codec-derive",
"serde",
@@ -6287,9 +6357,9 @@ dependencies = [
[[package]]
name = "parity-scale-codec-derive"
-version = "3.1.3"
+version = "3.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd"
+checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -6305,9 +6375,9 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
[[package]]
name = "parity-util-mem"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f"
+checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8"
dependencies = [
"cfg-if 1.0.0",
"hashbrown 0.12.3",
@@ -6341,9 +6411,9 @@ dependencies = [
[[package]]
name = "parity-wasm"
-version = "0.42.2"
+version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
+checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
[[package]]
name = "parking"
@@ -6359,7 +6429,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [
"instant",
"lock_api",
- "parking_lot_core 0.8.5",
+ "parking_lot_core 0.8.6",
]
[[package]]
@@ -6369,14 +6439,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.4",
+ "parking_lot_core 0.9.6",
]
[[package]]
name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
dependencies = [
"cfg-if 1.0.0",
"instant",
@@ -6388,9 +6458,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.4"
+version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -6401,9 +6471,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.9"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
[[package]]
name = "pbkdf2"
@@ -6437,9 +6507,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "pest"
-version = "2.4.1"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8"
+checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f"
dependencies = [
"thiserror",
"ucd-trie",
@@ -6447,9 +6517,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.4.1"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f"
+checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea"
dependencies = [
"pest",
"pest_generator",
@@ -6457,9 +6527,9 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.4.1"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4"
+checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f"
dependencies = [
"pest",
"pest_meta",
@@ -6470,13 +6540,13 @@ dependencies = [
[[package]]
name = "pest_meta"
-version = "2.4.1"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe"
+checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d"
dependencies = [
"once_cell",
"pest",
- "sha1",
+ "sha2 0.10.6",
]
[[package]]
@@ -6527,6 +6597,17 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "pkcs8"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
+dependencies = [
+ "der",
+ "spki",
+ "zeroize",
+]
+
[[package]]
name = "pkg-config"
version = "0.3.26"
@@ -6539,10 +6620,16 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
[[package]]
name = "polkadot-approval-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"polkadot-node-network-protocol",
@@ -6556,8 +6643,8 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"polkadot-node-network-protocol",
@@ -6570,13 +6657,13 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"derive_more",
"fatality",
"futures 0.3.25",
- "lru 0.7.8",
+ "lru 0.8.1",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6593,12 +6680,12 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"fatality",
"futures 0.3.25",
- "lru 0.7.8",
+ "lru 0.8.1",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6614,8 +6701,8 @@ dependencies = [
[[package]]
name = "polkadot-cli"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"clap",
"frame-benchmarking-cli",
@@ -6631,6 +6718,7 @@ dependencies = [
"sc-sysinfo",
"sc-tracing",
"sp-core",
+ "sp-keyring",
"sp-trie",
"substrate-build-script-utils",
"thiserror",
@@ -6639,8 +6727,8 @@ dependencies = [
[[package]]
name = "polkadot-client"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"beefy-primitives",
"frame-benchmarking",
@@ -6679,10 +6767,11 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"always-assert",
+ "bitvec",
"fatality",
"futures 0.3.25",
"futures-timer",
@@ -6700,8 +6789,8 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -6713,13 +6802,15 @@ dependencies = [
[[package]]
name = "polkadot-dispute-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"derive_more",
"fatality",
"futures 0.3.25",
- "lru 0.7.8",
+ "futures-timer",
+ "indexmap",
+ "lru 0.8.1",
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -6736,8 +6827,8 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"parity-scale-codec",
"polkadot-node-primitives",
@@ -6750,8 +6841,8 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"futures-timer",
@@ -6770,12 +6861,13 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"always-assert",
"async-trait",
"bytes",
+ "fatality",
"futures 0.3.25",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -6785,14 +6877,16 @@ dependencies = [
"polkadot-overseer",
"polkadot-primitives",
"sc-network",
+ "sc-network-common",
"sp-consensus",
+ "thiserror",
"tracing-gum",
]
[[package]]
name = "polkadot-node-collation-generation"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"parity-scale-codec",
@@ -6809,15 +6903,15 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bitvec",
"derive_more",
"futures 0.3.25",
"futures-timer",
"kvdb",
- "lru 0.7.8",
+ "lru 0.8.1",
"merlin",
"parity-scale-codec",
"polkadot-node-jaeger",
@@ -6838,8 +6932,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bitvec",
"futures 0.3.25",
@@ -6858,8 +6952,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bitvec",
"fatality",
@@ -6877,8 +6971,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"polkadot-node-subsystem",
@@ -6892,8 +6986,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"async-trait",
"futures 0.3.25",
@@ -6910,8 +7004,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"polkadot-node-subsystem",
@@ -6925,8 +7019,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-selection"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"futures-timer",
@@ -6942,13 +7036,13 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"fatality",
"futures 0.3.25",
"kvdb",
- "lru 0.7.8",
+ "lru 0.8.1",
"parity-scale-codec",
"polkadot-node-primitives",
"polkadot-node-subsystem",
@@ -6961,8 +7055,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"async-trait",
"futures 0.3.25",
@@ -6978,8 +7072,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bitvec",
"fatality",
@@ -6996,8 +7090,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"always-assert",
"assert_matches",
@@ -7008,7 +7102,7 @@ dependencies = [
"parity-scale-codec",
"pin-project",
"polkadot-core-primitives",
- "polkadot-node-subsystem-util",
+ "polkadot-node-metrics",
"polkadot-parachain",
"rand 0.8.5",
"rayon",
@@ -7028,8 +7122,8 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf-checker"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"polkadot-node-primitives",
@@ -7044,25 +7138,24 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"futures 0.3.25",
"memory-lru",
"parity-util-mem",
"polkadot-node-subsystem",
+ "polkadot-node-subsystem-types",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "sp-api",
- "sp-authority-discovery",
"sp-consensus-babe",
"tracing-gum",
]
[[package]]
name = "polkadot-node-jaeger"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"async-std",
"lazy_static",
@@ -7079,8 +7172,8 @@ dependencies = [
[[package]]
name = "polkadot-node-metrics"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bs58",
"futures 0.3.25",
@@ -7098,13 +7191,14 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"async-trait",
"derive_more",
"fatality",
"futures 0.3.25",
+ "hex",
"parity-scale-codec",
"polkadot-node-jaeger",
"polkadot-node-primitives",
@@ -7112,15 +7206,16 @@ dependencies = [
"rand 0.8.5",
"sc-authority-discovery",
"sc-network",
- "strum 0.24.1",
+ "sc-network-common",
+ "strum",
"thiserror",
"tracing-gum",
]
[[package]]
name = "polkadot-node-primitives"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bounded-vec",
"futures 0.3.25",
@@ -7141,8 +7236,8 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -7151,9 +7246,10 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-types"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
+ "async-trait",
"derive_more",
"futures 0.3.25",
"orchestra",
@@ -7164,14 +7260,17 @@ dependencies = [
"polkadot-statement-table",
"sc-network",
"smallvec",
+ "sp-api",
+ "sp-authority-discovery",
+ "sp-consensus-babe",
"substrate-prometheus-endpoint",
"thiserror",
]
[[package]]
name = "polkadot-node-subsystem-util"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"async-trait",
"derive_more",
@@ -7179,7 +7278,7 @@ dependencies = [
"futures 0.3.25",
"itertools",
"kvdb",
- "lru 0.7.8",
+ "lru 0.8.1",
"parity-db",
"parity-scale-codec",
"parity-util-mem",
@@ -7203,12 +7302,13 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
+ "async-trait",
"futures 0.3.25",
"futures-timer",
- "lru 0.7.8",
+ "lru 0.8.1",
"orchestra",
"parity-util-mem",
"parking_lot 0.12.1",
@@ -7225,8 +7325,8 @@ dependencies = [
[[package]]
name = "polkadot-parachain"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"derive_more",
"frame-support",
@@ -7242,10 +7342,10 @@ dependencies = [
[[package]]
name = "polkadot-performance-test"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
- "env_logger",
+ "env_logger 0.9.3",
"kusama-runtime",
"log",
"polkadot-erasure-coding",
@@ -7257,8 +7357,8 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bitvec",
"frame-system",
@@ -7287,8 +7387,8 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"beefy-gadget",
"beefy-gadget-rpc",
@@ -7319,8 +7419,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7346,12 +7446,16 @@ dependencies = [
"pallet-election-provider-multi-phase",
"pallet-election-provider-support-benchmarking",
"pallet-elections-phragmen",
+ "pallet-fast-unstake",
"pallet-grandpa",
"pallet-identity",
"pallet-im-online",
"pallet-indices",
"pallet-membership",
"pallet-multisig",
+ "pallet-nomination-pools",
+ "pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
"pallet-offences",
"pallet-offences-benchmarking",
"pallet-preimage",
@@ -7404,8 +7508,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7451,20 +7555,22 @@ dependencies = [
[[package]]
name = "polkadot-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "polkadot-runtime-metrics"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bs58",
"parity-scale-codec",
@@ -7475,8 +7581,8 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"bitflags",
"bitvec",
@@ -7518,19 +7624,20 @@ dependencies = [
[[package]]
name = "polkadot-service"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"async-trait",
"beefy-gadget",
"beefy-primitives",
+ "frame-support",
"frame-system-rpc-runtime-api",
"futures 0.3.25",
"hex-literal",
"kusama-runtime",
"kvdb",
"kvdb-rocksdb",
- "lru 0.7.8",
+ "lru 0.8.1",
"pallet-babe",
"pallet-im-online",
"pallet-staking",
@@ -7581,11 +7688,11 @@ dependencies = [
"sc-consensus",
"sc-consensus-babe",
"sc-consensus-slots",
- "sc-consensus-uncles",
"sc-executor",
"sc-finality-grandpa",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-offchain",
"sc-service",
"sc-sync-state-rpc",
@@ -7621,8 +7728,8 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"arrayvec 0.5.2",
"fatality",
@@ -7642,8 +7749,8 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -7652,8 +7759,8 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7713,8 +7820,8 @@ dependencies = [
[[package]]
name = "polkadot-test-service"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-benchmarking",
"frame-system",
@@ -7743,6 +7850,7 @@ dependencies = [
"sc-executor",
"sc-finality-grandpa",
"sc-network",
+ "sc-network-common",
"sc-service",
"sc-tracing",
"sc-transaction-pool",
@@ -7766,16 +7874,16 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.4.0"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2"
+checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"libc",
"log",
"wepoll-ffi",
- "winapi",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -7790,28 +7898,68 @@ dependencies = [
]
[[package]]
-name = "polyval"
-version = "0.5.3"
+name = "polyval"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "opaque-debug 0.3.0",
+ "universal-hash",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "predicates"
+version = "2.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
+dependencies = [
+ "difflib",
+ "float-cmp",
+ "itertools",
+ "normalize-line-endings",
+ "predicates-core",
+ "regex",
+]
+
+[[package]]
+name = "predicates-core"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
+checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
+
+[[package]]
+name = "predicates-tree"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash",
+ "predicates-core",
+ "termtree",
]
[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
+name = "prettyplease"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
[[package]]
name = "primitive-types"
-version = "0.11.1"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
+checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
dependencies = [
"fixed-hash",
"impl-codec",
@@ -7823,7 +7971,8 @@ dependencies = [
[[package]]
name = "prioritized-metered-channel"
version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4"
dependencies = [
"coarsetime",
"crossbeam-queue",
@@ -7837,13 +7986,12 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "1.2.1"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
dependencies = [
"once_cell",
- "thiserror",
- "toml",
+ "toml_edit",
]
[[package]]
@@ -7872,9 +8020,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
dependencies = [
"unicode-ident",
]
@@ -7895,21 +8043,21 @@ dependencies = [
[[package]]
name = "prometheus-client"
-version = "0.16.0"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825"
+checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c"
dependencies = [
"dtoa",
"itoa",
- "owning_ref",
+ "parking_lot 0.12.1",
"prometheus-client-derive-text-encode",
]
[[package]]
name = "prometheus-client-derive-text-encode"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652"
+checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
dependencies = [
"proc-macro2",
"quote",
@@ -7918,9 +8066,9 @@ dependencies = [
[[package]]
name = "prost"
-version = "0.10.4"
+version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
+checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698"
dependencies = [
"bytes",
"prost-derive",
@@ -7928,31 +8076,31 @@ dependencies = [
[[package]]
name = "prost-build"
-version = "0.10.4"
+version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
+checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e"
dependencies = [
"bytes",
- "cfg-if 1.0.0",
- "cmake",
- "heck 0.4.0",
+ "heck",
"itertools",
"lazy_static",
"log",
"multimap",
"petgraph",
+ "prettyplease",
"prost",
"prost-types",
"regex",
+ "syn",
"tempfile",
"which",
]
[[package]]
name = "prost-codec"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007"
+checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987"
dependencies = [
"asynchronous-codec",
"bytes",
@@ -7963,9 +8111,9 @@ dependencies = [
[[package]]
name = "prost-derive"
-version = "0.10.1"
+version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
+checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d"
dependencies = [
"anyhow",
"itertools",
@@ -7976,9 +8124,9 @@ dependencies = [
[[package]]
name = "prost-types"
-version = "0.10.1"
+version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
+checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788"
dependencies = [
"bytes",
"prost",
@@ -8012,9 +8160,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.21"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
dependencies = [
"proc-macro2",
]
@@ -8133,20 +8281,19 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.6.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
dependencies = [
- "crossbeam-deque",
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
-version = "1.10.1"
+version = "1.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
+checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -8183,24 +8330,24 @@ dependencies = [
"derive_more",
"fs-err",
"itertools",
- "static_init",
+ "static_init 0.5.2",
"thiserror",
]
[[package]]
name = "ref-cast"
-version = "1.0.13"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44"
+checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.13"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36"
+checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
dependencies = [
"proc-macro2",
"quote",
@@ -8209,9 +8356,9 @@ dependencies = [
[[package]]
name = "regalloc2"
-version = "0.2.3"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c"
+checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779"
dependencies = [
"fxhash",
"log",
@@ -8221,9 +8368,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.7.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
dependencies = [
"aho-corasick",
"memchr",
@@ -8245,25 +8392,12 @@ version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-[[package]]
-name = "region"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0"
-dependencies = [
- "bitflags",
- "libc",
- "mach",
- "winapi",
-]
-
[[package]]
name = "remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
- "env_logger",
- "jsonrpsee",
+ "env_logger 0.9.3",
"log",
"parity-scale-codec",
"serde",
@@ -8272,6 +8406,7 @@ dependencies = [
"sp-io",
"sp-runtime",
"sp-version",
+ "substrate-rpc-client",
]
[[package]]
@@ -8293,12 +8428,6 @@ dependencies = [
"quick-error",
]
-[[package]]
-name = "retain_mut"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
-
[[package]]
name = "rfc6979"
version = "0.1.0"
@@ -8327,9 +8456,9 @@ dependencies = [
[[package]]
name = "rocksdb"
-version = "0.18.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290"
+checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc"
dependencies = [
"libc",
"librocksdb-sys",
@@ -8337,8 +8466,8 @@ dependencies = [
[[package]]
name = "rococo-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"beefy-merkle-tree",
"beefy-primitives",
@@ -8356,23 +8485,37 @@ dependencies = [
"pallet-balances",
"pallet-beefy",
"pallet-beefy-mmr",
+ "pallet-bounties",
+ "pallet-child-bounties",
"pallet-collective",
+ "pallet-democracy",
+ "pallet-elections-phragmen",
+ "pallet-gilt",
"pallet-grandpa",
+ "pallet-identity",
"pallet-im-online",
"pallet-indices",
"pallet-membership",
"pallet-mmr",
"pallet-multisig",
"pallet-offences",
+ "pallet-preimage",
"pallet-proxy",
+ "pallet-recovery",
+ "pallet-scheduler",
"pallet-session",
+ "pallet-society",
"pallet-staking",
"pallet-sudo",
"pallet-timestamp",
+ "pallet-tips",
"pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
+ "pallet-treasury",
"pallet-utility",
+ "pallet-vesting",
"pallet-xcm",
+ "pallet-xcm-benchmarks",
"parity-scale-codec",
"polkadot-parachain",
"polkadot-primitives",
@@ -8398,6 +8541,7 @@ dependencies = [
"sp-std",
"sp-transaction-pool",
"sp-version",
+ "static_assertions",
"substrate-wasm-builder",
"xcm",
"xcm-builder",
@@ -8406,23 +8550,26 @@ dependencies = [
[[package]]
name = "rococo-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "rpassword"
-version = "5.0.1"
+version = "7.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb"
+checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
dependencies = [
"libc",
+ "rtoolbox",
"winapi",
]
@@ -8441,6 +8588,16 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "rtoolbox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
[[package]]
name = "rustc-demangle"
version = "0.1.21"
@@ -8474,42 +8631,42 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.14",
+ "semver 1.0.16",
]
[[package]]
name = "rustix"
-version = "0.33.7"
+version = "0.35.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0"
+checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
dependencies = [
"bitflags",
"errno",
- "io-lifetimes 0.5.3",
+ "io-lifetimes 0.7.5",
"libc",
- "linux-raw-sys 0.0.42",
- "winapi",
+ "linux-raw-sys 0.0.46",
+ "windows-sys 0.42.0",
]
[[package]]
name = "rustix"
-version = "0.35.13"
+version = "0.36.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
dependencies = [
"bitflags",
"errno",
- "io-lifetimes 0.7.5",
+ "io-lifetimes 1.0.4",
"libc",
- "linux-raw-sys 0.0.46",
+ "linux-raw-sys 0.1.4",
"windows-sys 0.42.0",
]
[[package]]
name = "rustls"
-version = "0.20.7"
+version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
dependencies = [
"log",
"ring",
@@ -8531,18 +8688,18 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
dependencies = [
- "base64",
+ "base64 0.21.0",
]
[[package]]
name = "rustversion"
-version = "1.0.9"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
[[package]]
name = "rw-stream-sink"
@@ -8557,9 +8714,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
[[package]]
name = "safe-mix"
@@ -8570,15 +8727,6 @@ dependencies = [
"rustc_version 0.2.3",
]
-[[package]]
-name = "salsa20"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
-dependencies = [
- "cipher 0.4.3",
-]
-
[[package]]
name = "same-file"
version = "1.0.6"
@@ -8591,7 +8739,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"log",
"sp-core",
@@ -8602,7 +8750,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"futures 0.3.25",
@@ -8615,7 +8763,7 @@ dependencies = [
"prost-build",
"rand 0.7.3",
"sc-client-api",
- "sc-network",
+ "sc-network-common",
"sp-api",
"sp-authority-discovery",
"sp-blockchain",
@@ -8629,7 +8777,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"futures-timer",
@@ -8652,7 +8800,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -8668,13 +8816,13 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"impl-trait-for-tuples",
"memmap2",
"parity-scale-codec",
"sc-chain-spec-derive",
- "sc-network",
+ "sc-network-common",
"sc-telemetry",
"serde",
"serde_json",
@@ -8685,7 +8833,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -8696,13 +8844,13 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
"chrono",
"clap",
"fdlimit",
"futures 0.3.25",
- "hex",
"libp2p",
"log",
"names",
@@ -8714,6 +8862,7 @@ dependencies = [
"sc-client-db",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-service",
"sc-telemetry",
"sc-tracing",
@@ -8735,7 +8884,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"fnv",
"futures 0.3.25",
@@ -8763,7 +8912,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"hash-db",
"kvdb",
@@ -8788,7 +8937,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"futures 0.3.25",
@@ -8812,7 +8961,7 @@ dependencies = [
[[package]]
name = "sc-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"futures 0.3.25",
@@ -8841,20 +8990,19 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"fork-tree",
"futures 0.3.25",
"log",
"merlin",
- "num-bigint",
+ "num-bigint 0.2.6",
"num-rational 0.2.4",
"num-traits",
"parity-scale-codec",
"parking_lot 0.12.1",
"rand 0.7.3",
- "retain_mut",
"sc-client-api",
"sc-consensus",
"sc-consensus-epochs",
@@ -8884,7 +9032,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"jsonrpsee",
@@ -8906,7 +9054,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -8919,7 +9067,7 @@ dependencies = [
[[package]]
name = "sc-consensus-manual-seal"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"assert_matches",
"async-trait",
@@ -8953,7 +9101,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"futures 0.3.25",
@@ -8971,25 +9119,13 @@ dependencies = [
"sp-inherents",
"sp-runtime",
"sp-state-machine",
- "sp-timestamp",
- "thiserror",
-]
-
-[[package]]
-name = "sc-consensus-uncles"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
-dependencies = [
- "sc-client-api",
- "sp-authorship",
- "sp-runtime",
"thiserror",
]
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"lazy_static",
"lru 0.7.8",
@@ -9016,14 +9152,13 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"environmental",
"parity-scale-codec",
"sc-allocator",
"sp-maybe-compressed-blob",
"sp-sandbox",
- "sp-serializer",
"sp-wasm-interface",
"thiserror",
"wasm-instrument",
@@ -9033,7 +9168,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"log",
"parity-scale-codec",
@@ -9048,14 +9183,14 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"cfg-if 1.0.0",
"libc",
"log",
"once_cell",
"parity-scale-codec",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
"rustix 0.35.13",
"sc-allocator",
"sc-executor-common",
@@ -9068,16 +9203,16 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"ahash",
+ "array-bytes",
"async-trait",
"dyn-clone",
"finality-grandpa",
"fork-tree",
"futures 0.3.25",
"futures-timer",
- "hex",
"log",
"parity-scale-codec",
"parking_lot 0.12.1",
@@ -9088,6 +9223,7 @@ dependencies = [
"sc-consensus",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-network-gossip",
"sc-telemetry",
"sc-utils",
@@ -9108,7 +9244,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"finality-grandpa",
"futures 0.3.25",
@@ -9129,7 +9265,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"ansi_term",
"futures 0.3.25",
@@ -9137,7 +9273,7 @@ dependencies = [
"log",
"parity-util-mem",
"sc-client-api",
- "sc-network",
+ "sc-network-common",
"sc-transaction-pool-api",
"sp-blockchain",
"sp-runtime",
@@ -9146,10 +9282,10 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
"async-trait",
- "hex",
"parking_lot 0.12.1",
"serde_json",
"sp-application-crypto",
@@ -9161,8 +9297,9 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
"async-trait",
"asynchronous-codec",
"bitflags",
@@ -9173,7 +9310,6 @@ dependencies = [
"fork-tree",
"futures 0.3.25",
"futures-timer",
- "hex",
"ip_network",
"libp2p",
"linked-hash-map",
@@ -9184,14 +9320,11 @@ dependencies = [
"parking_lot 0.12.1",
"pin-project",
"prost",
- "prost-build",
"rand 0.7.3",
"sc-block-builder",
"sc-client-api",
"sc-consensus",
"sc-network-common",
- "sc-network-light",
- "sc-network-sync",
"sc-peerset",
"sc-utils",
"serde",
@@ -9201,32 +9334,63 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-core",
- "sp-finality-grandpa",
"sp-runtime",
"substrate-prometheus-endpoint",
"thiserror",
"unsigned-varint",
- "void",
"zeroize",
]
+[[package]]
+name = "sc-network-bitswap"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "cid",
+ "futures 0.3.25",
+ "libp2p",
+ "log",
+ "prost",
+ "prost-build",
+ "sc-client-api",
+ "sc-network-common",
+ "sp-blockchain",
+ "sp-runtime",
+ "thiserror",
+ "unsigned-varint",
+ "void",
+]
+
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "async-trait",
+ "bitflags",
+ "bytes",
"futures 0.3.25",
+ "futures-timer",
"libp2p",
+ "linked_hash_set",
"parity-scale-codec",
"prost-build",
+ "sc-consensus",
"sc-peerset",
+ "serde",
"smallvec",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-finality-grandpa",
+ "sp-runtime",
+ "substrate-prometheus-endpoint",
+ "thiserror",
]
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"ahash",
"futures 0.3.25",
@@ -9234,7 +9398,8 @@ dependencies = [
"libp2p",
"log",
"lru 0.7.8",
- "sc-network",
+ "sc-network-common",
+ "sc-peerset",
"sp-runtime",
"substrate-prometheus-endpoint",
"tracing",
@@ -9243,8 +9408,9 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
"futures 0.3.25",
"libp2p",
"log",
@@ -9263,15 +9429,15 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
- "bitflags",
- "either",
+ "array-bytes",
"fork-tree",
"futures 0.3.25",
"libp2p",
"log",
"lru 0.7.8",
+ "mockall",
"parity-scale-codec",
"prost",
"prost-build",
@@ -9279,6 +9445,7 @@ dependencies = [
"sc-consensus",
"sc-network-common",
"sc-peerset",
+ "sc-utils",
"smallvec",
"sp-arithmetic",
"sp-blockchain",
@@ -9289,25 +9456,46 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "sc-network-transactions"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "array-bytes",
+ "futures 0.3.25",
+ "hex",
+ "libp2p",
+ "log",
+ "parity-scale-codec",
+ "pin-project",
+ "sc-network-common",
+ "sc-peerset",
+ "sp-consensus",
+ "sp-runtime",
+ "substrate-prometheus-endpoint",
+]
+
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
"bytes",
"fnv",
"futures 0.3.25",
"futures-timer",
- "hex",
"hyper",
"hyper-rustls",
+ "libp2p",
"num_cpus",
"once_cell",
"parity-scale-codec",
"parking_lot 0.12.1",
"rand 0.7.3",
"sc-client-api",
- "sc-network",
+ "sc-network-common",
+ "sc-peerset",
"sc-utils",
"sp-api",
"sp-core",
@@ -9320,7 +9508,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"libp2p",
@@ -9333,7 +9521,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9342,7 +9530,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"hash-db",
@@ -9372,7 +9560,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"jsonrpsee",
@@ -9395,7 +9583,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"jsonrpsee",
@@ -9405,10 +9593,29 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "sc-rpc-spec-v2"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "futures 0.3.25",
+ "hex",
+ "jsonrpsee",
+ "parity-scale-codec",
+ "sc-chain-spec",
+ "sc-transaction-pool-api",
+ "serde",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-runtime",
+ "thiserror",
+]
+
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"directories",
@@ -9432,10 +9639,15 @@ dependencies = [
"sc-informant",
"sc-keystore",
"sc-network",
+ "sc-network-bitswap",
"sc-network-common",
+ "sc-network-light",
+ "sc-network-sync",
+ "sc-network-transactions",
"sc-offchain",
"sc-rpc",
"sc-rpc-server",
+ "sc-rpc-spec-v2",
"sc-sysinfo",
"sc-telemetry",
"sc-tracing",
@@ -9462,6 +9674,7 @@ dependencies = [
"sp-transaction-storage-proof",
"sp-trie",
"sp-version",
+ "static_init 1.0.3",
"substrate-prometheus-endpoint",
"tempfile",
"thiserror",
@@ -9473,7 +9686,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"log",
"parity-scale-codec",
@@ -9487,7 +9700,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -9506,7 +9719,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"libc",
@@ -9525,7 +9738,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"chrono",
"futures 0.3.25",
@@ -9543,7 +9756,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"ansi_term",
"atty",
@@ -9574,7 +9787,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9585,8 +9798,9 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "async-trait",
"futures 0.3.25",
"futures-timer",
"linked-hash-map",
@@ -9594,7 +9808,6 @@ dependencies = [
"parity-scale-codec",
"parity-util-mem",
"parking_lot 0.12.1",
- "retain_mut",
"sc-client-api",
"sc-transaction-pool-api",
"sc-utils",
@@ -9612,8 +9825,9 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "async-trait",
"futures 0.3.25",
"log",
"serde",
@@ -9625,7 +9839,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"futures-timer",
@@ -9637,9 +9851,9 @@ dependencies = [
[[package]]
name = "scale-info"
-version = "2.3.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d8a765117b237ef233705cc2cc4c6a27fccd46eea6ef0c8c6dae5f3ef407f8"
+checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608"
dependencies = [
"bitvec",
"cfg-if 1.0.0",
@@ -9651,9 +9865,9 @@ dependencies = [
[[package]]
name = "scale-info-derive"
-version = "2.3.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdcd47b380d8c4541044e341dcd9475f55ba37ddc50c908d945fc036a8642496"
+checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9663,12 +9877,11 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.20"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
dependencies = [
- "lazy_static",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -9697,9 +9910,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
[[package]]
name = "sct"
@@ -9719,24 +9932,25 @@ checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
dependencies = [
"der",
"generic-array 0.14.6",
+ "pkcs8",
"subtle",
"zeroize",
]
[[package]]
name = "secp256k1"
-version = "0.21.3"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260"
+checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
dependencies = [
"secp256k1-sys",
]
[[package]]
name = "secp256k1-sys"
-version = "0.4.2"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036"
+checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
dependencies = [
"cc",
]
@@ -9752,9 +9966,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.7.0"
+version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+checksum = "7c4437699b6d34972de58652c68b98cb5b53a4199ab126db8e20ec8ded29a721"
dependencies = [
"bitflags",
"core-foundation",
@@ -9765,9 +9979,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.6.1"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
dependencies = [
"core-foundation-sys",
"libc",
@@ -9793,9 +10007,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.14"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
+checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
dependencies = [
"serde",
]
@@ -9808,18 +10022,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.147"
+version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.147"
+version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
@@ -9828,9 +10042,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
dependencies = [
"itoa",
"ryu",
@@ -9849,7 +10063,7 @@ dependencies = [
[[package]]
name = "session-keys-primitives"
version = "0.1.0"
-source = "git+https://github.com/zeitgeistpm/moonbeam?branch=polkadot-v0.9.26#5d24d606a8a2cfeb75a3ab95b77087ebe6522cb0"
+source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126"
dependencies = [
"async-trait",
"frame-support",
@@ -9880,17 +10094,6 @@ dependencies = [
"opaque-debug 0.3.0",
]
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.6",
-]
-
[[package]]
name = "sha2"
version = "0.8.2"
@@ -10010,8 +10213,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
[[package]]
name = "slot-range-helper"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -10050,7 +10253,7 @@ dependencies = [
"aes-gcm",
"blake2",
"chacha20poly1305",
- "curve25519-dalek 4.0.0-pre.1",
+ "curve25519-dalek 4.0.0-pre.5",
"rand_core 0.6.4",
"ring",
"rustc_version 0.4.0",
@@ -10074,7 +10277,7 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
dependencies = [
- "base64",
+ "base64 0.13.1",
"bytes",
"flate2",
"futures 0.3.25",
@@ -10087,7 +10290,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"hash-db",
"log",
@@ -10097,6 +10300,7 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-std",
+ "sp-trie",
"sp-version",
"thiserror",
]
@@ -10104,7 +10308,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"blake2",
"proc-macro-crate",
@@ -10116,7 +10320,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10129,7 +10333,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -10144,7 +10348,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10157,7 +10361,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10169,7 +10373,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10181,7 +10385,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures 0.3.25",
"log",
@@ -10199,7 +10403,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"futures 0.3.25",
@@ -10218,7 +10422,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10236,7 +10440,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"merlin",
@@ -10259,7 +10463,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10273,7 +10477,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10286,18 +10490,18 @@ dependencies = [
[[package]]
name = "sp-core"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
"base58",
"bitflags",
- "blake2-rfc",
+ "blake2",
"byteorder",
"dyn-clonable",
- "ed25519-dalek",
+ "ed25519-zebra",
"futures 0.3.25",
"hash-db",
"hash256-std-hasher",
- "hex",
"impl-serde",
"lazy_static",
"libsecp256k1",
@@ -10332,7 +10536,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"blake2",
"byteorder",
@@ -10346,7 +10550,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"proc-macro2",
"quote",
@@ -10357,7 +10561,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -10366,7 +10570,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"proc-macro2",
"quote",
@@ -10376,7 +10580,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -10387,7 +10591,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"finality-grandpa",
"log",
@@ -10405,7 +10609,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -10419,8 +10623,9 @@ dependencies = [
[[package]]
name = "sp-io"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "bytes",
"futures 0.3.25",
"hash-db",
"libsecp256k1",
@@ -10444,18 +10649,18 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"lazy_static",
"sp-core",
"sp-runtime",
- "strum 0.23.0",
+ "strum",
]
[[package]]
name = "sp-keystore"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"futures 0.3.25",
@@ -10472,7 +10677,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"thiserror",
"zstd",
@@ -10481,10 +10686,11 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"log",
"parity-scale-codec",
+ "scale-info",
"serde",
"sp-api",
"sp-core",
@@ -10496,7 +10702,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10510,7 +10716,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"sp-api",
"sp-core",
@@ -10520,7 +10726,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"backtrace",
"lazy_static",
@@ -10530,7 +10736,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"rustc-hash",
"serde",
@@ -10540,7 +10746,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"either",
"hash256-std-hasher",
@@ -10557,13 +10763,15 @@ dependencies = [
"sp-core",
"sp-io",
"sp-std",
+ "sp-weights",
]
[[package]]
name = "sp-runtime-interface"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "bytes",
"impl-trait-for-tuples",
"parity-scale-codec",
"primitive-types",
@@ -10579,7 +10787,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -10591,30 +10799,21 @@ dependencies = [
[[package]]
name = "sp-sandbox"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"log",
- "parity-scale-codec",
- "sp-core",
- "sp-io",
- "sp-std",
- "sp-wasm-interface",
- "wasmi",
-]
-
-[[package]]
-name = "sp-serializer"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
-dependencies = [
- "serde",
- "serde_json",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-io",
+ "sp-std",
+ "sp-wasm-interface",
+ "wasmi",
]
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10628,7 +10827,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10639,7 +10838,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"hash-db",
"log",
@@ -10661,12 +10860,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
[[package]]
name = "sp-storage"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10679,7 +10878,7 @@ dependencies = [
[[package]]
name = "sp-tasks"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"log",
"sp-core",
@@ -10692,7 +10891,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"futures-timer",
@@ -10708,7 +10907,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -10720,7 +10919,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"sp-api",
"sp-runtime",
@@ -10729,7 +10928,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"async-trait",
"log",
@@ -10745,15 +10944,22 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "ahash",
"hash-db",
+ "hashbrown 0.12.3",
+ "lazy_static",
+ "lru 0.7.8",
"memory-db",
+ "nohash-hasher",
"parity-scale-codec",
+ "parking_lot 0.12.1",
"scale-info",
"sp-core",
"sp-std",
"thiserror",
+ "tracing",
"trie-db",
"trie-root",
]
@@ -10761,11 +10967,11 @@ dependencies = [
[[package]]
name = "sp-version"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"impl-serde",
"parity-scale-codec",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
"scale-info",
"serde",
"sp-core-hashing-proc-macro",
@@ -10778,7 +10984,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -10789,7 +10995,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"impl-trait-for-tuples",
"log",
@@ -10799,17 +11005,43 @@ dependencies = [
"wasmtime",
]
+[[package]]
+name = "sp-weights"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "smallvec",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-debug-derive",
+ "sp-std",
+]
+
[[package]]
name = "spin"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+[[package]]
+name = "spki"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
[[package]]
name = "ss58-registry"
-version = "1.35.0"
+version = "1.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0813c10b9dbdc842c2305f949f724c64866e4ef4d09c9151e96f6a2106773c"
+checksum = "e40c020d72bc0a9c5660bb71e4a6fdef081493583062c474740a7d59f55f0e7b"
dependencies = [
"Inflector",
"num-format",
@@ -10841,7 +11073,22 @@ dependencies = [
"cfg_aliases",
"libc",
"parking_lot 0.11.2",
- "static_init_macro",
+ "static_init_macro 0.5.0",
+]
+
+[[package]]
+name = "static_init"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
+dependencies = [
+ "bitflags",
+ "cfg_aliases",
+ "libc",
+ "parking_lot 0.11.2",
+ "parking_lot_core 0.8.6",
+ "static_init_macro 1.0.2",
+ "winapi",
]
[[package]]
@@ -10857,6 +11104,19 @@ dependencies = [
"syn",
]
+[[package]]
+name = "static_init_macro"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
+dependencies = [
+ "cfg_aliases",
+ "memchr",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "statrs"
version = "0.15.0"
@@ -10876,35 +11136,13 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-[[package]]
-name = "strum"
-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"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
dependencies = [
- "strum_macros 0.24.3",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
+ "strum_macros",
]
[[package]]
@@ -10913,7 +11151,7 @@ version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
dependencies = [
- "heck 0.4.0",
+ "heck",
"proc-macro2",
"quote",
"rustversion",
@@ -10936,9 +11174,9 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
- "platforms",
+ "platforms 2.0.0",
]
[[package]]
@@ -10949,13 +11187,13 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
- "typenum 1.16.0",
+ "typenum 1.16.0 (git+https://github.com/encointer/typenum?tag=v1.16.0)",
]
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"frame-system-rpc-runtime-api",
"futures 0.3.25",
@@ -10976,7 +11214,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"futures-util",
"hyper",
@@ -10986,10 +11224,23 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "substrate-rpc-client"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
+dependencies = [
+ "async-trait",
+ "jsonrpsee",
+ "log",
+ "sc-rpc-api",
+ "serde",
+ "sp-runtime",
+]
+
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"jsonrpsee",
"log",
@@ -11010,11 +11261,11 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
+ "array-bytes",
"async-trait",
"futures 0.3.25",
- "hex",
"parity-scale-codec",
"sc-client-api",
"sc-client-db",
@@ -11036,14 +11287,14 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"ansi_term",
"build-helper",
"cargo_metadata",
"filetime",
"sp-maybe-compressed-blob",
- "strum 0.23.0",
+ "strum",
"tempfile",
"toml",
"walkdir",
@@ -11058,9 +11309,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "syn"
-version = "1.0.103"
+version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
dependencies = [
"proc-macro2",
"quote",
@@ -11128,13 +11379,19 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
+[[package]]
+name = "termtree"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
+
[[package]]
name = "test-case"
version = "2.2.2"
@@ -11159,36 +11416,32 @@ dependencies = [
[[package]]
name = "test-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
[[package]]
name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
@@ -11234,9 +11487,9 @@ dependencies = [
[[package]]
name = "tikv-jemalloc-sys"
-version = "0.4.3+5.2.1-patched.2"
+version = "0.5.2+5.3.0-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49"
+checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3"
dependencies = [
"cc",
"fs_extra",
@@ -11290,9 +11543,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.22.0"
+version = "1.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
+checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
dependencies = [
"autocfg",
"bytes",
@@ -11305,7 +11558,7 @@ dependencies = [
"signal-hook-registry",
"socket2",
"tokio-macros",
- "winapi",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -11358,13 +11611,30 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.5.9"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
"serde",
]
+[[package]]
+name = "toml_datetime"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
+
+[[package]]
+name = "toml_edit"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581"
+dependencies = [
+ "indexmap",
+ "nom8",
+ "toml_datetime",
+]
+
[[package]]
name = "tower-service"
version = "0.3.2"
@@ -11373,9 +11643,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
-version = "0.1.34"
+version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
"cfg-if 1.0.0",
"pin-project-lite 0.2.9",
@@ -11396,11 +11666,11 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.26"
+version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
dependencies = [
- "lazy_static",
+ "once_cell",
"valuable",
]
@@ -11416,8 +11686,8 @@ dependencies = [
[[package]]
name = "tracing-gum"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"polkadot-node-jaeger",
"polkadot-primitives",
@@ -11427,8 +11697,8 @@ dependencies = [
[[package]]
name = "tracing-gum-proc-macro"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"expander 0.0.6",
"proc-macro-crate",
@@ -11443,10 +11713,8 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
dependencies = [
- "ahash",
"lazy_static",
"log",
- "lru 0.7.8",
"tracing-core",
]
@@ -11485,9 +11753,9 @@ dependencies = [
[[package]]
name = "trie-db"
-version = "0.23.1"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83"
+checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908"
dependencies = [
"hash-db",
"hashbrown 0.12.3",
@@ -11507,9 +11775,9 @@ dependencies = [
[[package]]
name = "trust-dns-proto"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
+checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
dependencies = [
"async-trait",
"cfg-if 1.0.0",
@@ -11521,46 +11789,46 @@ dependencies = [
"idna 0.2.3",
"ipnet",
"lazy_static",
- "log",
"rand 0.8.5",
"smallvec",
"thiserror",
"tinyvec",
+ "tracing",
"url",
]
[[package]]
name = "trust-dns-resolver"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
+checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
dependencies = [
"cfg-if 1.0.0",
"futures-util",
"ipconfig",
"lazy_static",
- "log",
"lru-cache",
"parking_lot 0.12.1",
"resolv-conf",
"smallvec",
"thiserror",
+ "tracing",
"trust-dns-proto",
]
[[package]]
name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#1cca061ede75a4c693a3b71bd1b61d7275fe29e4"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
dependencies = [
"clap",
- "jsonrpsee",
+ "frame-try-runtime",
"log",
"parity-scale-codec",
"remote-externalities",
@@ -11576,14 +11844,16 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-version",
+ "sp-weights",
+ "substrate-rpc-client",
"zstd",
]
[[package]]
name = "tt-call"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055"
+checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
[[package]]
name = "twox-hash"
@@ -11599,9 +11869,9 @@ dependencies = [
[[package]]
name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "typenum"
@@ -11641,15 +11911,15 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
[[package]]
name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
[[package]]
name = "unicode-normalization"
@@ -11660,12 +11930,6 @@ dependencies = [
"tinyvec",
]
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
-
[[package]]
name = "unicode-width"
version = "0.1.10"
@@ -11725,13 +11989,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e"
[[package]]
name = "vcpkg"
@@ -11875,11 +12135,11 @@ dependencies = [
[[package]]
name = "wasm-instrument"
-version = "0.1.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f"
+checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd"
dependencies = [
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
]
[[package]]
@@ -11899,58 +12159,63 @@ dependencies = [
[[package]]
name = "wasmi"
-version = "0.9.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d"
+checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
dependencies = [
- "downcast-rs",
- "libc",
- "libm",
- "memory_units",
- "num-rational 0.2.4",
- "num-traits",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.45.0",
"wasmi-validation",
+ "wasmi_core",
]
[[package]]
name = "wasmi-validation"
-version = "0.4.1"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
+dependencies = [
+ "parity-wasm 0.45.0",
+]
+
+[[package]]
+name = "wasmi_core"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937"
+checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
dependencies = [
- "parity-wasm 0.42.2",
+ "downcast-rs",
+ "libm 0.2.6",
+ "memory_units",
+ "num-rational 0.4.1",
+ "num-traits",
]
[[package]]
name = "wasmparser"
-version = "0.85.0"
+version = "0.89.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7"
+checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef"
dependencies = [
"indexmap",
]
[[package]]
name = "wasmtime"
-version = "0.38.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5"
+checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731"
dependencies = [
"anyhow",
- "backtrace",
"bincode",
"cfg-if 1.0.0",
"indexmap",
- "lazy_static",
"libc",
"log",
- "object 0.28.4",
+ "object 0.29.0",
"once_cell",
"paste",
"psm",
"rayon",
- "region",
"serde",
"target-lexicon",
"wasmparser",
@@ -11959,34 +12224,43 @@ dependencies = [
"wasmtime-environ",
"wasmtime-jit",
"wasmtime-runtime",
- "winapi",
+ "windows-sys 0.36.1",
+]
+
+[[package]]
+name = "wasmtime-asm-macros"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597"
+dependencies = [
+ "cfg-if 1.0.0",
]
[[package]]
name = "wasmtime-cache"
-version = "0.38.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2"
+checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882"
dependencies = [
"anyhow",
- "base64",
+ "base64 0.13.1",
"bincode",
"directories-next",
"file-per-thread-logger",
"log",
- "rustix 0.33.7",
+ "rustix 0.35.13",
"serde",
"sha2 0.9.9",
"toml",
- "winapi",
+ "windows-sys 0.36.1",
"zstd",
]
[[package]]
name = "wasmtime-cranelift"
-version = "0.38.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd"
+checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -11994,10 +12268,9 @@ dependencies = [
"cranelift-frontend",
"cranelift-native",
"cranelift-wasm",
- "gimli",
+ "gimli 0.26.2",
"log",
- "more-asserts",
- "object 0.28.4",
+ "object 0.29.0",
"target-lexicon",
"thiserror",
"wasmparser",
@@ -12006,17 +12279,16 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
-version = "0.38.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6"
+checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644"
dependencies = [
"anyhow",
"cranelift-entity",
- "gimli",
+ "gimli 0.26.2",
"indexmap",
"log",
- "more-asserts",
- "object 0.28.4",
+ "object 0.29.0",
"serde",
"target-lexicon",
"thiserror",
@@ -12026,49 +12298,47 @@ dependencies = [
[[package]]
name = "wasmtime-jit"
-version = "0.38.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49"
+checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681"
dependencies = [
- "addr2line",
+ "addr2line 0.17.0",
"anyhow",
"bincode",
"cfg-if 1.0.0",
"cpp_demangle",
- "gimli",
+ "gimli 0.26.2",
"log",
- "object 0.28.4",
- "region",
+ "object 0.29.0",
"rustc-demangle",
- "rustix 0.33.7",
+ "rustix 0.35.13",
"serde",
"target-lexicon",
"thiserror",
"wasmtime-environ",
"wasmtime-jit-debug",
"wasmtime-runtime",
- "winapi",
+ "windows-sys 0.36.1",
]
[[package]]
name = "wasmtime-jit-debug"
-version = "0.38.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac"
+checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731"
dependencies = [
- "lazy_static",
- "object 0.28.4",
- "rustix 0.33.7",
+ "object 0.29.0",
+ "once_cell",
+ "rustix 0.35.13",
]
[[package]]
name = "wasmtime-runtime"
-version = "0.38.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a"
+checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd"
dependencies = [
"anyhow",
- "backtrace",
"cc",
"cfg-if 1.0.0",
"indexmap",
@@ -12077,21 +12347,21 @@ dependencies = [
"mach",
"memfd",
"memoffset 0.6.5",
- "more-asserts",
+ "paste",
"rand 0.8.5",
- "region",
- "rustix 0.33.7",
+ "rustix 0.35.13",
"thiserror",
+ "wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-jit-debug",
- "winapi",
+ "windows-sys 0.36.1",
]
[[package]]
name = "wasmtime-types"
-version = "0.38.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2"
+checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb"
dependencies = [
"cranelift-entity",
"serde",
@@ -12121,9 +12391,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.22.5"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
dependencies = [
"webpki",
]
@@ -12139,8 +12409,8 @@ dependencies = [
[[package]]
name = "westend-runtime"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -12164,6 +12434,7 @@ dependencies = [
"pallet-election-provider-multi-phase",
"pallet-election-provider-support-benchmarking",
"pallet-elections-phragmen",
+ "pallet-fast-unstake",
"pallet-grandpa",
"pallet-identity",
"pallet-im-online",
@@ -12172,6 +12443,7 @@ dependencies = [
"pallet-multisig",
"pallet-nomination-pools",
"pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
"pallet-offences",
"pallet-offences-benchmarking",
"pallet-preimage",
@@ -12227,21 +12499,23 @@ dependencies = [
[[package]]
name = "westend-runtime-constants"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-support",
"polkadot-primitives",
"polkadot-runtime-common",
"smallvec",
+ "sp-core",
"sp-runtime",
+ "sp-weights",
]
[[package]]
name = "which"
-version = "4.3.0"
+version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
dependencies = [
"either",
"libc",
@@ -12318,19 +12592,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
"windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_x86_64_msvc 0.42.1",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
[[package]]
name = "windows_aarch64_msvc"
@@ -12346,9 +12620,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
[[package]]
name = "windows_i686_gnu"
@@ -12364,9 +12638,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
[[package]]
name = "windows_i686_msvc"
@@ -12382,9 +12656,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
[[package]]
name = "windows_x86_64_gnu"
@@ -12400,15 +12674,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
[[package]]
name = "windows_x86_64_msvc"
@@ -12424,9 +12698,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
[[package]]
name = "winreg"
@@ -12459,8 +12733,8 @@ dependencies = [
[[package]]
name = "xcm"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"derivative",
"impl-trait-for-tuples",
@@ -12473,8 +12747,8 @@ dependencies = [
[[package]]
name = "xcm-builder"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-support",
"frame-system",
@@ -12494,7 +12768,7 @@ dependencies = [
[[package]]
name = "xcm-emulator"
version = "0.1.0"
-source = "git+https://github.com/shaunxw/xcm-simulator?rev=ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe#ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe"
+source = "git+https://github.com/shaunxw/xcm-simulator?rev=158a6bd2768c679563efa891aa17329635b2764b#158a6bd2768c679563efa891aa17329635b2764b"
dependencies = [
"cumulus-pallet-dmp-queue",
"cumulus-pallet-parachain-system",
@@ -12510,6 +12784,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-runtime-parachains",
"quote",
+ "sp-arithmetic",
"sp-io",
"sp-std",
"xcm",
@@ -12518,8 +12793,8 @@ dependencies = [
[[package]]
name = "xcm-executor"
-version = "0.9.26"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -12536,8 +12811,8 @@ dependencies = [
[[package]]
name = "xcm-procedural"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59"
+version = "0.9.32"
+source = "git+https://github.com/zeitgeistpm/polkadot.git?branch=v0.9.32-recent-bootnodes#90e98fe87db4b62c7722e802549d2b3739b07017"
dependencies = [
"Inflector",
"proc-macro2",
@@ -12561,7 +12836,7 @@ dependencies = [
[[package]]
name = "zeitgeist-node"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"battery-station-runtime",
"cfg-if 1.0.0",
@@ -12606,6 +12881,7 @@ dependencies = [
"sc-finality-grandpa",
"sc-keystore",
"sc-network",
+ "sc-network-common",
"sc-rpc",
"sc-rpc-api",
"sc-service",
@@ -12636,7 +12912,6 @@ dependencies = [
"substrate-build-script-utils",
"substrate-frame-rpc-system",
"substrate-prometheus-endpoint",
- "tracing-core",
"try-runtime-cli",
"zeitgeist-primitives",
"zeitgeist-runtime",
@@ -12646,7 +12921,7 @@ dependencies = [
[[package]]
name = "zeitgeist-primitives"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"arbitrary",
"frame-support",
@@ -12664,7 +12939,7 @@ dependencies = [
[[package]]
name = "zeitgeist-runtime"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"cfg-if 1.0.0",
"common-runtime",
@@ -12683,7 +12958,6 @@ dependencies = [
"frame-system-rpc-runtime-api",
"frame-try-runtime",
"hex-literal",
- "kusama-runtime",
"log",
"nimbus-primitives",
"orml-asset-registry",
@@ -12701,7 +12975,8 @@ dependencies = [
"pallet-balances",
"pallet-bounties",
"pallet-collective",
- "pallet-crowdloan-rewards",
+ "pallet-contracts",
+ "pallet-contracts-primitives",
"pallet-democracy",
"pallet-grandpa",
"pallet-identity",
@@ -12723,6 +12998,7 @@ dependencies = [
"parity-scale-codec",
"polkadot-parachain",
"polkadot-primitives",
+ "polkadot-runtime",
"polkadot-runtime-parachains",
"scale-info",
"session-keys-primitives",
@@ -12736,10 +13012,12 @@ dependencies = [
"sp-offchain",
"sp-runtime",
"sp-session",
+ "sp-std",
"sp-transaction-pool",
"sp-version",
"substrate-fixed",
"substrate-wasm-builder",
+ "test-case",
"xcm",
"xcm-builder",
"xcm-emulator",
@@ -12781,7 +13059,7 @@ dependencies = [
[[package]]
name = "zrml-authorized"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -12798,7 +13076,7 @@ dependencies = [
[[package]]
name = "zrml-court"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"arrayvec 0.7.2",
"frame-benchmarking",
@@ -12818,7 +13096,7 @@ dependencies = [
[[package]]
name = "zrml-global-disputes"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -12838,7 +13116,7 @@ dependencies = [
[[package]]
name = "zrml-liquidity-mining"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -12856,7 +13134,7 @@ dependencies = [
[[package]]
name = "zrml-market-commons"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-support",
"frame-system",
@@ -12872,7 +13150,7 @@ dependencies = [
[[package]]
name = "zrml-orderbook-v1"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -12901,12 +13179,13 @@ dependencies = [
[[package]]
name = "zrml-prediction-markets"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"more-asserts",
+ "orml-asset-registry",
"orml-currencies",
"orml-tokens",
"orml-traits",
@@ -12916,12 +13195,14 @@ dependencies = [
"pallet-treasury",
"parity-scale-codec",
"scale-info",
+ "serde",
"sp-api",
"sp-arithmetic",
"sp-io",
"sp-runtime",
"substrate-fixed",
"test-case",
+ "xcm",
"zeitgeist-primitives",
"zrml-authorized",
"zrml-court",
@@ -12949,7 +13230,7 @@ dependencies = [
[[package]]
name = "zrml-prediction-markets-runtime-api"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -12958,7 +13239,7 @@ dependencies = [
[[package]]
name = "zrml-rikiddo"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"arbitrary",
"cfg-if 1.0.0",
@@ -12991,7 +13272,7 @@ dependencies = [
[[package]]
name = "zrml-simple-disputes"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -13008,7 +13289,7 @@ dependencies = [
[[package]]
name = "zrml-styx"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -13024,7 +13305,7 @@ dependencies = [
[[package]]
name = "zrml-swaps"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -13066,7 +13347,7 @@ dependencies = [
[[package]]
name = "zrml-swaps-rpc"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -13079,11 +13360,12 @@ dependencies = [
[[package]]
name = "zrml-swaps-runtime-api"
-version = "0.3.7"
+version = "0.3.9"
dependencies = [
"parity-scale-codec",
"sp-api",
"sp-runtime",
+ "sp-std",
"zeitgeist-primitives",
]
@@ -13108,10 +13390,11 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "2.0.1+zstd.1.5.2"
+version = "2.0.5+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
+checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596"
dependencies = [
"cc",
"libc",
+ "pkg-config",
]
diff --git a/Cargo.toml b/Cargo.toml
index d23a28b70..b6b4157cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,33 +46,6 @@ members = [
"zrml/styx",
]
resolver = "2"
-
-[patch."https://github.com/purestake/crowdloan-rewards"]
-# This patch does ensure that crowdloan-rewards only uses partiytech dependencies.
-# If it is not used, the Zeitgeist runtimes will contain duplicate crates from
-# different repositories which results in bigger WASM-blobs, binary and the inability
-# to compile with the "runtime-benchmarks" feature.
-pallet-crowdloan-rewards = { git = "https://github.com/zeitgeistpm/crowdloan-rewards", branch = "polkadot-v0.9.26" }
-
-[patch."https://github.com/purestake/moonbeam"]
-# Use dependencies from Paritytech
-moonbeam-vrf = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
-# Fix author-mapping migration
-pallet-author-mapping = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
-# Use dependencies from Paritytech
-pallet-parachain-staking = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
-session-keys-primitives = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
-
-[patch."https://github.com/purestake/nimbus"]
-# Use dependencies from Paritytech
-nimbus-consensus = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
-# Use dependencies from Paritytech
-nimbus-primitives = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
-# Use dependencies from Paritytech
-pallet-author-inherent = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
-# Use dependencies from Paritytech
-pallet-author-slot-filter = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
-
# The list of dependencies below (which can be both direct and indirect dependencies) are crates
# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
# their debug info might be missing) or to require to be frequently recompiled. We compile these
@@ -139,3 +112,22 @@ lto = true
opt-level = 3
# Zeitgeist runtime requires unwinding.
panic = "unwind"
+
+[patch."https://github.com/paritytech/polkadot"]
+pallet-xcm = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-cli = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-client = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-core-primitives = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-node-primitives = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-node-subsystem = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-overseer = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-parachain = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-primitives = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-runtime = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-runtime-parachains = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-service = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+polkadot-test-service = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+rococo-runtime = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+xcm = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+xcm-builder = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
+xcm-executor = { git = "https://github.com/zeitgeistpm/polkadot.git", branch = "v0.9.32-recent-bootnodes" }
diff --git a/Dockerfile b/Dockerfile
index 032016ed8..7cb7bb18e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,30 @@
# Based from https://github.com/paritytech/substrate/blob/master/.maintain/Dockerfile
-FROM phusion/baseimage:bionic-1.0.0 as builder
+FROM phusion/baseimage:jammy-1.0.1 as builder
LABEL maintainer="hi@zeitgeit.pm"
LABEL description="This is the build stage for the Zeitgeist node. Here is created the binary."
ENV DEBIAN_FRONTEND=noninteractive
-ARG PROFILE=release
+ARG PROFILE=production
ARG FEATURES=default
WORKDIR /zeitgeist
COPY . /zeitgeist
RUN apt-get update && \
- apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
- apt-get install -y cmake pkg-config libssl-dev git clang libclang-dev
+ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold"
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
- export PATH="$PATH:$HOME/.cargo/bin" && \
- rustup toolchain install nightly-2022-04-13 && \
- rustup target add wasm32-unknown-unknown --toolchain nightly-2022-04-13 && \
- rustup default stable && \
- cargo build --profile "$PROFILE" --features "$FEATURES"
+RUN ./scripts/init.sh nosudo
+
+RUN . "$HOME/.cargo/env" && cargo build --profile "$PROFILE" --features "$FEATURES"
# ==== SECOND STAGE ====
-FROM phusion/baseimage:bionic-1.0.0
+FROM phusion/baseimage:jammy-1.0.1
LABEL maintainer="hi@zeitgeist.pm"
LABEL description="This is the 2nd stage: a very small image where we copy the Zeigeist node binary."
-ARG PROFILE=release
+ARG PROFILE=production
RUN mv /usr/share/ca* /tmp && \
rm -rf /usr/share/* && \
@@ -42,13 +38,12 @@ RUN ldd /usr/local/bin/zeitgeist && \
/usr/local/bin/zeitgeist --version
# Shrinking
-RUN rm -rf /usr/lib/python* && \
- rm -rf /usr/bin /usr/sbin /usr/share/man
+RUN rm -rf /usr/lib/python* && rm -rf /usr/share/man
USER zeitgeist
EXPOSE 30333 9933 9944
-RUN mkdir /zeitgeist/data
+RUN mkdir -p /zeitgeist/data
VOLUME ["/zeitgeist/data"]
diff --git a/Makefile b/Makefile
index 129668d69..c3b5d6df7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ check-dummy:
try-runtime \
--execution=Native \
--chain=${TRYRUNTIME_CHAIN} \
+ --no-spec-check-panic \
on-runtime-upgrade \
live \
--uri=${TRYRUNTIME_URL}
diff --git a/README.md b/README.md
index 6e54a9c1e..b31e630fb 100644
--- a/README.md
+++ b/README.md
@@ -4,18 +4,14 @@
# Zeitgeist: An Evolving Blockchain for Prediction Markets and Futarchy
-
-
-
- 
-
+ [](https://codecov.io/gh/zeitgeistpm/zeitgeist) [](https://discord.gg/MD3TbH3ctv) [](https://t.me/zeitgeist_official)
Zeitgeist is a decentralized network for creating, betting on, and resolving
prediction markets. The platform's native currency, the ZTG, is used to sway the
direction of the network, and as a means of last-call dispute resolution.
Additionally, Zeitgeist is a protocol for efficient trading of prediction market
shares and will one day become the backbone of the decentralized finance
-ecosystem by allowing for traders to create complex financial contracts on
+ecosystem by allowing traders to create complex financial contracts on
virtually _anything_.
## Modules
@@ -46,7 +42,7 @@ virtually _anything_.
constants.
- [rikiddo](./zrml/rikiddo) - The module contains a completely modular
implementation of our novel market scoring rule [Rikiddo][rikiddo]. It also
- offer a pallet, that other pallets can use to utilize the Rikiddo market
+ offers a pallet, that other pallets can use to utilize the Rikiddo market
scoring rule. Rikiddo can be used by the automated market maker to determine
swap prices.
@@ -62,7 +58,7 @@ project and type:
cargo build --release
```
-To build the parachain version, execute the following conmmand:
+To build the parachain version, execute the following command:
```
cargo build --features parachain --release
diff --git a/docs/STYLE_GUIDE.md b/docs/STYLE_GUIDE.md
new file mode 100644
index 000000000..1dc3d15f8
--- /dev/null
+++ b/docs/STYLE_GUIDE.md
@@ -0,0 +1,111 @@
+# Style guide
+
+## Comments
+
+- Comments **must** be wrapped at 100 chars per line.
+- Comments **must** be formulated in markdown.
+
+## Doc comments
+
+- Documentation is written using Markdown syntax.
+- Function documentation should be kept lean and mean. Try to avoid documenting
+ the parameters, and instead choose self-documenting parameter names. If
+ parameters interact in a complex manner (for example, if two arguments of type
+ `Vec` must have the same length), then add a paragraph explaining this.
+- Begin every docstring with a meaningful one sentence description of the
+ function in third person.
+- Avoid WET documentation such as this:
+
+ ```rust
+ /// Rejects a market.
+ ///
+ /// # Arguments:
+ ///
+ /// - `origin`: The origin calling the dispatchable
+ /// - `market_id`: The market id of the market to reject
+ pub fn reject_market(
+ origin: OriginFor,
+ #[pallet::compact] market_id: MarketIdOf,
+ ) -> DispatchResultWithPostInfo {
+ // --- snip! ---
+ }
+ ```
+
+ Self-explanatory function arguments need not be documented if they are
+ explained in full text. Instead, focus on describing the effects of the
+ function. Someone who doesn't know how to read the code must be able to
+ understand what the function does.
+
+- Docstrings for dispatchable **should** contain a section on runtime complexity
+ (to make understanding the benchmarks easier).
+- Docstrings for dispatchables need not document the `origin` parameter, but
+ should specify what origins the dispatchable may be called by.
+- Docstrings for dispatchables **must** include the events that the dispatchable
+ emits.
+- Use `#![doc = include_str!("../README.md")]`.
+- Detail non-trivial algorithms in comments inside the function.
+
+An example of a good docstring would be this:
+
+```rust
+/// Rejects a market, destroying the market and unreserving and/or slashing the creator's advisory
+/// bond.
+///
+/// May only be (successfully) called by `RejectOrigin`. The fraction of the advisory bond that is
+/// slashed is determined by `AdvisoryBondSlashPercentage`.
+pub fn reject_market(
+ origin: OriginFor,
+ #[pallet::compact] market_id: MarketIdOf,
+) -> DispatchResultWithPostInfo {
+ // --- snip! ---
+}
+```
+
+Info like "The fraction of the advisory bond that is slashed is determined by
+`AdvisoryBondSlashPercentage`" **may** be stored in `README.md` to avoid
+duplicating documentation.
+
+## Formatting
+
+- rustfmt and clippy have the last say in formatting.
+- Format code contained in macro invocations (`impl_benchmarks!`,
+ `decl_runtime_apis!`, homebrew macros in `runtime/`, etc.) and attributes
+ (`#[pallet::weight(...)`, etc.) manually.
+- Add trailing commas in macro invocations manually, as rustfmt won't add them
+ automatically.
+
+ ```rust
+ ensure!(
+ a_very_very_very_very_very_very_very_long_variable,
+ b_very_very_very_very_very_very_very_long_variable, // This comma is not ensured by rustfmt.
+ )
+ ```
+
+## Code Style
+
+- Never use panickers.
+- Prefer double turbofish `Vec::::new()` over single turbofish
+ `>::new()`.
+- All branches of match expressions **should** be explicit. Avoid using the
+ catch-all `_ =>`.
+- When changing enums, maintain the existing order and add variants only at the
+ end of the enum to prevent messing up indices.
+- Maintain lexicographical ordering of traits in `#[derive(...)]` attributes.
+
+## Crate and Pallet Structure
+
+- Don't dump all code into `lib.rs`. Split code multiple files (`types.rs`,
+ `traits.rs`, etc.) or even modules (`types/`, `traits/`, etc.).
+- Changes to pallets **must** retain order of dispatchables.
+- Sort pallet contents in the following order:
+ - `Config` trait
+ - Type values
+ - Types
+ - Storage items
+ - Genesis info
+ - `Event` enum
+ - `Error` enum
+ - Hooks
+ - Dispatchables
+ - Pallet's public and private functions
+ - Trait impelmentations
diff --git a/docs/changelog_for_devs.md b/docs/changelog_for_devs.md
index 9f113d413..491cdde57 100644
--- a/docs/changelog_for_devs.md
+++ b/docs/changelog_for_devs.md
@@ -1,10 +1,51 @@
-# v0.3.8
+# Changelog for Developers
+
+Used for communicating changes to other parts of Zeitgeist infrastructure
+([zeitgeistpm/ui](https://github.com/zeitgeistpm/ui),
+[zeitgeistpm/sdk-next](https://github.com/zeitgeistpm/sdk-next),
+[zeitgeistpm/zeitgeist-subsquid](https://github.com/zeitgeistpm/zeitgeist-subsquid))
+and does not represent a complete changelog for the zeitgeistpm/zeitgeist
+repository.
+
+As of 0.3.9, the changelog's format is based on
+https://keepachangelog.com/en/1.0.0/ and ⚠️ marks changes that might break
+components which query the chain's storage, the extrinsics or the runtime
+APIs/RPC interface.
+
+## v0.3.9
+
+[#1011]: https://github.com/zeitgeistpm/zeitgeist/pull/1011
+[#937]: https://github.com/zeitgeistpm/zeitgeist/pull/937
+[#903]: https://github.com/zeitgeistpm/zeitgeist/pull/903
+
+### Changed
+
+- ⚠️ Add `outsider` field to `MarketBonds` struct. In particular, the `Market`
+ struct's layout has changed ([#903]).
+- Adjust `deposit` function used to calculate storage fees for the following
+ pallets: identity, multisig, preimage, proxy. The cost of adding an identity
+ reduced from a minimum of 125 ZTG to a minimum of 1.5243 ZTG ([#1011])
+
+### Fixed
+
+- ⚠️ Fix order of arguments for `get_spot_price` ([#937]).
+
+## v0.3.8
- Added the `bonds` field to the `Market` struct, which tracks the status of the
advisory, oracle and validity bonds. Each of its members has type `Bond`,
which has three fields: `who` (the account that reserved the bond), `value`
(the amount reserved), `is_settled` (a flag which determines if the bond was
already unreserved and/or (partially) slashed).
+- The market dispute mechanisms are now able to control their resolution. The
+ `CorrectionPeriod` parameter determines how long the authorized pallet can
+ call `authorize_market_outcome` again after the first call to it (fat-finger
+ protection). The authority report now includes its resolution block number.
+ This is the time of the first call to `authorize_market_outcome` plus the
+ `CorrectionPeriod`.
+- Create prediction markets with Ztg or registered foreign asset which has
+ `allow_as_base_asset` set to `true` in `AssetRegistry` metadata. Extrinsics
+ related to prediction market creation/editing now have `base_asset` parameter.
# v0.3.7
diff --git a/docs/review_checklist.md b/docs/review_checklist.md
new file mode 100644
index 000000000..90c94b2ce
--- /dev/null
+++ b/docs/review_checklist.md
@@ -0,0 +1,87 @@
+- [ ] All todos contain a reference to an issue like this: `TODO(#999)`.
+- [ ] The PR links relevant issues and contains a detailed description.
+- [ ] All relevant labels were added.
+- [ ] The docstrings are up to date.
+- [ ] If the PR adds or changes extrinsics or functions used by extrinsics:
+ - [ ] The _Weight_ section in the documentation is up to date.
+ - [ ] The benchmarks are up to date.
+ - [ ] The call filters were adjusted.
+ - [ ] The extrinsics emit all the required events (see [Events](#events)
+ below).
+- [ ] The module `README.md` is up to date.
+- [ ] [docs.zeitgeist.pm] is up to date.
+- [ ] `docs/changelog_for_devs.md` is up to date, specifically:
+ - [ ] Changes relevant to the Frontend Team (extrinsics changed, new
+ functions) are mentioned here.
+ - [ ] All new events are explained so they can easily be integrated into the
+ indexer.
+ - [ ] Breaking changes are marked as such.
+ - [ ] The file is formatted with `prettier -w docs/changelog_for_devs.md`.
+- Sanity tests:
+ - [ ] The local temporary development node produces blocks:
+ `cargo run --profile=production -- --tmp`.
+ - [ ] The node syncs with Zeitgeist and Battery Station:
+ `cargo run --profile=production --features=parachain`,
+ `cargo run --profile=production --features=parachain -- --chain=battery_station`.
+ - [ ] `try-runtime` passes on Zeitgeist and Battery Station.
+- [ ] Code quality:
+ - [ ] Avoidable compiler warnings were resolved.
+ - [ ] Integer arithmetic is only saturated/checked and all panickers are
+ removed.
+ - [ ] Code contained in macro invocations (benchmarks,
+ `runtime/common/src/lib.rs`, `decl_runtime_apis!`) is correctly
+ formatted.
+ - [ ] All `*.toml` files are formatted with `taplo` (run
+ `taplo format --check`).
+ - [ ] All copyright notices are up to date.
+ - [ ] Enums are sorted alphabetically, except for enums used in storage (to
+ prevent migrations), errors and events.
+- [ ] In case an action is required by the Frontend Team, an issue was added to
+ zeitgeistpm/ui.
+- [ ] In case the PR adds a new pallet, the pallet is added to the benchmark
+ configuration in `scripts/`.
+- [ ] In case configuration items or storage elements were changed: Necessary
+ storage migrations are provided.
+- [ ] In case configuration values changed: The implications have been discussed
+ with the
+ [code owners](https://github.com/zeitgeistpm/zeitgeist/blob/main/CODEOWNERS).
+- [ ] If the changes include a storage migration:
+ - [ ] The affected pallet's `STORAGE_VERSION` was bumped.
+ - [ ] Try-runtime checks were added and the following conditions were ensured:
+ - [ ] The storage migration bumps the pallet version correctly.
+ - [ ] The try-runtime _fails_ if you comment out the migration code.
+ - [ ] The try-runtime passes without any warnings (substrate storage
+ operations often just log a warning instead of failing, so these
+ warnings usually point to problem which could break the storage).
+
+## Events
+
+_All_ modifications of the on-chain storage **must** be broadcast to indexers by
+emitting a high-level event. The term _high-level_ event refers to an event
+which may or may not contextualize _low-level_ events emitted by pallets that
+Zeitgeist's business logic builds on, for example pallet-balances. Examples of
+high-level events are:
+
+- `SwapExactAmountIn` (contextualizes a couple of low-level events like
+ `Transfer`)
+- `PoolActive` (doesn't add context, but describes a storage change of a pool
+ structure)
+
+Furthermore, these modifications need to be detailed by specifying either a diff
+or the new storage content, unless the change is absolutely clear from the
+context. For example, `SwapExactAmountIn` specifies the balance changes that the
+accounts suffer, but `PoolActive` only provides the id of the pool, _not_ the
+new status (`Active`), which is clear from the context. Information that is
+implicitly already available to the indexer **may** be provided, but this is not
+necessary. For example, the `MarketRejected(market_id, reason)` event not only
+specifies that the market with `market_id` was rejected and for what `reason`,
+but also that the advisory bond and oracle bond are settled, but it doesn't
+include the info how much the oracle bond actually was.
+
+Additional info (similar to the remark emitted by
+[`remark_with_event`](https://github.com/paritytech/substrate/blob/6a504b063cf66351b6e352ef18cc18d49146487b/frame/system/src/lib.rs#L488-L499))
+**may** be added to the event. For example,
+`MarketRequestedEdit(market_id, reason)` contains a `reason` which is not stored
+anywhere in the chain storage.
+
+[docs.zeitgeist.pm]: docs.zeitgeist.pm
diff --git a/integration-tests/package-lock.json b/integration-tests/package-lock.json
index 95ee09cd1..996ae53cd 100644
--- a/integration-tests/package-lock.json
+++ b/integration-tests/package-lock.json
@@ -3297,7 +3297,7 @@
"string.prototype.trimstart": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
- "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+ "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgroccWwziwYuZw==",
"dev": true,
"requires": {
"call-bind": "^1.0.2",
diff --git a/misc/frame_weight_template.hbs b/misc/frame_weight_template.hbs
index 7c49be588..88ff5802e 100644
--- a/misc/frame_weight_template.hbs
+++ b/misc/frame_weight_template.hbs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -44,22 +45,22 @@ impl {{pallet}}::weights::WeightInfo for WeightInfo
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
- ({{underscore benchmark.base_weight}} as Weight)
+ Weight::from_ref_time({{underscore benchmark.base_weight}})
{{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
- .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+ .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
{{/each}}
{{#if (ne benchmark.base_reads "0")}}
- .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+ .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
{{/if}}
{{#each benchmark.component_reads as |cr|}}
- .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+ .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
{{/each}}
{{#if (ne benchmark.base_writes "0")}}
- .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+ .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
{{/if}}
{{#each benchmark.component_writes as |cw|}}
- .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+ .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
{{/each}}
}
{{/each}}
diff --git a/misc/orml_weight_template.hbs b/misc/orml_weight_template.hbs
index f77d35c8e..1fcc3355b 100644
--- a/misc/orml_weight_template.hbs
+++ b/misc/orml_weight_template.hbs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -45,22 +46,22 @@ impl {{pallet}}::WeightInfo for WeightInfo {
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
- ({{underscore benchmark.base_weight}} as Weight)
+ Weight::from_ref_time({{underscore benchmark.base_weight}})
{{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
- .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+ .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
{{/each}}
{{#if (ne benchmark.base_reads "0")}}
- .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+ .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
{{/if}}
{{#each benchmark.component_reads as |cr|}}
- .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+ .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
{{/each}}
{{#if (ne benchmark.base_writes "0")}}
- .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+ .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
{{/if}}
{{#each benchmark.component_writes as |cw|}}
- .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+ .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
{{/each}}
}
{{/each}}
diff --git a/misc/types.json b/misc/types.json
deleted file mode 100644
index 1484a1354..000000000
--- a/misc/types.json
+++ /dev/null
@@ -1,347 +0,0 @@
-{
- "alias": {
- "tokens": {
- "AccountData": "TokensAccountData"
- }
- },
- "AccountData": {
- "free": "Balance",
- "reserved": "Balance",
- "miscFrozen": "Balance",
- "feeFrozen": "Balance"
- },
- "Address": "MultiAddress",
- "Amount": "i128",
- "AmountOf": "i128",
- "Asset": {
- "_enum": {
- "CategoricalOutcome": "(MarketId, CategoryIndex)",
- "ScalarOutcome": "(MarketId, ScalarPosition)",
- "CombinatorialOutcome": null,
- "PoolShare": "u128",
- "ZTG": null
- }
- },
- "AuthorId": "AccountId",
- "BlockNumber": "u64",
- "Bond": {
- "owner": "AccountId",
- "amount": "Balance"
- },
- "CategoryIndex": "u16",
- "Collator2": {
- "id": "AccountId",
- "bond": "Balance",
- "nominators": "Vec",
- "topNominators": "Vec",
- "bottomNominators": "Vec",
- "totalCounted": "Balance",
- "totalBacking": "Balance",
- "state": "CollatorStatus"
- },
- "CollatorSnapshot": {
- "bond": "Balance",
- "delegations": "Vec",
- "total": "Balance"
- },
- "CollatorStatus": {
- "_enum": {
- "Active": null,
- "Idle": null,
- "Leaving": "RoundIndex"
- }
- },
- "CommonPoolEventParams": {
- "poolId": "u128",
- "who": "AccountId"
- },
- "Currency": "Asset",
- "CurrencyId": "Asset",
- "CurrencyIdOf": "Asset",
- "DelegatorStatus": {
- "_enum": {
- "Active": null,
- "Leaving": "RoundIndex"
- }
- },
- "EmaConfig": {
- "emaPeriod": "Timespan",
- "emaPeriodEstimateAfter": "Option",
- "smoothing": "u128"
- },
- "EmaMarketVolume": {
- "config": "EmaConfig",
- "ema": "u128",
- "multiplier": "u128",
- "lastTime": "UnixTimestamp",
- "state": "MarketVolumeState",
- "startTime": "UnixTimestamp",
- "volumesPerPeriod": "u128"
- },
- "ExitQ": {
- "candidates": "Vec",
- "nominatorsLeaving": "Vec",
- "candidateSchedule": "Vec<(AccountId, RoundIndex)>",
- "nominatorSchedule": "Vec<(AccountId, Option, RoundIndex)>"
- },
- "FeeSigmoid": {
- "config": "FeeSigmoidConfig"
- },
- "FeeSigmoidConfig": {
- "m": "i128",
- "p": "i128",
- "n": "i128",
- "initialFee": "i128",
- "minRevenue": "i128"
- },
- "Index": "u64",
- "InflationInfo": {
- "expect": "RangeBalance",
- "annual": "RangePerbill",
- "round": "RangePerbill"
- },
- "Juror": {
- "status": "JurorStatus"
- },
- "JurorStatus": {
- "_enum": [
- "Ok",
- "Tardy"
- ]
- },
- "Lookup": "MultiAddress",
- "Market": {
- "creator": "AccountId",
- "creation": "MarketCreation",
- "creatorFee": "u8",
- "oracle": "AccountId",
- "metadata": "Vec",
- "marketType": "MarketType",
- "period": "MarketPeriod",
- "scoringRule": "ScoringRule",
- "status": "MarketStatus",
- "report": "Option",
- "resolvedOutcome": "Option",
- "dispute_mechanism": "MarketDisputeMechanism"
- },
- "MarketCreation": {
- "_enum": [
- "Permissionless",
- "Advised"
- ]
- },
- "MarketDispute": {
- "at": "BlockNumber",
- "by": "AccountId",
- "outcome": "OutcomeReport"
- },
- "MarketDisputeMechanism": {
- "_enum": {
- "Authorized": "AccountId",
- "Court": null,
- "SimpleDisputes": null
- }
- },
- "MarketId": "u128",
- "MarketIdOf": "u128",
- "MarketPeriod": {
- "_enum": {
- "Block": "Range",
- "Timestamp": "Range"
- }
- },
- "MarketStatus": {
- "_enum": [
- "Proposed",
- "Active",
- "Suspended",
- "Closed",
- "CollectingSubsidy",
- "InsufficientSubsidy",
- "Reported",
- "Disputed",
- "Resolved"
- ]
- },
- "MarketType": {
- "_enum": {
- "Categorical": "u16",
- "Scalar": "RangeInclusive"
- }
- },
- "MarketVolumeState": {
- "_enum": [
- "Uninitialized",
- "DataCollectionStarted",
- "DataCollected"
- ]
- },
- "MaxRuntimeUsize": "u64",
- "Moment": "u64",
- "MultiHash": {
- "_enum": {
- "Sha3_384": "[u8; 50]"
- }
- },
- "Nominator2": {
- "delegations": "Vec",
- "revocations": "Vec",
- "total": "Balance",
- "scheduledRevocationsCount": "u32",
- "scheduledRevocationsTotal": "Balance",
- "status": "DelegatorStatus"
- },
- "NominatorAdded": {
- "_enum": {
- "AddedToTop": "Balance",
- "AddedToBottom": null
- }
- },
- "Order": {
- "side": "OrderSide",
- "maker": "AccountId",
- "taker": "Option",
- "asset": "Asset",
- "total": "Balance",
- "price": "Balance",
- "filled": "Balance"
- },
- "OrderSide": {
- "_enum": [
- "Bid",
- "Ask"
- ]
- },
- "OrderedSet": "Vec",
- "OwnedValuesParams": {
- "participatedBlocks": "BlockNumber",
- "perpetualIncentives": "Balance",
- "totalIncentives": "Balance",
- "totalShares": "Balance"
- },
- "RangeBalance": {
- "min": "Balance",
- "ideal": "Balance",
- "max": "Balance"
- },
- "RangePerbill": {
- "min": "Perbill",
- "ideal": "Perbill",
- "max": "Perbill"
- },
- "RelayChainAccountId": "AccountId32",
- "RewardInfo": {
- "totalReward": "Balance",
- "claimedReward": "Balance"
- },
- "Rikiddo": {
- "config": "RikiddoConfig",
- "fees": "FeeSigmoid",
- "maShort": "EmaMarketVolume",
- "maLong": "EmaMarketVolume"
- },
- "RikiddoConfig": {
- "initialFee": "i128",
- "log2E": "i128"
- },
- "ScoringRule": {
- "_enum": [
- "CPMM",
- "RikiddoSigmoidFeeMarketEma"
- ]
- },
- "OutcomeReport": {
- "_enum": {
- "Categorical": "u16",
- "Scalar": "u128"
- }
- },
- "ParachainBondConfig": {
- "account": "AccountId",
- "percent": "Percent"
- },
- "Pool": {
- "assets": "Vec",
- "baseAsset": "Asset",
- "marketId": "MarketId",
- "poolStatus": "PoolStatus",
- "scoringRule": "ScoringRule",
- "swapFee": "Option",
- "totalSubsidy": "Option",
- "totalWeight": "Option",
- "weights": "Option>"
- },
- "PoolAssetEvent": {
- "asset": "Asset",
- "bound": "Balance",
- "cpep": "CommonPoolEventParams",
- "transferred": "Balance"
- },
- "PoolAssetsEvent": {
- "assets": "Vec",
- "bounds": "Vec",
- "cpep": "CommonPoolEventParams",
- "transferred": "Vec"
- },
- "PoolId": "u128",
- "PoolStatus": {
- "_enum": [
- "Active",
- "CollectingSubsidy",
- "Closed",
- "Clean",
- "Initialized"
- ]
- },
- "RegistrationInfo": {
- "account": "AccountId",
- "deposit": "Balance"
- },
- "Report": {
- "at": "BlockNumber",
- "by": "AccountId",
- "outcome": "OutcomeReport"
- },
- "RoundInfo": {
- "current": "RoundIndex",
- "first": "BlockNumber",
- "length": "u32"
- },
- "RoundIndex": "u32",
- "ScalarPosition": {
- "_enum": [
- "Long",
- "Short"
- ]
- },
- "SerdeWrapper": "Balance",
- "SubsidyUntil": {
- "marketId": "MarketId",
- "period": "MarketPeriod"
- },
- "SwapEvent": {
- "assetAmountIn": "Balance",
- "assetAmountOut": "Balance",
- "assetBound": "Balance",
- "assetIn": "Asset",
- "assetOut": "Asset",
- "cpep": "CommonPoolEventParams",
- "maxPrice": "Balance"
- },
- "Timespan": {
- "_enum": {
- "Seconds": "u32",
- "Minutes": "u32",
- "Hours": "u32",
- "Days": "u16",
- "Weeks": "u16"
- }
- },
- "TokensAccountData": {
- "free": "Balance",
- "reserved": "Balance",
- "frozen": "Balance"
- },
- "UnixTimestamp": "u64",
- "VestingBlockNumber": "u32"
-}
diff --git a/misc/weight_template.hbs b/misc/weight_template.hbs
index 49d63138d..c5c0ec357 100644
--- a/misc/weight_template.hbs
+++ b/misc/weight_template.hbs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -57,22 +58,22 @@ impl WeightInfoZeitgeist for WeightInfo {
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
- ({{underscore benchmark.base_weight}} as Weight)
+ Weight::from_ref_time({{underscore benchmark.base_weight}})
{{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
- .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+ .saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
{{/each}}
{{#if (ne benchmark.base_reads "0")}}
- .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+ .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
{{/if}}
{{#each benchmark.component_reads as |cr|}}
- .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+ .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
{{/each}}
{{#if (ne benchmark.base_writes "0")}}
- .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+ .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
{{/if}}
{{#each benchmark.component_writes as |cw|}}
- .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+ .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
{{/each}}
}
{{/each}}
diff --git a/node/Cargo.toml b/node/Cargo.toml
index a89fc7bbf..4df5d88a8 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -3,103 +3,102 @@ name = "zeitgeist"
path = "./src/main.rs"
[build-dependencies]
-substrate-build-script-utils = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+substrate-build-script-utils = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
[dependencies]
-pallet-transaction-payment = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-basic-authorship = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-cli = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
-sc-client-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-consensus = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-executor = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
-sc-keystore = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-rpc = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-rpc-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-service = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
-sc-sysinfo = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-telemetry = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-transaction-pool = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-transaction-pool-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-block-builder = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-blockchain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-consensus = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-core = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-inherents = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-keyring = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-offchain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-session = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-storage = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-transaction-pool = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-trie = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-substrate-frame-rpc-system = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+pallet-transaction-payment = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-basic-authorship = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-cli = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
+sc-client-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-consensus = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-executor = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
+sc-keystore = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-rpc = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-rpc-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-service = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
+sc-sysinfo = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-telemetry = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-transaction-pool = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-transaction-pool-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-block-builder = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-blockchain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-consensus = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-core = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-inherents = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-keyring = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-offchain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-session = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-storage = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-transaction-pool = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-trie = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+substrate-frame-rpc-system = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
# Try-Runtime
-try-runtime-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
+try-runtime-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
# Benchmark
-frame-benchmarking = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-frame-benchmarking-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+frame-benchmarking = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
+frame-benchmarking-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
# Cumulus
-cumulus-client-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-collator = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-consensus-common = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-consensus-relay-chain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-network = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-client-service = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-core = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-parachain-inherent = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-relay-chain-inprocess-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-relay-chain-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-relay-chain-rpc-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-client-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-client-collator = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-client-consensus-common = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-client-consensus-relay-chain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-client-network = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-client-service = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-primitives-core = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-primitives-parachain-inherent = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-relay-chain-inprocess-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-relay-chain-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-relay-chain-rpc-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true }
# Parachain
-moonbeam-vrf = { tag = "v0.26.1", git = "https://github.com/purestake/moonbeam", optional = true }
-nimbus-consensus = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-parachain-staking = { tag = "v0.26.1", git = "https://github.com/purestake/moonbeam", optional = true }
+moonbeam-vrf = { git = "https://github.com/zeitgeistpm/external", optional = true }
+nimbus-consensus = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+nimbus-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-author-inherent = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-parachain-staking = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
parity-scale-codec = { optional = true, version = "3.0.0" }
-sc-chain-spec = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sc-network = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-sc-tracing = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-serde = { features = ["derive"], optional = true, version = "1.0.137" }
-session-keys-primitives = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-sp-keystore = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
-substrate-prometheus-endpoint = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
+sc-chain-spec = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
+sc-network = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
+sc-network-common = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
+sc-tracing = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
+serde = { features = ["derive"], optional = true, version = "1.0.144" }
+session-keys-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+sp-keystore = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
+substrate-prometheus-endpoint = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true }
# Polkadot
-polkadot-cli = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-parachain = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-primitives = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-service = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-test-service = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
+polkadot-cli = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
+polkadot-parachain = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
+polkadot-primitives = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
+polkadot-service = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
+polkadot-test-service = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true }
# Standalone
-sc-consensus-aura = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sc-finality-grandpa = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-consensus-aura = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-sp-finality-grandpa = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+sc-consensus-aura = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sc-finality-grandpa = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-consensus-aura = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+sp-finality-grandpa = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
# Utility
cfg-if = { version = "1.0.0" }
-clap = { version = "3.2.6", features = ["derive"] }
+clap = { version = "4.0.9", features = ["derive"] }
hex-literal = { version = "0.3.4" }
-jsonrpsee = { version = "0.14.0", features = ["server"] }
-log = { optional = true, version = "0.4.17" }
-# TODO(#865): Remove in future Polkadot release
-tracing-core = "=0.1.26"
+jsonrpsee = { version = "0.15.1", features = ["server"] }
+log = { optional = true, version = "0.4.18" }
# Zeitgeist
@@ -142,6 +141,7 @@ parachain = [
"session-keys-primitives",
"sc-chain-spec",
"sc-network",
+ "sc-network-common",
"sc-tracing",
"serde",
"sp-keystore",
@@ -158,6 +158,8 @@ parachain = [
runtime-benchmarks = [
"battery-station-runtime?/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
+ "frame-benchmarking-cli/runtime-benchmarks",
+ "polkadot-cli?/runtime-benchmarks",
"polkadot-service?/runtime-benchmarks",
"zeitgeist-runtime?/runtime-benchmarks",
]
@@ -176,7 +178,7 @@ description = "An evolving blockchain for prediction markets and futarchy."
edition = "2021"
homepage = "https://zeitgeist.pm"
name = "zeitgeist-node"
-version = "0.3.7"
+version = "0.3.9"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
diff --git a/node/res/bs_parachain.json b/node/res/bs_parachain.json
index b34034a25..24eae3dbe 100644
--- a/node/res/bs_parachain.json
+++ b/node/res/bs_parachain.json
@@ -16,14 +16,14 @@
0
]
],
- "protocolId": "battery_station_v2",
+ "protocolId": "battery_station_v3",
"properties": {
"ss58Format": 73,
"tokenDecimals": 10,
"tokenSymbol": "ZBS"
},
- "parachain_id": 2050,
- "relay_chain": "battery_station_relay_v3",
+ "parachain_id": 2101,
+ "relay_chain": "rococo",
"consensusEngine": null,
"codeSubstitutes": {},
"genesis": {
diff --git a/node/res/zeitgeist_parachain.json b/node/res/zeitgeist_parachain.json
index 1b956577b..18802a0af 100644
--- a/node/res/zeitgeist_parachain.json
+++ b/node/res/zeitgeist_parachain.json
@@ -18,14 +18,14 @@
0
]
],
- "protocolId": "zeitgeist",
+ "protocolId": "zeitgeist-polkadot",
"properties": {
"ss58Format": 73,
"tokenDecimals": 10,
"tokenSymbol": "ZTG"
},
- "parachain_id": 2101,
- "relay_chain": "kusama",
+ "parachain_id": 2092,
+ "relay_chain": "polkadot",
"consensusEngine": null,
"codeSubstitutes": {},
"genesis": {
diff --git a/node/src/command_helper.rs b/node/src/benchmarking.rs
similarity index 72%
rename from node/src/command_helper.rs
rename to node/src/benchmarking.rs
index 0253d06dd..d893ff953 100644
--- a/node/src/command_helper.rs
+++ b/node/src/benchmarking.rs
@@ -25,18 +25,18 @@ use sp_inherents::{InherentData, InherentDataProvider};
use sp_keyring::Sr25519Keyring;
use sp_runtime::{OpaqueExtrinsic, SaturatedConversion};
use std::{sync::Arc, time::Duration};
-use zeitgeist_primitives::types::Signature;
+use zeitgeist_primitives::types::{AccountId, Balance, Signature};
/// Generates extrinsics for the `benchmark overhead` command.
///
/// Note: Should only be used for benchmarking.
-pub struct BenchmarkExtrinsicBuilder {
+pub struct RemarksExtrinsicBuilder {
client: Arc>,
is_zeitgeist: bool,
}
impl
- BenchmarkExtrinsicBuilder
+ RemarksExtrinsicBuilder
{
/// Creates a new [`Self`] from the given client.
pub fn new(client: Arc>, is_zeitgeist: bool) -> Self {
@@ -45,9 +45,17 @@ impl
}
impl
- frame_benchmarking_cli::ExtrinsicBuilder for BenchmarkExtrinsicBuilder
+ frame_benchmarking_cli::ExtrinsicBuilder for RemarksExtrinsicBuilder
{
- fn remark(&self, nonce: u32) -> std::result::Result {
+ fn pallet(&self) -> &str {
+ "system"
+ }
+
+ fn extrinsic(&self) -> &str {
+ "remark"
+ }
+
+ fn build(&self, nonce: u32) -> std::result::Result {
let acc = Sr25519Keyring::Bob.pair();
#[cfg(feature = "with-zeitgeist-runtime")]
@@ -75,6 +83,76 @@ impl
}
}
+/// Generates `Balances::TransferKeepAlive` extrinsics for the benchmarks.
+///
+/// Note: Should only be used for benchmarking.
+pub struct TransferKeepAliveBuilder {
+ client: Arc>,
+ dest: AccountId,
+ value: Balance,
+ is_zeitgeist: bool,
+}
+
+impl
+ TransferKeepAliveBuilder
+{
+ /// Creates a new [`Self`] from the given client.
+ pub fn new(
+ client: Arc>,
+ dest: AccountId,
+ value: Balance,
+ is_zeitgeist: bool,
+ ) -> Self {
+ Self { client, dest, value, is_zeitgeist }
+ }
+}
+
+impl
+ frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder
+{
+ fn pallet(&self) -> &str {
+ "balances"
+ }
+
+ fn extrinsic(&self) -> &str {
+ "transfer_keep_alive"
+ }
+
+ fn build(&self, nonce: u32) -> std::result::Result {
+ let acc = Sr25519Keyring::Bob.pair();
+ #[cfg(feature = "with-zeitgeist-runtime")]
+ if self.is_zeitgeist {
+ return Ok(create_benchmark_extrinsic_zeitgeist(
+ self.client.as_ref(),
+ acc,
+ zeitgeist_runtime::BalancesCall::transfer_keep_alive {
+ dest: self.dest.clone().into(),
+ value: self.value,
+ }
+ .into(),
+ nonce,
+ )
+ .into());
+ }
+ #[cfg(feature = "with-battery-station-runtime")]
+ if !self.is_zeitgeist {
+ return Ok(create_benchmark_extrinsic_battery_station(
+ self.client.as_ref(),
+ acc,
+ battery_station_runtime::BalancesCall::transfer_keep_alive {
+ dest: self.dest.clone().into(),
+ value: self.value,
+ }
+ .into(),
+ nonce,
+ )
+ .into());
+ }
+
+ Err(crate::BATTERY_STATION_RUNTIME_NOT_AVAILABLE)
+ }
+}
+
/// Creates a transaction using the given `call`.
///
/// Note: Should only be used for benchmarking.
@@ -85,7 +163,7 @@ pub fn create_benchmark_extrinsic_zeitgeist<
>(
client: &FullClient,
sender: sp_core::sr25519::Pair,
- call: zeitgeist_runtime::Call,
+ call: zeitgeist_runtime::RuntimeCall,
nonce: u32,
) -> zeitgeist_runtime::UncheckedExtrinsic {
let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed");
@@ -143,7 +221,7 @@ pub fn create_benchmark_extrinsic_battery_station<
>(
client: &FullClient,
sender: sp_core::sr25519::Pair,
- call: battery_station_runtime::Call,
+ call: battery_station_runtime::RuntimeCall,
nonce: u32,
) -> battery_station_runtime::UncheckedExtrinsic {
let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed");
diff --git a/node/src/chain_spec/additional_chain_spec.rs b/node/src/chain_spec/additional_chain_spec.rs
index 0498ef136..d5324fce9 100644
--- a/node/src/chain_spec/additional_chain_spec.rs
+++ b/node/src/chain_spec/additional_chain_spec.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -20,15 +21,18 @@ use {
cumulus_primitives_core::ParaId,
nimbus_primitives::NimbusId,
pallet_parachain_staking::InflationInfo,
+ sp_runtime::{Perbill, Percent},
zeitgeist_primitives::types::{AccountId, Balance},
};
#[cfg(feature = "parachain")]
pub struct AdditionalChainSpec {
+ pub blocks_per_round: u32,
pub candidates: Vec<(AccountId, NimbusId, Balance)>,
- pub crowdloan_fund_pot: Balance,
+ pub collator_commission: Perbill,
pub inflation_info: InflationInfo,
- pub nominations: Vec<(AccountId, AccountId, Balance)>,
+ pub nominations: Vec<(AccountId, AccountId, Balance, Percent)>,
+ pub parachain_bond_reserve_percent: Percent,
pub parachain_id: ParaId,
}
diff --git a/node/src/chain_spec/battery_station.rs b/node/src/chain_spec/battery_station.rs
index 7c8835db4..e7424c51e 100644
--- a/node/src/chain_spec/battery_station.rs
+++ b/node/src/chain_spec/battery_station.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -33,8 +34,13 @@ use zeitgeist_primitives::{
#[cfg(feature = "parachain")]
use {
- super::{Extensions, DEFAULT_COLLATOR_INFLATION_INFO},
- battery_station_runtime::{CollatorDeposit, EligibilityValue, PolkadotXcmConfig},
+ super::{generate_inflation_config_function, Extensions},
+ crate::BATTERY_STATION_PARACHAIN_ID,
+ battery_station_runtime::{
+ CollatorDeposit, DefaultBlocksPerRound, DefaultCollatorCommission,
+ DefaultParachainBondReservePercent, EligibilityValue, PolkadotXcmConfig,
+ },
+ zeitgeist_primitives::constants::ztg::{STAKING_PTD, TOTAL_INITIAL_ZTG},
};
cfg_if::cfg_if! {
@@ -42,7 +48,6 @@ cfg_if::cfg_if! {
pub(super) const DEFAULT_STAKING_AMOUNT_BATTERY_STATION: u128 = 2_000 * BASE;
const DEFAULT_COLLATOR_BALANCE_BATTERY_STATION: Option =
DEFAULT_STAKING_AMOUNT_BATTERY_STATION.checked_add(CollatorDeposit::get());
- const DEFAULT_INITIAL_CROWDLOAN_FUNDS_BATTERY_STATION: u128 = 100 * BASE;
pub type BatteryStationChainSpec = sc_service::GenericChainSpec;
} else {
pub type BatteryStationChainSpec = sc_service::GenericChainSpec;
@@ -56,15 +61,22 @@ fn additional_chain_spec_staging_battery_station(
parachain_id: cumulus_primitives_core::ParaId,
) -> AdditionalChainSpec {
AdditionalChainSpec {
+ blocks_per_round: DefaultBlocksPerRound::get(),
candidates: vec![(
hex!["302f6d7467ae2d7e3b9b962bfc3b9d929da9fae5f1e8c977a031ddf721b0790d"].into(),
hex!["e6ea0b63b2b5b7247a1e8280350a14c5f9e7745dec2fe3428b68aa4167d48e66"]
.unchecked_into(),
DEFAULT_STAKING_AMOUNT_BATTERY_STATION,
)],
- crowdloan_fund_pot: DEFAULT_INITIAL_CROWDLOAN_FUNDS_BATTERY_STATION,
- inflation_info: DEFAULT_COLLATOR_INFLATION_INFO,
+ collator_commission: DefaultCollatorCommission::get(),
+ inflation_info: inflation_config(
+ STAKING_PTD * Perbill::from_percent(40),
+ STAKING_PTD * Perbill::from_percent(70),
+ STAKING_PTD,
+ TOTAL_INITIAL_ZTG * BASE,
+ ),
nominations: vec![],
+ parachain_bond_reserve_percent: DefaultParachainBondReservePercent::get(),
parachain_id,
}
}
@@ -87,7 +99,7 @@ fn endowed_accounts_staging_battery_station() -> Vec
vec![
// 5D2L4ghyiYE8p2z7VNJo9JYwRuc8uzPWtMBqdVyvjRcsnw4P
EndowedAccountWithBalance(
- hex!["2a6c61a907556e4c673880b5767dd4be08339ee7f2a58d5137d0c19ca9570a5c"].into(),
+ root_key_staging_battery_station(),
DEFAULT_INITIAL_BALANCE_BATTERY_STATION,
),
// 5EeeZVU4SiPG6ZRY7o8aDcav2p2mZMdu3ZLzbREWuHktYdhX
@@ -108,7 +120,6 @@ fn root_key_staging_battery_station() -> AccountId {
hex!["2a6c61a907556e4c673880b5767dd4be08339ee7f2a58d5137d0c19ca9570a5c"].into()
}
-#[inline]
pub(super) fn get_wasm() -> Result<&'static [u8], String> {
battery_station_runtime::WASM_BINARY.ok_or_else(|| "WASM binary is not available".to_string())
}
@@ -120,6 +131,9 @@ generate_generic_genesis_function!(
},
);
+#[cfg(feature = "parachain")]
+generate_inflation_config_function!(battery_station_runtime);
+
pub fn battery_station_staging_config() -> Result {
let wasm = get_wasm()?;
@@ -131,7 +145,7 @@ pub fn battery_station_staging_config() -> Result Result> 4;
@@ -65,15 +77,22 @@ pub fn dev_config() -> Result {
generic_genesis(
#[cfg(feature = "parachain")]
AdditionalChainSpec {
+ blocks_per_round: DefaultBlocksPerRound::get(),
candidates: vec![(
get_account_id_from_seed::("Alice"),
get_from_seed::("Alice"),
super::battery_station::DEFAULT_STAKING_AMOUNT_BATTERY_STATION,
)],
- crowdloan_fund_pot: zeitgeist_primitives::constants::BASE.saturating_mul(100),
- inflation_info: crate::chain_spec::DEFAULT_COLLATOR_INFLATION_INFO,
+ collator_commission: DefaultCollatorCommission::get(),
+ inflation_info: inflation_config(
+ STAKING_PTD * Perbill::from_percent(40),
+ STAKING_PTD * Perbill::from_percent(70),
+ STAKING_PTD,
+ TOTAL_INITIAL_ZTG * BASE,
+ ),
nominations: vec![],
- parachain_id: 2050_u32.into(),
+ parachain_bond_reserve_percent: DefaultParachainBondReservePercent::get(),
+ parachain_id: crate::BATTERY_STATION_PARACHAIN_ID.into(),
},
#[cfg(not(feature = "parachain"))]
AdditionalChainSpec {
@@ -105,7 +124,11 @@ pub fn dev_config() -> Result {
None,
Some(token_properties("DEV", battery_station_runtime::SS58Prefix::get())),
#[cfg(feature = "parachain")]
- crate::chain_spec::Extensions { relay_chain: "rococo-dev".into(), parachain_id: 2050_u32 },
+ crate::chain_spec::Extensions {
+ relay_chain: "rococo-dev".into(),
+ parachain_id: crate::BATTERY_STATION_PARACHAIN_ID,
+ bad_blocks: None,
+ },
#[cfg(not(feature = "parachain"))]
Default::default(),
))
diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs
index fa2ebaa97..bedb1a0f5 100644
--- a/node/src/chain_spec/mod.rs
+++ b/node/src/chain_spec/mod.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -42,46 +43,53 @@ use zeitgeist_primitives::{
constants::BalanceFractionalDecimals,
types::{AccountId, Balance},
};
-#[cfg(feature = "parachain")]
-use {
- sp_runtime::Perbill,
- zeitgeist_primitives::constants::{ztg, MILLISECS_PER_BLOCK},
- zeitgeist_runtime::DefaultBlocksPerRound,
-};
cfg_if::cfg_if! {
if #[cfg(feature = "parachain")] {
// Common
- pub(crate) const DEFAULT_COLLATOR_INFLATION_INFO: pallet_parachain_staking::InflationInfo = {
- let hours_per_year = 8766;
- let millisecs_per_year = hours_per_year * 60 * 60 * 1000;
- let round_millisecs = DefaultBlocksPerRound::get() as u64 * MILLISECS_PER_BLOCK as u64;
- let rounds_per_year = millisecs_per_year / round_millisecs;
-
- let annual_inflation = ztg::STAKING_PTD;
- let expected_annual_amount = ztg::COLLATORS * zeitgeist_primitives::constants::BASE;
- let round_inflation_parts = annual_inflation.deconstruct() as u64 / rounds_per_year;
- let round_inflation = Perbill::from_parts(round_inflation_parts as _);
-
- pallet_parachain_staking::InflationInfo {
- annual: pallet_parachain_staking::Range {
- ideal: annual_inflation,
- max: annual_inflation,
- min: annual_inflation,
- },
- expect: pallet_parachain_staking::Range {
- ideal: expected_annual_amount,
- max: expected_annual_amount,
- min: expected_annual_amount,
- },
- round: pallet_parachain_staking::Range {
- ideal: round_inflation,
- min: round_inflation,
- max: round_inflation,
- },
+ macro_rules! generate_inflation_config_function {
+ ($runtime:ident) => {
+ use sp_runtime::Perbill;
+
+ pub(super) fn inflation_config(
+ annual_inflation_min: Perbill,
+ annual_inflation_ideal: Perbill,
+ annual_inflation_max: Perbill,
+ total_supply: zeitgeist_primitives::types::Balance
+ ) -> pallet_parachain_staking::inflation::InflationInfo {
+ fn to_round_inflation(annual: pallet_parachain_staking::inflation::Range) -> pallet_parachain_staking::inflation::Range {
+ use pallet_parachain_staking::inflation::{
+ perbill_annual_to_perbill_round,
+ };
+ use $runtime::parachain_params::DefaultBlocksPerRound;
+
+ perbill_annual_to_perbill_round(
+ annual,
+ // rounds per year
+ u32::try_from(zeitgeist_primitives::constants::BLOCKS_PER_YEAR).unwrap() / DefaultBlocksPerRound::get()
+ )
+ }
+ let annual = pallet_parachain_staking::inflation::Range {
+ min: annual_inflation_min,
+ ideal: annual_inflation_ideal,
+ max: annual_inflation_max,
+ };
+ pallet_parachain_staking::inflation::InflationInfo {
+ // staking expectations
+ expect: pallet_parachain_staking::inflation::Range {
+ min: Perbill::from_percent(5).mul_floor(total_supply),
+ ideal: Perbill::from_percent(10).mul_floor(total_supply),
+ max: Perbill::from_percent(15).mul_floor(total_supply),
+ },
+ // annual inflation
+ annual,
+ round: to_round_inflation(annual),
+ }
+ }
}
- };
+ }
+ pub(crate) use generate_inflation_config_function;
pub type DummyChainSpec = sc_service::GenericChainSpec<(), Extensions>;
} else {
pub type DummyChainSpec = sc_service::GenericChainSpec<()>;
@@ -116,7 +124,7 @@ macro_rules! generate_generic_genesis_function {
},
#[cfg(feature = "parachain")]
author_filter: $runtime::AuthorFilterConfig {
- eligible_count: EligibilityValue::new_unchecked(50),
+ eligible_count: EligibilityValue::new_unchecked(1),
},
#[cfg(feature = "parachain")]
author_mapping: $runtime::AuthorMappingConfig {
@@ -135,8 +143,6 @@ macro_rules! generate_generic_genesis_function {
members: vec![].try_into().unwrap(),
phantom: Default::default(),
},
- #[cfg(feature = "parachain")]
- crowdloan: $runtime::CrowdloanConfig { funded_amount: acs.crowdloan_fund_pot },
democracy: Default::default(),
#[cfg(not(feature = "parachain"))]
grandpa: $runtime::GrandpaConfig {
@@ -150,14 +156,17 @@ macro_rules! generate_generic_genesis_function {
parachain_info: $runtime::ParachainInfoConfig { parachain_id: acs.parachain_id },
#[cfg(feature = "parachain")]
parachain_staking: $runtime::ParachainStakingConfig {
+ blocks_per_round: acs.blocks_per_round,
candidates: acs
.candidates
.iter()
.cloned()
.map(|(account, _, bond)| (account, bond))
.collect(),
+ collator_commission: acs.collator_commission,
inflation_config: acs.inflation_info,
delegations: acs.nominations,
+ parachain_bond_reserve_percent: acs.parachain_bond_reserve_percent,
},
#[cfg(feature = "parachain")]
parachain_system: Default::default(),
@@ -219,6 +228,8 @@ pub struct Extensions {
pub parachain_id: u32,
/// The relay chain of the Parachain.
pub relay_chain: String,
+ /// Known bad block hashes.
+ pub bad_blocks: sc_client_api::BadBlocks,
}
#[cfg(feature = "parachain")]
diff --git a/node/src/chain_spec/zeitgeist.rs b/node/src/chain_spec/zeitgeist.rs
index dfdc7b20d..ab0a0420e 100644
--- a/node/src/chain_spec/zeitgeist.rs
+++ b/node/src/chain_spec/zeitgeist.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -17,8 +18,10 @@
#![cfg(feature = "with-zeitgeist-runtime")]
-use super::{AdditionalChainSpec, EndowedAccountWithBalance};
-use crate::chain_spec::{generate_generic_genesis_function, telemetry_endpoints, token_properties};
+use super::{
+ generate_generic_genesis_function, telemetry_endpoints, token_properties, AdditionalChainSpec,
+ EndowedAccountWithBalance,
+};
use hex_literal::hex;
use sc_service::ChainType;
use sp_core::crypto::UncheckedInto;
@@ -28,8 +31,13 @@ use zeitgeist_primitives::constants::ztg::{LIQUIDITY_MINING, LIQUIDITY_MINING_PT
#[cfg(feature = "parachain")]
use {
- super::{Extensions, DEFAULT_COLLATOR_INFLATION_INFO},
- zeitgeist_runtime::{CollatorDeposit, EligibilityValue, MinCollatorStk, PolkadotXcmConfig},
+ super::{generate_inflation_config_function, Extensions},
+ crate::POLKADOT_PARACHAIN_ID,
+ zeitgeist_primitives::constants::ztg::{STAKING_PTD, TOTAL_INITIAL_ZTG},
+ zeitgeist_runtime::{
+ CollatorDeposit, DefaultBlocksPerRound, DefaultCollatorCommission,
+ DefaultParachainBondReservePercent, EligibilityValue, MinCollatorStk, PolkadotXcmConfig,
+ },
};
cfg_if::cfg_if! {
@@ -37,7 +45,6 @@ cfg_if::cfg_if! {
const DEFAULT_STAKING_AMOUNT_ZEITGEIST: u128 = MinCollatorStk::get();
const DEFAULT_COLLATOR_BALANCE_ZEITGEIST: Option =
DEFAULT_STAKING_AMOUNT_ZEITGEIST.checked_add(CollatorDeposit::get());
- const DEFAULT_INITIAL_CROWDLOAN_FUNDS_ZEITGEIST: u128 = 0;
pub type ZeitgeistChainSpec = sc_service::GenericChainSpec;
} else {
pub type ZeitgeistChainSpec = sc_service::GenericChainSpec;
@@ -71,7 +78,10 @@ fn endowed_accounts_staging_zeitgeist() -> Vec {
fn additional_chain_spec_staging_zeitgeist(
parachain_id: cumulus_primitives_core::ParaId,
) -> AdditionalChainSpec {
+ use zeitgeist_primitives::constants::BASE;
+
AdditionalChainSpec {
+ blocks_per_round: DefaultBlocksPerRound::get(),
candidates: vec![
(
hex!["524e9aac979cbb9ecdb7acd1635755c3b15696321a3345ca77f0ab0ae23f675a"].into(),
@@ -92,9 +102,15 @@ fn additional_chain_spec_staging_zeitgeist(
DEFAULT_STAKING_AMOUNT_ZEITGEIST,
),
],
- crowdloan_fund_pot: DEFAULT_INITIAL_CROWDLOAN_FUNDS_ZEITGEIST,
- inflation_info: DEFAULT_COLLATOR_INFLATION_INFO,
+ collator_commission: DefaultCollatorCommission::get(),
+ inflation_info: inflation_config(
+ STAKING_PTD * Perbill::from_percent(40),
+ STAKING_PTD * Perbill::from_percent(70),
+ STAKING_PTD,
+ TOTAL_INITIAL_ZTG * BASE,
+ ),
nominations: vec![],
+ parachain_bond_reserve_percent: DefaultParachainBondReservePercent::get(),
parachain_id,
}
}
@@ -113,13 +129,15 @@ fn additional_chain_spec_staging_zeitgeist() -> AdditionalChainSpec {
}
}
-#[inline]
pub(super) fn get_wasm() -> Result<&'static [u8], String> {
zeitgeist_runtime::WASM_BINARY.ok_or_else(|| "WASM binary is not available".to_string())
}
generate_generic_genesis_function!(zeitgeist_runtime,);
+#[cfg(feature = "parachain")]
+generate_inflation_config_function!(zeitgeist_runtime);
+
pub fn zeitgeist_staging_config() -> Result {
let wasm = get_wasm()?;
@@ -131,7 +149,7 @@ pub fn zeitgeist_staging_config() -> Result {
generic_genesis(
additional_chain_spec_staging_zeitgeist(
#[cfg(feature = "parachain")]
- crate::KUSAMA_PARACHAIN_ID.into(),
+ POLKADOT_PARACHAIN_ID.into(),
),
endowed_accounts_staging_zeitgeist(),
wasm,
@@ -144,8 +162,9 @@ pub fn zeitgeist_staging_config() -> Result {
Some(token_properties("ZTG", SS58Prefix::get())),
#[cfg(feature = "parachain")]
crate::chain_spec::Extensions {
- relay_chain: "kusama".into(),
- parachain_id: crate::KUSAMA_PARACHAIN_ID,
+ relay_chain: "polkadot".into(),
+ parachain_id: POLKADOT_PARACHAIN_ID,
+ bad_blocks: None,
},
#[cfg(not(feature = "parachain"))]
Default::default(),
diff --git a/node/src/cli.rs b/node/src/cli.rs
index e0609c5eb..0446312c5 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -442,84 +442,84 @@ impl sc_client_api::BlockBackend for Client {
impl sc_client_api::StorageProvider for Client {
fn storage(
&self,
- id: &BlockId,
+ hash: &::Hash,
key: &StorageKey,
) -> sp_blockchain::Result> {
- match_client!(self, storage(id, key))
+ match_client!(self, storage(hash, key))
}
fn storage_keys(
&self,
- id: &BlockId,
+ hash: &::Hash,
key_prefix: &StorageKey,
) -> sp_blockchain::Result> {
- match_client!(self, storage_keys(id, key_prefix))
+ match_client!(self, storage_keys(hash, key_prefix))
}
fn storage_hash(
&self,
- id: &BlockId,
+ hash: &::Hash,
key: &StorageKey,
) -> sp_blockchain::Result::Hash>> {
- match_client!(self, storage_hash(id, key))
+ match_client!(self, storage_hash(hash, key))
}
fn storage_pairs(
&self,
- id: &BlockId,
+ hash: &::Hash,
key_prefix: &StorageKey,
) -> sp_blockchain::Result> {
- match_client!(self, storage_pairs(id, key_prefix))
+ match_client!(self, storage_pairs(hash, key_prefix))
}
fn storage_keys_iter<'a>(
&self,
- id: &BlockId,
+ hash: &::Hash,
prefix: Option<&'a StorageKey>,
start_key: Option<&StorageKey>,
) -> sp_blockchain::Result<
KeyIterator<'a, >::State, Block>,
> {
- match_client!(self, storage_keys_iter(id, prefix, start_key))
+ match_client!(self, storage_keys_iter(hash, prefix, start_key))
}
fn child_storage(
&self,
- id: &BlockId,
+ hash: &::Hash,
child_info: &ChildInfo,
key: &StorageKey,
) -> sp_blockchain::Result> {
- match_client!(self, child_storage(id, child_info, key))
+ match_client!(self, child_storage(hash, child_info, key))
}
fn child_storage_keys(
&self,
- id: &BlockId,
+ hash: &::Hash,
child_info: &ChildInfo,
key_prefix: &StorageKey,
) -> sp_blockchain::Result> {
- match_client!(self, child_storage_keys(id, child_info, key_prefix))
+ match_client!(self, child_storage_keys(hash, child_info, key_prefix))
}
fn child_storage_keys_iter<'a>(
&self,
- id: &BlockId,
+ hash: &::Hash,
child_info: ChildInfo,
prefix: Option<&'a StorageKey>,
start_key: Option<&StorageKey>,
) -> sp_blockchain::Result<
KeyIterator<'a, >::State, Block>,
> {
- match_client!(self, child_storage_keys_iter(id, child_info, prefix, start_key))
+ match_client!(self, child_storage_keys_iter(hash, child_info, prefix, start_key))
}
fn child_storage_hash(
&self,
- id: &BlockId,
+ hash: &::Hash,
child_info: &ChildInfo,
key: &StorageKey,
) -> sp_blockchain::Result::Hash>> {
- match_client!(self, child_storage_hash(id, child_info, key))
+ match_client!(self, child_storage_hash(hash, child_info, key))
}
}
diff --git a/node/src/cli/cli_parachain.rs b/node/src/cli/cli_parachain.rs
index 0e544b9eb..9b7810f18 100644
--- a/node/src/cli/cli_parachain.rs
+++ b/node/src/cli/cli_parachain.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -60,7 +61,7 @@ impl sc_cli::CliConfiguration for RelayChainCli {
}
fn base_path(&self) -> sc_cli::Result> {
- Ok(self.shared_params().base_path().or_else(|| self.base_path.clone().map(Into::into)))
+ Ok(self.shared_params().base_path()?.or_else(|| self.base_path.clone().map(Into::into)))
}
fn chain_id(&self, is_dev: bool) -> sc_cli::Result {
@@ -150,12 +151,11 @@ impl sc_cli::CliConfiguration for RelayChainCli {
self.base.base.shared_params()
}
- fn state_cache_child_ratio(&self) -> sc_cli::Result> {
- self.base.base.state_cache_child_ratio()
- }
-
- fn transaction_pool(&self) -> sc_cli::Result {
- self.base.base.transaction_pool()
+ fn transaction_pool(
+ &self,
+ is_dev: bool,
+ ) -> sc_cli::Result {
+ self.base.base.transaction_pool(is_dev)
}
}
diff --git a/node/src/command.rs b/node/src/command.rs
index 5c4936a92..c0ef23837 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -16,20 +17,25 @@
// along with Zeitgeist. If not, see .
use super::{
+ benchmarking::{inherent_benchmark_data, RemarksExtrinsicBuilder, TransferKeepAliveBuilder},
cli::{Cli, Subcommand},
- command_helper::{inherent_benchmark_data, BenchmarkExtrinsicBuilder},
service::{new_chain_ops, new_full, IdentifyVariant},
};
-use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
+use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE};
use sc_cli::SubstrateCli;
-use std::sync::Arc;
+use sp_keyring::Sr25519Keyring;
#[cfg(feature = "with-battery-station-runtime")]
use {
super::service::BatteryStationExecutor,
- battery_station_runtime::RuntimeApi as BatteryStationRuntimeApi,
+ battery_station_runtime::{
+ ExistentialDeposit as BatteryStationED, RuntimeApi as BatteryStationRuntimeApi,
+ },
};
#[cfg(feature = "with-zeitgeist-runtime")]
-use {super::service::ZeitgeistExecutor, zeitgeist_runtime::RuntimeApi as ZeitgeistRuntimeApi};
+use {
+ super::service::ZeitgeistExecutor,
+ zeitgeist_runtime::{ExistentialDeposit as ZeitgeistED, RuntimeApi as ZeitgeistRuntimeApi},
+};
#[cfg(feature = "parachain")]
use {
sc_client_api::client::BlockBackend,
@@ -109,6 +115,11 @@ pub fn run() -> sc_cli::Result<()> {
BenchmarkCmd::Machine(cmd) => {
runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()))
}
+ #[cfg(not(feature = "runtime-benchmarks"))]
+ BenchmarkCmd::Storage(_) => Err("Storage benchmarking can be enabled with \
+ `--features runtime-benchmarks`."
+ .into()),
+ #[cfg(feature = "runtime-benchmarks")]
BenchmarkCmd::Storage(cmd) => match chain_spec {
#[cfg(feature = "with-zeitgeist-runtime")]
spec if spec.is_zeitgeist() => runner.sync_run(|config| {
@@ -151,12 +162,13 @@ pub fn run() -> sc_cli::Result<()> {
>(&config)?;
let ext_builder =
- BenchmarkExtrinsicBuilder::new(params.client.clone(), true);
+ RemarksExtrinsicBuilder::new(params.client.clone(), true);
cmd.run(
config,
params.client,
inherent_benchmark_data()?,
- Arc::new(ext_builder),
+ Vec::new(),
+ &ext_builder,
)
}),
#[cfg(feature = "with-battery-station-runtime")]
@@ -167,12 +179,72 @@ pub fn run() -> sc_cli::Result<()> {
>(&config)?;
let ext_builder =
- BenchmarkExtrinsicBuilder::new(params.client.clone(), false);
+ RemarksExtrinsicBuilder::new(params.client.clone(), false);
cmd.run(
config,
params.client,
inherent_benchmark_data()?,
- Arc::new(ext_builder),
+ Vec::new(),
+ &ext_builder,
+ )
+ }),
+ #[cfg(not(feature = "with-battery-station-runtime"))]
+ _ => panic!("{}", crate::BATTERY_STATION_RUNTIME_NOT_AVAILABLE),
+ }
+ }
+
+ BenchmarkCmd::Extrinsic(cmd) => {
+ if cfg!(feature = "parachain") {
+ return Err("Extrinsic is only supported in standalone chain".into());
+ }
+ match chain_spec {
+ #[cfg(feature = "with-zeitgeist-runtime")]
+ spec if spec.is_zeitgeist() => runner.sync_run(|config| {
+ let params = crate::service::new_partial::<
+ zeitgeist_runtime::RuntimeApi,
+ ZeitgeistExecutor,
+ >(&config)?;
+ // Register the *Remark* and *TKA* builders.
+ let ext_factory = ExtrinsicFactory(vec![
+ Box::new(RemarksExtrinsicBuilder::new(params.client.clone(), true)),
+ Box::new(TransferKeepAliveBuilder::new(
+ params.client.clone(),
+ Sr25519Keyring::Alice.to_account_id(),
+ ZeitgeistED::get(),
+ true,
+ )),
+ ]);
+ cmd.run(
+ params.client,
+ inherent_benchmark_data()?,
+ Vec::new(),
+ &ext_factory,
+ )
+ }),
+ #[cfg(feature = "with-battery-station-runtime")]
+ _ => runner.sync_run(|config| {
+ let params = crate::service::new_partial::<
+ battery_station_runtime::RuntimeApi,
+ BatteryStationExecutor,
+ >(&config)?;
+ // Register the *Remark* and *TKA* builders.
+ let ext_factory = ExtrinsicFactory(vec![
+ Box::new(RemarksExtrinsicBuilder::new(
+ params.client.clone(),
+ false,
+ )),
+ Box::new(TransferKeepAliveBuilder::new(
+ params.client.clone(),
+ Sr25519Keyring::Alice.to_account_id(),
+ BatteryStationED::get(),
+ false,
+ )),
+ ]);
+ cmd.run(
+ params.client,
+ inherent_benchmark_data()?,
+ Vec::new(),
+ &ext_factory,
)
}),
#[cfg(not(feature = "with-battery-station-runtime"))]
@@ -421,7 +493,7 @@ fn none_command(cli: &Cli) -> sc_cli::Result<()> {
);
let parachain_id = cumulus_primitives_core::ParaId::from(
- cli.parachain_id.or(parachain_id_extension).unwrap_or(super::KUSAMA_PARACHAIN_ID),
+ cli.parachain_id.or(parachain_id_extension).unwrap_or(super::POLKADOT_PARACHAIN_ID),
);
let parachain_account =
@@ -484,10 +556,6 @@ fn none_command(cli: &Cli) -> sc_cli::Result<()> {
fn none_command(cli: &Cli) -> sc_cli::Result<()> {
let runner = cli.create_runner(&cli.run)?;
runner.run_node_until_exit(|config| async move {
- if let sc_cli::Role::Light = config.role {
- return Err("Light client not supported!".into());
- }
-
match &config.chain_spec {
#[cfg(feature = "with-zeitgeist-runtime")]
spec if spec.is_zeitgeist() => new_full::(
diff --git a/node/src/main.rs b/node/src/main.rs
index 202e66293..256b159d6 100644
--- a/node/src/main.rs
+++ b/node/src/main.rs
@@ -1,3 +1,4 @@
+// Copyright 2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -17,10 +18,10 @@
#![warn(unused_extern_crates)]
+mod benchmarking;
mod chain_spec;
mod cli;
mod command;
-mod command_helper;
mod rpc;
#[macro_use]
mod service;
@@ -34,9 +35,9 @@ pub const ZEITGEIST_RUNTIME_NOT_AVAILABLE: &str = "Zeitgeist runtime is not avai
cfg_if::cfg_if!(
if #[cfg(feature = "parachain")] {
- const KUSAMA_PARACHAIN_ID: u32 = 2101;
- const BATTERY_STATION_PARACHAIN_ID: u32 = 2050;
- const KUSAMA_BLOCK_DURATION: core::time::Duration = core::time::Duration::from_secs(6);
+ const POLKADOT_PARACHAIN_ID: u32 = 2092;
+ const BATTERY_STATION_PARACHAIN_ID: u32 = 2101;
+ const POLKADOT_BLOCK_DURATION: core::time::Duration = core::time::Duration::from_secs(6);
const SOFT_DEADLINE_PERCENT: sp_runtime::Percent = sp_runtime::Percent::from_percent(100);
}
);
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
index 4fa35ceec..ffa85bead 100644
--- a/node/src/rpc.rs
+++ b/node/src/rpc.rs
@@ -1,3 +1,4 @@
+// Copyright 2022 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
diff --git a/node/src/service.rs b/node/src/service.rs
index f61e46e3e..ef120727c 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -132,7 +133,6 @@ cfg_if::cfg_if! {
/// Additional APIs for parachain runtimes
pub trait AdditionalRuntimeApiCollection:
sp_api::ApiExt
- + nimbus_primitives::AuthorFilterAPI
+ nimbus_primitives::NimbusApi
+ cumulus_primitives_core::CollectCollationInfo
+ session_keys_primitives::VrfApi
@@ -144,7 +144,6 @@ cfg_if::cfg_if! {
impl AdditionalRuntimeApiCollection for Api
where
Api: sp_api::ApiExt
- + nimbus_primitives::AuthorFilterAPI
+ nimbus_primitives::NimbusApi
+ cumulus_primitives_core::CollectCollationInfo
+ session_keys_primitives::VrfApi,
diff --git a/node/src/service/service_parachain.rs b/node/src/service/service_parachain.rs
index 5bf6cbbe3..b9adec1c1 100644
--- a/node/src/service/service_parachain.rs
+++ b/node/src/service/service_parachain.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -17,9 +18,8 @@
use crate::{
service::{AdditionalRuntimeApiCollection, RuntimeApiCollection},
- KUSAMA_BLOCK_DURATION, SOFT_DEADLINE_PERCENT,
+ POLKADOT_BLOCK_DURATION, SOFT_DEADLINE_PERCENT,
};
-use cumulus_client_cli::CollatorOptions;
use cumulus_client_consensus_common::ParachainConsensus;
use cumulus_client_network::BlockAnnounceValidator;
use cumulus_client_service::{
@@ -32,7 +32,8 @@ use nimbus_consensus::{BuildNimbusConsensusParams, NimbusConsensus};
use nimbus_primitives::NimbusId;
use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch};
use sc_network::NetworkService;
-use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
+use sc_network_common::service::NetworkBlock;
+use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
use sp_api::ConstructRuntimeApi;
use sp_keystore::SyncCryptoStorePtr;
@@ -233,7 +234,7 @@ where
/// Start a node with the given parachain `Configuration` and relay chain `Configuration`.
///
/// This is the actual implementation that is abstract over the executor and the runtime api.
-#[sc_tracing::logging::prefix_logs_with("🌔 Zeitgeist Parachain")]
+#[sc_tracing::logging::prefix_logs_with("🔮 Zeitgeist Parachain")]
async fn do_new_full(
parachain_config: Configuration,
polkadot_config: Configuration,
@@ -261,10 +262,6 @@ where
bool,
) -> Result>, sc_service::Error>,
{
- if matches!(parachain_config.role, Role::Light) {
- return Err("Light client not supported!".into());
- }
-
let parachain_config = prepare_node_config(parachain_config);
let params = new_partial::(¶chain_config)?;
@@ -293,7 +290,7 @@ where
let prometheus_registry = parachain_config.prometheus_registry().cloned();
let transaction_pool = params.transaction_pool.clone();
let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue);
- let (network, system_rpc_tx, start_network) =
+ let (network, system_rpc_tx, tx_handler_controller, start_network) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: ¶chain_config,
client: client.clone(),
@@ -325,6 +322,7 @@ where
keystore: params.keystore_container.sync_keystore(),
network: network.clone(),
rpc_builder,
+ tx_handler_controller,
system_rpc_tx,
task_manager: &mut task_manager,
telemetry: telemetry.as_mut(),
@@ -349,7 +347,7 @@ where
Arc::new(move |hash, data| network.announce_block(hash, data))
};
- let relay_chain_slot_duration = KUSAMA_BLOCK_DURATION;
+ let relay_chain_slot_duration = POLKADOT_BLOCK_DURATION;
if collator {
let parachain_consensus = build_consensus(
@@ -392,7 +390,6 @@ where
relay_chain_interface,
relay_chain_slot_duration,
import_queue,
- collator_options: CollatorOptions { relay_chain_rpc_url: Default::default() },
};
start_full_node(params)?;
diff --git a/node/src/service/service_standalone.rs b/node/src/service/service_standalone.rs
index 235284feb..6fe00885c 100644
--- a/node/src/service/service_standalone.rs
+++ b/node/src/service/service_standalone.rs
@@ -1,3 +1,4 @@
+// Copyright 2022 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -18,7 +19,7 @@
//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
use crate::service::{AdditionalRuntimeApiCollection, RuntimeApiCollection};
-use sc_client_api::{BlockBackend, ExecutorProvider};
+use sc_client_api::BlockBackend;
use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch};
use sc_finality_grandpa::{grandpa_peers_set_config, protocol_standard_name, SharedVoterState};
@@ -95,7 +96,7 @@ where
Vec::default(),
));
- let (network, system_rpc_tx, network_starter) =
+ let (network, system_rpc_tx, tx_handler_controller, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
client: client.clone(),
@@ -141,6 +142,7 @@ where
task_manager: &mut task_manager,
transaction_pool: transaction_pool.clone(),
rpc_builder: rpc_builder,
+ tx_handler_controller: tx_handler_controller,
backend,
system_rpc_tx,
config,
@@ -169,12 +171,9 @@ where
telemetry.as_ref().map(|x| x.handle()),
);
- let can_author_with =
- sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
-
let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
- let aura = sc_consensus_aura::start_aura::(
+ let aura = sc_consensus_aura::start_aura::(
StartAuraParams {
slot_duration,
client,
@@ -190,12 +189,11 @@ where
slot_duration,
);
- Ok((timestamp, slot))
+ Ok((slot, timestamp))
},
force_authoring,
backoff_authoring_blocks,
keystore: keystore_container.sync_keystore(),
- can_author_with,
sync_oracle: network.clone(),
justification_sync_link: network.clone(),
block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
@@ -340,7 +338,7 @@ where
let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
- let import_queue = sc_consensus_aura::import_queue::(
+ let import_queue = sc_consensus_aura::import_queue::(
ImportQueueParams {
block_import: grandpa_block_import.clone(),
justification_import: Some(Box::new(grandpa_block_import.clone())),
@@ -354,12 +352,9 @@ where
slot_duration,
);
- Ok((timestamp, slot))
+ Ok((slot, timestamp))
},
spawner: &task_manager.spawn_essential_handle(),
- can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(
- client.executor().clone(),
- ),
registry: config.prometheus_registry(),
check_for_equivocation: Default::default(),
telemetry: telemetry.as_ref().map(|x| x.handle()),
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 4fc57091d..87a5a04ad 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -1,15 +1,15 @@
[dependencies]
arbitrary = { default-features = false, optional = true, version = "1.0" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-currencies = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+orml-currencies = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+orml-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { default-features = false, features = ["derive"], optional = true, version = "1.0.137" }
-sp-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+serde = { default-features = false, features = ["derive"], optional = true, version = "1.0.144" }
+sp-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
[dev-dependencies]
test-case = "2.0.2"
@@ -34,4 +34,4 @@ with-global-disputes = []
authors = ["Zeitgeist PM "]
edition = "2021"
name = "zeitgeist-primitives"
-version = "0.3.7"
+version = "0.3.9"
diff --git a/primitives/src/asset.rs b/primitives/src/asset.rs
index 92a99dc23..094f718c9 100644
--- a/primitives/src/asset.rs
+++ b/primitives/src/asset.rs
@@ -1,3 +1,4 @@
+// Copyright 2022 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
diff --git a/primitives/src/constants.rs b/primitives/src/constants.rs
index 5675bbc16..ec0dd7740 100644
--- a/primitives/src/constants.rs
+++ b/primitives/src/constants.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -18,7 +19,7 @@
#![allow(
// Constants parameters inside `parameter_types!` already check
// arithmetic operations at compile time
- clippy::integer_arithmetic
+ clippy::arithmetic_side_effects
)]
#[cfg(feature = "mock")]
@@ -29,6 +30,7 @@ use crate::types::{Balance, BlockNumber};
use frame_support::{parameter_types, PalletId};
// Definitions for time
+pub const BLOCKS_PER_YEAR: BlockNumber = (BLOCKS_PER_DAY * 36525) / 100;
pub const BLOCKS_PER_DAY: BlockNumber = BLOCKS_PER_HOUR * 24;
pub const MILLISECS_PER_BLOCK: u32 = 12000;
pub const BLOCKS_PER_MINUTE: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
@@ -40,8 +42,10 @@ pub const CENT: Balance = BASE / 100; // 100_000_000
pub const MILLI: Balance = CENT / 10; // 10_000_000
pub const MICRO: Balance = MILLI / 1000; // 10_000
+/// Storage cost per byte and item.
+// Approach: Achieve same cost per item and bytes in relation to total supply as on Polkadot.
pub const fn deposit(items: u32, bytes: u32) -> Balance {
- items as Balance * 20 * BASE + (bytes as Balance) * 100 * MILLI
+ items as Balance * 150 * CENT + (bytes as Balance) * 75 * MICRO
}
// Rikiddo and TokensConfig
@@ -77,6 +81,8 @@ pub const GLOBAL_DISPUTES_LOCK_ID: [u8; 8] = *b"zge/gdlk";
pub const LM_PALLET_ID: PalletId = PalletId(*b"zge/lymg");
// Prediction Markets
+/// The maximum allowed market life time, measured in blocks.
+pub const MAX_MARKET_LIFETIME: BlockNumber = 365 * BLOCKS_PER_DAY;
/// Max. categories in a prediction market.
pub const MAX_CATEGORIES: u16 = 64;
/// The dispute_duration is time where users can dispute the outcome.
diff --git a/primitives/src/constants/mock.rs b/primitives/src/constants/mock.rs
index 5ceec13d6..3c0f64294 100644
--- a/primitives/src/constants/mock.rs
+++ b/primitives/src/constants/mock.rs
@@ -1,3 +1,21 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
+// Copyright 2022 Zeitgeist PM LLC.
+//
+// This file is part of Zeitgeist.
+//
+// Zeitgeist is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// Zeitgeist is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Zeitgeist. If not, see .
+
#![cfg(feature = "mock")]
pub use super::*;
@@ -11,6 +29,7 @@ use orml_traits::parameter_type_with_key;
// Authorized
parameter_types! {
pub const AuthorizedPalletId: PalletId = PalletId(*b"zge/atzd");
+ pub const CorrectionPeriod: BlockNumber = 4;
}
// Court
@@ -43,23 +62,24 @@ parameter_types! {
pub const DisputeFactor: Balance = 2 * BASE;
pub const GlobalDisputePeriod: BlockNumber = 7 * BLOCKS_PER_DAY;
pub const MaxCategories: u16 = 10;
+ pub const MaxDisputeDuration: BlockNumber = 50;
pub const MaxDisputes: u16 = 6;
+ pub const MaxEditReasonLen: u32 = 1024;
+ pub const MaxGracePeriod: BlockNumber = 20;
+ pub const MaxMarketLifetime: BlockNumber = 1_000_000;
+ pub const MaxOracleDuration: BlockNumber = 30;
+ pub const MaxRejectReasonLen: u32 = 1024;
+ // 2_678_400_000 = 31 days.
+ pub const MaxSubsidyPeriod: Moment = 2_678_400_000;
pub const MinCategories: u16 = 2;
+ pub const MinDisputeDuration: BlockNumber = 2;
+ pub const MinOracleDuration: BlockNumber = 2;
// 60_000 = 1 minute. Should be raised to something more reasonable in the future.
pub const MinSubsidyPeriod: Moment = 60_000;
- // 2_678_400_000 = 31 days.
- pub const MaxSubsidyPeriod: Moment = 2_678_400_000;
- pub const MaxMarketPeriod: Moment = u64::MAX / 2;
pub const OracleBond: Balance = 50 * CENT;
+ pub const OutsiderBond: Balance = 2 * OracleBond::get();
pub const PmPalletId: PalletId = PalletId(*b"zge/pred");
pub const ValidityBond: Balance = 50 * CENT;
- pub const MinDisputeDuration: BlockNumber = 2;
- pub const MinOracleDuration: BlockNumber = 2;
- pub const MaxDisputeDuration: BlockNumber = 50;
- pub const MaxGracePeriod: BlockNumber = 20;
- pub const MaxOracleDuration: BlockNumber = 30;
- pub const MaxEditReasonLen: u32 = 1024;
- pub const MaxRejectReasonLen: u32 = 1024;
}
// Simple disputes parameters
@@ -77,8 +97,7 @@ parameter_types! {
pub const MaxSwapFee: Balance = BASE / 10; // 10%
pub const MaxTotalWeight: Balance = 50 * BASE;
pub const MaxWeight: Balance = 50 * BASE;
- pub const MinLiquidity: Balance = 100 * BASE;
- pub const MinSubsidy: Balance = MinLiquidity::get();
+ pub const MinSubsidy: Balance = 100 * BASE;
pub const MinSubsidyPerAccount: Balance = MinSubsidy::get();
pub const MinWeight: Balance = BASE;
pub const SwapsPalletId: PalletId = PalletId(*b"zge/swap");
diff --git a/primitives/src/constants/ztg.rs b/primitives/src/constants/ztg.rs
index 849e07add..c46c63420 100644
--- a/primitives/src/constants/ztg.rs
+++ b/primitives/src/constants/ztg.rs
@@ -1,3 +1,4 @@
+// Copyright 2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -22,10 +23,10 @@ use sp_runtime::Perbill;
/// Total ZTG amount for community incentives.
pub const COMMUNITY_INCENTIVES: u128 = 2_000_000;
-/// Total ZTG amount for collators
+/// Total ZTG amount for collators.
pub const COLLATORS: u128 = 0;
-/// Total ZTG amount for liquidity mining
+/// Total ZTG amount for liquidity mining.
pub const LIQUIDITY_MINING: u128 = 0;
/// Total ZTG amount for parachain lease.
@@ -46,13 +47,19 @@ pub const TEAM_AND_ADVISORS: u128 = 15_000_000;
/// Total ZTG amount for Zeitgesit foundation.
pub const ZEITGEIST_FOUNDATION: u128 = 22_000_000;
-// Inflation
+/// Total ZTG amount at genesis.
+pub const TOTAL_INITIAL_ZTG: u128 = COMMUNITY_INCENTIVES
+ + PARACHAIN_LEASE
+ + PUBLIC_SALE
+ + SEED_SALE
+ + STRATEGIC_SALE
+ + TEAM_AND_ADVISORS
+ + ZEITGEIST_FOUNDATION;
-/// Perthousand crowdloan inflation. 1.5%
-pub const CROWDLOAN_PTD: Perbill = Perbill::from_perthousand(15);
+// Inflation
-/// Perthousand liquidity mining inflation. 2%
-pub const LIQUIDITY_MINING_PTD: Perbill = Perbill::from_perthousand(20);
+/// Perthousand liquidity mining inflation. 0%
+pub const LIQUIDITY_MINING_PTD: Perbill = Perbill::from_perthousand(0);
-/// Perthousand collator staking inflation. 1.5%
-pub const STAKING_PTD: Perbill = Perbill::from_perthousand(15);
+/// Perthousand collator staking inflation. 5%
+pub const STAKING_PTD: Perbill = Perbill::from_perthousand(50);
diff --git a/primitives/src/market.rs b/primitives/src/market.rs
index a2ccf417a..7a2cc3127 100644
--- a/primitives/src/market.rs
+++ b/primitives/src/market.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -28,8 +29,11 @@ use sp_runtime::RuntimeDebug;
/// * `BA`: Balance type for bonds
/// * `BN`: Block number
/// * `M`: Moment (time moment)
+/// * `A`: Asset
#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
-pub struct Market {
+pub struct Market {
+ /// Base asset of the market.
+ pub base_asset: A,
/// Creator of this market.
pub creator: AI,
/// Creation type.
@@ -83,6 +87,7 @@ impl Bond {
pub struct MarketBonds {
pub creation: Option>,
pub oracle: Option>,
+ pub outsider: Option>,
}
impl MarketBonds {
@@ -92,18 +97,20 @@ impl MarketBonds {
Some(bond) if bond.who == *who => bond.value,
_ => BA::zero(),
};
- value_or_default(&self.creation).saturating_add(value_or_default(&self.oracle))
+ value_or_default(&self.creation)
+ .saturating_add(value_or_default(&self.oracle))
+ .saturating_add(value_or_default(&self.outsider))
}
}
// Used primarily for testing purposes.
impl Default for MarketBonds {
fn default() -> Self {
- MarketBonds { creation: None, oracle: None }
+ MarketBonds { creation: None, oracle: None, outsider: None }
}
}
-impl Market {
+impl Market {
// Returns the number of outcomes for a market.
pub fn outcomes(&self) -> u16 {
match self.market_type {
@@ -129,15 +136,17 @@ impl Market {
}
}
-impl MaxEncodedLen for Market
+impl MaxEncodedLen for Market
where
AI: MaxEncodedLen,
BA: MaxEncodedLen,
BN: MaxEncodedLen,
M: MaxEncodedLen,
+ A: MaxEncodedLen,
{
fn max_encoded_len() -> usize {
AI::max_encoded_len()
+ .saturating_add(A::max_encoded_len())
.saturating_add(MarketCreation::max_encoded_len())
.saturating_add(u8::max_encoded_len())
.saturating_add(AI::max_encoded_len())
@@ -264,6 +273,12 @@ pub struct Report {
pub outcome: OutcomeReport,
}
+#[derive(Clone, Decode, Encode, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
+pub struct AuthorityReport {
+ pub resolve_at: BlockNumber,
+ pub outcome: OutcomeReport,
+}
+
/// Contains a market id and the market period.
///
/// * `BN`: Block Number
@@ -279,9 +294,9 @@ pub struct SubsidyUntil {
#[cfg(test)]
mod tests {
- use crate::market::*;
+ use crate::{market::*, types::Asset};
use test_case::test_case;
- type Market = crate::market::Market;
+ type Market = crate::market::Market>;
#[test_case(
MarketType::Categorical(6),
@@ -337,6 +352,7 @@ mod tests {
expected: bool,
) {
let market = Market {
+ base_asset: Asset::Ztg,
creator: 1,
creation: MarketCreation::Permissionless,
creator_fee: 2,
diff --git a/primitives/src/traits.rs b/primitives/src/traits.rs
index ee21643ac..fe7ec219f 100644
--- a/primitives/src/traits.rs
+++ b/primitives/src/traits.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -21,7 +22,7 @@ mod market_id;
mod swaps;
mod zeitgeist_multi_reservable_currency;
-pub use dispute_api::DisputeApi;
+pub use dispute_api::{DisputeApi, DisputeResolutionApi};
pub use market_commons_pallet_api::MarketCommonsPalletApi;
pub use market_id::MarketId;
pub use swaps::Swaps;
diff --git a/primitives/src/traits/dispute_api.rs b/primitives/src/traits/dispute_api.rs
index 41733edd8..caa7b94f3 100644
--- a/primitives/src/traits/dispute_api.rs
+++ b/primitives/src/traits/dispute_api.rs
@@ -1,3 +1,4 @@
+// Copyright 2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -15,8 +16,13 @@
// You should have received a copy of the GNU General Public License
// along with Zeitgeist. If not, see .
-use crate::{market::MarketDispute, outcome_report::OutcomeReport, types::Market};
-use frame_support::dispatch::DispatchResult;
+use crate::{
+ market::MarketDispute,
+ outcome_report::OutcomeReport,
+ types::{Asset, Market},
+};
+use frame_support::{dispatch::DispatchResult, pallet_prelude::Weight, BoundedVec};
+use parity_scale_codec::MaxEncodedLen;
use sp_runtime::DispatchError;
// Abstraction of the market type, which is not a part of `DisputeApi` because Rust doesn't support
@@ -26,13 +32,14 @@ type MarketOfDisputeApi = Market<
::Balance,
::BlockNumber,
::Moment,
+ Asset<::MarketId>,
>;
pub trait DisputeApi {
type AccountId;
type Balance;
type BlockNumber;
- type MarketId;
+ type MarketId: MaxEncodedLen;
type Moment;
type Origin;
@@ -60,4 +67,84 @@ pub trait DisputeApi {
market_id: &Self::MarketId,
market: &MarketOfDisputeApi,
) -> Result, DispatchError>;
+
+ /// Query the future resolution block of a disputed market.
+ /// **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
+ ///
+ /// # Returns
+ ///
+ /// Returns the future resolution block if available, otherwise `None`.
+ fn get_auto_resolve(
+ disputes: &[MarketDispute],
+ market_id: &Self::MarketId,
+ market: &MarketOfDisputeApi,
+ ) -> Result, DispatchError>;
+
+ /// Returns `true` if the market dispute mechanism
+ /// was unable to come to a conclusion.
+ /// **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
+ fn has_failed(
+ disputes: &[MarketDispute],
+ market_id: &Self::MarketId,
+ market: &MarketOfDisputeApi,
+ ) -> Result;
+}
+
+type MarketOfDisputeResolutionApi = Market<
+ ::AccountId,
+ ::Balance,
+ ::BlockNumber,
+ ::Moment,
+ Asset<::MarketId>,
+>;
+
+pub trait DisputeResolutionApi {
+ type AccountId;
+ type Balance;
+ type BlockNumber;
+ type MarketId: MaxEncodedLen;
+ type MaxDisputes;
+ type Moment;
+
+ /// Resolve a market.
+ ///
+ /// **Should** only be called if the market dispute
+ /// mechanism is ready for the resolution ([`DisputeApi::on_resolution`]).
+ ///
+ /// # Returns
+ ///
+ /// Returns the consumed weight.
+ fn resolve(
+ market_id: &Self::MarketId,
+ market: &MarketOfDisputeResolutionApi,
+ ) -> Result;
+
+ /// Add a future block resolution of a disputed market.
+ ///
+ /// # Returns
+ ///
+ /// Returns the number of elements in the storage structure.
+ fn add_auto_resolve(
+ market_id: &Self::MarketId,
+ resolve_at: Self::BlockNumber,
+ ) -> Result;
+
+ /// Check if a future block resolution of a disputed market exists.
+ ///
+ /// # Returns
+ ///
+ /// Returns `true` if the future block resolution exists, otherwise `false`.
+ fn auto_resolve_exists(market_id: &Self::MarketId, resolve_at: Self::BlockNumber) -> bool;
+
+ /// Remove a future block resolution of a disputed market.
+ ///
+ /// # Returns
+ ///
+ /// Returns the number of elements in the storage structure.
+ fn remove_auto_resolve(market_id: &Self::MarketId, resolve_at: Self::BlockNumber) -> u32;
+
+ /// Get the disputes of a market.
+ fn get_disputes(
+ market_id: &Self::MarketId,
+ ) -> BoundedVec, Self::MaxDisputes>;
}
diff --git a/primitives/src/traits/market_commons_pallet_api.rs b/primitives/src/traits/market_commons_pallet_api.rs
index d0e463a4d..280808028 100644
--- a/primitives/src/traits/market_commons_pallet_api.rs
+++ b/primitives/src/traits/market_commons_pallet_api.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -16,7 +17,7 @@
// along with Zeitgeist. If not, see .
#![allow(clippy::type_complexity)]
-use crate::types::{Market, PoolId};
+use crate::types::{Asset, Market, PoolId};
use frame_support::{
dispatch::{DispatchError, DispatchResult},
pallet_prelude::{MaybeSerializeDeserialize, Member},
@@ -36,6 +37,7 @@ type MarketOf = Market<
>>::Balance,
::BlockNumber,
::Moment,
+ Asset<::MarketId>,
>;
/// Abstraction over storage operations for markets
diff --git a/primitives/src/traits/swaps.rs b/primitives/src/traits/swaps.rs
index f8c5f6d2b..007808286 100644
--- a/primitives/src/traits/swaps.rs
+++ b/primitives/src/traits/swaps.rs
@@ -31,7 +31,7 @@ pub trait Swaps {
/// # Arguments
///
/// * `who`: The account that is the creator of the pool. Must have enough
- /// funds for each of the assets to cover the `MinLiqudity`.
+ /// funds for each of the assets to cover the minimum balance.
/// * `assets`: The assets that are used in the pool.
/// * `base_asset`: The base asset in a prediction market swap pool (usually a currency).
/// * `market_id`: The market id of the market the pool belongs to.
diff --git a/primitives/src/traits/zeitgeist_multi_reservable_currency.rs b/primitives/src/traits/zeitgeist_multi_reservable_currency.rs
index 71697493d..11db3909e 100644
--- a/primitives/src/traits/zeitgeist_multi_reservable_currency.rs
+++ b/primitives/src/traits/zeitgeist_multi_reservable_currency.rs
@@ -1,3 +1,4 @@
+// Copyright 2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -17,10 +18,9 @@
#![allow(clippy::type_complexity)]
use alloc::vec::Vec;
-use frame_support::traits::Get;
use orml_tokens::{AccountData, Accounts, TotalIssuance};
use orml_traits::currency::NamedMultiReservableCurrency;
-use sp_runtime::DispatchError;
+use sp_runtime::{traits::Get, DispatchError};
/// Custom `NamedMultiReservableCurrency` trait.
pub trait ZeitgeistAssetManager: NamedMultiReservableCurrency {
@@ -48,7 +48,7 @@ where
let mut total = 0;
#[allow(
// Iterator will never yield more than `usize::MAX` elements
- clippy::integer_arithmetic
+ clippy::arithmetic_side_effects
)]
let accounts = >::iter()
.filter_map(|(k0, k1, v)| {
diff --git a/primitives/src/types.rs b/primitives/src/types.rs
index 2d0a331d2..a380cf656 100644
--- a/primitives/src/types.rs
+++ b/primitives/src/types.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -22,7 +23,7 @@ pub use crate::{
#[cfg(feature = "arbitrary")]
use arbitrary::{Arbitrary, Result, Unstructured};
use frame_support::dispatch::Weight;
-use parity_scale_codec::{Decode, Encode};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
use sp_runtime::{
generic,
@@ -121,3 +122,49 @@ pub struct ResultWithWeightInfo {
pub result: R,
pub weight: Weight,
}
+
+#[derive(
+ Clone,
+ Copy,
+ Debug,
+ Decode,
+ Default,
+ Encode,
+ Eq,
+ MaxEncodedLen,
+ Ord,
+ PartialEq,
+ PartialOrd,
+ TypeInfo,
+)]
+/// Custom XC asset metadata
+pub struct CustomMetadata {
+ /// XCM-related metadata.
+ pub xcm: XcmMetadata,
+
+ /// Whether an asset can be used as base_asset in pools.
+ pub allow_as_base_asset: bool,
+}
+
+#[derive(
+ Clone,
+ Copy,
+ Debug,
+ Decode,
+ Default,
+ Encode,
+ Eq,
+ MaxEncodedLen,
+ Ord,
+ PartialEq,
+ PartialOrd,
+ TypeInfo,
+)]
+pub struct XcmMetadata {
+ /// The factor used to determine the fee.
+ /// It is multiplied by the fee that would have been paid in native currency, so it represents
+ /// the ratio `native_price / other_asset_price`. It is a fixed point decimal number containing
+ /// as many fractional decimals as the asset it is used for contains.
+ /// Should be updated regularly.
+ pub fee_factor: Option,
+}
diff --git a/runtime/battery-station/Cargo.toml b/runtime/battery-station/Cargo.toml
index 6df889e83..eee248a39 100644
--- a/runtime/battery-station/Cargo.toml
+++ b/runtime/battery-station/Cargo.toml
@@ -1,102 +1,107 @@
[build-dependencies]
-substrate-wasm-builder = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
+substrate-wasm-builder = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
[dependencies]
-frame-executive = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-currencies = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-traits = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-pallet-balances = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-bounties = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-collective = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-democracy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-identity = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-membership = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-multisig = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-preimage = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-proxy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-randomness-collective-flip = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-scheduler = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-sudo = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-treasury = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-utility = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-vesting = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-executive = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+orml-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+orml-currencies = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+orml-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+pallet-balances = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-bounties = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-collective = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-contracts = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-contracts-primitives = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-democracy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-identity = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-membership = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-multisig = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-preimage = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-proxy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-randomness-collective-flip = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-scheduler = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-sudo = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-transaction-payment = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-treasury = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-utility = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-vesting = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
+polkadot-primitives = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot" }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-block-builder = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-inherents = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-offchain = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-runtime = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-session = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-transaction-pool = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-version = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-block-builder = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-inherents = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-offchain = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-session = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-std = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-transaction-pool = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-version = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
substrate-fixed = { default-features = false, features = ["serde"], git = "https://github.com/encointer/substrate-fixed" }
# Try-Runtime
-frame-try-runtime = { branch = "polkadot-v0.9.26", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
+frame-try-runtime = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" }
# Benchmark
-frame-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
-frame-system-benchmarking = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
+frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
+frame-system-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate", optional = true }
# Cumulus
-cumulus-pallet-dmp-queue = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-parachain-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-xcm = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-core = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-cumulus-primitives-utility = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-parachain-info = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-pallet-dmp-queue = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-pallet-parachain-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-pallet-xcm = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-primitives-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-primitives-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+cumulus-primitives-utility = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+parachain-info = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
# Parachain
+nimbus-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-author-inherent = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-author-mapping = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-author-slot-filter = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-parachain-staking = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+session-keys-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
-nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-mapping = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-crowdloan-rewards = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/crowdloan-rewards", optional = true }
-pallet-parachain-staking = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-polkadot-parachain = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-session-keys-primitives = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
+
+# Polkadot
+
+polkadot-parachain = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
# Standalone
-pallet-aura = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-grandpa = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-consensus-aura = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-sp-finality-grandpa = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-aura = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-grandpa = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-consensus-aura = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+sp-finality-grandpa = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
# Utility
cfg-if = { version = "1.0.0" }
hex-literal = { default-features = false, optional = true, version = "0.3.4" }
-log = { version = "0.4.17", default-features = false, optional = true }
+log = { version = "0.4.18", default-features = false, optional = true }
# XCM
-kusama-runtime = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-orml-asset-registry = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-unknown-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-xcm-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-orml-xtokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
-pallet-xcm = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-primitives = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-polkadot-runtime-parachains = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm-builder = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
-xcm-executor = { branch = "release-v0.9.26", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
+orml-asset-registry = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
+orml-unknown-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
+orml-xcm-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
+orml-xtokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true }
+pallet-xcm = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
+polkadot-runtime-parachains = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
+rococo-runtime = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
+xcm = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
+xcm-builder = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
+xcm-executor = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true }
# Zeitgeist
@@ -115,12 +120,14 @@ zrml-swaps = { default-features = false, path = "../../zrml/swaps" }
zrml-swaps-runtime-api = { default-features = false, path = "../../zrml/swaps/runtime-api" }
[dev-dependencies]
-sp-io = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
-xcm-emulator = { rev = "ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe", git = "https://github.com/shaunxw/xcm-simulator" }
+sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" }
+test-case = "2.0.2"
+xcm-emulator = { rev = "158a6bd2768c679563efa891aa17329635b2764b", git = "https://github.com/shaunxw/xcm-simulator" }
[features]
default = ["std"]
parachain = [
+ "zrml-prediction-markets/parachain",
# Cumulus
"cumulus-pallet-dmp-queue",
@@ -138,21 +145,19 @@ parachain = [
"pallet-author-inherent",
"pallet-author-mapping",
"pallet-author-slot-filter",
- "pallet-crowdloan-rewards",
"pallet-parachain-staking",
"polkadot-parachain",
"session-keys-primitives",
# XCM
- "kusama-runtime",
- "polkadot-primitives",
- "polkadot-runtime-parachains",
"orml-asset-registry",
"orml-unknown-tokens",
"orml-xcm-support",
"orml-xtokens",
"pallet-xcm",
+ "polkadot-runtime-parachains",
+ "rococo-runtime",
"xcm-builder",
"xcm-executor",
"xcm",
@@ -167,10 +172,9 @@ runtime-benchmarks = [
"cumulus-pallet-xcmp-queue?/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
- "frame-system-benchmarking",
+ "frame-system-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"hex-literal",
- "kusama-runtime?/runtime-benchmarks",
"orml-asset-registry?/runtime-benchmarks",
"orml-tokens/runtime-benchmarks",
"orml-benchmarking",
@@ -181,7 +185,7 @@ runtime-benchmarks = [
"pallet-balances/runtime-benchmarks",
"pallet-bounties/runtime-benchmarks",
"pallet-collective/runtime-benchmarks",
- "pallet-crowdloan-rewards?/runtime-benchmarks",
+ "pallet-contracts/runtime-benchmarks",
"pallet-democracy/runtime-benchmarks",
"pallet-grandpa/runtime-benchmarks",
"pallet-identity/runtime-benchmarks",
@@ -196,6 +200,7 @@ runtime-benchmarks = [
"pallet-vesting/runtime-benchmarks",
"pallet-xcm?/runtime-benchmarks",
"pallet-parachain-staking?/runtime-benchmarks",
+ "rococo-runtime?/runtime-benchmarks",
"nimbus-primitives?/runtime-benchmarks",
"session-keys-primitives?/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
@@ -223,6 +228,8 @@ std = [
"pallet-balances/std",
"pallet-bounties/std",
"pallet-collective/std",
+ "pallet-contracts/std",
+ "pallet-contracts-primitives/std",
"pallet-democracy/std",
"pallet-identity/std",
"pallet-membership/std",
@@ -239,6 +246,7 @@ std = [
"pallet-utility/std",
"pallet-vesting/std",
"parity-scale-codec/std",
+ "polkadot-primitives/std",
"scale-info/std",
"sp-api/std",
"sp-block-builder/std",
@@ -276,7 +284,6 @@ std = [
"pallet-author-inherent?/std",
"pallet-author-mapping?/std",
"pallet-author-slot-filter?/std",
- "pallet-crowdloan-rewards?/std",
"pallet-parachain-staking?/std",
"session-keys-primitives?/std",
@@ -294,14 +301,13 @@ std = [
# XCM
- "kusama-runtime?/std",
- "polkadot-primitives?/std",
- "polkadot-runtime-parachains?/std",
"orml-asset-registry?/std",
"orml-unknown-tokens?/std",
"orml-xcm-support?/std",
"orml-xtokens?/std",
"pallet-xcm?/std",
+ "polkadot-runtime-parachains?/std",
+ "rococo-runtime?/std",
"xcm-builder?/std",
"xcm-executor?/std",
"xcm?/std",
@@ -329,6 +335,7 @@ try-runtime = [
# System runtime pallets
"frame-system/try-runtime",
+ "frame-support/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-randomness-collective-flip/try-runtime",
"pallet-scheduler/try-runtime",
@@ -348,6 +355,7 @@ try-runtime = [
"pallet-membership/try-runtime",
# Other Parity runtime pallets
+ "pallet-contracts/try-runtime",
"pallet-identity/try-runtime",
"pallet-utility/try-runtime",
@@ -372,10 +380,23 @@ try-runtime = [
# Parachain
"pallet-author-mapping?/try-runtime",
+ "pallet-author-inherent?/try-runtime",
"pallet-author-slot-filter?/try-runtime",
"pallet-parachain-staking?/try-runtime",
# Required by pallet-parachain-staking@v0.26.1
"parity-scale-codec/full",
+ "pallet-proxy/try-runtime",
+ "pallet-grandpa/try-runtime",
+ "pallet-aura/try-runtime",
+ "pallet-sudo/try-runtime",
+ "pallet-xcm?/try-runtime",
+
+ # Cumulus
+ "cumulus-pallet-parachain-system?/try-runtime",
+ "cumulus-pallet-xcm?/try-runtime",
+ "cumulus-pallet-dmp-queue?/try-runtime",
+ "cumulus-pallet-xcmp-queue?/try-runtime",
+ "parachain-info?/try-runtime",
]
with-global-disputes = [
"zrml-global-disputes",
@@ -387,7 +408,7 @@ with-global-disputes = [
authors = ["Zeitgeist PM "]
edition = "2021"
name = "battery-station-runtime"
-version = "0.3.7"
+version = "0.3.9"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
diff --git a/runtime/battery-station/src/integration_tests/mod.rs b/runtime/battery-station/src/integration_tests/mod.rs
index 64f89683b..31216c4f4 100644
--- a/runtime/battery-station/src/integration_tests/mod.rs
+++ b/runtime/battery-station/src/integration_tests/mod.rs
@@ -1,4 +1,5 @@
// Copyright 2022 Forecasting Technologies LTD.
+//
// This file is part of Zeitgeist.
//
// Zeitgeist is free software: you can redistribute it and/or modify it
diff --git a/runtime/battery-station/src/integration_tests/xcm/mod.rs b/runtime/battery-station/src/integration_tests/xcm/mod.rs
index d2226363f..d37a62036 100644
--- a/runtime/battery-station/src/integration_tests/xcm/mod.rs
+++ b/runtime/battery-station/src/integration_tests/xcm/mod.rs
@@ -1,4 +1,5 @@
// Copyright 2022 Forecasting Technologies LTD.
+//
// This file is part of Zeitgeist.
//
// Zeitgeist is free software: you can redistribute it and/or modify it
diff --git a/runtime/battery-station/src/integration_tests/xcm/setup.rs b/runtime/battery-station/src/integration_tests/xcm/setup.rs
index 510c5b58d..83cae024f 100644
--- a/runtime/battery-station/src/integration_tests/xcm/setup.rs
+++ b/runtime/battery-station/src/integration_tests/xcm/setup.rs
@@ -1,5 +1,5 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021 Centrifuge Foundation (centrifuge.io).
-// Copyright 2022 Forecasting Technologies LTD.
//
// This file is part of Zeitgeist.
//
@@ -17,19 +17,18 @@
// along with Zeitgeist. If not, see .
use crate::{
- xcm_config::{
- asset_registry::CustomMetadata,
- config::{battery_station, general_key},
- },
- AccountId, AssetRegistry, Balance, CurrencyId, ExistentialDeposit, Origin, Runtime, System,
+ xcm_config::config::{battery_station, general_key},
+ AccountId, AssetRegistry, Balance, CurrencyId, ExistentialDeposit, Runtime, RuntimeOrigin,
+ System,
};
use frame_support::{assert_ok, traits::GenesisBuild};
use orml_traits::asset_registry::AssetMetadata;
+use sp_runtime::AccountId32;
use xcm::{
latest::{Junction::Parachain, Junctions::X2, MultiLocation},
VersionedMultiLocation,
};
-use zeitgeist_primitives::types::Asset;
+use zeitgeist_primitives::types::{Asset, CustomMetadata};
pub(super) struct ExtBuilder {
balances: Vec<(AccountId, CurrencyId, Balance)>,
@@ -97,8 +96,8 @@ impl ExtBuilder {
}
/// Accounts
-pub const ALICE: [u8; 32] = [4u8; 32];
-pub const BOB: [u8; 32] = [5u8; 32];
+pub const ALICE: AccountId32 = AccountId32::new([0u8; 32]);
+pub const BOB: AccountId32 = AccountId32::new([1u8; 32]);
/// A PARA ID used for a sibling parachain.
/// It must be one that doesn't collide with any other in use.
@@ -136,7 +135,7 @@ pub(super) fn register_foreign_ztg(additional_meta: Option) {
additional: additional_meta.unwrap_or_default(),
};
- assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_ZTG_ID)));
+ assert_ok!(AssetRegistry::register_asset(RuntimeOrigin::root(), meta, Some(FOREIGN_ZTG_ID)));
}
pub(super) fn register_foreign_sibling(additional_meta: Option) {
@@ -150,21 +149,25 @@ pub(super) fn register_foreign_sibling(additional_meta: Option)
additional: additional_meta.unwrap_or_default(),
};
- assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_SIBLING_ID)));
+ assert_ok!(AssetRegistry::register_asset(
+ RuntimeOrigin::root(),
+ meta,
+ Some(FOREIGN_SIBLING_ID)
+ ));
}
pub(super) fn register_foreign_parent(additional_meta: Option) {
- // Register KSM as foreign asset in the sibling parachain
+ // Register roc as foreign asset in the sibling parachain
let meta: AssetMetadata = AssetMetadata {
decimals: 12,
- name: "Kusama".into(),
- symbol: "KSM".into(),
- existential_deposit: 10_000_000_000, // 0.01
+ name: "Rococo".into(),
+ symbol: "ROC".into(),
+ existential_deposit: 33_333_333, // 0.0033333333
location: Some(VersionedMultiLocation::V1(foreign_parent_multilocation())),
additional: additional_meta.unwrap_or_default(),
};
- assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_PARENT_ID)));
+ assert_ok!(AssetRegistry::register_asset(RuntimeOrigin::root(), meta, Some(FOREIGN_PARENT_ID)));
}
#[inline]
@@ -173,7 +176,7 @@ pub(super) fn ztg(amount: Balance) -> Balance {
}
#[inline]
-pub(super) fn ksm(amount: Balance) -> Balance {
+pub(super) fn roc(amount: Balance) -> Balance {
foreign(amount, 12)
}
diff --git a/runtime/battery-station/src/integration_tests/xcm/test_net.rs b/runtime/battery-station/src/integration_tests/xcm/test_net.rs
index 8d6d8351d..7e1becfd9 100644
--- a/runtime/battery-station/src/integration_tests/xcm/test_net.rs
+++ b/runtime/battery-station/src/integration_tests/xcm/test_net.rs
@@ -1,5 +1,6 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Centrifuge GmbH (centrifuge.io).
-// Copyright 2022 Forecasting Technologies LTD.
+//
// This file is part of Zeitgeist.
//
// Zeitgeist is free software: you can redistribute it and/or modify it
@@ -16,20 +17,23 @@
// along with Zeitgeist. If not, see .
use crate::{
- parameters::ZeitgeistTreasuryAccount, xcm_config::config::battery_station, AccountId,
- CurrencyId, DmpQueue, Origin, Runtime, XcmpQueue,
+ parameters::ZeitgeistTreasuryAccount, xcm_config::config::battery_station, CurrencyId,
+ DmpQueue, Runtime, RuntimeOrigin, XcmpQueue,
};
use frame_support::{traits::GenesisBuild, weights::Weight};
-use polkadot_primitives::v2::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
+use polkadot_primitives::{
+ runtime_api::runtime_decl_for_ParachainHost::ParachainHostV3,
+ v2::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE},
+};
use polkadot_runtime_parachains::configuration::HostConfiguration;
use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain};
-use super::setup::{ksm, ztg, ExtBuilder, ALICE, FOREIGN_PARENT_ID, PARA_ID_SIBLING};
+use super::setup::{roc, ztg, ExtBuilder, ALICE, FOREIGN_PARENT_ID, PARA_ID_SIBLING};
decl_test_relay_chain! {
- pub struct KusamaNet {
- Runtime = kusama_runtime::Runtime,
- XcmConfig = kusama_runtime::xcm_config::XcmConfig,
+ pub struct RococoNet {
+ Runtime = rococo_runtime::Runtime,
+ XcmConfig = rococo_runtime::xcm_config::XcmConfig,
new_ext = relay_ext(),
}
}
@@ -37,7 +41,7 @@ decl_test_relay_chain! {
decl_test_parachain! {
pub struct Zeitgeist {
Runtime = Runtime,
- Origin = Origin,
+ RuntimeOrigin = RuntimeOrigin,
XcmpMessageHandler = XcmpQueue,
DmpMessageHandler = DmpQueue,
new_ext = para_ext(battery_station::ID),
@@ -47,7 +51,7 @@ decl_test_parachain! {
decl_test_parachain! {
pub struct Sibling {
Runtime = Runtime,
- Origin = Origin,
+ RuntimeOrigin = RuntimeOrigin,
XcmpMessageHandler = XcmpQueue,
DmpMessageHandler = DmpQueue,
new_ext = para_ext(PARA_ID_SIBLING),
@@ -56,13 +60,13 @@ decl_test_parachain! {
decl_test_network! {
pub struct TestNet {
- relay_chain = KusamaNet,
+ relay_chain = RococoNet,
parachains = vec![
// N.B: Ideally, we could use the defined para id constants but doing so
// fails with: "error: arbitrary expressions aren't allowed in patterns"
// Be sure to use `xcm_config::config::battery_station::ID`
- (2050, Zeitgeist),
+ (2101, Zeitgeist),
// Be sure to use `PARA_ID_SIBLING`
(3000, Sibling),
],
@@ -70,15 +74,13 @@ decl_test_network! {
}
pub(super) fn relay_ext() -> sp_io::TestExternalities {
- use kusama_runtime::{Runtime, System};
+ use rococo_runtime::{Runtime, System};
let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap();
- pallet_balances::GenesisConfig:: {
- balances: vec![(AccountId::from(ALICE), ksm(2002))],
- }
- .assimilate_storage(&mut t)
- .unwrap();
+ pallet_balances::GenesisConfig:: { balances: vec![(ALICE, roc(2002))] }
+ .assimilate_storage(&mut t)
+ .unwrap();
polkadot_runtime_parachains::configuration::GenesisConfig:: {
config: default_parachains_host_configuration(),
@@ -100,9 +102,9 @@ pub(super) fn relay_ext() -> sp_io::TestExternalities {
pub(super) fn para_ext(parachain_id: u32) -> sp_io::TestExternalities {
ExtBuilder::default()
.set_balances(vec![
- (AccountId::from(ALICE), CurrencyId::Ztg, ztg(10)),
- (AccountId::from(ALICE), FOREIGN_PARENT_ID, ksm(10)),
- (ZeitgeistTreasuryAccount::get(), FOREIGN_PARENT_ID, ksm(1)),
+ (ALICE, CurrencyId::Ztg, ztg(10)),
+ (ALICE, FOREIGN_PARENT_ID, roc(10)),
+ (ZeitgeistTreasuryAccount::get(), FOREIGN_PARENT_ID, roc(1)),
])
.set_parachain_id(parachain_id)
.build()
@@ -123,7 +125,7 @@ fn default_parachains_host_configuration() -> HostConfiguration {
max_upward_queue_count: 8,
max_upward_queue_size: 1024 * 1024,
max_downward_message_size: 1024,
- ump_service_total_weight: Weight::from(4 * 1_000_000_000u32),
+ ump_service_total_weight: Weight::from_ref_time(4_u64 * 1_000_000_000_u64),
max_upward_message_size: 50 * 1024,
max_upward_message_num_per_candidate: 5,
hrmp_sender_deposit: 0,
diff --git a/runtime/battery-station/src/integration_tests/xcm/tests/currency_id_convert.rs b/runtime/battery-station/src/integration_tests/xcm/tests/currency_id_convert.rs
index a2d744b5a..cda575235 100644
--- a/runtime/battery-station/src/integration_tests/xcm/tests/currency_id_convert.rs
+++ b/runtime/battery-station/src/integration_tests/xcm/tests/currency_id_convert.rs
@@ -1,5 +1,5 @@
-// Copyright 2021 Centrifuge Foundation (centrifuge.io).
// Copyright 2022 Forecasting Technologies LTD.
+// Copyright 2021 Centrifuge Foundation (centrifuge.io).
//
// This file is part of Zeitgeist.
//
diff --git a/runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs b/runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs
index ffa956c08..65514f572 100644
--- a/runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs
+++ b/runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs
@@ -1,5 +1,5 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021 Centrifuge Foundation (centrifuge.io).
-// Copyright 2022 Forecasting Technologies LTD.
//
// This file is part of Zeitgeist.
//
@@ -19,18 +19,14 @@
use crate::{
integration_tests::xcm::{
setup::{
- ksm, register_foreign_parent, register_foreign_ztg, sibling_parachain_account,
+ register_foreign_parent, register_foreign_ztg, roc, sibling_parachain_account,
zeitgeist_parachain_account, ztg, ALICE, BOB, FOREIGN_PARENT_ID, FOREIGN_ZTG_ID,
PARA_ID_SIBLING,
},
- test_net::{KusamaNet, Sibling, TestNet, Zeitgeist},
+ test_net::{RococoNet, Sibling, TestNet, Zeitgeist},
},
- xcm_config::{
- asset_registry::{CustomMetadata, XcmMetadata},
- config::battery_station,
- fees::default_per_second,
- },
- AssetRegistry, Balance, Balances, CurrencyId, Origin, Tokens, XTokens,
+ xcm_config::{config::battery_station, fees::default_per_second},
+ AssetRegistry, Balance, Balances, CurrencyId, RuntimeOrigin, Tokens, XTokens,
ZeitgeistTreasuryAccount,
};
@@ -38,7 +34,10 @@ use frame_support::assert_ok;
use orml_traits::MultiCurrency;
use xcm::latest::{Junction, Junction::*, Junctions::*, MultiLocation, NetworkId};
use xcm_emulator::TestExt;
-use zeitgeist_primitives::constants::BalanceFractionalDecimals;
+use zeitgeist_primitives::{
+ constants::BalanceFractionalDecimals,
+ types::{CustomMetadata, XcmMetadata},
+};
#[test]
fn transfer_ztg_to_sibling() {
@@ -51,15 +50,15 @@ fn transfer_ztg_to_sibling() {
Sibling::execute_with(|| {
treasury_initial_balance =
Tokens::free_balance(FOREIGN_ZTG_ID, &ZeitgeistTreasuryAccount::get());
- assert_eq!(Tokens::free_balance(FOREIGN_ZTG_ID, &BOB.into()), 0);
+ assert_eq!(Tokens::free_balance(FOREIGN_ZTG_ID, &BOB), 0);
register_foreign_ztg(None);
});
Zeitgeist::execute_with(|| {
- assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance);
- assert_eq!(Balances::free_balance(&sibling_parachain_account()), 0);
+ assert_eq!(Balances::free_balance(&ALICE), alice_initial_balance);
+ assert_eq!(Balances::free_balance(sibling_parachain_account()), 0);
assert_ok!(XTokens::transfer(
- Origin::signed(ALICE.into()),
+ RuntimeOrigin::signed(ALICE),
CurrencyId::Ztg,
transfer_amount,
Box::new(
@@ -67,23 +66,23 @@ fn transfer_ztg_to_sibling() {
1,
X2(
Parachain(PARA_ID_SIBLING),
- Junction::AccountId32 { network: NetworkId::Any, id: BOB }
+ Junction::AccountId32 { network: NetworkId::Any, id: BOB.into() }
)
)
.into()
),
- 4_000_000_000,
+ xcm_emulator::Limited(4_000_000_000),
));
// Confirm that Alice's balance is initial_balance - amount_transferred
- assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance - transfer_amount);
+ assert_eq!(Balances::free_balance(&ALICE), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the sibling account here
- assert_eq!(Balances::free_balance(&sibling_parachain_account()), transfer_amount);
+ assert_eq!(Balances::free_balance(sibling_parachain_account()), transfer_amount);
});
Sibling::execute_with(|| {
- let current_balance = Tokens::free_balance(FOREIGN_ZTG_ID, &BOB.into());
+ let current_balance = Tokens::free_balance(FOREIGN_ZTG_ID, &BOB);
// Verify that BOB now has (amount transferred - fee)
assert_eq!(current_balance, transfer_amount - ztg_fee());
@@ -118,18 +117,18 @@ fn transfer_ztg_sibling_to_zeitgeist() {
Zeitgeist::execute_with(|| {
treasury_initial_balance = Balances::free_balance(ZeitgeistTreasuryAccount::get());
- assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance);
+ assert_eq!(Balances::free_balance(&ALICE), alice_initial_balance);
assert_eq!(
- Balances::free_balance(&sibling_parachain_account()),
+ Balances::free_balance(sibling_parachain_account()),
sibling_sovereign_initial_balance
);
});
Sibling::execute_with(|| {
- assert_eq!(Balances::free_balance(&zeitgeist_parachain_account()), 0);
- assert_eq!(Tokens::free_balance(FOREIGN_ZTG_ID, &BOB.into()), bob_initial_balance);
+ assert_eq!(Balances::free_balance(zeitgeist_parachain_account()), 0);
+ assert_eq!(Tokens::free_balance(FOREIGN_ZTG_ID, &BOB), bob_initial_balance);
assert_ok!(XTokens::transfer(
- Origin::signed(BOB.into()),
+ RuntimeOrigin::signed(BOB),
FOREIGN_ZTG_ID,
transfer_amount,
Box::new(
@@ -137,17 +136,17 @@ fn transfer_ztg_sibling_to_zeitgeist() {
1,
X2(
Parachain(battery_station::ID),
- Junction::AccountId32 { network: NetworkId::Any, id: ALICE }
+ Junction::AccountId32 { network: NetworkId::Any, id: ALICE.into() }
)
)
.into()
),
- 4_000_000_000,
+ xcm_emulator::Limited(4_000_000_000),
));
// Confirm that Bobs's balance is initial balance - amount transferred
assert_eq!(
- Tokens::free_balance(FOREIGN_ZTG_ID, &BOB.into()),
+ Tokens::free_balance(FOREIGN_ZTG_ID, &BOB),
bob_initial_balance - transfer_amount
);
});
@@ -155,13 +154,13 @@ fn transfer_ztg_sibling_to_zeitgeist() {
Zeitgeist::execute_with(|| {
// Verify that ALICE now has initial balance + amount transferred - fee
assert_eq!(
- Balances::free_balance(&ALICE.into()),
+ Balances::free_balance(&ALICE),
alice_initial_balance + transfer_amount - ztg_fee(),
);
// Verify that the reserve has been adjusted properly
assert_eq!(
- Balances::free_balance(&sibling_parachain_account()),
+ Balances::free_balance(sibling_parachain_account()),
sibling_sovereign_initial_balance - transfer_amount
);
@@ -174,69 +173,68 @@ fn transfer_ztg_sibling_to_zeitgeist() {
}
#[test]
-fn transfer_ksm_from_relay_chain() {
+fn transfer_roc_from_relay_chain() {
TestNet::reset();
- let transfer_amount: Balance = ksm(1);
+ let transfer_amount: Balance = roc(1);
Zeitgeist::execute_with(|| {
register_foreign_parent(None);
});
- KusamaNet::execute_with(|| {
- let initial_balance = kusama_runtime::Balances::free_balance(&ALICE.into());
+ RococoNet::execute_with(|| {
+ let initial_balance = rococo_runtime::Balances::free_balance(&ALICE);
assert!(initial_balance >= transfer_amount);
- assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets(
- kusama_runtime::Origin::signed(ALICE.into()),
+ assert_ok!(rococo_runtime::XcmPallet::reserve_transfer_assets(
+ rococo_runtime::RuntimeOrigin::signed(ALICE),
Box::new(Parachain(battery_station::ID).into().into()),
- Box::new(Junction::AccountId32 { network: NetworkId::Any, id: BOB }.into().into()),
+ Box::new(
+ Junction::AccountId32 { network: NetworkId::Any, id: BOB.into() }.into().into()
+ ),
Box::new((Here, transfer_amount).into()),
0
));
});
Zeitgeist::execute_with(|| {
- assert_eq!(
- Tokens::free_balance(FOREIGN_PARENT_ID, &BOB.into()),
- transfer_amount - ksm_fee()
- );
+ assert_eq!(Tokens::free_balance(FOREIGN_PARENT_ID, &BOB), transfer_amount - roc_fee());
});
}
#[test]
-fn transfer_ksm_to_relay_chain() {
+fn transfer_roc_to_relay_chain() {
TestNet::reset();
- let transfer_amount: Balance = ksm(1);
- transfer_ksm_from_relay_chain();
+ let transfer_amount: Balance = roc(1);
+ transfer_roc_from_relay_chain();
Zeitgeist::execute_with(|| {
- let initial_balance = Tokens::free_balance(FOREIGN_PARENT_ID, &ALICE.into());
+ let initial_balance = Tokens::free_balance(FOREIGN_PARENT_ID, &ALICE);
assert!(initial_balance >= transfer_amount);
assert_ok!(XTokens::transfer(
- Origin::signed(ALICE.into()),
+ RuntimeOrigin::signed(ALICE),
FOREIGN_PARENT_ID,
transfer_amount,
Box::new(
MultiLocation::new(
1,
- X1(Junction::AccountId32 { id: BOB, network: NetworkId::Any })
+ X1(Junction::AccountId32 { id: BOB.into(), network: NetworkId::Any })
)
.into()
),
- 4_000_000_000
+ xcm_emulator::Limited(4_000_000_000)
));
assert_eq!(
- Tokens::free_balance(FOREIGN_PARENT_ID, &ALICE.into()),
+ Tokens::free_balance(FOREIGN_PARENT_ID, &ALICE),
initial_balance - transfer_amount
)
});
- KusamaNet::execute_with(|| {
- assert_eq!(kusama_runtime::Balances::free_balance(&BOB.into()), 999_988_476_752);
+ RococoNet::execute_with(|| {
+ assert_eq!(rococo_runtime::Balances::free_balance(&BOB), 999_988_806_429);
});
}
@@ -253,7 +251,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() {
Sibling::execute_with(|| {
treasury_initial_balance =
Tokens::free_balance(FOREIGN_ZTG_ID, &ZeitgeistTreasuryAccount::get());
- assert_eq!(Tokens::free_balance(FOREIGN_ZTG_ID, &BOB.into()), 0);
+ assert_eq!(Tokens::free_balance(FOREIGN_ZTG_ID, &BOB), 0);
register_foreign_ztg(None);
let custom_metadata = CustomMetadata {
@@ -272,10 +270,10 @@ fn transfer_ztg_to_sibling_with_custom_fee() {
});
Zeitgeist::execute_with(|| {
- assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance);
- assert_eq!(Balances::free_balance(&sibling_parachain_account()), 0);
+ assert_eq!(Balances::free_balance(&ALICE), alice_initial_balance);
+ assert_eq!(Balances::free_balance(sibling_parachain_account()), 0);
assert_ok!(XTokens::transfer(
- Origin::signed(ALICE.into()),
+ RuntimeOrigin::signed(ALICE),
CurrencyId::Ztg,
transfer_amount,
Box::new(
@@ -283,23 +281,23 @@ fn transfer_ztg_to_sibling_with_custom_fee() {
1,
X2(
Parachain(PARA_ID_SIBLING),
- Junction::AccountId32 { network: NetworkId::Any, id: BOB }
+ Junction::AccountId32 { network: NetworkId::Any, id: BOB.into() }
)
)
.into()
),
- 4_000_000_000,
+ xcm_emulator::Limited(4_000_000_000),
));
// Confirm that Alice's balance is initial_balance - amount_transferred
- assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance - transfer_amount);
+ assert_eq!(Balances::free_balance(&ALICE), alice_initial_balance - transfer_amount);
// Verify that the amount transferred is now part of the sibling account here
- assert_eq!(Balances::free_balance(&sibling_parachain_account()), transfer_amount);
+ assert_eq!(Balances::free_balance(sibling_parachain_account()), transfer_amount);
});
Sibling::execute_with(|| {
- let current_balance = Tokens::free_balance(FOREIGN_ZTG_ID, &BOB.into());
+ let current_balance = Tokens::free_balance(FOREIGN_ZTG_ID, &BOB);
let custom_fee = calc_fee(default_per_second(10) * 10);
// Verify that BOB now has (amount transferred - fee)
@@ -319,7 +317,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() {
#[test]
fn test_total_fee() {
assert_eq!(ztg_fee(), 92_696_000);
- assert_eq!(ksm_fee(), 9_269_600_000);
+ assert_eq!(roc_fee(), 9_269_600_000);
}
#[inline]
@@ -332,9 +330,9 @@ fn fee(decimals: u32) -> Balance {
calc_fee(default_per_second(decimals))
}
-// The fee associated with transferring KSM tokens
+// The fee associated with transferring roc tokens
#[inline]
-fn ksm_fee() -> Balance {
+fn roc_fee() -> Balance {
fee(12)
}
diff --git a/runtime/battery-station/src/lib.rs b/runtime/battery-station/src/lib.rs
index b24f04a30..972a6f08e 100644
--- a/runtime/battery-station/src/lib.rs
+++ b/runtime/battery-station/src/lib.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -33,6 +34,8 @@ pub use frame_system::{
};
#[cfg(feature = "parachain")]
pub use pallet_author_slot_filter::EligibilityValue;
+pub use pallet_balances::Call as BalancesCall;
+use pallet_collective::EnsureProportionMoreThan;
#[cfg(feature = "parachain")]
pub use crate::parachain_params::*;
@@ -40,12 +43,15 @@ pub use crate::parameters::*;
use alloc::vec;
use frame_support::{
traits::{ConstU16, ConstU32, Contains, EitherOfDiverse, EqualPrivilegeOnly, InstanceFilter},
- weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee},
+ weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee, Weight},
};
use frame_system::EnsureRoot;
use pallet_collective::{EnsureProportionAtLeast, PrimeDefaultVote};
use pallet_transaction_payment::ChargeTransactionPayment;
-use sp_runtime::traits::{AccountIdConversion, AccountIdLookup, BlakeTwo256};
+use sp_runtime::{
+ traits::{AccountIdConversion, AccountIdLookup, BlakeTwo256},
+ DispatchError,
+};
#[cfg(feature = "std")]
use sp_version::NativeVersion;
use substrate_fixed::{types::extra::U33, FixedI128, FixedU128};
@@ -54,10 +60,9 @@ use zrml_rikiddo::types::{EmaMarketVolume, FeeSigmoid, RikiddoSigmoidMV};
#[cfg(feature = "parachain")]
use {
frame_support::traits::{AsEnsureOriginWithArg, Everything, Nothing},
- frame_system::EnsureSigned,
xcm_builder::{EnsureXcmOrigin, FixedWeightBounds, LocationInverter},
xcm_config::{
- asset_registry::{CustomAssetProcessor, CustomMetadata},
+ asset_registry::CustomAssetProcessor,
config::{LocalOriginToLocation, XcmConfig, XcmOriginToTransactDispatchOrigin, XcmRouter},
},
};
@@ -74,10 +79,9 @@ use sp_runtime::{
};
#[cfg(feature = "parachain")]
-use nimbus_primitives::{CanAuthor, NimbusId};
+use nimbus_primitives::CanAuthor;
use sp_version::RuntimeVersion;
-#[cfg(feature = "parachain")]
#[cfg(test)]
pub mod integration_tests;
#[cfg(feature = "parachain")]
@@ -90,10 +94,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("zeitgeist"),
impl_name: create_runtime_str!("zeitgeist"),
authoring_version: 1,
- spec_version: 41,
+ spec_version: 46,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
- transaction_version: 18,
+ transaction_version: 21,
state_version: 1,
};
@@ -101,8 +105,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
pub struct IsCallable;
// Currently disables Court, Rikiddo and creation of markets using Court.
-impl Contains for IsCallable {
- fn contains(call: &Call) -> bool {
+impl Contains for IsCallable {
+ fn contains(call: &RuntimeCall) -> bool {
use zeitgeist_primitives::types::{
MarketDisputeMechanism::Court, ScoringRule::RikiddoSigmoidFeeMarketEma,
};
@@ -112,9 +116,9 @@ impl Contains for IsCallable {
#[allow(clippy::match_like_matches_macro)]
match call {
- Call::Court(_) => false,
- Call::LiquidityMining(_) => false,
- Call::PredictionMarkets(inner_call) => {
+ RuntimeCall::Court(_) => false,
+ RuntimeCall::LiquidityMining(_) => false,
+ RuntimeCall::PredictionMarkets(inner_call) => {
match inner_call {
// Disable Rikiddo markets
create_market { scoring_rule: RikiddoSigmoidFeeMarketEma, .. } => false,
@@ -145,8 +149,8 @@ create_runtime_with_additional_pallets!(
);
impl pallet_sudo::Config for Runtime {
- type Call = Call;
- type Event = Event;
+ type RuntimeCall = RuntimeCall;
+ type RuntimeEvent = RuntimeEvent;
}
impl_config_traits!();
diff --git a/runtime/battery-station/src/parachain_params.rs b/runtime/battery-station/src/parachain_params.rs
index 1d5092151..c906fcfe7 100644
--- a/runtime/battery-station/src/parachain_params.rs
+++ b/runtime/battery-station/src/parachain_params.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -18,11 +19,11 @@
#![allow(
// Constants parameters inside `parameter_types!` already check
// arithmetic operations at compile time
- clippy::integer_arithmetic
+ clippy::arithmetic_side_effects
)]
#![cfg(feature = "parachain")]
-use super::{parameters::MAXIMUM_BLOCK_WEIGHT, Origin, ParachainInfo};
+use super::{parameters::MAXIMUM_BLOCK_WEIGHT, ParachainInfo, RuntimeOrigin};
use frame_support::{parameter_types, weights::Weight};
use orml_traits::parameter_type_with_key;
use sp_runtime::{Perbill, Percent};
@@ -37,22 +38,14 @@ parameter_types! {
/// The amount that should be taken as a security deposit when registering a NimbusId.
pub const CollatorDeposit: Balance = 2 * BASE;
- // Crowdloan
- pub const InitializationPayment: Perbill = Perbill::from_percent(30);
- pub const Initialized: bool = false;
- pub const MaxInitContributorsBatchSizes: u32 = 500;
- pub const MinimumReward: Balance = 0;
- pub const RelaySignaturesThreshold: Perbill = Perbill::from_percent(100);
- pub const SignatureNetworkIdentifier: &'static [u8] = b"zeitgeist-";
-
// Cumulus and Polkadot
pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
pub const RelayLocation: MultiLocation = MultiLocation::parent();
pub const RelayNetwork: NetworkId = NetworkId::Any;
- pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
- pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
- pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
- pub UnitWeightCost: Weight = 200_000_000;
+ pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+ pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+ pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
+ pub UnitWeightCost: u64 = 200_000_000;
// Staking
/// Rounds before the candidate bond increase/decrease can be executed
@@ -90,7 +83,7 @@ parameter_types! {
// XCM
/// Base weight for XCM execution
- pub const BaseXcmWeight: Weight = 200_000_000;
+ pub const BaseXcmWeight: u64 = 200_000_000;
/// The maximum number of distinct assets allowed to be transferred in a
/// single helper extrinsic.
pub const MaxAssetsForTransfer: usize = 2;
diff --git a/runtime/battery-station/src/parameters.rs b/runtime/battery-station/src/parameters.rs
index 68bf1c76d..67b791636 100644
--- a/runtime/battery-station/src/parameters.rs
+++ b/runtime/battery-station/src/parameters.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -18,15 +19,17 @@
#![allow(
// Constants parameters inside `parameter_types!` already check
// arithmetic operations at compile time
- clippy::integer_arithmetic
+ clippy::arithmetic_side_effects
)]
-use super::VERSION;
+use super::{Runtime, VERSION};
use frame_support::{
+ dispatch::DispatchClass,
parameter_types,
+ traits::WithdrawReasons,
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_PER_SECOND},
- DispatchClass, Weight,
+ Weight,
},
PalletId,
};
@@ -34,7 +37,8 @@ use frame_system::limits::{BlockLength, BlockWeights};
use orml_traits::parameter_type_with_key;
use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
use sp_runtime::{
- traits::AccountIdConversion, FixedPointNumber, Perbill, Percent, Permill, Perquintill,
+ traits::{AccountIdConversion, Bounded},
+ FixedPointNumber, Perbill, Percent, Permill, Perquintill,
};
use sp_version::RuntimeVersion;
use zeitgeist_primitives::{constants::*, types::*};
@@ -43,7 +47,9 @@ use zeitgeist_primitives::{constants::*, types::*};
use frame_support::traits::LockIdentifier;
pub(crate) const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
-pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;
+pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight =
+ Weight::from_ref_time(WEIGHT_PER_SECOND.ref_time() / 2)
+ .set_proof_size(polkadot_primitives::v2::MAX_POV_SIZE as u64);
pub(crate) const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
pub(crate) const FEES_AND_TIPS_TREASURY_PERCENTAGE: u32 = 100;
pub(crate) const FEES_AND_TIPS_BURN_PERCENTAGE: u32 = 0;
@@ -51,6 +57,7 @@ pub(crate) const FEES_AND_TIPS_BURN_PERCENTAGE: u32 = 0;
parameter_types! {
// Authorized
pub const AuthorizedPalletId: PalletId = AUTHORIZED_PALLET_ID;
+ pub const CorrectionPeriod: BlockNumber = BLOCKS_PER_DAY;
// Authority
pub const MaxAuthorities: u32 = 32;
@@ -73,6 +80,20 @@ parameter_types! {
pub const TechnicalCommitteeMaxProposals: u32 = 64;
pub const TechnicalCommitteeMotionDuration: BlockNumber = 7 * BLOCKS_PER_DAY;
+ // Contracts
+ pub const ContractsDeletionQueueDepth: u32 = 128;
+ pub ContractsDeletionWeightLimit: Weight = Perbill::from_percent(10)
+ * RuntimeBlockWeights::get()
+ .per_class
+ .get(DispatchClass::Normal)
+ .max_total
+ .unwrap_or(RuntimeBlockWeights::get().max_block);
+ pub const ContractsDepositPerByte: Balance = deposit(0,1);
+ pub const ContractsDepositPerItem: Balance = deposit(1,0);
+ pub const ContractsMaxCodeLen: u32 = 246 * 1024;
+ pub const ContractsMaxStorageKeyLen: u32 = 128;
+ pub ContractsSchedule: pallet_contracts::Schedule = Default::default();
+
// Court
/// Duration of a single court case.
pub const CourtCaseDuration: u64 = BLOCKS_PER_DAY;
@@ -112,9 +133,9 @@ parameter_types! {
// Identity
/// The amount held on deposit for a registered identity
- pub const BasicDeposit: Balance = 8 * BASE;
+ pub const BasicDeposit: Balance = deposit(1, 258);
/// The amount held on deposit per additional field for a registered identity.
- pub const FieldDeposit: Balance = 256 * CENT;
+ pub const FieldDeposit: Balance = deposit(0, 66);
/// Maximum number of additional fields that may be stored in an ID. Needed to bound the I/O
/// required to access an identity, but can be pretty high.
pub const MaxAdditionalFields: u32 = 64;
@@ -126,7 +147,7 @@ parameter_types! {
/// The amount held on deposit for a registered subaccount. This should account for the fact
/// that one storage item's value will increase by the size of an account ID, and there will
/// be another trie item whose value is the size of an account ID plus 32 bytes.
- pub const SubAccountDeposit: Balance = 2 * BASE;
+ pub const SubAccountDeposit: Balance = deposit(1, 53);
// Liquidity Mining parameters
/// Pallet identifier, mainly used for named balance reserves.
@@ -140,12 +161,12 @@ parameter_types! {
// ORML
pub const GetNativeCurrencyId: CurrencyId = Asset::Ztg;
- pub DustAccount: AccountId = PalletId(*b"orml/dst").into_account_truncating();
// Prediction Market parameters
/// (Slashable) Bond that is provided for creating an advised market that needs approval.
/// Slashed in case the market is rejected.
pub const AdvisoryBond: Balance = 25 * CENT;
+ /// The percentage of the advisory bond that gets slashed when a market is rejected.
pub const AdvisoryBondSlashPercentage: Percent = Percent::from_percent(0);
/// (Slashable) Bond that is provided for disputing the outcome.
/// Slashed in case the final outcome does not match the dispute for which the `DisputeBond`
@@ -155,43 +176,46 @@ parameter_types! {
pub const DisputeFactor: Balance = 2 * BASE;
/// Maximum Categories a prediciton market can have (excluding base asset).
pub const MaxCategories: u16 = MAX_CATEGORIES;
+ /// Maximum block period for a dispute.
+ pub const MaxDisputeDuration: BlockNumber = MAX_DISPUTE_DURATION;
/// Maximum number of disputes.
pub const MaxDisputes: u16 = 6;
- /// Minimum number of categories. The trivial minimum is 2, which represents a binary market.
- pub const MinCategories: u16 = 2;
- // 60_000 = 1 minute. Should be raised to something more reasonable in the future.
- /// Minimum number of milliseconds a Rikiddo market must be in subsidy gathering phase.
- pub const MinSubsidyPeriod: Moment = 60_000;
+ /// Maximum string length for edit reason.
+ pub const MaxEditReasonLen: u32 = 1024;
+ /// Maximum block period for a grace_period.
+ /// The grace_period is a delay between the point where the market closes and the point where the oracle may report.
+ pub const MaxGracePeriod: BlockNumber = MAX_GRACE_PERIOD;
+ /// The maximum allowed duration of a market from creation to market close in blocks.
+ pub const MaxMarketLifetime: BlockNumber = MAX_MARKET_LIFETIME;
+ /// Maximum block period for a oracle_duration.
+ /// The oracle_duration is a duration where the oracle has to submit its report.
+ pub const MaxOracleDuration: BlockNumber = MAX_ORACLE_DURATION;
+ /// Maximum string length allowed for reject reason.
+ pub const MaxRejectReasonLen: u32 = 1024;
// 2_678_400_000 = 31 days.
/// Maximum number of milliseconds a Rikiddo market can be in subsidy gathering phase.
pub const MaxSubsidyPeriod: Moment = 2_678_400_000;
+ /// Minimum number of categories. The trivial minimum is 2, which represents a binary market.
+ pub const MinCategories: u16 = 2;
/// The dispute_duration is time where users can dispute the outcome.
/// Minimum block period for a dispute.
pub const MinDisputeDuration: BlockNumber = MIN_DISPUTE_DURATION;
- /// Maximum block period for a dispute.
- pub const MaxDisputeDuration: BlockNumber = MAX_DISPUTE_DURATION;
- /// Maximum block period for a grace_period.
- /// The grace_period is a delay between the point where the market closes and the point where the oracle may report.
- pub const MaxGracePeriod: BlockNumber = MAX_GRACE_PERIOD;
/// Minimum block period for a oracle_duration.
pub const MinOracleDuration: BlockNumber = MIN_ORACLE_DURATION;
- /// Maximum block period for a oracle_duration.
- /// The oracle_duration is a duration where the oracle has to submit its report.
- pub const MaxOracleDuration: BlockNumber = MAX_ORACLE_DURATION;
- /// The maximum market period.
- pub const MaxMarketPeriod: Moment = u64::MAX / 2;
+ // 60_000 = 1 minute. Should be raised to something more reasonable in the future.
+ /// Minimum number of milliseconds a Rikiddo market must be in subsidy gathering phase.
+ pub const MinSubsidyPeriod: Moment = 60_000;
/// (Slashable) The orcale bond. Slashed in case the final outcome does not match the
/// outcome the oracle reported.
pub const OracleBond: Balance = 50 * CENT;
+ /// (Slashable) A bond for an outcome reporter, who is not the oracle.
+ /// Slashed in case the final outcome does not match the outcome by the outsider.
+ pub const OutsiderBond: Balance = 2 * OracleBond::get();
/// Pallet identifier, mainly used for named balance reserves.
pub const PmPalletId: PalletId = PM_PALLET_ID;
/// (Slashable) A bond for creation markets that do not require approval. Slashed in case
/// the market is forcefully destroyed.
pub const ValidityBond: Balance = 50 * CENT;
- /// Maximum string length for edit reason.
- pub const MaxEditReasonLen: u32 = 1024;
- /// Maximum string length allowed for reject reason.
- pub const MaxRejectReasonLen: u32 = 1024;
// Preimage
pub const PreimageMaxSize: u32 = 4096 * 1024;
@@ -235,10 +259,8 @@ parameter_types! {
pub const MaxTotalWeight: Balance = MaxWeight::get() * 2;
/// The maximum weight a single asset can have.
pub const MaxWeight: Balance = 64 * BASE;
- /// Minimum amount of liquidity required to launch a CPMM pool.
- pub const MinLiquidity: Balance = 100 * BASE;
/// Minimum subsidy required to launch a Rikiddo pool.
- pub const MinSubsidy: Balance = MinLiquidity::get();
+ pub const MinSubsidy: Balance = 100 * BASE;
/// Minimum subsidy a single account can provide.
pub const MinSubsidyPerAccount: Balance = MinSubsidy::get();
/// Minimum weight a single asset can have.
@@ -271,9 +293,6 @@ parameter_types! {
.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
.build_or_panic();
- // Timestamp
- pub const MinimumPeriod: u64 = MILLISECS_PER_BLOCK as u64 / 2;
-
// Transaction payment
/// A fee mulitplier for Operational extrinsics to compute “virtual tip”
/// to boost their priority.
@@ -290,6 +309,8 @@ parameter_types! {
/// Minimum amount of the multiplier. The test `multiplier_can_grow_from_zero` ensures
/// that this value is not too low.
pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000u128);
+ /// Maximum amount of the multiplier.
+ pub MaximumMultiplier: Multiplier = Bounded::max_value();
// Treasury
/// Percentage of spare funds (if any) that are burnt per spend period.
@@ -310,6 +331,10 @@ parameter_types! {
/// Treasury account.
pub ZeitgeistTreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating();
+ // Timestamp
+ /// MinimumPeriod for Timestamp
+ pub const MinimumPeriodValue: u64 = MILLISECS_PER_BLOCK as u64 / 2;
+
// Bounties
/// The amount held on deposit for placing a bounty proposal.
pub const BountyDepositBase: Balance = 100 * BASE;
@@ -341,6 +366,8 @@ parameter_types! {
// Vesting
pub const MinVestedTransfer: Balance = ExistentialDeposit::get();
+ pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
+ WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
}
#[cfg(feature = "with-global-disputes")]
@@ -365,16 +392,43 @@ parameter_types! {
}
parameter_type_with_key! {
- // Well, not every asset is a currency ¯\_(ツ)_/¯
+ // Existential deposits used by orml-tokens.
+ // Only native ZTG and foreign assets should have an existential deposit.
+ // Winning outcome tokens are redeemed completely by the user, losing outcome tokens
+ // are cleaned up automatically. In case of scalar outcomes, the market account can have dust.
+ // Unless LPs use `pool_exit_with_exact_asset_amount`, there can be some dust pool shares remaining.
+ // Explicit match arms are used to ensure new asset types are respected.
pub ExistentialDeposits: |currency_id: CurrencyId| -> Balance {
match currency_id {
+ Asset::CategoricalOutcome(_,_) => ExistentialDeposit::get(),
+ Asset::CombinatorialOutcome => ExistentialDeposit::get(),
+ Asset::PoolShare(_) => ExistentialDeposit::get(),
+ Asset::ScalarOutcome(_,_) => ExistentialDeposit::get(),
+ #[cfg(feature = "parachain")]
+ Asset::ForeignAsset(id) => {
+ let maybe_metadata = <
+ orml_asset_registry::Pallet as orml_traits::asset_registry::Inspect
+ >::metadata(&Asset::ForeignAsset(*id));
+
+ if let Some(metadata) = maybe_metadata {
+ return metadata.existential_deposit;
+ }
+
+ 1
+ }
+ #[cfg(not(feature = "parachain"))]
+ Asset::ForeignAsset(_) => ExistentialDeposit::get(),
Asset::Ztg => ExistentialDeposit::get(),
- _ => 0
}
};
}
// Parameterized slow adjusting fee updated based on
// https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html#-2.-slow-adjusting-mechanism
-pub type SlowAdjustingFeeUpdate =
- TargetedFeeAdjustment;
+pub type SlowAdjustingFeeUpdate = TargetedFeeAdjustment<
+ R,
+ TargetBlockFullness,
+ AdjustmentVariable,
+ MinimumMultiplier,
+ MaximumMultiplier,
+>;
diff --git a/runtime/battery-station/src/xcm_config/asset_registry.rs b/runtime/battery-station/src/xcm_config/asset_registry.rs
index ba7807a8c..1b2f16f11 100644
--- a/runtime/battery-station/src/xcm_config/asset_registry.rs
+++ b/runtime/battery-station/src/xcm_config/asset_registry.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Zeitgeist PM LLC.
+// Copyright 2022-2023 Forecasting Technologies LTD.
//
// This file is part of Zeitgeist.
//
@@ -20,6 +20,7 @@ use orml_traits::asset_registry::{AssetMetadata, AssetProcessor};
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
use sp_runtime::DispatchError;
+use zeitgeist_primitives::types::CustomMetadata;
#[derive(
Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Debug, Encode, Decode, TypeInfo, MaxEncodedLen,
@@ -46,49 +47,3 @@ impl AssetProcessor> for Cust
Ok(())
}
}
-
-#[derive(
- Clone,
- Copy,
- Default,
- PartialOrd,
- Ord,
- PartialEq,
- Eq,
- Debug,
- Encode,
- Decode,
- TypeInfo,
- MaxEncodedLen,
-)]
-/// Custom XC asset metadata
-pub struct CustomMetadata {
- /// XCM-related metadata.
- pub xcm: XcmMetadata,
-
- /// Whether an asset can be used in pools.
- pub allow_in_pool: bool,
-}
-
-#[derive(
- Clone,
- Copy,
- Default,
- PartialOrd,
- Ord,
- PartialEq,
- Eq,
- Debug,
- Encode,
- Decode,
- TypeInfo,
- MaxEncodedLen,
-)]
-pub struct XcmMetadata {
- /// The factor used to determine the fee.
- /// It is multiplied by the fee that would have been paid in native currency, so it represents
- /// the ratio `native_price / other_asset_price`. It is a fixed point decimal number containing
- /// as many fractional decimals as the asset it is used for contains.
- /// Should be updated regularly.
- pub fee_factor: Option,
-}
diff --git a/runtime/battery-station/src/xcm_config/config.rs b/runtime/battery-station/src/xcm_config/config.rs
index 4e09b741c..003801fda 100644
--- a/runtime/battery-station/src/xcm_config/config.rs
+++ b/runtime/battery-station/src/xcm_config/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Zeitgeist PM LLC.
+// Copyright 2022-2023 Forecasting Technologies LTD.
//
// This file is part of Zeitgeist.
//
@@ -17,9 +17,9 @@
use super::fees::{native_per_second, FixedConversionRateProvider};
use crate::{
- AccountId, Ancestry, AssetManager, AssetRegistry, Balance, Call, CurrencyId, MaxInstructions,
- Origin, ParachainInfo, ParachainSystem, PolkadotXcm, RelayChainOrigin, RelayNetwork,
- UnitWeightCost, UnknownTokens, XcmpQueue, ZeitgeistTreasuryAccount,
+ AccountId, Ancestry, AssetManager, AssetRegistry, Balance, CurrencyId, MaxInstructions,
+ ParachainInfo, ParachainSystem, PolkadotXcm, RelayChainOrigin, RelayNetwork, RuntimeCall,
+ RuntimeOrigin, UnitWeightCost, UnknownTokens, XcmpQueue, ZeitgeistTreasuryAccount,
};
use frame_support::{parameter_types, traits::Everything, WeakBoundedVec};
@@ -50,7 +50,7 @@ use zeitgeist_primitives::types::Asset;
pub mod battery_station {
#[cfg(test)]
- pub const ID: u32 = 2050;
+ pub const ID: u32 = 2101;
pub const KEY: &[u8] = &[0, 1];
}
@@ -70,7 +70,7 @@ impl Config for XcmConfig {
/// Additional filters that specify whether the XCM instruction should be executed at all.
type Barrier = Barrier;
/// The outer call dispatch type.
- type Call = Call;
+ type RuntimeCall = RuntimeCall;
/// Combinations of (Location, Asset) pairs which are trusted as reserves.
// Trust the parent chain, sibling parachains and children chains of this chain.
type IsReserve = MultiNativeAsset;
@@ -89,7 +89,7 @@ impl Config for XcmConfig {
/// The means of determining an XCM message's weight.
// Adds UnitWeightCost per instruction plus the weight of each instruction.
// The total number of instructions are bounded by MaxInstructions
- type Weigher = FixedWeightBounds;
+ type Weigher = FixedWeightBounds;
/// How to send an onward XCM message.
type XcmSender = XcmRouter;
}
@@ -261,7 +261,7 @@ impl Convert for AccountIdToMultiLocation {
}
/// No local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation = SignedToAccountId32;
+pub type LocalOriginToLocation = SignedToAccountId32;
/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
/// when determining ownership of accounts for asset transacting and when attempting to use XCM
@@ -282,18 +282,18 @@ pub type XcmOriginToTransactDispatchOrigin = (
// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
// foreign chains who want to have a local sovereign account on this chain which they control.
- SovereignSignedViaLocation,
+ SovereignSignedViaLocation,
// Native converter for Relay-chain (Parent) location; will convert to a `Relay` origin when
// recognized.
- RelayChainAsNative,
+ RelayChainAsNative,
// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
// recognized.
- SiblingParachainAsNative,
+ SiblingParachainAsNative,
// Native signed account converter; this just converts an `AccountId32` origin into a normal
// `Origin::Signed` origin of the same 32-byte value.
- SignedAccountId32AsNative,
+ SignedAccountId32AsNative,
// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
- XcmPassthrough,
+ XcmPassthrough,
);
/// The means for routing XCM messages which are not for local execution into the right message
diff --git a/runtime/battery-station/src/xcm_config/fees.rs b/runtime/battery-station/src/xcm_config/fees.rs
index b70484d97..53a036e53 100644
--- a/runtime/battery-station/src/xcm_config/fees.rs
+++ b/runtime/battery-station/src/xcm_config/fees.rs
@@ -1,4 +1,5 @@
-// Copyright 2022 Zeitgeist PM LLC.
+// Copyright 2022-2023 Forecasting Technologies LTD.
+// Copyright 2021 Centrifuge Foundation (centrifuge.io).
//
// This file is part of Zeitgeist.
//
@@ -15,11 +16,11 @@
// You should have received a copy of the GNU General Public License
// along with Zeitgeist. If not, see .
-use crate::{xcm_config::asset_registry::CustomMetadata, Balance, CurrencyId};
+use crate::{Balance, CurrencyId};
use core::marker::PhantomData;
use frame_support::weights::constants::{ExtrinsicBaseWeight, WEIGHT_PER_SECOND};
use xcm::latest::MultiLocation;
-use zeitgeist_primitives::constants::BalanceFractionalDecimals;
+use zeitgeist_primitives::{constants::BalanceFractionalDecimals, types::CustomMetadata};
use zrml_swaps::check_arithm_rslt::CheckArithmRslt;
/// The fee cost per second for transferring the native token in cents.
@@ -28,8 +29,8 @@ pub fn native_per_second() -> Balance {
}
pub fn default_per_second(decimals: u32) -> Balance {
- let base_weight = Balance::from(ExtrinsicBaseWeight::get());
- let default_per_second = (WEIGHT_PER_SECOND as u128) / base_weight;
+ let base_weight = ExtrinsicBaseWeight::get().ref_time() as u128;
+ let default_per_second = (WEIGHT_PER_SECOND.ref_time() as u128) / base_weight;
default_per_second * base_fee(decimals)
}
@@ -59,10 +60,10 @@ pub struct FixedConversionRateProvider(PhantomData
impl<
AssetRegistry: orml_traits::asset_registry::Inspect<
- AssetId = CurrencyId,
- Balance = Balance,
- CustomMetadata = CustomMetadata,
- >,
+ AssetId = CurrencyId,
+ Balance = Balance,
+ CustomMetadata = CustomMetadata,
+ >,
> orml_traits::FixedConversionRateProvider for FixedConversionRateProvider
{
fn get_fee_per_second(location: &MultiLocation) -> Option {
diff --git a/runtime/battery-station/src/xcm_config/mod.rs b/runtime/battery-station/src/xcm_config/mod.rs
index 363ac87b1..448000ebe 100644
--- a/runtime/battery-station/src/xcm_config/mod.rs
+++ b/runtime/battery-station/src/xcm_config/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 Zeitgeist PM LLC.
+// Copyright 2022 Forecasting Technologies LTD.
//
// This file is part of Zeitgeist.
//
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index d83c20cb1..c4cf9f3ca 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -1,31 +1,33 @@
[dependencies]
# Pallets
-cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
-frame-support = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-frame-system = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-orml-currencies = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-orml-tokens = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
-pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-author-mapping = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
-pallet-balances = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-bounties = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-collective = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-democracy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-identity = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-membership = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-multisig = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-parachain-staking = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
-pallet-preimage = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-proxy = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-randomness-collective-flip = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-scheduler = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-timestamp = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-treasury = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-utility = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
-pallet-vesting = { branch = "polkadot-v0.9.26", default-features = false, git = "https://github.com/paritytech/substrate" }
+cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true }
+frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+orml-currencies = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+orml-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" }
+pallet-author-inherent = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-author-mapping = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-author-slot-filter = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-balances = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-bounties = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-collective = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-contracts = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-contracts-primitives = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-democracy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-identity = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-membership = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-multisig = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-parachain-staking = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true }
+pallet-preimage = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-proxy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-randomness-collective-flip = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-scheduler = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-transaction-payment = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-treasury = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-utility = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
+pallet-vesting = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" }
# Utility
cfg-if = { version = "1.0.0" }
@@ -51,6 +53,8 @@ std = [
"pallet-balances/std",
"pallet-bounties/std",
"pallet-collective/std",
+ "pallet-contracts/std",
+ "pallet-contracts-primitives/std",
"pallet-democracy/std",
"pallet-identity/std",
"pallet-membership/std",
@@ -73,7 +77,7 @@ with-global-disputes = []
authors = ["Zeitgeist PM "]
edition = "2021"
name = "common-runtime"
-version = "0.3.7"
+version = "0.3.9"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index 09466e035..051cdba12 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -1,3 +1,4 @@
+// Copyright 2022-2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
// Copyright 2019-2020 Parity Technologies (UK) Ltd.
//
@@ -45,30 +46,26 @@ pub mod weights;
macro_rules! decl_common_types {
{} => {
use sp_runtime::generic;
- use frame_support::traits::{Currency, Imbalance, OnUnbalanced, NeverEnsureOrigin};
+ use frame_support::traits::{Currency, Imbalance, OnRuntimeUpgrade, OnUnbalanced, NeverEnsureOrigin, TryStateSelect};
pub type Block = generic::Block;
type Address = sp_runtime::MultiAddress;
- #[cfg(feature = "parachain")]
- pub type Executive = frame_executive::Executive<
- Runtime,
- Block,
- frame_system::ChainContext,
- Runtime,
- AllPalletsWithSystem,
- zrml_prediction_markets::migrations::RecordBonds