Skip to content
This repository has been archived by the owner on May 21, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: paritytech/trappist
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: paritytech/trappist
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: xcmv3-receive-foreign-asset
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 14 commits
  • 80 files changed
  • 8 contributors

Commits on May 19, 2023

  1. Upgrade to v0.9.40 (#171)

    * Upgraded to 9-40 missing some fixes
    
    * Added XCM v3 Traits (Need to configure)
    
    * Added fee per MB
    
    * Added XCM V3 Configs
    
    * Fix XCM_config and node service
    
    * Removed chess pallet
    
    * pallet_contracts and pallet_xcm fix
    
    * rust fmt
    
    * Quick fix to contracts on stout and pallet-dex dependancie
    
    * Added hardware check to service
    
    * Fixed stout service
    
    * Review fixes
    
    * run tests on CI (#174)
    (cherry picked from commit d826938)
    
    * fmt
    
    * review fix
    
    * review fix
    
    * fmt
    
    * Fixed xcm-playground error
    
    ---------
    
    Co-authored-by: Valentin Fernandez <valentin@parity.io>
    Co-authored-by: Alexander Kalankhodzhaev <kalansoft@gmail.com>
    3 people authored May 19, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6cd2ee6 View commit details

Commits on May 24, 2023

  1. Backport Drop Assets (#189)

    Backport PR #165 (cherry picked from commit 3f1c483) in Trappist v0.9.40 and updates it to match the changes included in polkadot v0.9.38 to v0.9.40. Weights were re benchmarked to match weightsV2.
    ---------
    
    Co-authored-by: Valentin Fernandez <valentin@parity.io>
    valentinfernandez1 and Valentin Fernandez authored May 24, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2529ee2 View commit details

Commits on May 25, 2023

  1. asset-registry backport (#193)

    Backport PR #173 (cherry picked from commit 24552f3) in Trappist v0.9.40 and updates it to match the changes included in polkadot v0.9.38 to v0.9.40. Weights were re benchmarked to match weightsV2.
    
    Co-authored-by: Valentin Fernandez <valentin@parity.io>
    valentinfernandez1 and Valentin Fernandez authored May 25, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d4e4fb8 View commit details

Commits on May 26, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    141571e View commit details
  2. Backport Zombienet and CI testing (#194)

    * zombienet refactor and ci fix
    
    * swap-storage removed from CI
    
    * ci fix
    
    * CI fix
    
    ---------
    
    Co-authored-by: Valentin Fernandez <valentin@parity.io>
    valentinfernandez1 and Valentin Fernandez authored May 26, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7ee2415 View commit details
  3. Backport Lockdown-pallet (#191)

    * lockdown-pallet backport
    
    * Add lockdown mode activation to lockdown-mode pallet's `GenesisConfig` (#176)
    
    * add activating lockdown mode to GenesisConfig
    
    * add activating lockdown mode to test ext
    
    * add tests for activating lockdown mode in GenesisConfig
    
    * cargo fmt -p pallet-lockdown-mode
    
    * fix linting
    
    * add activated to benchmark
    
    * removing, as this is already in another test
    
    * setting initial state to true, therefore no longer need to manually change state
    
    * rename activated in genesisConfig to initial_status
    
    ---------
    
    Co-authored-by: Valentin Fernandez <valentin@parity.io>
    Co-authored-by: Bruno Galvao <brunopgalvao@gmail.com>
    3 people authored May 26, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a6f4f90 View commit details

Commits on May 30, 2023

  1. [Backport] #185 XCM benchmarks from pallet_xcm_benchmarks to v0.9.40 (

    #201)
    
    * backport xcm_benchmarks
    
    * Co-Authored-By: hbulgarini <hbulgarini@gmail.com>
    
    * fix
    
    * add profile "production" (#187)
    
    ---------
    
    Co-authored-by: Alexander Kalankhodzhaev <kalansoft@gmail.com>
    valentinfernandez1 and kalaninja authored May 30, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    16d1480 View commit details

Commits on Jun 6, 2023

  1. [Backport] #206 Trappist node and #207 workspace refactor to v0.9.40 (#…

    …209)
    
    * cherry-picked changes
    
    * WIP fixing node service¨
    
    * Upgrade fixes, missing stout trait bound error
    
    * workspace refactor
    
    * added dex to stout
    
    * fmt
    
    ---------
    
    Co-authored-by: Hector Bulgarini <hbulgarini@gmail.com>
    valentinfernandez1 and hbulgarini authored Jun 6, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2e3c910 View commit details
  2. Query account balances using accounts_common (#202)

    * query_account_balances added
    
    * fmt
    
    * Added assets-common dependency from Cumulus
    
    ---------
    
    Co-authored-by: Steve Degosserie <steve@parity.io>
    valentinfernandez1 and Steve Degosserie authored Jun 6, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    855f102 View commit details

Commits on Jun 14, 2023

  1. [Backport] #220 Apache License and #223 Minor Refactoring (#228)

    * backport apache license
    
    * backport minor refactoring PR #223
    
    * fmt
    valentinfernandez1 authored Jun 14, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    00f7621 View commit details

Commits on Jun 15, 2023

  1. Refactor WeightToFee to include ProofSize (#215)

    * Removed FixedRateOfFungibles
    
    * fmt
    
    * added comments
    
    * fmt
    
    * removed unused imports
    
    * fmt
    
    * removed allow unpaid execution from rockmine following PR #211
    
    * Include new traders from PR #221
    
    * minor fixes
    
    * minor fixes
    
    * fmt
    valentinfernandez1 authored Jun 15, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    85b9903 View commit details
  2. [Backport] Asset-registry fix, Bump Docker and add preimage to benchm…

    …arks (#229)
    
    * Validate `MultiLocation` for asset-registry  (#224)
    
    * Validate location for register_reserve_asset
    
    * fmt
    
    * fmt
    
    * fmt
    
    * validator refactor
    
    * fmt
    
    * fix `pallet_xcm_benchmarks::generic::claim_asset` benchmark (#226)
    
    * Bump docker/login-action from 2.1.0 to 2.2.0 (#219)
    
    Bumps [docker/login-action](https://github.com/docker/login-action) from 2.1.0 to 2.2.0.
    - [Release notes](https://github.com/docker/login-action/releases)
    - [Commits](docker/login-action@f4ef78c...465a078)
    
    ---
    updated-dependencies:
    - dependency-name: docker/login-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    
    * Bump docker/metadata-action from 4.4.0 to 4.5.0 (#218)
    
    Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4.4.0 to 4.5.0.
    - [Release notes](https://github.com/docker/metadata-action/releases)
    - [Commits](docker/metadata-action@c4ee3ad...2c0bd77)
    
    ---
    updated-dependencies:
    - dependency-name: docker/metadata-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    
    * fix network id in tests
    
    * fix network id in tests
    
    * Add missing import
    
    * include preimage to benchmarks
    
    * Bump docker/metadata-action from 4.5.0 to 4.6.0 (#233)
    
    Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4.5.0 to 4.6.0.
    - [Release notes](https://github.com/docker/metadata-action/releases)
    - [Commits](docker/metadata-action@2c0bd77...818d4b7)
    
    ---
    updated-dependencies:
    - dependency-name: docker/metadata-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    
    * Bump docker/build-push-action from 4.0.0 to 4.1.1 (#232)
    
    Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.0.0 to 4.1.1.
    - [Release notes](https://github.com/docker/build-push-action/releases)
    - [Commits](docker/build-push-action@3b5e802...2eb1c19)
    
    ---
    updated-dependencies:
    - dependency-name: docker/build-push-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    
    ---------
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: Alexander Kalankhodzhaev <kalansoft@gmail.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    3 people authored Jun 15, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dc3f174 View commit details

Commits on Jul 28, 2023

  1. Allow teleport

    metricaez committed Jul 28, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    metricaez Emiliano
    Copy the full SHA
    71851cb View commit details

Commits on Aug 1, 2023

  1. barrier re-work

    metricaez committed Aug 1, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    metricaez Emiliano
    Copy the full SHA
    0a89494 View commit details
Showing with 6,966 additions and 3,195 deletions.
  1. +24 −0 .github/templates/setup-worker/action.yaml
  2. +2 −2 .github/workflows/build_docker.yml
  3. +50 −47 .github/workflows/check.yml
  4. +3 −3 .github/workflows/publish-docker.yml
  5. +0 −1 .gitignore
  6. +1,402 −1,262 Cargo.lock
  7. +179 −0 Cargo.toml
  8. +13 −14 README.md
  9. +2 −2 docker/scripts/inject_bootnodes.sh
  10. +4 −4 docker/trappist-parachain.dockerfile
  11. BIN docs/media/trappist-topology.png
  12. BIN docs/media/xcm-use-cases.png
  13. +96 −34 node/Cargo.toml
  14. +23 −0 node/build.rs
  15. +0 −97 node/cli/Cargo.toml
  16. +0 −7 node/cli/build.rs
  17. +0 −17 node/cli/src/lib.rs
  18. +0 −121 node/service/Cargo.toml
  19. +0 −5 node/service/src/chain_spec/mod.rs
  20. +0 −634 node/service/src/lib.rs
  21. +69 −0 node/src/chain_spec/mod.rs
  22. +30 −108 node/{service → }/src/chain_spec/stout.rs
  23. +40 −72 node/{service → }/src/chain_spec/trappist.rs
  24. +23 −22 node/{cli → }/src/cli.rs
  25. +332 −84 node/{cli → }/src/command.rs
  26. +24 −16 node/src/main.rs
  27. +39 −29 rpc/src/lib.rs → node/src/rpc.rs
  28. +759 −0 node/src/service.rs
  29. +61 −0 node/tests/benchmark_storage_works.rs
  30. +137 −0 node/tests/common.rs
  31. +40 −0 node/tests/polkadot_argument_parsing.rs
  32. +34 −0 node/tests/polkadot_mdns_issue.rs
  33. +54 −0 node/tests/purge_chain_works.rs
  34. +34 −0 node/tests/running_the_node_and_interrupt.rs
  35. +33 −31 pallets/asset-registry/Cargo.toml
  36. +1 −1 pallets/asset-registry/README.md
  37. +26 −22 pallets/asset-registry/src/benchmarking.rs
  38. +61 −27 pallets/asset-registry/src/lib.rs
  39. +28 −0 pallets/asset-registry/src/mock.rs
  40. +198 −55 pallets/asset-registry/src/tests.rs
  41. +67 −20 pallets/asset-registry/src/weights.rs
  42. +35 −0 pallets/benchmarks/Cargo.toml
  43. +74 −0 pallets/benchmarks/src/benchmarking.rs
  44. +60 −0 pallets/benchmarks/src/lib.rs
  45. +24 −0 pallets/benchmarks/src/weights.rs
  46. +80 −0 pallets/lockdown-mode/Cargo.toml
  47. +41 −0 pallets/lockdown-mode/README.md
  48. +42 −0 pallets/lockdown-mode/src/benchmarking.rs
  49. +168 −0 pallets/lockdown-mode/src/lib.rs
  50. +147 −0 pallets/lockdown-mode/src/mock.rs
  51. +100 −0 pallets/lockdown-mode/src/tests.rs
  52. +88 −0 pallets/lockdown-mode/src/weights.rs
  53. +7 −4 primitives/xcm/Cargo.toml
  54. +103 −45 primitives/xcm/src/lib.rs
  55. +0 −32 rpc/Cargo.toml
  56. +78 −77 runtime/stout/Cargo.toml
  57. +17 −0 runtime/stout/build.rs
  58. +3 −1 runtime/stout/src/constants.rs
  59. +19 −2 runtime/stout/src/contracts.rs
  60. +88 −24 runtime/stout/src/lib.rs
  61. +60 −31 runtime/stout/src/xcm_config.rs
  62. +107 −98 runtime/trappist/Cargo.toml
  63. +17 −0 runtime/trappist/build.rs
  64. +60 −5 runtime/trappist/src/constants.rs
  65. +19 −2 runtime/trappist/src/contracts.rs
  66. +77 −4 runtime/trappist/src/impls.rs
  67. +254 −46 runtime/trappist/src/lib.rs
  68. +39 −0 runtime/trappist/src/weights/mod.rs
  69. +82 −0 runtime/trappist/src/weights/trappist_runtime_benchmarks.rs
  70. +251 −0 runtime/trappist/src/weights/xcm/mod.rs
  71. +159 −0 runtime/trappist/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
  72. +349 −0 runtime/trappist/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
  73. +145 −56 runtime/trappist/src/xcm_config.rs
  74. +0 −2 scripts/build_runtimes.sh
  75. +16 −0 templates/file_header.txt
  76. +63 −0 templates/xcm-bench-template.hbs
  77. +25 −25 xcm-simulator/Cargo.toml
  78. +9 −4 xcm-playground.toml → zombienet/full_network.toml
  79. +92 −0 zombienet/stout_rococo.toml
  80. +80 −0 zombienet/trappist_rococo.toml
24 changes: 24 additions & 0 deletions .github/templates/setup-worker/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: setup-worker
description: |
This action sets up a worker for use in other actions. It installs the
necessary dependencies for building the project.
inputs:
rust-components:
description: Comma-separated list of components to be additionally installed for a new rust toolchain
required: false

runs:
using: "composite"

steps:
- name: Setup Ubuntu dependencies
shell: bash
run: sudo apt update && sudo apt install -y git clang curl libssl-dev llvm libudev-dev cmake protobuf-compiler

- name: Install Rust nightly
shell: bash
run: |
rustup toolchain install nightly-2023-01-01 --profile minimal --component rustfmt
rustup default nightly-2023-01-01
rustup target add wasm32-unknown-unknown
4 changes: 2 additions & 2 deletions .github/workflows/build_docker.yml
Original file line number Diff line number Diff line change
@@ -14,12 +14,12 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e # v4.4.0
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4.6.0
with:
images: paritytech/trappist

- name: Build Docker image
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 #v4.0.0
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 #v4.1.1
with:
file: docker/trappist-parachain.dockerfile
push: false
97 changes: 50 additions & 47 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -1,53 +1,37 @@
name: Check Set-Up & Build
name: Check Build and Tests

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ main ]
branches: [ main, xcmv3-dev ]
pull_request:
branches: [ main ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
check:
# The type of runner that the job will run on
runs-on: ubuntu-20.04
env:
NIGHTLY: nightly-2022-11-02 # Fix version to prevent cache misses with nightly changes

# Steps represent a sequence of tasks that will be executed as part of the job
lint:
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3

- name: Set-Up
run: sudo apt update && sudo apt install -y git clang curl libssl-dev llvm libudev-dev cmake protobuf-compiler

- name: Install Rust
uses: actions-rs/toolchain@v1
- name: Setup worker
uses: "./.github/templates/setup-worker"
with:
profile: minimal
toolchain: stable
rust-components: rustfmt

- name: Install Nightly
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.NIGHTLY }}
override: true
target: wasm32-unknown-unknown
components: rustfmt

# Fail fast: check formatting first as it doesn't require compilation
- name: Check formatting
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all --check
run: cargo fmt --all -- --check

check:
needs: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup worker
uses: "./.github/templates/setup-worker"

- name: Cache Build artefacts
uses: actions/cache@v3
@@ -58,23 +42,42 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
key: ${{ runner.os }}-cargo-release-${{ hashFiles('**/Cargo.lock') }}

- name: Check Build Trappist Runtime
run: |
SKIP_WASM_BUILD=1 cargo check --release --features with-trappist-runtime
SKIP_WASM_BUILD=1 cargo check --release
- name: Check Build Stout Runtime
run: |
SKIP_WASM_BUILD=1 cargo check --release --no-default-features --features with-stout-runtime
test:
needs: lint
runs-on: ubuntu-latest
steps:
# Tests with benchmarks require a lot of disk space
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
android: true
dotnet: true
haskell: true
large-packages: false
swap-storage: false

- name: Check Build for Benchmarking Trappist Runtime
run: >
pushd node &&
cargo check --features=runtime-benchmarks,with-trappist-runtime --release
- uses: actions/checkout@v3

- name: Setup worker
uses: "./.github/templates/setup-worker"

- name: Check Build for Benchmarking stout Runtime
run: >
pushd node &&
cargo check --no-default-features --features=runtime-benchmarks,with-stout-runtime --release
- name: Cache Build artefacts
uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-debug-${{ hashFiles('**/Cargo.lock') }}

- name: Run tests
run: |
cargo test --features runtime-benchmarks --locked --jobs 1
6 changes: 3 additions & 3 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
@@ -13,19 +13,19 @@ jobs:
uses: actions/checkout@v3

- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e # v4.4.0
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4.6.0
with:
images: paritytech/trappist

- name: Build and push Docker image
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 #v4.0.0
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 #v4.1.1
with:
file: docker/trappist-parachain.dockerfile
push: true
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Generated by Cargo
# will have compiled files and executables
**/target/
**/target_stout/
# These are backup files generated by rustfmt
**/*.rs.bk

Loading