diff --git a/Cargo.lock b/Cargo.lock index b8a823481f..7f48e5e889 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2238,6 +2238,7 @@ dependencies = [ "collectives-polkadot-runtime", "coretime-kusama-runtime", "coretime-polkadot-runtime", + "encointer-kusama-runtime", "glutton-kusama-runtime", "people-kusama-runtime", "people-polkadot-runtime", @@ -3838,6 +3839,170 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "encointer-balances-tx-payment" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f7fcaa7f5fc5cd9493884a4020a9b1d50cb3d26ad1a921e68a6c50310aff144" +dependencies = [ + "encointer-primitives", + "frame-support", + "frame-system", + "log", + "pallet-asset-tx-payment", + "pallet-encointer-balances", + "pallet-encointer-ceremonies", + "pallet-transaction-payment", + "sp-runtime 39.0.2", +] + +[[package]] +name = "encointer-balances-tx-payment-rpc-runtime-api" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "584f431b0780640fa3fa7f6637f2661cc317cd126a345bf4bba6809c7c0f891f" +dependencies = [ + "encointer-primitives", + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-std", +] + +[[package]] +name = "encointer-ceremonies-assignment" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d3890b05d20d81cd72e461b4e4a40e574f357bd8bd93095d60196bf85f0ca2b" +dependencies = [ + "encointer-primitives", + "sp-runtime 39.0.2", + "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", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives 16.0.0", + "polkadot-runtime-common", + "scale-info", + "serde_json", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core 34.0.0", + "sp-genesis-builder", + "sp-inherents", + "sp-offchain", + "sp-runtime 39.0.2", + "sp-session", + "sp-std", + "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 = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "722b39de0c811f628d8f4667b9d10f119b7219b2fef4bd8e58f4c06ea2e25b02" +dependencies = [ + "encointer-primitives", + "parity-scale-codec", + "scale-info", + "serde", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "encointer-primitives" +version = "14.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829bc6eb901227ef42798e4004703dd4b9512763d23c90f808063947d34679d7" +dependencies = [ + "bs58 0.5.1", + "crc", + "ep-core", + "frame-support", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", + "substrate-geohash", +] + [[package]] name = "enum-as-inner" version = "0.5.1" @@ -3912,6 +4077,24 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" +[[package]] +name = "ep-core" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7252d3d17ddaf02f1f1dccce29db2de5d76fb94ed046c7b1e5a7d74e0b636cf5" +dependencies = [ + "array-bytes", + "impl-serde", + "parity-scale-codec", + "scale-info", + "serde", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.2", + "sp-std", + "substrate-fixed", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -7957,6 +8140,252 @@ dependencies = [ "sp-runtime 39.0.2", ] +[[package]] +name = "pallet-encointer-balances" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d8d128d6062328cff1896e08239b638a8be998f4c49f3a71f458c00a93bac" +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 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-encointer-bazaar" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8119cf4debfaa60ee94b6a57868c6a5e8491a1aa5e129c51d9093852e90907b2" +dependencies = [ + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-communities", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-std", +] + +[[package]] +name = "pallet-encointer-bazaar-rpc-runtime-api" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e298ebe7c5b8f36ae47d470c6065bfa7b8aec1953c93358ab11004d1e0988632" +dependencies = [ + "encointer-primitives", + "frame-support", + "parity-scale-codec", + "sp-api", + "sp-std", +] + +[[package]] +name = "pallet-encointer-ceremonies" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee2cee62c5c2a816f5a5604f51c69d3db5818f47dbe9c98a6275f30fa8e2cb3" +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 38.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-encointer-ceremonies-rpc-runtime-api" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a1d61b552aab2114b3635c8c950c8dcf8f2af585477a43d06b3316fb238742d" +dependencies = [ + "encointer-primitives", + "frame-support", + "parity-scale-codec", + "sp-api", + "sp-std", +] + +[[package]] +name = "pallet-encointer-communities" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f4fdd122abdd8d046adbb23699c305885a6cb2142bc4297cd801fc0cb8179f3" +dependencies = [ + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-encointer-balances", + "pallet-encointer-scheduler", + "parity-scale-codec", + "scale-info", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-encointer-communities-rpc-runtime-api" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3485d8ecd6899a3c9d2e29ad9fcf404eea3c21b6a3c59fe62b767b4e1d7e61b" +dependencies = [ + "encointer-primitives", + "parity-scale-codec", + "sp-api", + "sp-std", +] + +[[package]] +name = "pallet-encointer-democracy" +version = "14.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fe02f09f9202b7840bf2fcbfb88cf78cab603b654c47aad3eafe2e1d8052f5e" +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 38.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-encointer-faucet" +version = "14.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55868ee5af69fbda4c9e846b7fb1d1b5818a70aeb378ca7b8859694c65e36cf5" +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 34.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-encointer-reputation-commitments" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf93d7e68eedbd6a9bac69cfdf6d7ade00fbd1d08523361f0733b7b2441241d" +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 34.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-encointer-scheduler" +version = "14.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1db5f74ee0a201eb39f08d769b1c9578fd6d68c619cf41f6acf927f765b6072" +dependencies = [ + "encointer-primitives", + "frame-benchmarking", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-encointer-treasuries" +version = "14.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88fcb45c1337287da9b8d1568d8c9b87bfb7f45613572b1112527847d7e9931" +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 34.0.0", + "sp-runtime 39.0.2", + "sp-std", +] + +[[package]] +name = "pallet-encointer-treasuries-rpc-runtime-api" +version = "14.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928962dcd8404a9bc6bfbca33f4fe5799f299455033efd44c75eb7c0f44b80f1" +dependencies = [ + "encointer-primitives", + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-std", +] + [[package]] name = "pallet-fast-unstake" version = "37.0.0" @@ -8072,6 +8501,37 @@ dependencies = [ "sp-runtime 39.0.2", ] +[[package]] +name = "pallet-insecure-randomness-collective-flip" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce7ad80675d78bd38a7a66ecbbf2d218dd32955e97f8e301d0afe6c87b0f251" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "safe-mix", + "scale-info", + "sp-runtime 39.0.2", +] + +[[package]] +name = "pallet-membership" +version = "38.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868b5dca4bbfd1f4a222cbb80735a5197020712a71577b496bbb7e19aaa5394" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.2", +] + [[package]] name = "pallet-message-queue" version = "41.0.0" @@ -10850,6 +11310,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" @@ -11100,6 +11569,15 @@ version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +[[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.1" @@ -11923,6 +12401,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" @@ -14171,6 +14658,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "substrate-fixed" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e83ba2b4f68f12ec6b0f55bac0a23a5bcaaf2676f1109c7a5ead6121c7f0622" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "substrate-typenum", +] + +[[package]] +name = "substrate-geohash" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa2aad67d4ac1b37d97338ab6fd18fd5ec79c35a24112028e6feda0d67142e9a" +dependencies = [ + "parity-scale-codec", + "scale-info", + "substrate-fixed", +] + [[package]] name = "substrate-prometheus-endpoint" version = "0.17.0" @@ -14198,6 +14708,16 @@ dependencies = [ "sp-runtime 39.0.2", ] +[[package]] +name = "substrate-typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f0091e93c2c75b233ae39424c52cb8a662c0811fb68add149e20e5d7e8a788" +dependencies = [ + "parity-scale-codec", + "scale-info", +] + [[package]] name = "substrate-wasm-builder" version = "24.0.1" diff --git a/Cargo.toml b/Cargo.toml index 1a87dabbaf..87a852cfda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,10 +58,10 @@ cumulus-primitives-aura = { version = "0.15.0", default-features = false } cumulus-primitives-core = { version = "0.16.0", default-features = false } cumulus-primitives-utility = { version = "0.17.0", default-features = false } emulated-integration-tests-common = { version = "14.0.0" } -# encointer-balances-tx-payment = { version = "~13.1.0", default-features = false } -# encointer-balances-tx-payment-rpc-runtime-api = { version = "~13.1.0", default-features = false } -# encointer-kusama-runtime = { path = "system-parachains/encointer" } -# encointer-primitives = { version = "~13.3.0", default-features = false } +encointer-balances-tx-payment = { version = "~14.1.0", default-features = false } +encointer-balances-tx-payment-rpc-runtime-api = { version = "~14.1.0", default-features = false } +encointer-kusama-runtime = { path = "system-parachains/encointer" } +encointer-primitives = { version = "~14.3.0", default-features = false } enumflags2 = { version = "0.7.7" } frame-benchmarking = { version = "38.0.0", default-features = false } frame-election-provider-support = { version = "38.0.0", default-features = false } @@ -108,19 +108,19 @@ pallet-conviction-voting = { version = "38.0.0", default-features = false } pallet-core-fellowship = { version = "22.0.0", default-features = false } pallet-election-provider-multi-phase = { version = "37.0.0", default-features = false } pallet-election-provider-support-benchmarking = { version = "37.0.0", default-features = false } -# pallet-encointer-balances = { version = "~13.1.0", default-features = false } -# pallet-encointer-bazaar = { version = "~13.1.0", default-features = false } -# pallet-encointer-bazaar-rpc-runtime-api = { version = "~13.1.0", default-features = false } -# pallet-encointer-ceremonies = { version = "~13.1.0", default-features = false } -# pallet-encointer-ceremonies-rpc-runtime-api = { version = "~13.1.0", default-features = false } -# pallet-encointer-communities = { version = "~13.1.0", default-features = false } -# pallet-encointer-communities-rpc-runtime-api = { version = "~13.1.0", default-features = false } -# pallet-encointer-democracy = { version = "~13.3.2", default-features = false } -# pallet-encointer-faucet = { version = "~13.2.0", default-features = false } -# pallet-encointer-reputation-commitments = { version = "~13.1.0", default-features = false } -# pallet-encointer-scheduler = { version = "~13.1.0", default-features = false } -# pallet-encointer-treasuries = { version = "~13.3.0", default-features = false } -# pallet-encointer-treasuries-rpc-runtime-api = { version = "~13.3.0", default-features = false } +pallet-encointer-balances = { version = "~14.1.0", default-features = false } +pallet-encointer-bazaar = { version = "~14.1.0", default-features = false } +pallet-encointer-bazaar-rpc-runtime-api = { version = "~14.1.0", default-features = false } +pallet-encointer-ceremonies = { version = "~14.1.0", default-features = false } +pallet-encointer-ceremonies-rpc-runtime-api = { version = "~14.1.0", default-features = false } +pallet-encointer-communities = { version = "~14.1.0", default-features = false } +pallet-encointer-communities-rpc-runtime-api = { version = "~14.1.0", default-features = false } +pallet-encointer-democracy = { version = "~14.3.2", default-features = false } +pallet-encointer-faucet = { version = "~14.2.0", default-features = false } +pallet-encointer-reputation-commitments = { version = "~14.1.0", default-features = false } +pallet-encointer-scheduler = { version = "~14.1.0", default-features = false } +pallet-encointer-treasuries = { version = "~14.3.0", default-features = false } +pallet-encointer-treasuries-rpc-runtime-api = { version = "~14.3.0", default-features = false } pallet-fast-unstake = { version = "37.0.0", default-features = false } pallet-glutton = { version = "24.0.0", default-features = false } pallet-grandpa = { version = "38.0.0", default-features = false } @@ -299,7 +299,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 9e0884e567..157c51981a 100644 --- a/chain-spec-generator/Cargo.toml +++ b/chain-spec-generator/Cargo.toml @@ -22,7 +22,7 @@ asset-hub-kusama-runtime = { workspace = true } collectives-polkadot-runtime = { workspace = true } bridge-hub-polkadot-runtime = { workspace = true } bridge-hub-kusama-runtime = { workspace = true } -# encointer-kusama-runtime = { workspace = true } +encointer-kusama-runtime = { workspace = true } glutton-kusama-runtime = { workspace = true } coretime-kusama-runtime = { workspace = true } coretime-polkadot-runtime = { workspace = true } @@ -39,7 +39,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", @@ -55,7 +55,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", diff --git a/chain-spec-generator/src/common.rs b/chain-spec-generator/src/common.rs index f15fd59b0b..d05e597c4a 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, - /* EncointerKusamaChainSpec, */ GluttonKusamaChainSpec, PeopleKusamaChainSpec, + 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 60b88dcfb2..3b6ed2288c 100644 --- a/chain-spec-generator/src/main.rs +++ b/chain-spec-generator/src/main.rs @@ -72,10 +72,10 @@ fn main() -> Result<(), String> { "glutton-kusama-local", Box::new(system_parachains_specs::glutton_kusama_local_testnet_config) as Box<_>, ), - // ( - // "encointer-kusama-local", - // Box::new(system_parachains_specs::encointer_kusama_local_testnet_config) as Box<_>, - // ), + ( + "encointer-kusama-local", + Box::new(system_parachains_specs::encointer_kusama_local_testnet_config) as Box<_>, + ), ( "coretime-kusama", Box::new(system_parachains_specs::coretime_kusama_config) as Box<_>, diff --git a/chain-spec-generator/src/system_parachains_specs.rs b/chain-spec-generator/src/system_parachains_specs.rs index c8e5e901bc..dd37d8d7b2 100644 --- a/chain-spec-generator/src/system_parachains_specs.rs +++ b/chain-spec-generator/src/system_parachains_specs.rs @@ -42,7 +42,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; @@ -172,7 +172,7 @@ pub fn glutton_kusama_local_testnet_config() -> Result, Strin )) } -/* pub fn encointer_kusama_local_testnet_config() -> Result, String> { +pub fn encointer_kusama_local_testnet_config() -> Result, String> { let mut properties = sc_chain_spec::Properties::new(); properties.insert("ss58Format".into(), 2.into()); properties.insert("tokenSymbol".into(), "KSM".into()); @@ -190,7 +190,7 @@ pub fn glutton_kusama_local_testnet_config() -> Result, Strin .with_properties(properties) .build(), )) -} */ +} pub fn coretime_kusama_local_testnet_config() -> Result, String> { let mut properties = sc_chain_spec::Properties::new(); diff --git a/system-parachains/encointer/src/genesis_config_presets.rs b/system-parachains/encointer/src/genesis_config_presets.rs index 79d0dedaf9..cda23b6565 100644 --- a/system-parachains/encointer/src/genesis_config_presets.rs +++ b/system-parachains/encointer/src/genesis_config_presets.rs @@ -56,6 +56,7 @@ fn encointer_kusama_genesis( ) }) .collect(), + non_authority_keys: vec![], }, "polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION),