From 6e24fed138efff06518d2c0fa8220399b721d484 Mon Sep 17 00:00:00 2001
From: Christian Langenbacher <clangenb+gh@protonmail.ch>
Date: Wed, 6 Mar 2024 11:50:35 +0800
Subject: [PATCH] revert formatting changes

---
 .cargo/config.toml                       |  16 +-
 .github/workflows/check-pull-request.yml |  13 -
 .maintain/zombienet-config.toml          |   2 +-
 Cargo.toml                               | 249 +++++++--------
 node/Cargo.toml                          | 118 +++----
 runtime/bajun/Cargo.toml                 | 386 +++++++++++------------
 rust-toolchain.toml                      |   8 +-
 rustfmt.toml                             |  10 +-
 8 files changed, 395 insertions(+), 407 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 1685b35..ad56242 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,13 +1,13 @@
 [alias]
-build-bajun = "build --release --no-default-features --bin bajun-node"
-build-bajun-benchmarks = ["build-bajun", "--features", "runtime-benchmarks"]
+build-bajun            = "build --release --no-default-features --bin bajun-node"
+build-bajun-benchmarks = [ "build-bajun", "--features", "runtime-benchmarks" ]
 
 [target.'cfg(feature = "cargo-clippy")']
 rustflags = [
-  "-Aclippy::derive_partial_eq_without_eq",
-  "-Aclippy::too_many_arguments",
-  "-Aclippy::type_complexity",
-  "-Aclippy::uninlined-format-args",
-  "-Aclippy::unnecessary_cast",
-  "-Aclippy::large_enum_variant",
+    "-Aclippy::derive_partial_eq_without_eq",
+    "-Aclippy::too_many_arguments",
+    "-Aclippy::type_complexity",
+    "-Aclippy::uninlined-format-args",
+    "-Aclippy::unnecessary_cast",
+    "-Aclippy::large_enum_variant",
 ]
diff --git a/.github/workflows/check-pull-request.yml b/.github/workflows/check-pull-request.yml
index 13fc4d2..4c33d02 100644
--- a/.github/workflows/check-pull-request.yml
+++ b/.github/workflows/check-pull-request.yml
@@ -56,19 +56,6 @@ jobs:
           restore-keys: ${{ runner.os }}-cargo-lint-
       - run: cargo clippy --workspace --all-features --all-targets ${{ env.CARGO_ARGS }} -- -D warnings
 
-  cargo-toml-fmt:
-    runs-on: ubuntu-latest
-    container: "tamasfe/taplo:0.7.0-alpine"
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Run Taplo fmt
-        run: taplo fmt --check
-
-      - name: Fail-fast; cancel other jobs
-        if: failure()
-        uses: andymckay/cancel-action@0.2
-
   test:
     if: ${{ !startsWith(github.head_ref, 'release/') }}
     name: Test
diff --git a/.maintain/zombienet-config.toml b/.maintain/zombienet-config.toml
index 974eddd..ae5a0db 100644
--- a/.maintain/zombienet-config.toml
+++ b/.maintain/zombienet-config.toml
@@ -3,7 +3,7 @@ timeout = 120
 
 [relaychain]
 default_command = "./zombienet-tests/bin/polkadot"
-default_args = ["-lparachain=debug"]
+default_args = [ "-lparachain=debug" ]
 chain = "rococo-local"
 
 [[relaychain.nodes]]
diff --git a/Cargo.toml b/Cargo.toml
index 6bc574d..7da6805 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,147 +1,150 @@
 [workspace.package]
-authors = ["Ajuna Network <https://github.com/ajuna-network>"]
-edition = "2021"
-homepage = "https://ajuna.io"
+authors    = [ "Ajuna Network <https://github.com/ajuna-network>" ]
+edition    = "2021"
+homepage   = "https://ajuna.io"
 repository = "https://github.com/ajuna-network/Ajuna"
-version = "0.2.2"
+version    = "0.2.2"
 
 [workspace]
 resolver = "2"
-members = ["node", "runtime/bajun"]
+members = [
+    "node",
+    "runtime/bajun",
+]
 
 [workspace.dependencies]
 # General
 async-trait = { version = "0.1.73", default-features = false }
-clap = { version = "4.4.6", default-features = false }
+clap        = { version = "4.4.6", default-features = false }
 color-print = { version = "0.3.5" }
-futures = { version = "0.3.28", default-features = false }
+futures     = { version = "0.3.28", default-features = false }
 hex-literal = { version = "0.4.1", default-features = false }
