Merge branch 'main' into joshy-kill-offchain-worker

Off-Narrative-Labs · Sep 26, 2023 · cea184d · cea184d
2 parents 74f0891 + e3b72ff
commit cea184d
Show file tree

Hide file tree

Showing 15 changed files with 259 additions and 230 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -95,4 +95,4 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: -- -D warnings
+          args: -- -D warnings
diff --git a/.github/workflows/toml-sort.yml b/.github/workflows/toml-sort.yml
@@ -0,0 +1,22 @@
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+
+name: Toml Sort
+
+jobs:
+  toml-sort:
+    name: Toml Sort
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+      - run: cargo install --git https://github.com/Moonsong-Labs/toml_sort/
+      - run: find . -name Cargo.toml | xargs -L1 toml-sort --check
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,51 +1,50 @@
-[workspace]
-resolver = "2"
+[profile.release]
+panic = "unwind"
 
+[workspace]
 members = [
-    "node",
-    "tuxedo-template-runtime",
-    "tuxedo-core",
-    "tuxedo-core/aggregator",
-    "tuxedo-core/no_bound",
-    "wallet",
-    "wardrobe/amoeba",
-    "wardrobe/money",
-    "wardrobe/poe",
-    "wardrobe/kitties",
-    "wardrobe/runtime_upgrade",
+	"node",
+	"tuxedo-template-runtime",
+	"tuxedo-core",
+	"tuxedo-core/aggregator",
+	"tuxedo-core/no_bound",
+	"wallet",
+	"wardrobe/amoeba",
+	"wardrobe/money",
+	"wardrobe/poe",
+	"wardrobe/kitties",
+	"wardrobe/runtime_upgrade",
 ]
-
-[profile.release]
-panic = "unwind"
+resolver = "2"
 
 [workspace.dependencies]
 # Generic dependencies
+clap = "4.3.0"
+hex-literal = "0.4.1"
+jsonrpsee = "0.16.2"
 log = "0.4"
-serde =  "1.0"
 parity-scale-codec = { version = "3.4.0", default-features = false }
-scale-info = { version = "2.1.1", default-features = false }
 parity-util-mem = "0.12.0"
-jsonrpsee = "0.16.2"
-hex-literal = "0.4.1"
-clap = "4.3.0"
+scale-info = { version = "2.1.1", default-features = false }
+serde = "1.0"
 
 # Procedural macro dependencies
-syn = "2.0.15"
-quote = "1.0.23"
 proc-macro2 = "1.0.67"
+quote = "1.0.23"
+syn = "2.0.15"
 
 # Core-only dependencies
 array-bytes = "6.0.0"
 
 # Wallet-only dependencies
-serde_json = "1.0"
-tokio = "1.25.0"
 anyhow = "1.0.69"
-hex = "0.4.3"
 directories = "5.0.0"
-sled = "0.34.7"
-futures = "0.3"
 env_logger = "0.10.0"
+futures = "0.3"
+hex = "0.4.3"
+serde_json = "1.0"
+sled = "0.34.7"
+tokio = "1.25.0"
 
 # Node-only dependencies
 substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
@@ -54,38 +53,38 @@ substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-s
 substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
 
 # Substrate primitives and client
+sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
 sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
+sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
 sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sc-network = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
 sc-service = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
 sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sp-session = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
-sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
 sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
 sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-api = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-application-crypto = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-block-builder = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
 sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sc-network = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default-features = false }
-sp-version = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default-features = false }
-sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
-sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
+sp-consensus-aura = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-consensus-grandpa = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-core = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-debug-derive = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-inherents = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-io = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
 sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sp-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
-sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
-sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
-sp-debug-derive = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
-sp-std = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false}
-sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false}
-sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false}
-sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false}
-sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false}
-sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0", default_features = false }
+sp-keystore = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-session = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-std = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-storage = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-timestamp = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-transaction-pool = { default_features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
+sp-version = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-v1.1.0" }
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,54 +1,54 @@
 [package]
-name = "node-template"
-version = "4.0.0-dev"
+build = "build.rs"
 description = "A fresh Substrate node, ready for hacking."
 edition = "2021"
 license = "Unlicense"
+name = "node-template"
 publish = false
-build = "build.rs"
+version = "4.0.0-dev"
 
 [package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[[bin]]
-name = "node-template"
+targets = [ "x86_64-unknown-linux-gnu" ]
 
 [dependencies]
-clap = { workspace = true, features = ["derive"] }
+clap = { features = [ "derive" ], workspace = true }
 
 sc-cli = { workspace = true }
-sp-core = { workspace = true }
+sc-client-api = { workspace = true }
+sc-consensus = { workspace = true }
+sc-consensus-aura = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
 sc-executor = { workspace = true }
+sc-keystore = { workspace = true }
+sc-network = { workspace = true }
 sc-service = { workspace = true }
 sc-telemetry = { workspace = true }
-sc-keystore = { workspace = true }
 sc-transaction-pool = { workspace = true }
 sc-transaction-pool-api = { workspace = true }
-sc-consensus-aura = { workspace = true }
-sp-consensus-aura = { workspace = true }
 sp-consensus = { workspace = true }
-sc-consensus = { workspace = true }
-sc-consensus-grandpa = { workspace = true }
+sp-consensus-aura = { workspace = true }
 sp-consensus-grandpa = { workspace = true }
-sc-network = { workspace = true }
-sc-client-api = { workspace = true }
-sp-runtime = { workspace = true }
-sp-timestamp = { workspace = true }
+sp-core = { workspace = true }
 sp-inherents = { workspace = true }
 sp-keyring = { workspace = true }
+sp-runtime = { workspace = true }
+sp-timestamp = { workspace = true }
 
 # These dependencies are used for the node template's RPCs
-jsonrpsee = { workspace = true, features = ["server"] }
+jsonrpsee = { features = [ "server" ], workspace = true }
+sc-basic-authorship = { workspace = true }
 sc-rpc = { workspace = true }
-sp-api = { workspace = true }
 sc-rpc-api = { workspace = true }
-sp-blockchain = { workspace = true }
+sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
-sc-basic-authorship = { workspace = true }
+sp-blockchain = { workspace = true }
 
 # Local Dependencies
 node-template-runtime = { package = "tuxedo-template-runtime", path = "../tuxedo-template-runtime" }
 
+[[bin]]
+name = "node-template"
+
 [build-dependencies]
 substrate-build-script-utils = { workspace = true }
 

diff --git a/toml-sort.toml b/toml-sort.toml
@@ -0,0 +1,9 @@
+keys = [
+    "package",
+    "dependencies",
+]
+
+inline_keys = [
+    "version",
+    "features",
+]
diff --git a/tuxedo-core/Cargo.toml b/tuxedo-core/Cargo.toml
@@ -1,34 +1,34 @@
 [package]
-name = "tuxedo-core"
-version = "1.0.0-dev"
-repository = 'https://github.com/Off-Narrative-Labs/Tuxedo'
+description = "Core components that all Tuxedo runtimes will use."
 edition = "2021"
 license = "Apache-2.0"
-description = "Core components that all Tuxedo runtimes will use."
+name = "tuxedo-core"
+repository = "https://github.com/Off-Narrative-Labs/Tuxedo"
+version = "1.0.0-dev"
 
 [dependencies]
 log = { workspace = true }
-serde = { workspace = true, optional = true, features = ["derive"] }
-parity-scale-codec = { workspace = true, features = ['derive'] }
-scale-info = { workspace = true, features = ["derive"] }
-parity-util-mem = { workspace = true, optional = true }
+parity-scale-codec = { features = [ "derive" ], workspace = true }
+parity-util-mem = { optional = true, workspace = true }
+scale-info = { features = [ "derive" ], workspace = true }
+serde = { features = [ "derive" ], optional = true, workspace = true }
 
 aggregator = { path = "aggregator" }
 derive-no-bound = { path = "no_bound" }
 
-sp-api = { workspace = true, default_features = false}
-sp-debug-derive = { workspace = true, default_features = false, features = ["force-debug"] }
-sp-core = { workspace = true, default_features = false}
-sp-io = { workspace = true, default_features = false, features = ["with-tracing"] }
-sp-runtime = { workspace = true, default_features = false}
-sp-std = { workspace = true, default_features = false}
-sp-storage = { workspace = true, default_features = false}
+sp-api = { default_features = false, workspace = true }
+sp-core = { default_features = false, workspace = true }
+sp-debug-derive = { features = [ "force-debug" ], default_features = false, workspace = true }
+sp-io = { features = [ "with-tracing" ], default_features = false, workspace = true }
+sp-runtime = { default_features = false, workspace = true }
+sp-std = { default_features = false, workspace = true }
+sp-storage = { default_features = false, workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"sp-debug-derive/std",
 	"parity-scale-codec/std",

diff --git a/tuxedo-core/aggregator/Cargo.toml b/tuxedo-core/aggregator/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
+edition = "2021"
 name = "aggregator"
 version = "0.1.0"
-edition = "2021"
+
+[dependencies]
+quote = { workspace = true }
+syn = { features = [ "extra-traits", "full" ], workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
 proc-macro = true
-
-[dependencies]
-syn = { workspace = true, features = ["extra-traits", "full"] }
-quote = { workspace = true }
diff --git a/tuxedo-core/no_bound/Cargo.toml b/tuxedo-core/no_bound/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
+edition = "2021"
 name = "derive-no-bound"
 version = "0.1.0"
-edition = "2021"
+
+[dependencies]
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { features = [ "extra-traits", "full" ], workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
 proc-macro = true
-
-[dependencies]
-syn = { workspace = true, features = ["extra-traits", "full"] }
-quote = { workspace = true }
-proc-macro2 = { workspace = true }