Skip to content

Update encointer deps to unstable2604 and re-enable encointer #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clangenb merged 2 commits into from
May 5, 2026
Merged

Update encointer deps to unstable2604 and re-enable encointer #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e2daf6
Update encointer deps to unstable2604 and re-enable encointer
clangenb May 5, 2026
121a28c
fmt
clangenb May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,020 changes: 877 additions & 143 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ cumulus-primitives-aura = { version = "0.23.0", default-features = false }
cumulus-primitives-core = { version = "0.25.0", default-features = false }
cumulus-primitives-utility = { version = "0.27.0", default-features = false }
emulated-integration-tests-common = { version = "30.0.0" }
# TODO @ggwpez encointer-balances-tx-payment = { version = "~22.1.0", default-features = false }
# TODO @ggwpez encointer-balances-tx-payment-rpc-runtime-api = { version = "~22.1.0", default-features = false }
# TODO @ggwpez encointer-kusama-runtime = { path = "system-parachains/encointer" }
# TODO @ggwpez encointer-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/encointer/encointer-kusama" }
# TODO @ggwpez encointer-primitives = { version = "~22.5.0", default-features = false }
encointer-balances-tx-payment = { version = "~22.2.0", default-features = false }
encointer-balances-tx-payment-rpc-runtime-api = { version = "~22.2.0", default-features = false }
encointer-kusama-runtime = { path = "system-parachains/encointer" }
encointer-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/encointer/encointer-kusama" }
encointer-primitives = { version = "~22.6.0", default-features = false }
enumflags2 = { version = "0.7.7" }
frame-benchmarking = { version = "47.0.0", default-features = false }
frame-election-provider-support = { version = "47.0.0", default-features = false }
Expand Down Expand Up @@ -123,21 +123,21 @@ pallet-dap = { version = "0.4.0", default-features = false }
pallet-core-fellowship = { version = "31.0.0", default-features = false }
pallet-election-provider-multi-phase = { version = "46.0.0", default-features = false }
pallet-election-provider-support-benchmarking = { version = "46.0.0", default-features = false }
# TODO @ggwpez pallet-encointer-balances = { version = "~22.2.0", default-features = false }
# TODO @ggwpez pallet-encointer-bazaar = { version = "~22.1.0", default-features = false }
# TODO @ggwpez pallet-encointer-bazaar-rpc-runtime-api = { version = "~22.1.0", default-features = false }
# TODO @ggwpez pallet-encointer-ceremonies = { version = "~22.1.0", default-features = false }
# TODO @ggwpez pallet-encointer-ceremonies-rpc-runtime-api = { version = "~22.1.0", default-features = false }
# TODO @ggwpez pallet-encointer-communities = { version = "~22.1.0", default-features = false }
# TODO @ggwpez pallet-encointer-communities-rpc-runtime-api = { version = "~22.1.0", default-features = false }
# TODO @ggwpez pallet-encointer-democracy = { version = "~22.7.0", default-features = false }
# TODO @ggwpez pallet-encointer-faucet = { version = "~22.2.0", default-features = false }
# TODO @ggwpez pallet-encointer-offline-payment = { version = "~22.0.0", default-features = false }
# TODO @ggwpez pallet-encointer-reputation-commitments = { version = "~22.1.1", default-features = false }
# TODO @ggwpez pallet-encointer-reputation-rings = { version = "~22.0.0", default-features = false }
# TODO @ggwpez pallet-encointer-scheduler = { version = "~22.1.0", default-features = false }
# TODO @ggwpez pallet-encointer-treasuries = { version = "~22.7.0", default-features = false }
# TODO @ggwpez pallet-encointer-treasuries-rpc-runtime-api = { version = "~22.3.0", default-features = false }
pallet-encointer-balances = { version = "~22.3.0", default-features = false }
pallet-encointer-bazaar = { version = "~22.2.0", default-features = false }
pallet-encointer-bazaar-rpc-runtime-api = { version = "~22.2.0", default-features = false }
pallet-encointer-ceremonies = { version = "~22.2.0", default-features = false }
pallet-encointer-ceremonies-rpc-runtime-api = { version = "~22.2.0", default-features = false }
pallet-encointer-communities = { version = "~22.2.0", default-features = false }
pallet-encointer-communities-rpc-runtime-api = { version = "~22.2.0", default-features = false }
pallet-encointer-democracy = { version = "~22.8.0", default-features = false }
pallet-encointer-faucet = { version = "~22.3.0", default-features = false }
pallet-encointer-offline-payment = { version = "~22.1.0", default-features = false }
pallet-encointer-reputation-commitments = { version = "~22.2.0", default-features = false }
pallet-encointer-reputation-rings = { version = "~22.1.0", default-features = false }
pallet-encointer-scheduler = { version = "~22.2.0", default-features = false }
pallet-encointer-treasuries = { version = "~22.8.0", default-features = false }
pallet-encointer-treasuries-rpc-runtime-api = { version = "~22.4.0", default-features = false }
pallet-fast-unstake = { version = "46.0.0", default-features = false }
pallet-glutton = { version = "33.0.0", default-features = false }
pallet-grandpa = { version = "47.0.0", default-features = false }
Expand Down Expand Up @@ -301,7 +301,7 @@ members = [
"integration-tests/emulated/chains/parachains/collectives/collectives-polkadot",
"integration-tests/emulated/chains/parachains/coretime/coretime-kusama",
"integration-tests/emulated/chains/parachains/coretime/coretime-polkadot",
# TODO @ggwpez "integration-tests/emulated/chains/parachains/encointer/encointer-kusama",
"integration-tests/emulated/chains/parachains/encointer/encointer-kusama",
"integration-tests/emulated/chains/parachains/people/people-kusama",
"integration-tests/emulated/chains/parachains/people/people-polkadot",
"integration-tests/emulated/chains/parachains/testing/penpal",
Expand All @@ -319,7 +319,7 @@ members = [
"integration-tests/emulated/tests/collectives/collectives-polkadot",
"integration-tests/emulated/tests/coretime/coretime-kusama",
"integration-tests/emulated/tests/coretime/coretime-polkadot",
# TODO @ggwpez "integration-tests/emulated/tests/encointer/encointer-kusama",
"integration-tests/emulated/tests/encointer/encointer-kusama",
"integration-tests/emulated/tests/governance/kusama",
"integration-tests/emulated/tests/governance/polkadot",
"integration-tests/emulated/tests/people/people-kusama",
Expand Down Expand Up @@ -348,7 +348,7 @@ members = [
"system-parachains/constants",
"system-parachains/coretime/coretime-kusama",
"system-parachains/coretime/coretime-polkadot",
# TODO @ggwpez "system-parachains/encointer",
"system-parachains/encointer",
"system-parachains/gluttons/glutton-kusama",
"system-parachains/people/people-kusama",
"system-parachains/people/people-polkadot",
Expand Down
10 changes: 5 additions & 5 deletions chain-spec-generator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ bulletin-polkadot-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 }
# TODO @ggwpez 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 }
Expand All @@ -42,7 +42,7 @@ runtime-benchmarks = [
"collectives-polkadot-runtime?/runtime-benchmarks",
"coretime-kusama-runtime?/runtime-benchmarks",
"coretime-polkadot-runtime?/runtime-benchmarks",
# TODO @ggwpez "encointer-kusama-runtime?/runtime-benchmarks",
"encointer-kusama-runtime?/runtime-benchmarks",
"glutton-kusama-runtime?/runtime-benchmarks",
"kusama-runtime?/runtime-benchmarks",
"people-kusama-runtime?/runtime-benchmarks",
Expand All @@ -59,7 +59,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",
# TODO @ggwpez "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",
Expand All @@ -78,7 +78,7 @@ collectives-polkadot = ["collectives-polkadot-runtime"]
bridge-hub-polkadot = ["bridge-hub-polkadot-runtime"]
bridge-hub-kusama = ["bridge-hub-kusama-runtime"]
bulletin-polkadot = ["bulletin-polkadot-runtime"]
# TODO @ggwpez 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"]
Expand All @@ -98,7 +98,7 @@ all-kusama = [
"asset-hub-kusama",
"bridge-hub-kusama",
"coretime-kusama",
# TODO @ggwpez "encointer-kusama",
"encointer-kusama",
"glutton-kusama",
"kusama",
"people-kusama",
Expand Down
19 changes: 6 additions & 13 deletions chain-spec-generator/src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,10 @@
use crate::{
relay_chain_specs::{KusamaChainSpec, PolkadotChainSpec},
system_parachains_specs::{
AssetHubKusamaChainSpec,
AssetHubPolkadotChainSpec,
BridgeHubKusamaChainSpec,
BridgeHubPolkadotChainSpec,
CollectivesPolkadotChainSpec,
CoretimeKusamaChainSpec,
CoretimePolkadotChainSpec,
GluttonKusamaChainSpec,
// TODO @ggwpez EncointerKusamaChainSpec,
PeopleKusamaChainSpec,
PeoplePolkadotChainSpec,
AssetHubKusamaChainSpec, AssetHubPolkadotChainSpec, BridgeHubKusamaChainSpec,
BridgeHubPolkadotChainSpec, CollectivesPolkadotChainSpec, CoretimeKusamaChainSpec,
CoretimePolkadotChainSpec, EncointerKusamaChainSpec, GluttonKusamaChainSpec,
PeopleKusamaChainSpec, PeoplePolkadotChainSpec,
},
ChainSpec,
};
Expand Down Expand Up @@ -65,8 +58,8 @@ pub fn from_json_file(filepath: &str, supported: String) -> Result<Box<dyn Chain
Ok(Box::new(CoretimePolkadotChainSpec::from_json_file(path)?)),
x if x.starts_with("glutton-kusama") =>
Ok(Box::new(GluttonKusamaChainSpec::from_json_file(path)?)),
/* TODO @ggwpez 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") =>
Expand Down
4 changes: 2 additions & 2 deletions chain-spec-generator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ fn main() -> Result<(), String> {
"glutton-kusama-local",
Box::new(system_parachains_specs::glutton_kusama_local_testnet_config) as Box<_>,
),
/* TODO @ggwpez #[cfg(feature = "encointer-kusama")]
#[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",
Expand Down
6 changes: 3 additions & 3 deletions chain-spec-generator/src/system_parachains_specs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub type BridgeHubKusamaChainSpec = sc_chain_spec::GenericChainSpec<Extensions>;

pub type GluttonKusamaChainSpec = sc_chain_spec::GenericChainSpec<Extensions>;

// TODO @ggwpez pub type EncointerKusamaChainSpec = sc_chain_spec::GenericChainSpec<Extensions>;
pub type EncointerKusamaChainSpec = sc_chain_spec::GenericChainSpec<Extensions>;

pub type CoretimeKusamaChainSpec = sc_chain_spec::GenericChainSpec<Extensions>;

Expand Down Expand Up @@ -183,7 +183,7 @@ pub fn glutton_kusama_local_testnet_config() -> Result<Box<dyn sc_chain_spec::Ch
))
}

/* TODO @ggwpez #[cfg(feature = "encointer-kusama")]
#[cfg(feature = "encointer-kusama")]
pub fn encointer_kusama_local_testnet_config() -> Result<Box<dyn sc_chain_spec::ChainSpec>, String>
{
let mut properties = sc_chain_spec::Properties::new();
Expand All @@ -203,7 +203,7 @@ pub fn encointer_kusama_local_testnet_config() -> Result<Box<dyn sc_chain_spec::
.with_properties(properties)
.build(),
))
}*/
}

#[cfg(feature = "coretime-kusama")]
pub fn coretime_kusama_local_testnet_config() -> Result<Box<dyn sc_chain_spec::ChainSpec>, String> {
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/emulated/networks/kusama-system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ emulated-integration-tests-common = { workspace = true }
# Runtimes
asset-hub-kusama-emulated-chain = { workspace = true }
bridge-hub-kusama-emulated-chain = { workspace = true }
# TODO @ggwpez encointer-kusama-emulated-chain = { workspace = true }
encointer-kusama-emulated-chain = { workspace = true }
kusama-emulated-chain = { workspace = true }
penpal-emulated-chain = { workspace = true }
people-kusama-emulated-chain = { workspace = true }
Expand All @@ -26,7 +26,7 @@ runtime-benchmarks = [
"asset-hub-kusama-emulated-chain/runtime-benchmarks",
"bridge-hub-kusama-emulated-chain/runtime-benchmarks",
"coretime-kusama-emulated-chain/runtime-benchmarks",
# TODO @ggwpez "encointer-kusama-emulated-chain/runtime-benchmarks",
"encointer-kusama-emulated-chain/runtime-benchmarks",
"kusama-emulated-chain/runtime-benchmarks",
"penpal-emulated-chain/runtime-benchmarks",
"people-kusama-emulated-chain/runtime-benchmarks",
Expand Down
10 changes: 5 additions & 5 deletions integration-tests/emulated/networks/kusama-system/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
pub use asset_hub_kusama_emulated_chain;
pub use bridge_hub_kusama_emulated_chain;
pub use coretime_kusama_emulated_chain;
// TODO @ggwpez pub use encointer_kusama_emulated_chain;
pub use encointer_kusama_emulated_chain;
pub use kusama_emulated_chain;
pub use penpal_emulated_chain;
pub use people_kusama_emulated_chain;

use asset_hub_kusama_emulated_chain::AssetHubKusama;
use bridge_hub_kusama_emulated_chain::BridgeHubKusama;
use coretime_kusama_emulated_chain::CoretimeKusama;
// TODO @ggwpez use encointer_kusama_emulated_chain::EncointerKusama;
use encointer_kusama_emulated_chain::EncointerKusama;
use kusama_emulated_chain::Kusama;
use penpal_emulated_chain::{PenpalA, PenpalB};
use people_kusama_emulated_chain::PeopleKusama;
Expand All @@ -45,7 +45,7 @@ decl_test_networks! {
PenpalB,
PeopleKusama,
CoretimeKusama,
// TODO @ggwpez EncointerKusama,
EncointerKusama,
],
bridge = ()
},
Expand All @@ -58,6 +58,6 @@ decl_test_sender_receiver_accounts_parameter_types! {
PenpalAPara { sender: ALICE, receiver: BOB },
PenpalBPara { sender: ALICE, receiver: BOB },
PeopleKusamaPara { sender: ALICE, receiver: BOB },
CoretimeKusamaPara { sender: ALICE, receiver: BOB }
// TODO @ggwpez EncointerKusamaPara { sender: ALICE, receiver: BOB }
CoretimeKusamaPara { sender: ALICE, receiver: BOB },
EncointerKusamaPara { sender: ALICE, receiver: BOB }
}
Loading