diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7393bef..18503c03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -460,7 +460,8 @@ test-partition-1: --exclude people-pezkuwichain-integration-tests \ --exclude people-zagros-integration-tests \ --exclude pezbridge-hub-pezkuwichain-integration-tests \ - --exclude pezbridge-hub-zagros-integration-tests + --exclude pezbridge-hub-zagros-integration-tests \ + --exclude pez-chain-spec-guide-runtime artifacts: when: always paths: [test-results-1.xml] @@ -486,7 +487,8 @@ test-partition-2: --exclude people-pezkuwichain-integration-tests \ --exclude people-zagros-integration-tests \ --exclude pezbridge-hub-pezkuwichain-integration-tests \ - --exclude pezbridge-hub-zagros-integration-tests + --exclude pezbridge-hub-zagros-integration-tests \ + --exclude pez-chain-spec-guide-runtime artifacts: when: always paths: [test-results-2.xml] @@ -512,7 +514,8 @@ test-partition-3: --exclude people-pezkuwichain-integration-tests \ --exclude people-zagros-integration-tests \ --exclude pezbridge-hub-pezkuwichain-integration-tests \ - --exclude pezbridge-hub-zagros-integration-tests + --exclude pezbridge-hub-zagros-integration-tests \ + --exclude pez-chain-spec-guide-runtime # Also runs runtime-api tests - cargo nextest run -p pezsp-api-test --features enable-pez-staging-api --cargo-quiet artifacts: @@ -540,7 +543,8 @@ test-no-try-runtime-1: --exclude people-pezkuwichain-integration-tests \ --exclude people-zagros-integration-tests \ --exclude pezbridge-hub-pezkuwichain-integration-tests \ - --exclude pezbridge-hub-zagros-integration-tests + --exclude pezbridge-hub-zagros-integration-tests \ + --exclude pez-chain-spec-guide-runtime test-no-try-runtime-2: extends: .test-base @@ -560,7 +564,8 @@ test-no-try-runtime-2: --exclude people-pezkuwichain-integration-tests \ --exclude people-zagros-integration-tests \ --exclude pezbridge-hub-pezkuwichain-integration-tests \ - --exclude pezbridge-hub-zagros-integration-tests + --exclude pezbridge-hub-zagros-integration-tests \ + --exclude pez-chain-spec-guide-runtime # Emulated XCM integration tests — require WASM blobs, run separately with # SKIP_WASM_BUILD=0. Uses the same CARGO_TARGET_DIR as test-partition jobs so diff --git a/Cargo.lock b/Cargo.lock index 8bb282ca..b87a96ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4090,7 +4090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" dependencies = [ "data-encoding", - "syn 1.0.109", + "syn 2.0.114", ] [[package]] @@ -17271,7 +17271,7 @@ dependencies = [ "pezpallet-revive-uapi", "pezsp-core", "pezsp-io", - "polkavm-linker 0.30.0", + "polkavm-linker 0.29.0", "serde_json", "toml 0.8.23", ] @@ -21626,12 +21626,6 @@ dependencies = [ "siphasher 1.0.1", ] -[[package]] -name = "picosimd" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af35c838647fef3d6d052e27006ef88ea162336eee33063c50a63f163c18cdeb" - [[package]] name = "pin-project" version = "1.1.10" @@ -21795,15 +21789,6 @@ dependencies = [ "polkavm-assembler 0.29.0", ] -[[package]] -name = "polkavm-common" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1b408db93d4f49f5c651a7844682b9d7a561827b4dc6202c10356076c055c9" -dependencies = [ - "picosimd", -] - [[package]] name = "polkavm-derive" version = "0.26.0" @@ -21884,16 +21869,16 @@ dependencies = [ [[package]] name = "polkavm-linker" -version = "0.30.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6739125c4f8f44b4282b6531d765d599f20514e9b608737c6c3544594d08f995" +checksum = "43e01613e9e3e4ebd624aa3a11f1775a5c90b881200c50e054fe13c3ba451f98" dependencies = [ "dirs", "gimli 0.31.1", "hashbrown 0.14.5", "log", "object 0.36.7", - "polkavm-common 0.30.0", + "polkavm-common 0.29.0", "regalloc2 0.9.3", "rustc-demangle", ] diff --git a/bizinikiwi/pezframe/revive/fixtures/Cargo.toml b/bizinikiwi/pezframe/revive/fixtures/Cargo.toml index 027ff540..4c3ad5e2 100644 --- a/bizinikiwi/pezframe/revive/fixtures/Cargo.toml +++ b/bizinikiwi/pezframe/revive/fixtures/Cargo.toml @@ -30,7 +30,7 @@ anyhow = { workspace = true, default-features = true } cargo_metadata = { workspace = true } hex = { workspace = true, features = ["alloc"] } pezpallet-revive-uapi = { workspace = true } -polkavm-linker = { version = "0.30.0" } +polkavm-linker = { version = "0.29.0" } serde_json = { workspace = true } toml = { workspace = true } diff --git a/bizinikiwi/pezframe/revive/fixtures/build.rs b/bizinikiwi/pezframe/revive/fixtures/build.rs index 88c419c9..e6105d6d 100644 --- a/bizinikiwi/pezframe/revive/fixtures/build.rs +++ b/bizinikiwi/pezframe/revive/fixtures/build.rs @@ -180,9 +180,6 @@ fn invoke_build(current_dir: &Path) -> Result<()> { // This works with stable rust when RUSTC_BOOTSTRAP=1 is set let encoded_rustflags = ["-Dwarnings"].join("\x1f"); - let mut args = polkavm_linker::TargetJsonArgs::default(); - args.is_64_bit = true; - let mut build_command = Command::new("cargo"); build_command .current_dir(current_dir) @@ -199,7 +196,7 @@ fn invoke_build(current_dir: &Path) -> Result<()> { "-Zbuild-std-features=panic_immediate_abort", ]) .arg("--target") - .arg(polkavm_linker::target_json_path(args).unwrap()); + .arg(polkavm_linker::target_json_64_path().unwrap()); if let Ok(toolchain) = env::var(OVERRIDE_RUSTUP_TOOLCHAIN_ENV_VAR) { build_command.env("RUSTUP_TOOLCHAIN", &toolchain); @@ -228,7 +225,6 @@ fn post_process(input_path: &Path, output_path: &Path) -> Result<()> { let orig = fs::read(input_path).with_context(|| format!("Failed to read {input_path:?}"))?; let linked = polkavm_linker::program_from_elf( config, - polkavm_linker::TargetInstructionSet::Latest, orig.as_ref(), ) .map_err(|err| anyhow::format_err!("Failed to link polkavm program: {}", err))?; diff --git a/bizinikiwi/utils/bizinikiwi-bip39/src/lib.rs b/bizinikiwi/utils/bizinikiwi-bip39/src/lib.rs index 55c688c1..055a3f11 100644 --- a/bizinikiwi/utils/bizinikiwi-bip39/src/lib.rs +++ b/bizinikiwi/utils/bizinikiwi-bip39/src/lib.rs @@ -81,7 +81,7 @@ mod test { // phrase, entropy, seed, expanded secret_key // - // ALL SEEDS GENERATED USING "Bizinikiwi" PASSWORD! + // ALL SEEDS GENERATED USING "Substrate" PASSWORD! static VECTORS: &[[&str; 3]] = &[ [ "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", @@ -214,8 +214,8 @@ mod test { let expected_seed: Vec = vector[2].from_hex().unwrap(); let mnemonic = Mnemonic::parse_in(Language::English, phrase).unwrap(); - let seed = seed_from_entropy(&mnemonic.to_entropy(), "Bizinikiwi").unwrap(); - let secret = mini_secret_from_entropy(&mnemonic.to_entropy(), "Bizinikiwi") + let seed = seed_from_entropy(&mnemonic.to_entropy(), "Substrate").unwrap(); + let secret = mini_secret_from_entropy(&mnemonic.to_entropy(), "Substrate") .unwrap() .to_bytes(); diff --git a/pezkuwi/xcm/xcm-builder/src/location_conversion.rs b/pezkuwi/xcm/xcm-builder/src/location_conversion.rs index 0c7492e6..14fa74a4 100644 --- a/pezkuwi/xcm/xcm-builder/src/location_conversion.rs +++ b/pezkuwi/xcm/xcm-builder/src/location_conversion.rs @@ -59,7 +59,7 @@ impl DescribeLocation for DescribePalletTerminal { fn describe_location(l: &Location) -> Option> { match l.unpack() { (0, [PalletInstance(i)]) => { - Some((b"Pezpallet", Compact::::from(*i as u32)).encode()) + Some((b"Pallet", Compact::::from(*i as u32)).encode()) }, _ => return None, }