remove taplo in favor of zepter

AstarNetwork · Jun 23, 2024 · 83c5606 · 83c5606
1 parent 7c334fb
commit 83c5606
Show file tree

Hide file tree

Showing 46 changed files with 1,045 additions and 704 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -24,15 +24,6 @@ jobs:
       - name: Check fmt
         run: cargo fmt -- --check
 
-      - name: Check Cargo.toml format
-        run: |
-          if taplo --version &> /dev/null; then
-            echo "taplo-cli is already installed"
-          else
-            cargo install taplo-cli
-          fi
-          taplo fmt --check
-
   clippy:
     if: github.event.pull_request.draft == false
     runs-on: [self-hosted, Linux, X64]

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -154,28 +154,58 @@ sc-service = { workspace = true, optional = true }
 substrate-build-script-utils = { workspace = true }
 
 [features]
-default = ["sc-cli", "polkadot-cli", "sc-service", "sc-service/rocksdb"]
+default = [ "polkadot-cli", "sc-cli", "sc-service", "sc-service/rocksdb" ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
+	"astar-runtime/runtime-benchmarks",
 	"frame-benchmarking-cli",
+	"frame-benchmarking-cli?/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"local-runtime/runtime-benchmarks",
-	"shibuya-runtime/runtime-benchmarks",
-	"shiden-runtime/runtime-benchmarks",
-	"astar-runtime/runtime-benchmarks",
+	"pallet-ethereum/runtime-benchmarks",
+	"pallet-evm/runtime-benchmarks",
 	"polkadot-cli/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
+	"polkadot-runtime-common",
 	"polkadot-runtime-common/std",
+	"polkadot-runtime-common?/runtime-benchmarks",
+	"polkadot-service/runtime-benchmarks",
+	"sc-client-db/runtime-benchmarks",
+	"sc-service/runtime-benchmarks",
+	"shibuya-runtime/runtime-benchmarks",
+	"shiden-runtime/runtime-benchmarks",
 	"sp-keyring",
-	"polkadot-runtime-common",
-	"astar-primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+cli = [ "try-runtime-cli" ]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"astar-runtime/try-runtime",
+	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"local-runtime/try-runtime",
+	"pallet-ethereum/try-runtime",
+	"pallet-evm/try-runtime",
+	"pallet-transaction-payment/try-runtime",
+	"polkadot-cli?/try-runtime",
+	"polkadot-runtime-common?/try-runtime",
+	"polkadot-service/try-runtime",
+	"shibuya-runtime/try-runtime",
+	"shiden-runtime/try-runtime",
+	"sp-runtime/try-runtime",
+	"try-runtime-cli/try-runtime",
 ]
-cli = ["try-runtime-cli"]
-try-runtime = ["local-runtime/try-runtime", "try-runtime-cli/try-runtime"]
 evm-tracing = [
+	"astar-runtime/evm-tracing",
+	"local-runtime/evm-tracing",
 	"moonbeam-rpc-debug",
 	"moonbeam-rpc-primitives-debug",
 	"moonbeam-rpc-primitives-txpool",
 	"moonbeam-rpc-trace",
 	"moonbeam-rpc-txpool",
+	"shibuya-runtime/evm-tracing",
+	"shiden-runtime/evm-tracing",
 ]
-manual-seal = [
-	"sc-consensus-manual-seal",
-]
+manual-seal = [ "sc-consensus-manual-seal" ]
diff --git a/chain-extensions/pallet-assets/Cargo.toml b/chain-extensions/pallet-assets/Cargo.toml
@@ -30,21 +30,34 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	"assets-chain-extension-types/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"num-traits/std",
-	"pallet-contracts/std",
+	"pallet-assets/std",
+	"pallet-balances/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
-	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	"pallet-assets/std",
-	"assets-chain-extension-types/std",
-	"pallet-balances/std",
+	"sp-std/std",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-contracts/try-runtime",
+	"sp-runtime/try-runtime",
+]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
+	"pallet-contracts/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
-runtime-benchmarks = ["pallet-assets/runtime-benchmarks"]
diff --git a/chain-extensions/types/assets/Cargo.toml b/chain-extensions/types/assets/Cargo.toml
@@ -15,10 +15,10 @@ scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"num_enum/std",
-	"scale-info/std",
 	"parity-scale-codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 ]
