Skip to content
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.

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

Add paseo feature and update runtime and package versions #814

Merged
merged 3 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repository = "https://github.com/freeverseio/laos.git"
homepage = "https://www.laosfoundation.io"
authors = ["Freeverse"]
edition = "2021"
version = "0.22.90"
version = "0.22.91"

[workspace]
resolver = "2"
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ParachainStaking from "../build/contracts/ParachainStaking.json";

// Node config
export const RUNTIME_SPEC_NAME = "laos";
export const RUNTIME_SPEC_VERSION = 2290;
export const RUNTIME_SPEC_VERSION = 2291;
export const RUNTIME_IMPL_VERSION = 0;
export const LOCAL_NODE_URL = "http://127.0.0.1:9999";

Expand Down
1 change: 1 addition & 0 deletions runtime/laos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ test-utils = { workspace = true }
ethereum = { workspace = true }

[features]
paseo=[]
fast-runtime=[]
default = [
"std",
Expand Down
8 changes: 7 additions & 1 deletion runtime/laos/src/configs/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use frame_support::{
weights::Weight,
};
use frame_system::{EnsureRoot, RawOrigin as SystemRawOrigin};
use hex_literal::hex;
use pallet_xcm::XcmPassthrough;
use polkadot_parachain_primitives::primitives::Sibling;
use sp_runtime::traits::TryConvert;
Expand All @@ -40,12 +41,17 @@ use xcm_builder::{
use xcm_executor::XcmExecutor;

pub const ASSET_HUB_ID: u32 = 1000;
#[cfg(not(feature = "paseo"))]
pub const RELAY_NETWORK: NetworkId = NetworkId::Polkadot;
#[cfg(feature = "paseo")]
pub const RELAY_NETWORK: NetworkId =
NetworkId::ByGenesis(hex!("77afd6190f1554ad45fd0d31aee62aacc33c6db0ea801129acb813f913e0764f"));

parameter_types! {
// Represents the location of the Relay Chain (parent in the XCM hierarchy).
pub const RelayLocation: Location = Location::parent();
// Optional network identifier for the Relay Chain; set to `None` for default behavior.
pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
pub const RelayNetwork: NetworkId = RELAY_NETWORK;
// Defines the origin for messages coming from the Relay Chain.
pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
// For the real deployment, it is recommended to set `RelayNetwork` according to the relay chain
Expand Down
2 changes: 1 addition & 1 deletion runtime/laos/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("laos"),
impl_name: create_runtime_str!("laos"),
authoring_version: 1,
spec_version: 2290,
spec_version: 2291,
impl_version: 0,
apis: apis::RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down
Loading