-hex = { version = "0.4.3", default-features = false }
-jsonrpsee = { version = "0.20.3", default-features = false }
-log = { version = "0.4.17", default-features = false }
+hex         = { version = "0.4.3", default-features = false }
+jsonrpsee   = { version = "0.20.3", default-features = false }
+log         = { version = "0.4.17", default-features = false }
 parking_lot = { version = "0.12.1", default-features = false }
-serde = { version = "1.0.56", default-features = false }
-serde_json = { version = "1.0.113", default-features = false }
-smallvec = { version = "1.11.1", default-features = false }
+serde       = { version = "1.0.56", default-features = false }
+serde_json  = { version = "1.0.113", default-features = false }
+smallvec    = { version = "1.11.1", default-features = false }
 
 # Parity codec
 parity-scale-codec = { version = "3.0.0", default-features = false }
-scale-info = { version = "2.1.1", default-features = false }
+scale-info         = { version = "2.1.1", default-features = false }
 
 # Substrate
-frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+frame-benchmarking                         = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+frame-benchmarking-cli                     = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+frame-executive                            = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+frame-support                              = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+frame-system                               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+frame-system-benchmarking                  = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+frame-system-rpc-runtime-api               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+frame-try-runtime                          = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-aura                                = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-authorship                          = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-balances                            = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-collective                          = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-democracy                           = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-grandpa                             = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-identity                            = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
 pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-nfts = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+pallet-message-queue                       = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-membership                          = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-multisig                            = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-nfts                                = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-preimage                            = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-proxy                               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-scheduler                           = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-session                             = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-sudo                                = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-timestamp                           = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-transaction-payment                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-transaction-payment-rpc             = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-network = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-session = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-version = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-treasury                            = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-utility                             = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sc-basic-authorship                        = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-chain-spec                              = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-cli                                     = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-client-api                              = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-consensus                               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-consensus-grandpa                       = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-executor                                = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-network                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-network-sync                            = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-rpc                                     = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-rpc-api                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-service                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-sysinfo                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-telemetry                               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-tracing                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-transaction-pool                        = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sc-transaction-pool-api                    = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sp-api                                     = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-block-builder                           = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-blockchain                              = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+sp-consensus                               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-consensus-grandpa                       = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-core                                    = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-genesis-builder                         = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-inherents                               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-keyring                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-io                                      = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-runtime                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-session                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-std                                     = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-storage                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-timestamp                               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-transaction-pool                        = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-version                                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+substrate-build-script-utils               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+substrate-frame-rpc-system                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+substrate-prometheus-endpoint              = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+substrate-wasm-builder                     = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+try-runtime-cli                            = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
 
 # Polkadot
-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-xcm                    = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+polkadot-cli                  = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+polkadot-service              = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
 polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-staging-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-staging-xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-staging-xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+polkadot-primitives           = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+polkadot-runtime-common       = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+staging-xcm                   = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+staging-xcm-builder           = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+staging-xcm-executor          = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
 
 # Cumulus
-cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-primitives-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-client-cli                      = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+cumulus-client-collator                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+cumulus-client-consensus-aura           = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+cumulus-client-consensus-common         = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+cumulus-client-consensus-proposer       = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+cumulus-client-consensus-relay-chain    = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-client-network                  = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-client-service                  = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-pallet-aura-ext                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-pallet-parachain-system         = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-pallet-session-benchmarking     = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-pallet-xcm                      = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-pallet-xcmp-queue               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-primitives-aura                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-primitives-core                 = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-primitives-parachain-inherent   = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-primitives-utility              = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
 cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-parachains-common = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
-staging-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-relay-chain-interface           = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0" }
+cumulus-relay-chain-minimal-node        = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+cumulus-relay-chain-rpc-interface       = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+pallet-collator-selection               = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+parachains-common                       = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
+staging-parachain-info                  = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.7.0", default-features = false }
 
 # ORML
 orml-vesting = { git = "https://github.com/ajuna-network/open-runtime-module-library.git", branch = "ds/dependency-use", default-features = false }
