Skip to content

Commit f13967c

Browse files
ermalkaleciermalkaleci
committed
Revert "remove taplo in favor of zepter"
This reverts commit 83c5606.
1 parent ac509e1 commit f13967c

File tree

43 files changed

+606
-993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+606
-993
lines changed

‎bin/collator/Cargo.toml

+7-37
Original file line numberDiff line numberDiff line change
@@ -154,52 +154,22 @@ sc-service = { workspace = true, optional = true }
154154
substrate-build-script-utils = { workspace = true }
155155

156156
[features]
157-
default = ["polkadot-cli", "sc-cli", "sc-service", "sc-service/rocksdb"]
157+
default = ["sc-cli", "polkadot-cli", "sc-service", "sc-service/rocksdb"]
158158
runtime-benchmarks = [
159-
"astar-primitives/runtime-benchmarks",
160-
"astar-runtime/runtime-benchmarks",
161159
"frame-benchmarking-cli",
162-
"frame-benchmarking-cli?/runtime-benchmarks",
163-
"frame-benchmarking/runtime-benchmarks",
164-
"frame-system/runtime-benchmarks",
165160
"local-runtime/runtime-benchmarks",
166-
"pallet-ethereum/runtime-benchmarks",
167-
"pallet-evm/runtime-benchmarks",
168-
"polkadot-cli/runtime-benchmarks",
169-
"polkadot-parachain/runtime-benchmarks",
170-
"polkadot-primitives/runtime-benchmarks",
171-
"polkadot-runtime-common",
172-
"polkadot-runtime-common/std",
173-
"polkadot-runtime-common?/runtime-benchmarks",
174-
"polkadot-service/runtime-benchmarks",
175-
"sc-client-db/runtime-benchmarks",
176-
"sc-service/runtime-benchmarks",
177161
"shibuya-runtime/runtime-benchmarks",
178162
"shiden-runtime/runtime-benchmarks",
163+
"astar-runtime/runtime-benchmarks",
164+
"polkadot-cli/runtime-benchmarks",
165+
"polkadot-runtime-common/std",
179166
"sp-keyring",
180-
"sp-runtime/runtime-benchmarks",
167+
"polkadot-runtime-common",
168+
"astar-primitives/runtime-benchmarks",
181169
]
182170
cli = ["try-runtime-cli"]
183-
try-runtime = [
184-
"astar-primitives/try-runtime",
185-
"astar-runtime/try-runtime",
186-
"frame-system/try-runtime",
187-
"frame-try-runtime/try-runtime",
188-
"local-runtime/try-runtime",
189-
"pallet-ethereum/try-runtime",
190-
"pallet-evm/try-runtime",
191-
"pallet-transaction-payment/try-runtime",
192-
"polkadot-cli?/try-runtime",
193-
"polkadot-runtime-common?/try-runtime",
194-
"polkadot-service/try-runtime",
195-
"shibuya-runtime/try-runtime",
196-
"shiden-runtime/try-runtime",
197-
"sp-runtime/try-runtime",
198-
"try-runtime-cli/try-runtime",
199-
]
171+
try-runtime = ["local-runtime/try-runtime", "try-runtime-cli/try-runtime"]
200172
evm-tracing = [
201-
"astar-runtime/evm-tracing",
202-
"local-runtime/evm-tracing",
203173
"moonbeam-rpc-debug",
204174
"moonbeam-rpc-primitives-debug",
205175
"moonbeam-rpc-primitives-txpool",

‎chain-extensions/pallet-assets/Cargo.toml

+8-21
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,19 @@ sp-io = { workspace = true }
3232
[features]
3333
default = ["std"]
3434
std = [
35-
"assets-chain-extension-types/std",
35+
"parity-scale-codec/std",
3636
"frame-support/std",
3737
"frame-system/std",
38-
"log/std",
3938
"num-traits/std",
40-
"pallet-assets/std",
41-
"pallet-balances/std",
42-
"pallet-contracts-primitives/std",
4339
"pallet-contracts/std",
44-
"parity-scale-codec/std",
40+
"pallet-contracts-primitives/std",
4541
"scale-info/std",
42+
"sp-std/std",
4643
"sp-core/std",
4744
"sp-runtime/std",
48-
"sp-std/std",
49-
]
50-
try-runtime = [
51-
"frame-support/try-runtime",
52-
"frame-system/try-runtime",
53-
"pallet-assets/try-runtime",
54-
"pallet-contracts/try-runtime",
55-
"sp-runtime/try-runtime",
56-
]
57-
runtime-benchmarks = [
58-
"frame-support/runtime-benchmarks",
59-
"frame-system/runtime-benchmarks",
60-
"pallet-assets/runtime-benchmarks",
61-
"pallet-contracts/runtime-benchmarks",
62-
"sp-runtime/runtime-benchmarks",
45+
"pallet-assets/std",
46+
"assets-chain-extension-types/std",
47+
"pallet-balances/std",
6348
]
49+
try-runtime = ["frame-support/try-runtime"]
50+
runtime-benchmarks = ["pallet-assets/runtime-benchmarks"]

‎chain-extensions/types/assets/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sp-runtime = { workspace = true }
1818
default = ["std"]
1919
std = [
2020
"num_enum/std",
21-
"parity-scale-codec/std",
2221
"scale-info/std",
22+
"parity-scale-codec/std",
2323
"sp-runtime/std",
2424
]

‎chain-extensions/types/xvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ sp-std = { workspace = true }
1818
[features]
1919
default = ["std"]
2020
std = [
21-
"astar-primitives/std",
2221
"parity-scale-codec/std",
2322
"scale-info/std",
2423
"sp-runtime/std",
2524
"sp-std/std",
25+
"astar-primitives/std",
2626
]

‎chain-extensions/unified-accounts/Cargo.toml

+6-7
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,19 @@ unified-accounts-chain-extension-types = { workspace = true }
2929
[features]
3030
default = ["std"]
3131
std = [
32-
# Astar
33-
"astar-primitives/std",
32+
"parity-scale-codec/std",
3433
"frame-support/std",
3534
"frame-system/std",
36-
"log/std",
3735
"num-traits/std",
38-
"pallet-contracts-primitives/std",
3936
"pallet-contracts/std",
4037
"pallet-evm/std",
41-
"pallet-unified-accounts/std",
42-
"parity-scale-codec/std",
38+
"pallet-contracts-primitives/std",
4339
"scale-info/std",
40+
"sp-std/std",
4441
"sp-core/std",
4542
"sp-runtime/std",
46-
"sp-std/std",
43+
# Astar
44+
"astar-primitives/std",
45+
"pallet-unified-accounts/std",
4746
"unified-accounts-chain-extension-types/std",
4847
]

‎chain-extensions/xvm/Cargo.toml

+5-7
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,17 @@ xvm-chain-extension-types = { workspace = true }
2929
[features]
3030
default = ["std"]
3131
std = [
32-
# Astar
33-
"astar-primitives/std",
32+
"parity-scale-codec/std",
3433
"frame-support/std",
3534
"frame-system/std",
36-
"log/std",
3735
"num-traits/std",
38-
"pallet-contracts-primitives/std",
3936
"pallet-contracts/std",
37+
"pallet-contracts-primitives/std",
4038
"pallet-unified-accounts/std",
41-
"parity-scale-codec/std",
4239
"scale-info/std",
40+
"sp-std/std",
4341
"sp-core/std",
4442
"sp-runtime/std",
45-
"sp-std/std",
46-
"xvm-chain-extension-types/std",
43+
# Astar
44+
"astar-primitives/std",
4745
]

‎pallets/astar-xcm-benchmarks/Cargo.toml

+4-18
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ serde = { workspace = true, optional = true }
1616
# Substrate
1717
frame-support = { workspace = true }
1818
frame-system = { workspace = true }
19-
parity-scale-codec = { workspace = true, optional = true, features = [
20-
"derive",
21-
] }
19+
parity-scale-codec = { workspace = true, optional = true, features = ["derive"] }
2220
scale-info = { workspace = true }
2321
sp-runtime = { workspace = true }
2422
sp-std = { workspace = true }
@@ -48,34 +46,22 @@ std = [
4846
"frame-benchmarking/std",
4947
"frame-support/std",
5048
"frame-system/std",
51-
"log/std",
5249
"pallet-xcm-benchmarks/std",
5350
"parity-scale-codec/std",
54-
"scale-info/std",
5551
"serde",
56-
"serde?/std",
57-
"sp-runtime/std",
5852
"sp-std/std",
59-
"xcm-executor/std",
53+
"sp-runtime/std",
6054
"xcm/std",
6155
]
6256

63-
try-runtime = [
64-
"astar-primitives/try-runtime",
65-
"frame-support/try-runtime",
66-
"frame-system/try-runtime",
67-
"sp-runtime/try-runtime",
68-
]
57+
try-runtime = ["frame-support/try-runtime"]
6958

7059
runtime-benchmarks = [
71-
"astar-primitives/runtime-benchmarks",
7260
"frame-benchmarking",
73-
"frame-benchmarking/runtime-benchmarks",
74-
"frame-support/runtime-benchmarks",
7561
"frame-system/runtime-benchmarks",
62+
"frame-support/runtime-benchmarks",
7663
"pallet-assets/runtime-benchmarks",
7764
"pallet-xcm-benchmarks/runtime-benchmarks",
7865
"parity-scale-codec",
79-
"sp-runtime/runtime-benchmarks",
8066
"xcm-executor/runtime-benchmarks",
8167
]

‎pallets/collator-selection/Cargo.toml

+10-20
Original file line numberDiff line numberDiff line change
@@ -42,34 +42,24 @@ sp-tracing = { workspace = true }
4242
default = ["std"]
4343
runtime-benchmarks = [
4444
"frame-benchmarking",
45-
"frame-benchmarking/runtime-benchmarks",
4645
"frame-support/runtime-benchmarks",
4746
"frame-system/runtime-benchmarks",
48-
"sp-runtime/runtime-benchmarks",
49-
"sp-staking/runtime-benchmarks",
5047
]
5148
std = [
52-
"frame-benchmarking/std",
53-
"frame-support/std",
54-
"frame-system/std",
55-
"log/std",
56-
"pallet-aura/std",
57-
"pallet-authorship/std",
58-
"pallet-balances/std",
59-
"pallet-session/std",
6049
"parity-scale-codec/std",
61-
"rand/std",
50+
"log/std",
6251
"scale-info/std",
63-
"serde/std",
52+
"rand/std",
6453
"sp-runtime/std",
6554
"sp-staking/std",
6655
"sp-std/std",
56+
"frame-support/std",
57+
"frame-system/std",
58+
"frame-benchmarking/std",
59+
"pallet-authorship/std",
60+
"pallet-session/std",
61+
"pallet-aura/std",
62+
"pallet-balances/std",
6763
]
6864

69-
try-runtime = [
70-
"frame-support/try-runtime",
71-
"frame-system/try-runtime",
72-
"pallet-authorship/try-runtime",
73-
"pallet-session/try-runtime",
74-
"sp-runtime/try-runtime",
75-
]
65+
try-runtime = ["frame-support/try-runtime"]

‎pallets/dapp-staking-migration/Cargo.toml

+11-19
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,25 @@ sp-core = { workspace = true }
3030
[features]
3131
default = ["std"]
3232
std = [
33-
"astar-primitives/std",
34-
"frame-benchmarking/std",
33+
"parity-scale-codec/std",
34+
"scale-info/std",
35+
"sp-std/std",
36+
"sp-io/std",
37+
"log/std",
3538
"frame-support/std",
3639
"frame-system/std",
37-
"log/std",
38-
"pallet-balances/std",
3940
"pallet-dapp-staking-v3/std",
40-
"parity-scale-codec/std",
41-
"scale-info/std",
41+
"frame-benchmarking/std",
42+
"astar-primitives/std",
4243
"sp-core/std",
43-
"sp-io/std",
44-
"sp-runtime/std",
45-
"sp-std/std",
44+
"pallet-balances/std",
4645
]
4746
runtime-benchmarks = [
48-
"astar-primitives/runtime-benchmarks",
4947
"frame-benchmarking",
50-
"frame-benchmarking/runtime-benchmarks",
5148
"frame-support/runtime-benchmarks",
5249
"frame-system/runtime-benchmarks",
53-
"pallet-dapp-staking-v3/runtime-benchmarks",
5450
"sp-runtime/runtime-benchmarks",
51+
"pallet-dapp-staking-v3/runtime-benchmarks",
52+
"astar-primitives/runtime-benchmarks",
5553
]
56-
try-runtime = [
57-
"astar-primitives/try-runtime",
58-
"frame-support/try-runtime",
59-
"frame-system/try-runtime",
60-
"pallet-dapp-staking-v3/try-runtime",
61-
"sp-runtime/try-runtime",
62-
]
54+
try-runtime = ["frame-support/try-runtime"]

‎pallets/dapp-staking-v3/Cargo.toml

+12-18
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,28 @@ pallet-balances = { workspace = true }
3333
[features]
3434
default = ["std"]
3535
std = [
36-
"astar-primitives/std",
37-
"frame-benchmarking/std",
38-
"frame-support/std",
39-
"frame-system/std",
36+
"serde/std",
4037
"log/std",
41-
"num-traits/std",
42-
"pallet-balances/std",
4338
"parity-scale-codec/std",
4439
"scale-info/std",
45-
"serde/std",
46-
"sp-arithmetic/std",
40+
"num-traits/std",
4741
"sp-core/std",
48-
"sp-io/std",
4942
"sp-runtime/std",
43+
"sp-arithmetic/std",
44+
"sp-io/std",
5045
"sp-std/std",
46+
"frame-support/std",
47+
"frame-system/std",
48+
"pallet-balances/std",
49+
"astar-primitives/std",
50+
"frame-benchmarking/std",
5151
]
5252
runtime-benchmarks = [
53-
"assert_matches",
54-
"astar-primitives/runtime-benchmarks",
5553
"frame-benchmarking",
56-
"frame-benchmarking/runtime-benchmarks",
5754
"frame-support/runtime-benchmarks",
5855
"frame-system/runtime-benchmarks",
5956
"sp-runtime/runtime-benchmarks",
57+
"astar-primitives/runtime-benchmarks",
58+
"assert_matches",
6059
]
61-
try-runtime = [
62-
"astar-primitives/try-runtime",
63-
"frame-support/try-runtime",
64-
"frame-system/try-runtime",
65-
"sp-runtime/try-runtime",
66-
]
60+
try-runtime = ["frame-support/try-runtime"]

‎pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,8 @@ astar-primitives = { workspace = true }
1818

1919
[features]
2020
default = ["std"]
21-
std = ["astar-primitives/std", "sp-api/std", "sp-std/std"]
21+
std = [
22+
"sp-api/std",
23+
"sp-std/std",
24+
"astar-primitives/std",
25+
]

0 commit comments

Comments
 (0)