Release 0.9.42 to main.

.github/templates/free-space/action.yaml

@@ -0,0 +1,23 @@
+name: free-space
+description: |
+  This action frees up disk space on the runner.
+
+runs:
+  using: "composite"
+
+  steps:
+    - name: Remove Android library
+      shell: bash
+      run: sudo rm -rf /usr/local/lib/android
+
+    - name: Remove .NET runtime
+      shell: bash
+      run: sudo rm -rf /usr/share/dotnet
+
+    - name: Remove CodeQL
+      shell: bash
+      run: sudo rm -rf /opt/hostedtoolcache/CodeQL
+
+    - name: Removes cached Docker images
+      shell: bash
+      run: sudo docker image prune --all --force

.github/workflows/check.yml

@@ -10,6 +10,9 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+env:
+  POLKA_VERSION: 0.9.42
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -18,8 +21,6 @@ jobs:
 
       - name: Setup worker
         uses: "./.github/templates/setup-worker"
-        with:
-          rust-components: rustfmt
 
       - name: Check formatting
         run: cargo fmt --all -- --check
@@ -42,28 +43,23 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-release-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-release-${{ env.POLKA_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-release-${{ env.POLKA_VERSION }}
 
-      - name: Check Build Trappist Runtime
+      - name: Check Build Trappist node
         run: |
-          SKIP_WASM_BUILD=1 cargo check --release
+          SKIP_WASM_BUILD=1 cargo check --release --locked
 
   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
-
       - uses: actions/checkout@v3
 
+      # Tests with benchmarks require a lot of disk space
+      - name: Free Disk Space
+        uses: "./.github/templates/free-space"
+
       - name: Setup worker
         uses: "./.github/templates/setup-worker"
 
@@ -76,8 +72,9 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-debug-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-debug-${{ env.POLKA_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-debug-${{ env.POLKA_VERSION }}
 
-      - name: Run tests
+      - name: Run Trappist tests
         run: |
-          cargo test --features runtime-benchmarks --locked --jobs 1
+          cargo test --workspace --exclude stout-runtime --no-default-features --features trappist/trappist-runtime,std,runtime-benchmarks --locked --jobs 1

.gitignore

@@ -12,9 +12,6 @@
 # The cache for chain data in container
 .local
 
-#Local toolchain configuration
-rust-toolchain.toml
-
 # direnv cache
 .direnv
 

Cargo.toml

@@ -1,13 +1,12 @@
 [workspace]
 members = [
-    "node",
-    "runtime/stout",
-    "runtime/trappist",
-    "primitives/xcm",
+	"node",
+	"runtime/stout",
+	"runtime/trappist",
+	"primitives/xcm",
 ]
 exclude = [
-    "contracts",
-    "xcm-simulator"
+	"xcm-simulator"
 ]
 
 [profile.release]
@@ -32,22 +31,22 @@ license = "Apache License v2"
 async-trait = "0.1.57"
 clap = { version = "4.0.32" }
 parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
-futures = { version = "0.3.25"}
-hex-literal = { version = "0.3.4"}
-log = { version = "0.4.17"}
+futures = { version = "0.3.25" }
+hex-literal = { version = "0.3.4" }
+log = { version = "0.4.17" }
 serde = { version = "1.0.152" }
 scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
 smallvec = "1.9.0"
 
 # Local dependencies
-trappist-runtime = { path = "runtime/trappist"}
+trappist-runtime = { path = "runtime/trappist" }
 stout-runtime = { path = "runtime/stout" }
 jsonrpsee = { version = "0.16.2" }
 
 # External Dependencies
-pallet-dex-rpc = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-dex = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.42" }
-pallet-dex-rpc-runtime-api = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.42" }
+pallet-dex-rpc = { path = "../substrate-dex/rpc", default-features = false }
+pallet-dex =  { path = "../substrate-dex", default-features = false }
+pallet-dex-rpc-runtime-api =  { path = "../substrate-dex/rpc/runtime-api", default-features = false }
 
 # Trappist Pallets
 pallet-asset-registry = { default-features = false, path = "pallets/asset-registry" }
@@ -70,14 +69,13 @@ sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polk
 sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
 substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
 
@@ -102,6 +100,7 @@ sp-inherents = { git = "https://github.com/paritytech/substrate", default-featur
 sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+sp-weights = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 
 # Build Dependencies
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }

docker/trappist-parachain.dockerfile

@@ -1,5 +1,5 @@
 # This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile
-FROM docker.io/paritytech/ci-linux:production as builder
+FROM docker.io/paritytech/ci-linux:1.68.2-bullseye as builder
 
 WORKDIR /trappist
 COPY . /trappist
@@ -14,7 +14,7 @@ RUN cargo build --release
 #   --bootnodes /ip4/127.0.0.1/tcp/30333/p2p/PEER_ID
 #
 # with the appropriate ip and ID for both Alice and Bob
-FROM debian:buster-slim as collator
+FROM debian:bullseye-slim as collator
 RUN apt-get update && apt-get install jq curl bash -y && \
     curl -sSo /wait-for-it.sh https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \
     chmod +x /wait-for-it.sh && \
@@ -33,13 +33,13 @@ HEALTHCHECK --interval=300s --timeout=75s --start-period=30s --retries=3 \
 # the runtime stage is normally built once, cached, and ignored, but can be
 # specified with the --target build flag. This just preserves one of the builder's
 # outputs, which can then be moved into a volume at runtime
-FROM debian:buster-slim as runtime
+FROM debian:bullseye-slim as runtime
 COPY --from=builder \
     /trappist/target/release/wbuild/trappist-runtime/trappist_runtime.wasm \
     /var/opt/
 CMD ["cp", "-v", "/var/opt/trappist_runtime.wasm", "/runtime/"]
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 COPY --from=builder \
     /trappist/target/release/trappist-node /usr/bin
 

node/Cargo.toml

@@ -19,74 +19,76 @@ path = "src/main.rs"
 [dependencies]
 async-trait = { workspace = true }
 clap = { workspace = true }
-parity-scale-codec = { workspace = true  }
+parity-scale-codec = { workspace = true }
 futures = { workspace = true }
 hex-literal = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true }
 
 # Local Dependencies
-trappist-runtime = { workspace = true }
-stout-runtime = { workspace = true }
+trappist-runtime = { workspace = true, optional = true }
+stout-runtime = { workspace = true, optional = true }
 jsonrpsee = { workspace = true, features = ["server"] }
 
 # External Dependencies
 pallet-dex-rpc = { workspace = true }
 
 # Substrate
-frame-benchmarking = { workspace = true, features = [ "std" ] }
+frame-benchmarking = { workspace = true, features = ["std"] }
 frame-benchmarking-cli = { workspace = true }
 sp-runtime = { workspace = true }
-sp-io = { workspace = true, features = [ "std" ] }
-sp-core = { workspace = true, features = [ "std" ] }
+sp-io = { workspace = true, features = ["std"] }
+sp-core = { workspace = true, features = ["std"] }
 sp-consensus = { workspace = true }
-sp-session = { workspace = true, features = [ "std" ] }
+sp-session = { workspace = true, features = ["std"] }
 sc-consensus = { workspace = true }
 sc-cli = { workspace = true }
 sc-client-api = { workspace = true }
 sc-executor = { workspace = true }
 sc-service = { workspace = true }
 sc-telemetry = { workspace = true }
 sc-transaction-pool = { workspace = true }
-sp-transaction-pool = { workspace = true, features = [ "std" ] }
+sp-transaction-pool = { workspace = true, features = ["std"] }
 sc-network = { workspace = true }
 sc-network-sync = { workspace = true }
-sc-network-common = { workspace = true }
 sc-basic-authorship = { workspace = true }
-sp-timestamp = { workspace = true, features = [ "std" ] }
+sp-timestamp = { workspace = true, features = ["std"] }
+sp-inherents = { workspace = true }
 sp-blockchain = { workspace = true }
-sp-block-builder = { workspace = true, features = [ "std" ] }
-sp-keystore = { workspace = true, features = [ "std" ] }
+sp-block-builder = { workspace = true, features = ["std"] }
+sp-keyring = { workspace = true }
+sp-keystore = { workspace = true, features = ["std"] }
 sc-chain-spec = { workspace = true }
 sc-rpc = { workspace = true }
 sc-tracing = { workspace = true }
-sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-offchain = { workspace = true, features = [ "std" ] }
-sp-api = { workspace = true, features = [ "std" ] }
-sp-consensus-aura = { workspace = true, features = [ "std" ] }
+sp-offchain = { workspace = true, features = ["std"] }
+sp-api = { workspace = true, features = ["std"] }
+sp-consensus-aura = { workspace = true, features = ["std"] }
 sc-sysinfo = { workspace = true }
 sp-serializer = { workspace = true }
 substrate-prometheus-endpoint = { workspace = true }
 try-runtime-cli = { workspace = true, optional = true }
 sc-transaction-pool-api = { workspace = true }
+frame-system = { workspace = true }
 frame-rpc-system = { workspace = true }
+pallet-asset-tx-payment = { workspace = true }
 pallet-transaction-payment-rpc = { workspace = true }
 substrate-state-trie-migration-rpc = { workspace = true }
 
 # Polkadot
 polkadot-cli = { workspace = true }
 polkadot-primitives = { workspace = true }
 polkadot-service = { workspace = true }
-xcm = { workspace = true, features = [ "std" ] }
+xcm = { workspace = true, features = ["std"] }
 
 # Cumulus
-cumulus-client-cli ={ workspace = true }
+cumulus-client-cli = { workspace = true }
 cumulus-client-consensus-aura = { workspace = true }
 cumulus-client-consensus-relay-chain = { workspace = true }
 cumulus-client-consensus-common = { workspace = true }
 cumulus-client-service = { workspace = true }
 cumulus-client-network = { workspace = true }
-cumulus-primitives-core = { workspace = true, features = [ "std" ]  }
+cumulus-primitives-core = { workspace = true, features = ["std"] }
 cumulus-primitives-parachain-inherent = { workspace = true }
 cumulus-relay-chain-interface = { workspace = true }
 
@@ -105,13 +107,13 @@ wait-timeout = { workspace = true }
 polkadot-cli = { workspace = true }
 
 [features]
-default = []
+default = ["trappist-runtime", "stout-runtime"]
 runtime-benchmarks = [
-    "trappist-runtime/runtime-benchmarks",
-	"stout-runtime/runtime-benchmarks",
+	"trappist-runtime?/runtime-benchmarks",
+	"stout-runtime?/runtime-benchmarks",
 	"polkadot-cli/runtime-benchmarks"
 ]
 try-runtime = [
-	"trappist-runtime/try-runtime",
-	"stout-runtime/try-runtime"
+	"trappist-runtime?/try-runtime",
+	"try-runtime-cli/try-runtime"
 ]