diff --git a/chain-extensions/types/unified-accounts/Cargo.toml b/chain-extensions/types/unified-accounts/Cargo.toml
@@ -17,7 +17,7 @@ sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"num_enum/std",
 	"parity-scale-codec/std",

diff --git a/chain-extensions/types/xvm/Cargo.toml b/chain-extensions/types/xvm/Cargo.toml
@@ -16,11 +16,11 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
+	"astar-primitives/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"astar-primitives/std",
 ]
diff --git a/chain-extensions/unified-accounts/Cargo.toml b/chain-extensions/unified-accounts/Cargo.toml
@@ -27,21 +27,22 @@ pallet-unified-accounts = { workspace = true }
 unified-accounts-chain-extension-types = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	# Astar
+	"astar-primitives/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"num-traits/std",
+	"pallet-contracts-primitives/std",
 	"pallet-contracts/std",
 	"pallet-evm/std",
-	"pallet-contracts-primitives/std",
+	"pallet-unified-accounts/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
-	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	# Astar
-	"astar-primitives/std",
-	"pallet-unified-accounts/std",
+	"sp-std/std",
 	"unified-accounts-chain-extension-types/std",
 ]
diff --git a/chain-extensions/xvm/Cargo.toml b/chain-extensions/xvm/Cargo.toml
@@ -27,19 +27,21 @@ astar-primitives = { workspace = true }
 xvm-chain-extension-types = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
+	# Astar
+	"astar-primitives/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"num-traits/std",
-	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
 	"pallet-unified-accounts/std",
+	"parity-scale-codec/std",
 	"scale-info/std",
-	"sp-std/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	# Astar
-	"astar-primitives/std",
+	"sp-std/std",
+	"xvm-chain-extension-types/std",
 ]
diff --git a/pallets/astar-xcm-benchmarks/Cargo.toml b/pallets/astar-xcm-benchmarks/Cargo.toml
@@ -16,7 +16,9 @@ serde = { workspace = true, optional = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-parity-scale-codec = { workspace = true, optional = true, features = ["derive"] }
+parity-scale-codec = { workspace = true, optional = true, features = [
+    "derive",
+] }
 scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
@@ -40,28 +42,40 @@ sp-io = { workspace = true, features = ["std"] }
 xcm-builder = { workspace = true, features = ["std"] }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-xcm-benchmarks/std",
 	"parity-scale-codec/std",
+	"scale-info/std",
 	"serde",
-	"sp-std/std",
+	"serde?/std",
 	"sp-runtime/std",
+	"sp-std/std",
+	"xcm-executor/std",
 	"xcm/std",
 ]
 
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
 
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
-	"frame-system/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"parity-scale-codec",
+	"sp-runtime/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
@@ -39,27 +39,37 @@ sp-io = { workspace = true }
 sp-tracing = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
 std = [
-	"parity-scale-codec/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
 	"log/std",
-	"scale-info/std",
+	"pallet-aura/std",
+	"pallet-authorship/std",
+	"pallet-balances/std",
+	"pallet-session/std",
+	"parity-scale-codec/std",
 	"rand/std",
+	"scale-info/std",
+	"serde/std",
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"frame-support/std",
-	"frame-system/std",
-	"frame-benchmarking/std",
-	"pallet-authorship/std",
-	"pallet-session/std",
-	"pallet-aura/std",
-	"pallet-balances/std",
 ]
 
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-session/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/dapp-staking-migration/Cargo.toml b/pallets/dapp-staking-migration/Cargo.toml
@@ -28,27 +28,35 @@ sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"parity-scale-codec/std",
-	"scale-info/std",
-	"sp-std/std",
-	"sp-io/std",
-	"log/std",
+	"astar-primitives/std",
+	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
+	"pallet-balances/std",
 	"pallet-dapp-staking-v3/std",
-	"frame-benchmarking/std",
-	"astar-primitives/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
 	"sp-core/std",
-	"pallet-balances/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
+	"astar-primitives/runtime-benchmarks",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"pallet-dapp-staking-v3/runtime-benchmarks",
-	"astar-primitives/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"astar-primitives/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-dapp-staking-v3/try-runtime",
+	"sp-runtime/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime"]