@@ -150,11 +153,11 @@ orml-vesting = { git = "https://github.com/ajuna-network/open-runtime-module-lib
 bajun-runtime = { path = "runtime/bajun" }
 
 # Ajuna Pallets
-pallet-ajuna-awesome-avatars = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
-pallet-ajuna-battle-mogs = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
+pallet-ajuna-awesome-avatars              = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
+pallet-ajuna-battle-mogs                  = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
 pallet-ajuna-awesome-avatars-benchmarking = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
-pallet-ajuna-nft-transfer = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
-pallet-ajuna-nft-staking = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
+pallet-ajuna-nft-transfer                 = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
+pallet-ajuna-nft-staking                  = { git = "https://github.com/ajuna-network/ajuna-pallets.git", tag = "v0.1.0", default-features = false }
 
 [profile.production]
 codegen-units = 1
diff --git a/node/Cargo.toml b/node/Cargo.toml
index de1871a..8cc671f 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -1,71 +1,71 @@
 [package]
 name = "bajun-node"
 
-authors.workspace = true
-edition.workspace = true
-homepage.workspace = true
+authors.workspace    = true
+edition.workspace    = true
+homepage.workspace   = true
 repository.workspace = true
-version.workspace = true
+version.workspace    = true
 
 [dependencies]
 # General
-clap = { workspace = true, features = ["std"] }
-log = { workspace = true, features = ["std"] }
-serde = { workspace = true, features = ["derive"] }
-jsonrpsee = { workspace = true, features = ["server"] }
-futures = { workspace = true, features = ["std"] }
+clap       = { workspace = true, features = ["std"] }
+log        = { workspace = true, features = ["std"] }
+serde      = { workspace = true, features = ["derive"] }
+jsonrpsee  = { workspace = true, features = ["server"] }
+futures    = { workspace = true, features = ["std"] }
 serde_json = { workspace = true, features = ["std"] }
 
 # Parity codec
 parity-scale-codec = { workspace = true, features = ["std"] }
 
 # Substrate
-frame-benchmarking = { workspace = true, features = ["std"] }
-frame-benchmarking-cli = { workspace = true }
+frame-benchmarking             = { workspace = true, features = ["std"] }
+frame-benchmarking-cli         = { workspace = true }
 pallet-transaction-payment-rpc = { workspace = true }
-sc-basic-authorship = { workspace = true }
-sc-chain-spec = { workspace = true }
-sc-cli = { workspace = true }
-sc-client-api = { workspace = true }
-sc-offchain = { workspace = true }
-sc-consensus = { workspace = true }
-sc-executor = { workspace = true, features = ["std"] }
-sc-network = { workspace = true }
-sc-network-sync = { workspace = true }
-sc-rpc = { workspace = true }
-sc-service = { workspace = true }
-sc-sysinfo = { workspace = true }
-sc-telemetry = { workspace = true }
-sc-tracing = { workspace = true }
-sc-transaction-pool = { workspace = true }
-sc-transaction-pool-api = { workspace = true }
-sp-api = { workspace = true, features = ["std"] }
-sp-block-builder = { workspace = true, features = ["std"] }
-sp-blockchain = { workspace = true }
-sp-consensus-aura = { workspace = true, features = ["std"] }
-sp-core = { workspace = true, features = ["std"] }
-sp-keystore = { workspace = true, features = ["std"] }
-sp-runtime = { workspace = true, features = ["std"] }
-sp-timestamp = { workspace = true, features = ["std"] }
-substrate-frame-rpc-system = { workspace = true }
-substrate-prometheus-endpoint = { workspace = true }
+sc-basic-authorship            = { workspace = true }
+sc-chain-spec                  = { workspace = true }
+sc-cli                         = { workspace = true }
+sc-client-api                  = { workspace = true }
+sc-offchain                    = { workspace = true }
+sc-consensus                   = { workspace = true }
+sc-executor                    = { workspace = true, features = ["std"] }
+sc-network                     = { workspace = true }
+sc-network-sync                = { workspace = true }
+sc-rpc                         = { workspace = true }
+sc-service                     = { workspace = true }
+sc-sysinfo                     = { workspace = true }
+sc-telemetry                   = { workspace = true }
+sc-tracing                     = { workspace = true }
+sc-transaction-pool            = { workspace = true }
+sc-transaction-pool-api        = { workspace = true }
+sp-api                         = { workspace = true, features = ["std"] }
+sp-block-builder               = { workspace = true, features = ["std"] }
+sp-blockchain                  = { workspace = true }
+sp-consensus-aura              = { workspace = true, features = ["std"] }
+sp-core                        = { workspace = true, features = ["std"] }
+sp-keystore                    = { workspace = true, features = ["std"] }
+sp-runtime                     = { workspace = true, features = ["std"] }
+sp-timestamp                   = { workspace = true, features = ["std"] }
+substrate-frame-rpc-system     = { workspace = true }
+substrate-prometheus-endpoint  = { workspace = true }
 
 # Polkadot
-polkadot-cli = { workspace = true }
+polkadot-cli        = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["std"] }
-staging-xcm = { workspace = true, features = ["std"] }
+staging-xcm         = { workspace = true, features = ["std"] }
 
 # Cumulus
