diff --git a/.github/workflows/runtimes-matrix.json b/.github/workflows/runtimes-matrix.json index c0309f1de6..904d80fb91 100644 --- a/.github/workflows/runtimes-matrix.json +++ b/.github/workflows/runtimes-matrix.json @@ -150,5 +150,18 @@ "pallet_xcm_benchmarks::generic": "templates/xcm-bench-template.hbs", "pallet_xcm_benchmarks::fungible": "templates/xcm-bench-template.hbs" } + }, + { + "name": "encointer-kusama", + "package": "encointer-kusama-runtime", + "path": "system-parachains/encointer", + "uri": "wss://kusama.api.encointer.org:443", + "is_relay": false, + "blocktime": 12000, + "extra_args": "--disable-mbm-checks", + "benchmarks_templates": { + "pallet_xcm_benchmarks::generic": "templates/xcm-bench-template.hbs", + "pallet_xcm_benchmarks::fungible": "templates/xcm-bench-template.hbs" + } } ] diff --git a/Cargo.lock b/Cargo.lock index 3e569cd326..90915e83a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2486,6 +2486,7 @@ dependencies = [ "collectives-polkadot-runtime", "coretime-kusama-runtime", "coretime-polkadot-runtime", + "encointer-kusama-runtime", "glutton-kusama-runtime", "people-kusama-runtime", "people-polkadot-runtime", @@ -3236,6 +3237,21 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.5.0" @@ -4177,6 +4193,170 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "encointer-balances-tx-payment" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397b34bbcee048d599efc22a7688b4532a911438782328b19b2e6d289411735e" +dependencies = [ + "encointer-primitives", + "frame-support", + "frame-system", + "log", + "pallet-asset-tx-payment", + "pallet-encointer-balances", + "pallet-encointer-ceremonies", + "pallet-transaction-payment", + "sp-runtime", +] + +[[package]] +name = "encointer-balances-tx-payment-rpc-runtime-api" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62e4fce7992cf5099e6670ffdb7c96991465d8e6dc6c4201119bd1e43ddbf7df" +dependencies = [ + "encointer-primitives", + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-std", +] + +[[package]] +name = "encointer-ceremonies-assignment" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89986c66ff66121b5fa3335a43b22572703625ca34ddb5c2f180db1e9580ef99" +dependencies = [ + "encointer-primitives", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "encointer-kusama-runtime" +version = "1.0.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "encointer-balances-tx-payment", + "encointer-balances-tx-payment-rpc-runtime-api", + "encointer-primitives", + "frame-benchmarking", + "frame-executive", + "frame-metadata-hash-extension", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal", + "kusama-runtime-constants", + "log", + "pallet-asset-tx-payment", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-collective", + "pallet-encointer-balances", + "pallet-encointer-bazaar", + "pallet-encointer-bazaar-rpc-runtime-api", + "pallet-encointer-ceremonies", + "pallet-encointer-ceremonies-rpc-runtime-api", + "pallet-encointer-communities", + "pallet-encointer-communities-rpc-runtime-api", + "pallet-encointer-democracy", + "pallet-encointer-faucet", + "pallet-encointer-reputation-commitments", + "pallet-encointer-scheduler", + "pallet-encointer-treasuries", + "pallet-encointer-treasuries-rpc-runtime-api", + "pallet-insecure-randomness-collective-flip", + "pallet-membership", + "pallet-message-queue", + "pallet-proxy", + "pallet-scheduler", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachains-common", + "parachains-runtimes-test-utils", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-common", + "scale-info", + "serde_json", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core 38.0.0", + "sp-genesis-builder", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-transaction-pool", + "sp-version", + "staging-parachain-info", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", + "system-parachains-constants", + "xcm-runtime-apis", +] + +[[package]] +name = "encointer-meetup-validation" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ba685514c10a80504b665cb70d9c89366cfc920da260a09cfd3f1e552d4e210" +dependencies = [ + "encointer-primitives", + "parity-scale-codec", + "scale-info", + "serde", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "encointer-primitives" +version = "20.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3f3eb8c27de173898f75ba824e4a69a6cc88500006c0b8724cd467f9c524163" +dependencies = [ + "bs58", + "crc", + "ep-core", + "frame-support", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 38.0.0", + "sp-io", + "sp-runtime", + "sp-std", + "substrate-geohash", +] + [[package]] name = "enum-as-inner" version = "0.6.1" @@ -4259,6 +4439,24 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" +[[package]] +name = "ep-core" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbbc538bcc7452ae72554b3f1e022e5736fb9dd1eecb025c45383f36dd589030" +dependencies = [ + "array-bytes 6.2.3", + "impl-serde", + "parity-scale-codec", + "scale-info", + "serde", + "sp-arithmetic", + "sp-core 38.0.0", + "sp-runtime", + "sp-std", + "substrate-fixed", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -8632,6 +8830,254 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "pallet-encointer-balances" +version = "20.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec6f4ff2017c12e7f6771805f1718be52303c31e7332e08b2b30bf9c2384f1" +dependencies = [ + "approx", + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-asset-tx-payment", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-encointer-bazaar" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc6638f3f51fc6dbea1822a2c4f2bd65af748b54ee2f94b9a439228f1101e6c" +dependencies = [ + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-communities", + "parity-scale-codec", + "scale-info", + "sp-core 38.0.0", + "sp-std", +] + +[[package]] +name = "pallet-encointer-bazaar-rpc-runtime-api" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a81093a8550f5ab4caddff3c3e19eec717d01a77bd41080f75ccd7109934a8" +dependencies = [ + "encointer-primitives", + "frame-support", + "parity-scale-codec", + "sp-api", + "sp-std", +] + +[[package]] +name = "pallet-encointer-ceremonies" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "154f548c8a9cbe1e6ac328c20c01c21bd1268c9476029cc86fe6905213dfc586" +dependencies = [ + "encointer-ceremonies-assignment", + "encointer-meetup-validation", + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-balances", + "pallet-encointer-communities", + "pallet-encointer-scheduler", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-application-crypto", + "sp-core 38.0.0", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-encointer-ceremonies-rpc-runtime-api" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4fd62fc2b88dbbf2ef0b8e19adbc2c208b1ce24bb847e60967ceb6e9c1bf856" +dependencies = [ + "encointer-primitives", + "frame-support", + "parity-scale-codec", + "sp-api", + "sp-std", +] + +[[package]] +name = "pallet-encointer-communities" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943b2e805a9e8f9e487ff39de2aca34cd52fa7a18e6fd8e88262a408e7352dcc" +dependencies = [ + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-balances", + "pallet-encointer-scheduler", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-encointer-communities-rpc-runtime-api" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeec11cb0ab312ccef1b63b40de6cf71d5b47dfef7b32557c7d3cf38eb1dd39c" +dependencies = [ + "encointer-primitives", + "parity-scale-codec", + "sp-api", + "sp-std", +] + +[[package]] +name = "pallet-encointer-democracy" +version = "20.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0038e34f1d9c2f3063bf2799eb1442141d56583b898b9b163738f93d9db0b6d" +dependencies = [ + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-ceremonies", + "pallet-encointer-communities", + "pallet-encointer-reputation-commitments", + "pallet-encointer-scheduler", + "pallet-encointer-treasuries", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-application-crypto", + "sp-core 38.0.0", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-encointer-faucet" +version = "20.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75add1dcdfd397397ae6f21535e2fe543a07544d8249098e09b0a5fcbbf297e" +dependencies = [ + "approx", + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-communities", + "pallet-encointer-reputation-commitments", + "parity-scale-codec", + "scale-info", + "sp-core 38.0.0", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-encointer-reputation-commitments" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b683d57a39f9c605ddc642c173b1d768ad4c1973c08800ccf4b9faa77a9768f" +dependencies = [ + "approx", + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-ceremonies", + "pallet-encointer-communities", + "pallet-encointer-scheduler", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core 38.0.0", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-encointer-scheduler" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46911a93c68e57a4c6cf495da03fcf08e7853afab1955d53026c2e721e83dbd1" +dependencies = [ + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-encointer-treasuries" +version = "20.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb256efa55f3dab869ebbfb8956e3bfbafde77142fba1d354784d1901d6960b7" +dependencies = [ + "approx", + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-balances", + "pallet-encointer-communities", + "pallet-encointer-reputation-commitments", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core 38.0.0", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-encointer-treasuries-rpc-runtime-api" +version = "20.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e37c6da7e18e2b6e44903556c683f1c25689aa7bb9c063fe3341689412c15c" +dependencies = [ + "encointer-primitives", + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-std", +] + [[package]] name = "pallet-fast-unstake" version = "41.0.0" @@ -8746,6 +9192,35 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "pallet-insecure-randomness-collective-flip" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f81949b327165ea1eda973c49bddab1c9f42fa1d1192c3dfb09665127724e0" +dependencies = [ + "parity-scale-codec", + "polkadot-sdk-frame", + "safe-mix", + "scale-info", +] + +[[package]] +name = "pallet-membership" +version = "42.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd968f0ed6b2161ca213788c470855d5038109ee9924e03122a418f69aeeed05" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 38.0.0", + "sp-io", + "sp-runtime", +] + [[package]] name = "pallet-message-queue" version = "45.0.0" @@ -11611,6 +12086,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + [[package]] name = "rustc_version" version = "0.3.3" @@ -11837,6 +12321,15 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +[[package]] +name = "safe-mix" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" +dependencies = [ + "rustc_version 0.2.3", +] + [[package]] name = "safe_arch" version = "0.7.4" @@ -12686,6 +13179,15 @@ dependencies = [ "semver-parser 0.7.0", ] +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", +] + [[package]] name = "semver" version = "0.11.0" @@ -14746,6 +15248,29 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "substrate-fixed" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a58670b92bb23e63b32b32167ff4edf8a34a2d53a2bdfcd60a6d8ead57bd563" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "substrate-typenum", +] + +[[package]] +name = "substrate-geohash" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c822853591796a4f735f88ad603d32062090374d3c1c8118c62c28d6f85a683" +dependencies = [ + "parity-scale-codec", + "scale-info", + "substrate-fixed", +] + [[package]] name = "substrate-prometheus-endpoint" version = "0.17.4" @@ -14775,6 +15300,16 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "substrate-typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd64d3efe988228b8496698197ee60cfbfcedbf226961300e559870c1a3e8e0" +dependencies = [ + "parity-scale-codec", + "scale-info", +] + [[package]] name = "substrate-wasm-builder" version = "28.0.0" diff --git a/Cargo.toml b/Cargo.toml index 08c8bba7d9..6bf7d7c7de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,6 +56,10 @@ cumulus-primitives-aura = { version = "0.19.0", default-features = false } cumulus-primitives-core = { version = "0.20.0", default-features = false } cumulus-primitives-utility = { version = "0.22.0", default-features = false } emulated-integration-tests-common = { version = "23.0.0" } +encointer-balances-tx-payment = { version = "~20.1.0", default-features = false } +encointer-balances-tx-payment-rpc-runtime-api = { version = "~20.1.0", default-features = false } +encointer-kusama-runtime = { path = "system-parachains/encointer" } +encointer-primitives = { version = "~20.4.0", default-features = false } enumflags2 = { version = "0.7.7" } frame-benchmarking = { version = "42.0.0", default-features = false } frame-election-provider-support = { version = "42.0.0", default-features = false } @@ -102,6 +106,19 @@ pallet-conviction-voting = { version = "42.0.0", default-features = false } pallet-core-fellowship = { version = "26.0.0", default-features = false } pallet-election-provider-multi-phase = { version = "41.0.0", default-features = false } pallet-election-provider-support-benchmarking = { version = "41.0.0", default-features = false } +pallet-encointer-balances = { version = "~20.2.0", default-features = false } +pallet-encointer-bazaar = { version = "~20.1.0", default-features = false } +pallet-encointer-bazaar-rpc-runtime-api = { version = "~20.1.0", default-features = false } +pallet-encointer-ceremonies = { version = "~20.1.0", default-features = false } +pallet-encointer-ceremonies-rpc-runtime-api = { version = "~20.1.0", default-features = false } +pallet-encointer-communities = { version = "~20.1.0", default-features = false } +pallet-encointer-communities-rpc-runtime-api = { version = "~20.1.0", default-features = false } +pallet-encointer-democracy = { version = "~20.4.0", default-features = false } +pallet-encointer-faucet = { version = "~20.2.0", default-features = false } +pallet-encointer-reputation-commitments = { version = "~20.1.0", default-features = false } +pallet-encointer-scheduler = { version = "~20.1.0", default-features = false } +pallet-encointer-treasuries = { version = "~20.4.0", default-features = false } +pallet-encointer-treasuries-rpc-runtime-api = { version = "~20.3.0", default-features = false } pallet-fast-unstake = { version = "41.0.0", default-features = false } pallet-glutton = { version = "28.0.0", default-features = false } pallet-grandpa = { version = "42.0.0", default-features = false } @@ -292,7 +309,7 @@ members = [ "system-parachains/constants", "system-parachains/coretime/coretime-kusama", "system-parachains/coretime/coretime-polkadot", - # "system-parachains/encointer", + "system-parachains/encointer", "system-parachains/gluttons/glutton-kusama", "system-parachains/people/people-kusama", "system-parachains/people/people-polkadot", diff --git a/chain-spec-generator/Cargo.toml b/chain-spec-generator/Cargo.toml index 7dff3f6a22..fe5d2c518a 100644 --- a/chain-spec-generator/Cargo.toml +++ b/chain-spec-generator/Cargo.toml @@ -22,7 +22,7 @@ asset-hub-kusama-runtime = { workspace = true, optional = true } collectives-polkadot-runtime = { workspace = true, optional = true } bridge-hub-polkadot-runtime = { workspace = true, optional = true } bridge-hub-kusama-runtime = { workspace = true, optional = true } -#encointer-kusama-runtime = { workspace = true, optional = true } +encointer-kusama-runtime = { workspace = true, optional = true } glutton-kusama-runtime = { workspace = true, optional = true } coretime-kusama-runtime = { workspace = true, optional = true } coretime-polkadot-runtime = { workspace = true, optional = true } @@ -40,7 +40,7 @@ runtime-benchmarks = [ "collectives-polkadot-runtime?/runtime-benchmarks", "coretime-kusama-runtime?/runtime-benchmarks", "coretime-polkadot-runtime?/runtime-benchmarks", - # "encointer-kusama-runtime?/runtime-benchmarks", + "encointer-kusama-runtime?/runtime-benchmarks", "glutton-kusama-runtime?/runtime-benchmarks", "kusama-runtime?/runtime-benchmarks", "people-kusama-runtime?/runtime-benchmarks", @@ -56,7 +56,7 @@ on-chain-release-build = [ "collectives-polkadot-runtime?/on-chain-release-build", "coretime-kusama-runtime?/on-chain-release-build", "coretime-polkadot-runtime?/on-chain-release-build", - # "encointer-kusama-runtime?/on-chain-release-build", + "encointer-kusama-runtime?/on-chain-release-build", "glutton-kusama-runtime?/on-chain-release-build", "kusama-runtime?/on-chain-release-build", "people-kusama-runtime?/on-chain-release-build", @@ -71,7 +71,7 @@ asset-hub-kusama = ["asset-hub-kusama-runtime"] collectives-polkadot = ["collectives-polkadot-runtime"] bridge-hub-polkadot = ["bridge-hub-polkadot-runtime"] bridge-hub-kusama = ["bridge-hub-kusama-runtime"] -#encointer-kusama = ["encointer-kusama-runtime"] +encointer-kusama = ["encointer-kusama-runtime"] glutton-kusama = ["glutton-kusama-runtime"] coretime-kusama = ["coretime-kusama-runtime"] coretime-polkadot = ["coretime-polkadot-runtime"] @@ -90,7 +90,7 @@ all-kusama = [ "asset-hub-kusama", "bridge-hub-kusama", "coretime-kusama", - # "encointer-kusama", + "encointer-kusama", "glutton-kusama", "kusama", "people-kusama", diff --git a/chain-spec-generator/src/common.rs b/chain-spec-generator/src/common.rs index 7720b64ddf..ccd75bf2e3 100644 --- a/chain-spec-generator/src/common.rs +++ b/chain-spec-generator/src/common.rs @@ -20,7 +20,7 @@ use crate::{ system_parachains_specs::{ AssetHubKusamaChainSpec, AssetHubPolkadotChainSpec, BridgeHubKusamaChainSpec, BridgeHubPolkadotChainSpec, CollectivesPolkadotChainSpec, CoretimeKusamaChainSpec, - CoretimePolkadotChainSpec, /* EncointerKusamaChainSpec, */ GluttonKusamaChainSpec, + CoretimePolkadotChainSpec, EncointerKusamaChainSpec, GluttonKusamaChainSpec, PeopleKusamaChainSpec, PeoplePolkadotChainSpec, }, ChainSpec, @@ -58,8 +58,8 @@ pub fn from_json_file(filepath: &str, supported: String) -> Result Ok(Box::new(GluttonKusamaChainSpec::from_json_file(path)?)), - // x if x.starts_with("encointer-kusama") => - // Ok(Box::new(EncointerKusamaChainSpec::from_json_file(path)?)), + x if x.starts_with("encointer-kusama") => + Ok(Box::new(EncointerKusamaChainSpec::from_json_file(path)?)), x if x.starts_with("people-kusama") => Ok(Box::new(PeopleKusamaChainSpec::from_json_file(path)?)), x if x.starts_with("people-polkadot") => diff --git a/chain-spec-generator/src/main.rs b/chain-spec-generator/src/main.rs index 04d8618b16..253a07366d 100644 --- a/chain-spec-generator/src/main.rs +++ b/chain-spec-generator/src/main.rs @@ -82,13 +82,11 @@ fn main() -> Result<(), String> { "glutton-kusama-local", Box::new(system_parachains_specs::glutton_kusama_local_testnet_config) as Box<_>, ), - /* #[cfg(feature = "encointer-kusama")] ( "encointer-kusama-local", Box::new(system_parachains_specs::encointer_kusama_local_testnet_config) as Box<_>, ), - */ #[cfg(feature = "coretime-kusama")] ( "coretime-kusama", diff --git a/chain-spec-generator/src/system_parachains_specs.rs b/chain-spec-generator/src/system_parachains_specs.rs index 3506fb92d7..9a6faef0b8 100644 --- a/chain-spec-generator/src/system_parachains_specs.rs +++ b/chain-spec-generator/src/system_parachains_specs.rs @@ -40,7 +40,7 @@ pub type BridgeHubKusamaChainSpec = sc_chain_spec::GenericChainSpec; pub type GluttonKusamaChainSpec = sc_chain_spec::GenericChainSpec; -// pub type EncointerKusamaChainSpec = sc_chain_spec::GenericChainSpec; +pub type EncointerKusamaChainSpec = sc_chain_spec::GenericChainSpec; pub type CoretimeKusamaChainSpec = sc_chain_spec::GenericChainSpec; @@ -180,7 +180,7 @@ pub fn glutton_kusama_local_testnet_config() -> Result Result, String> { @@ -202,7 +202,7 @@ pub fn encointer_kusama_local_testnet_config() -> Result Result, String> { let mut properties = sc_chain_spec::Properties::new();