-cumulus-client-cli = { workspace = true }
-cumulus-client-collator = { workspace = true }
-cumulus-client-consensus-aura = { workspace = true }
-cumulus-client-consensus-common = { workspace = true }
-cumulus-client-consensus-proposer = { workspace = true }
-cumulus-client-service = { workspace = true }
-cumulus-primitives-core = { workspace = true, features = ["std"] }
+cumulus-client-cli                    = { workspace = true }
+cumulus-client-collator               = { workspace = true }
+cumulus-client-consensus-aura         = { workspace = true }
+cumulus-client-consensus-common       = { workspace = true }
+cumulus-client-consensus-proposer     = { workspace = true }
+cumulus-client-service                = { workspace = true }
+cumulus-primitives-core               = { workspace = true, features = ["std"] }
 cumulus-primitives-parachain-inherent = { workspace = true, features = ["std"] }
-cumulus-relay-chain-interface = { workspace = true }
-color-print = { workspace = true }
+cumulus-relay-chain-interface         = { workspace = true }
+color-print                           = { workspace = true }
 
 # Runtime
 bajun-runtime = { workspace = true, features = ["std"] }
@@ -76,17 +76,17 @@ substrate-build-script-utils = { workspace = true }
 [features]
 default = []
 runtime-benchmarks = [
-  "cumulus-primitives-core/runtime-benchmarks",
-  "frame-benchmarking-cli/runtime-benchmarks",
-  "frame-benchmarking/runtime-benchmarks",
-  "bajun-runtime/runtime-benchmarks",
-  "polkadot-cli/runtime-benchmarks",
-  "polkadot-primitives/runtime-benchmarks",
-  "sc-service/runtime-benchmarks",
-  "sp-runtime/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
+	"frame-benchmarking-cli/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"bajun-runtime/runtime-benchmarks",
+	"polkadot-cli/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-  "bajun-runtime/try-runtime",
-  "polkadot-cli/try-runtime",
-  "sp-runtime/try-runtime",
+	"bajun-runtime/try-runtime",
+	"polkadot-cli/try-runtime",
+	"sp-runtime/try-runtime",
 ]
diff --git a/runtime/bajun/Cargo.toml b/runtime/bajun/Cargo.toml
index 841b30c..ab47c81 100644
--- a/runtime/bajun/Cargo.toml
+++ b/runtime/bajun/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "bajun-runtime"
 
-authors.workspace = true
-edition.workspace = true
-homepage.workspace = true
+authors.workspace    = true
+edition.workspace    = true
+homepage.workspace   = true
 repository.workspace = true
-version.workspace = true
+version.workspace    = true
 
 [build-dependencies]
 substrate-wasm-builder = { workspace = true }
@@ -13,223 +13,221 @@ substrate-wasm-builder = { workspace = true }
 [dependencies]
 # General
 hex-literal = { workspace = true, optional = true }
-log = { workspace = true }
-serde = { workspace = true, features = ["derive"], optional = true }
-smallvec = { workspace = true }
+log         = { workspace = true }
+serde       = { workspace = true, features = ["derive"], optional = true }
+smallvec    = { workspace = true }
 
 # Parity codec
 parity-scale-codec = { workspace = true }
-scale-info = { workspace = true, features = ["derive"] }
+scale-info         = { workspace = true, features = ["derive"] }
 
 # Substrate
-frame-benchmarking = { workspace = true, optional = true }
-frame-executive = { workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
-frame-system-benchmarking = { workspace = true, optional = true }
-frame-system-rpc-runtime-api = { workspace = true }
-frame-try-runtime = { workspace = true, optional = true }
-pallet-aura = { workspace = true }
-pallet-authorship = { workspace = true }
-pallet-balances = { workspace = true }
-pallet-collective = { workspace = true }
-pallet-democracy = { workspace = true }
-pallet-identity = { workspace = true }
+frame-benchmarking                         = { workspace = true, optional = true }
+frame-executive                            = { workspace = true }
+frame-support                              = { workspace = true }
+frame-system                               = { workspace = true }
+frame-system-benchmarking                  = { workspace = true, optional = true }
+frame-system-rpc-runtime-api               = { workspace = true }
+frame-try-runtime                          = { workspace = true, optional = true }
+pallet-aura                                = { workspace = true }
+pallet-authorship                          = { workspace = true }
+pallet-balances                            = { workspace = true }
+pallet-collective                          = { workspace = true }
+pallet-democracy                           = { workspace = true }
+pallet-identity                            = { workspace = true }
 pallet-insecure-randomness-collective-flip = { workspace = true }
-pallet-membership = { workspace = true }
-pallet-message-queue = { workspace = true }
-pallet-multisig = { workspace = true }
-pallet-nfts = { workspace = true }
-pallet-preimage = { workspace = true }
-pallet-proxy = { workspace = true }
-pallet-scheduler = { workspace = true }
-pallet-session = { workspace = true }
-pallet-sudo = { workspace = true }
-pallet-timestamp = { workspace = true }
-pallet-transaction-payment = { workspace = true }
+pallet-membership                          = { workspace = true }
+pallet-message-queue                       = { workspace = true }
+pallet-multisig                            = { workspace = true }
+pallet-nfts                                = { workspace = true }
+pallet-preimage                            = { workspace = true }
+pallet-proxy                               = { workspace = true }
+pallet-scheduler                           = { workspace = true }
+pallet-session                             = { workspace = true }
+pallet-sudo                                = { workspace = true }
+pallet-timestamp                           = { workspace = true }
+pallet-transaction-payment                 = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
-pallet-treasury = { workspace = true }
-pallet-utility = { workspace = true }
-sp-api = { workspace = true }
-sp-block-builder = { workspace = true }
-sp-consensus-aura = { workspace = true }
-sp-core = { workspace = true }
-sp-genesis-builder = { workspace = true }
-sp-inherents = { workspace = true }
-sp-io = { workspace = true }
-sp-offchain = { workspace = true }
-sp-runtime = { workspace = true }
-sp-session = { workspace = true }
-sp-std = { workspace = true }
-sp-storage = { workspace = true }
-sp-transaction-pool = { workspace = true }
-sp-version = { workspace = true }
+pallet-treasury                            = { workspace = true }
+pallet-utility                             = { workspace = true }
+sp-api                                     = { workspace = true }
+sp-block-builder                           = { workspace = true }
+sp-consensus-aura                          = { workspace = true }
+sp-core                                    = { workspace = true }
+sp-genesis-builder                         = { workspace = true }
+sp-inherents                               = { workspace = true }
+sp-io                                      = { workspace = true }
+sp-offchain                                = { workspace = true }
+sp-runtime                                 = { workspace = true }
+sp-session                                 = { workspace = true }
+sp-std                                     = { workspace = true }
+sp-storage                                 = { workspace = true }
+sp-transaction-pool                        = { workspace = true }
+sp-version                                 = { workspace = true }
 
 # Polkadot
-pallet-xcm = { workspace = true }
+pallet-xcm                    = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
-polkadot-runtime-common = { workspace = true }
-staging-xcm = { workspace = true }
-staging-xcm-builder = { workspace = true }
-staging-xcm-executor = { workspace = true }
+polkadot-runtime-common       = { workspace = true }
+staging-xcm                   = { workspace = true }
+staging-xcm-builder           = { workspace = true }
+staging-xcm-executor          = { workspace = true }
 
 # Cumulus
-cumulus-pallet-aura-ext = { workspace = true }
-cumulus-pallet-parachain-system = { workspace = true, features = [
-  "parameterized-consensus-hook",
-] }
+cumulus-pallet-aura-ext             = { workspace = true }
+cumulus-pallet-parachain-system     = { workspace = true, features = [ "parameterized-consensus-hook" ] }
 cumulus-pallet-session-benchmarking = { workspace = true }
-cumulus-pallet-xcm = { workspace = true }
-cumulus-pallet-xcmp-queue = { workspace = true }
-cumulus-primitives-aura = { workspace = true }
-cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
-pallet-collator-selection = { workspace = true }
-parachains-common = { workspace = true }
-staging-parachain-info = { workspace = true }
+cumulus-pallet-xcm                  = { workspace = true }
+cumulus-pallet-xcmp-queue           = { workspace = true }
+cumulus-primitives-aura             = { workspace = true }
+cumulus-primitives-core             = { workspace = true }
+cumulus-primitives-utility          = { workspace = true }
+pallet-collator-selection           = { workspace = true }
+parachains-common                   = { workspace = true }
+staging-parachain-info              = { workspace = true }
 
 # ORML
 orml-vesting = { workspace = true }
 
 # Ajuna Pallets
-pallet-ajuna-awesome-avatars = { workspace = true }
+pallet-ajuna-awesome-avatars              = { workspace = true }
 pallet-ajuna-awesome-avatars-benchmarking = { workspace = true, optional = true }
-pallet-ajuna-nft-transfer = { workspace = true }
+pallet-ajuna-nft-transfer                 = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-  "parity-scale-codec/std",
-  "log/std",
-  "scale-info/std",
-  "serde/std",
-  "cumulus-pallet-aura-ext/std",
-  "cumulus-pallet-parachain-system/std",
-  "cumulus-pallet-xcm/std",
-  "cumulus-pallet-xcmp-queue/std",
-  "cumulus-primitives-aura/std",
-  "cumulus-primitives-core/std",
-  "cumulus-primitives-utility/std",
-  "frame-executive/std",
-  "frame-support/std",
-  "frame-system-rpc-runtime-api/std",
-  "frame-system/std",
-  "frame-try-runtime/std",
-  "orml-vesting/std",
-  "pallet-ajuna-awesome-avatars/std",
-  "pallet-ajuna-awesome-avatars-benchmarking?/std",
-  "pallet-ajuna-nft-transfer/std",
-  "pallet-aura/std",
-  "pallet-authorship/std",
-  "pallet-balances/std",
-  "pallet-collective/std",
-  "pallet-collator-selection/std",
-  "pallet-democracy/std",
-  "pallet-identity/std",
-  "pallet-membership/std",
-  "pallet-message-queue/std",
-  "pallet-multisig/std",
-  "pallet-nfts/std",
-  "pallet-preimage/std",
-  "pallet-proxy/std",
-  "pallet-insecure-randomness-collective-flip/std",
-  "pallet-scheduler/std",
-  "pallet-session/std",
-  "pallet-sudo/std",
-  "pallet-timestamp/std",
-  "pallet-treasury/std",
-  "pallet-transaction-payment-rpc-runtime-api/std",
-  "pallet-transaction-payment/std",
-  "pallet-utility/std",
-  "pallet-xcm/std",
-  "parachains-common/std",
-  "staging-parachain-info/std",
-  "polkadot-parachain-primitives/std",
-  "polkadot-runtime-common/std",
-  "sp-api/std",
-  "sp-block-builder/std",
-  "sp-consensus-aura/std",
-  "sp-core/std",
-  "sp-inherents/std",
-  "sp-io/std",
-  "sp-offchain/std",
-  "sp-runtime/std",
-  "sp-session/std",
-  "sp-std/std",
-  "sp-storage/std",
-  "sp-transaction-pool/std",
-  "sp-version/std",
-  "staging-xcm/std",
-  "staging-xcm-builder/std",
-  "staging-xcm-executor/std",
+    "parity-scale-codec/std",
+    "log/std",
+    "scale-info/std",
+    "serde/std",
+    "cumulus-pallet-aura-ext/std",
+    "cumulus-pallet-parachain-system/std",
+    "cumulus-pallet-xcm/std",
+    "cumulus-pallet-xcmp-queue/std",
+    "cumulus-primitives-aura/std",
+    "cumulus-primitives-core/std",
+    "cumulus-primitives-utility/std",
+    "frame-executive/std",
+    "frame-support/std",
+    "frame-system-rpc-runtime-api/std",
+    "frame-system/std",
+    "frame-try-runtime/std",
+    "orml-vesting/std",
+    "pallet-ajuna-awesome-avatars/std",
+    "pallet-ajuna-awesome-avatars-benchmarking?/std",
+    "pallet-ajuna-nft-transfer/std",
+    "pallet-aura/std",
+    "pallet-authorship/std",
+    "pallet-balances/std",
+    "pallet-collective/std",
+    "pallet-collator-selection/std",
+    "pallet-democracy/std",
+    "pallet-identity/std",
+    "pallet-membership/std",
+    "pallet-message-queue/std",
+    "pallet-multisig/std",
+    "pallet-nfts/std",
+    "pallet-preimage/std",
+    "pallet-proxy/std",
+    "pallet-insecure-randomness-collective-flip/std",
+    "pallet-scheduler/std",
+    "pallet-session/std",
+    "pallet-sudo/std",
+    "pallet-timestamp/std",
+    "pallet-treasury/std",
+    "pallet-transaction-payment-rpc-runtime-api/std",
+    "pallet-transaction-payment/std",
+    "pallet-utility/std",
+    "pallet-xcm/std",
+    "parachains-common/std",
+    "staging-parachain-info/std",
+    "polkadot-parachain-primitives/std",
+    "polkadot-runtime-common/std",
+    "sp-api/std",
+    "sp-block-builder/std",
+    "sp-consensus-aura/std",
+    "sp-core/std",
+    "sp-inherents/std",
+    "sp-io/std",
+    "sp-offchain/std",
+    "sp-runtime/std",
+    "sp-session/std",
+    "sp-std/std",
+    "sp-storage/std",
+    "sp-transaction-pool/std",
+    "sp-version/std",
+    "staging-xcm/std",
+    "staging-xcm-builder/std",
+    "staging-xcm-executor/std",
 ]
 
 runtime-benchmarks = [
-  "hex-literal",
-  "frame-benchmarking/runtime-benchmarks",
-  "frame-support/runtime-benchmarks",
-  "frame-system-benchmarking/runtime-benchmarks",
-  "frame-system/runtime-benchmarks",
-  "orml-vesting/runtime-benchmarks",
-  "pallet-balances/runtime-benchmarks",
-  "pallet-collator-selection/runtime-benchmarks",
-  "pallet-collective/runtime-benchmarks",
-  "pallet-democracy/runtime-benchmarks",
-  "pallet-identity/runtime-benchmarks",
-  "pallet-membership/runtime-benchmarks",
-  "pallet-message-queue/runtime-benchmarks",
-  "pallet-multisig/runtime-benchmarks",
-  "pallet-nfts/runtime-benchmarks",
-  "pallet-preimage/runtime-benchmarks",
-  "pallet-proxy/runtime-benchmarks",
-  "pallet-scheduler/runtime-benchmarks",
-  "pallet-timestamp/runtime-benchmarks",
-  "pallet-treasury/runtime-benchmarks",
-  "pallet-utility/runtime-benchmarks",
-  "pallet-xcm/runtime-benchmarks",
-  "sp-runtime/runtime-benchmarks",
-  "staging-xcm-builder/runtime-benchmarks",
-  "cumulus-pallet-parachain-system/runtime-benchmarks",
-  "cumulus-pallet-session-benchmarking/runtime-benchmarks",
-  "cumulus-pallet-xcmp-queue/runtime-benchmarks",
-  "pallet-ajuna-awesome-avatars-benchmarking/runtime-benchmarks",
-  "pallet-ajuna-nft-transfer/runtime-benchmarks",
+    "hex-literal",
+    "frame-benchmarking/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
+    "frame-system-benchmarking/runtime-benchmarks",
+    "frame-system/runtime-benchmarks",
+    "orml-vesting/runtime-benchmarks",
+    "pallet-balances/runtime-benchmarks",
+    "pallet-collator-selection/runtime-benchmarks",
+    "pallet-collective/runtime-benchmarks",
+    "pallet-democracy/runtime-benchmarks",
+    "pallet-identity/runtime-benchmarks",
+    "pallet-membership/runtime-benchmarks",
+    "pallet-message-queue/runtime-benchmarks",
+    "pallet-multisig/runtime-benchmarks",
+    "pallet-nfts/runtime-benchmarks",
+    "pallet-preimage/runtime-benchmarks",
+    "pallet-proxy/runtime-benchmarks",
+    "pallet-scheduler/runtime-benchmarks",
+    "pallet-timestamp/runtime-benchmarks",
+    "pallet-treasury/runtime-benchmarks",
+    "pallet-utility/runtime-benchmarks",
+    "pallet-xcm/runtime-benchmarks",
+    "sp-runtime/runtime-benchmarks",
+    "staging-xcm-builder/runtime-benchmarks",
+    "cumulus-pallet-parachain-system/runtime-benchmarks",
+    "cumulus-pallet-session-benchmarking/runtime-benchmarks",
+    "cumulus-pallet-xcmp-queue/runtime-benchmarks",
+    "pallet-ajuna-awesome-avatars-benchmarking/runtime-benchmarks",
+    "pallet-ajuna-nft-transfer/runtime-benchmarks",
 ]
 
 try-runtime = [
-  "cumulus-pallet-aura-ext/try-runtime",
-  "cumulus-pallet-parachain-system/try-runtime",
-  "cumulus-pallet-xcm/try-runtime",
-  "cumulus-pallet-xcmp-queue/try-runtime",
-  "frame-executive/try-runtime",
-  "frame-system/try-runtime",
-  "frame-try-runtime/try-runtime",
-  "orml-vesting/try-runtime",
-  "pallet-aura/try-runtime",
-  "pallet-authorship/try-runtime",
-  "pallet-balances/try-runtime",
-  "pallet-collator-selection/try-runtime",
-  "pallet-collective/try-runtime",
-  "pallet-democracy/try-runtime",
-  "pallet-identity/try-runtime",
-  "pallet-membership/try-runtime",
-  "pallet-message-queue/try-runtime",
-  "pallet-multisig/try-runtime",
-  "pallet-nfts/try-runtime",
-  "pallet-preimage/try-runtime",
-  "pallet-proxy/try-runtime",
-  "pallet-insecure-randomness-collective-flip/try-runtime",
-  "pallet-scheduler/try-runtime",
-  "pallet-session/try-runtime",
-  "pallet-sudo/try-runtime",
-  "pallet-timestamp/try-runtime",
-  "pallet-transaction-payment/try-runtime",
-  "pallet-treasury/try-runtime",
-  "pallet-utility/try-runtime",
-  "pallet-xcm/try-runtime",
-  "staging-parachain-info/try-runtime",
-  "pallet-ajuna-awesome-avatars/try-runtime",
-  "pallet-ajuna-nft-transfer/try-runtime",
+    "cumulus-pallet-aura-ext/try-runtime",
+    "cumulus-pallet-parachain-system/try-runtime",
+    "cumulus-pallet-xcm/try-runtime",
+    "cumulus-pallet-xcmp-queue/try-runtime",
+    "frame-executive/try-runtime",
+    "frame-system/try-runtime",
+    "frame-try-runtime/try-runtime",
+    "orml-vesting/try-runtime",
+    "pallet-aura/try-runtime",
+    "pallet-authorship/try-runtime",
+    "pallet-balances/try-runtime",
+    "pallet-collator-selection/try-runtime",
+    "pallet-collective/try-runtime",
+    "pallet-democracy/try-runtime",
+    "pallet-identity/try-runtime",
+    "pallet-membership/try-runtime",
+    "pallet-message-queue/try-runtime",
+    "pallet-multisig/try-runtime",
+    "pallet-nfts/try-runtime",
+    "pallet-preimage/try-runtime",
+    "pallet-proxy/try-runtime",
+    "pallet-insecure-randomness-collective-flip/try-runtime",
+    "pallet-scheduler/try-runtime",
+    "pallet-session/try-runtime",
+    "pallet-sudo/try-runtime",
+    "pallet-timestamp/try-runtime",
+    "pallet-transaction-payment/try-runtime",
+    "pallet-treasury/try-runtime",
+    "pallet-utility/try-runtime",
+    "pallet-xcm/try-runtime",
+    "staging-parachain-info/try-runtime",
+    "pallet-ajuna-awesome-avatars/try-runtime",
+    "pallet-ajuna-nft-transfer/try-runtime",
 ]
 
-experimental = ["pallet-aura/experimental"]
+experimental = [ "pallet-aura/experimental" ]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 44d4ccb..42129d0 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.74.1"
-components = ["clippy", "rustfmt", "rust-src"]
-profile = "minimal"
-targets = ["wasm32-unknown-unknown"]
+channel    = "1.74.1"
+components = [ "clippy", "rustfmt", "rust-src" ]
+profile    = "minimal"
+targets    = [ "wasm32-unknown-unknown" ]
diff --git a/rustfmt.toml b/rustfmt.toml
index c3783c7..2b1327d 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,6 +1,6 @@
 # Basic
-hard_tabs = true
-max_width = 100
+hard_tabs            = true
+max_width            = 100
 use_small_heuristics = "Max"
 # Imports
 reorder_imports = true
@@ -8,7 +8,7 @@ reorder_modules = true
 # Consistency
 newline_style = "Unix"
 # Misc
-chain_width = 80
-match_arm_leading_pipes = "Preserve"
+chain_width                = 80
+match_arm_leading_pipes    = "Preserve"
 match_block_trailing_comma = true
-use_field_init_shorthand = true
+use_field_init_shorthand   = true