diff --git a/.claude/WORKFLOW_PLAN.md b/.claude/WORKFLOW_PLAN.md index 827f31e7..5eb3f5b7 100644 --- a/.claude/WORKFLOW_PLAN.md +++ b/.claude/WORKFLOW_PLAN.md @@ -1,234 +1,201 @@ -# Pezkuwi SDK - CI Workflow Düzeltme Planı +# Pezkuwi SDK - CI Workflow Mühendislik Planı -> Bu dosya Claude oturumları arasında sürekliliği sağlamak için oluşturulmuştur. -> Her oturum başında bu dosyayı oku ve kaldığın yerden devam et. +> **KURAL:** Bu dosyadaki komutları birebir çalıştır. Kendi komutunu uydurma. -## Son Güncelleme -- **Tarih:** 2024-12-23 -- **Son Tamamlanan:** pez-kitchensink-runtime compilation fix (umbrella eksik crate'ler) -- **Aktif Görev:** FAZ 1 - CI Yeşil Işık +## Son CI Durumu (main branch) + +| Durum | Sayı | +|-------|------| +| Skipped | 25 | +| Successful | 58 | +| **Failing** | **42** | +| Cancelled | 10 | --- -## DURUM TABLOSU +## FAZ 1: Başarısız Workflow'lar (10 workflow, ~30 job) -### checks.yml (3 job) -| Job | Durum | Komut | Notlar | -|-----|-------|-------|--------| -| cargo-clippy | ✅ TAMAMLANDI | `RUSTFLAGS="-D warnings" SKIP_WASM_BUILD=1 cargo clippy --all-targets --all-features --locked --workspace --quiet` | 36 dosya düzeltildi | -| check-try-runtime | ⚠️ BLOKLU | `cargo check --locked --all --features try-runtime` | WASM duplicate lang item sorunu - CI'da test edilmeli | -| check-core-crypto-features | ✅ TAMAMLANDI | `check-features-variants.sh` | 3 script geçti (pezsp-core, application-crypto, keyring) | +### 1.1 quick-checks.yml -### checks-quick.yml (10 job) -| Job | Durum | Komut | Notlar | -|-----|-------|-------|--------| -| fmt | ✅ TAMAMLANDI | `cargo fmt --all -- --check` | rustfmt.toml stable-only yapıldı, 898 dosya formatlandı | -| check-toml-format | ✅ TAMAMLANDI | `taplo format --check --config .config/taplo.toml` | 10 dosya düzeltildi | -| check-zepter | ✅ TAMAMLANDI | `zepter run check` | 18 feature propagation düzeltildi | -| check-workspace | ✅ TAMAMLANDI | `python3 .github/scripts/check-workspace.py .` | 606 crate, 6919 link doğrulandı | -| check-dependency-rules | ✅ TAMAMLANDI | `python3 .github/scripts/deny-git-deps.py .` | Git deps path'e çevrildi | -| check-umbrella | ✅ TAMAMLANDI | `python3 scripts/generate-umbrella.py` | Umbrella crate oluşturuldu | -| test-rust-features | ✅ TAMAMLANDI | `.gitlab/rust-features.sh .` | Feature kontrolleri geçti | -| check-markdown | ✅ TAMAMLANDI | `markdownlint --config .github/.markdownlint.yaml --ignore target .` | Markdown formatı OK | -| check-fail-ci | ✅ TAMAMLANDI | `rg "FAIL-CI" --type rust` | FAIL-CI markerı yok | -| check-readme | ✅ TAMAMLANDI | `.github/scripts/check-missing-readme-generation.sh` | README'ler güncel | +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `check-toml-format` | ❌ | `taplo format --check --config .config/taplo.toml` | +| `check-markdown` | ❌ | `markdownlint --config .github/.markdownlint.yaml --ignore target --ignore vendor .` | +| `fmt` | ✅ | `cargo fmt --all -- --check` | +| `check-zepter` | ✅ | `zepter run check` | +| `check-workspace` | ✅ | `python3 .github/scripts/check-workspace.py .` | +| `check-dependency-rules` | ✅ | `python3 .github/scripts/deny-git-deps.py .` | +| `check-umbrella` | ✅ | `python3 scripts/generate-umbrella.py --check` | +| `test-rust-features` | ✅ | `.gitlab/rust-features.sh .` | +| `check-fail-ci` | ✅ | `! grep -r "FAIL-CI" --include="*.rs" . --exclude-dir=target` | +| `check-readme` | ✅ | `.github/scripts/check-missing-readme-generation.sh` | -### check-links.yml (1 job) -| Job | Durum | Komut | Notlar | -|-----|-------|-------|--------| -| link-checker | ✅ TAMAMLANDI | `lychee --config .config/lychee.toml './**/*.rs'` | 0 hata - 6747 OK, 2834 exclude | +**Düzeltme:** +```bash +# TOML format düzelt +taplo format --config .config/taplo.toml -### check-getting-started.yml (7 job) -| Job | Durum | Notlar | -|-----|-------|--------| -| ubuntu/minimal | ✅ DÜZELTİLDİ | Template URL: pezkuwi-sdk-minimal-template | -| debian/teyrchain | ✅ DÜZELTİLDİ | Template URL: pezkuwi-sdk-teyrchain-template | -| arch/solochain | ✅ DÜZELTİLDİ | Template URL: pezkuwi-sdk-solochain-template | -| fedora/teyrchain | ✅ DÜZELTİLDİ | Template URL düzeltildi | -| opensuse/solochain | ✅ DÜZELTİLDİ | Template URL düzeltildi | -| macos/teyrchain | ✅ DÜZELTİLDİ | Template URL düzeltildi | -| macos/solochain | ✅ DÜZELTİLDİ | Template URL düzeltildi | - -### tests-misc.yml (11 job) -| Job | Durum | Notlar | -|-----|-------|--------| -| test-full-crypto-feature | ✅ LOKAL OK | `cargo build --no-default-features --features full_crypto -p pezsp-core` geçti | -| test-pezframe-examples-compile-to-wasm | ⏳ BEKLEMEDE | CI'da test edilmeli | -| test-pezframe-ui | ⏳ BEKLEMEDE | CI'da test edilmeli | -| test-deterministic-wasm | ⏳ BEKLEMEDE | CI'da test edilmeli | -| cargo-check-benches | ⚠️ BLOKLU | pezpallet-revive-fixtures PolkaVM toolchain gerektiriyor | -| test-node-metrics | ⏳ BEKLEMEDE | CI'da test edilmeli | -| check-tracing | ✅ LOKAL OK | Tracing testleri geçti | -| check-metadata-hash | ⏳ BEKLEMEDE | CI'da test edilmeli | -| cargo-check-each-crate | ⏳ BEKLEMEDE | CI'da test edilmeli | -| cargo-check-all-crate-macos | ⏳ BEKLEMEDE | macOS gerekli | - -### build-misc.yml (3 job) -| Job | Durum | Notlar | -|-----|-------|--------| -| build-runtimes-polkavm | ⏳ BEKLEMEDE | RISC-V target gerekli - CI'da test edilmeli | -| check-revive-stable-uapi-polkavm | ⏳ BEKLEMEDE | CI'da test edilmeli | -| build-pez-subkey | ✅ LOKAL OK | 7m 49s'de release build tamamlandı | - ---- - -## BUGÜN YAPILAN DÜZELTMELER (2024-12-23) - -### pez-kitchensink-runtime Derleme Hatası Çözümü - -**Problem:** 679 derleme hatası - `Runtime`, `RuntimeCall`, `Balances`, `pezpallet_root_testing` bulunamıyor - -**Teşhis:** -- `use pezkuwi_sdk::*;` ile umbrella'dan import yapılıyor -- Umbrella'da `pezpallet-root-testing` ve `pezpallet-xcm-benchmarks` eksikti -- Macro chain kırılmış, Runtime type'ları generate edilmiyordu - -**Çözüm - Umbrella Cargo.toml'a eklendi:** - -1. **pezpallet-root-testing:** - - `std` feature eklendi - - `try-runtime` feature eklendi - - `runtime-full` feature eklendi - - `[dependencies.pezpallet-root-testing]` section eklendi - -2. **pezpallet-xcm-benchmarks:** - - `std` feature eklendi - - `runtime-benchmarks` feature eklendi - - `runtime-full` feature eklendi - - `[dependencies.pezpallet-xcm-benchmarks]` section eklendi - -3. **Umbrella src/lib.rs'e re-export eklendi:** -```rust -#[cfg(feature = "pezpallet-root-testing")] -pub use pezpallet_root_testing; - -#[cfg(feature = "pezpallet-xcm-benchmarks")] -pub use pezpallet_xcm_benchmarks; -``` - -**Sonuç:** -- ✅ `SKIP_WASM_BUILD=1 cargo check -p pez-kitchensink-runtime` - BAŞARILI -- ✅ `SKIP_WASM_BUILD=1 cargo clippy -p pez-kitchensink-runtime` - BAŞARILI -- ✅ `SKIP_WASM_BUILD=1 cargo clippy -p pez-kitchensink-runtime -- -D warnings` - BAŞARILI - -### Önceki Düzeltme: getrandom WASM Hatası - -**Problem:** `error: the wasm*-unknown-unknown targets are not supported by default` - -**Sebep:** -- `frame-decode v0.15.0` → `sp-crypto-hashing/std` → `twox-hash/std` → `rand` → `getrandom` -- subxt crate'leri runtime-full feature'ında getrandom'u çekiyordu - -**Çözüm:** -- Umbrella Cargo.toml'da subxt crate'leri `runtime-full`'dan çıkarıldı -- `node` feature'ına taşındı - ---- - -## GÜVENLİK DÜZELTMELERİ (Dependabot) - -| Vulnerability | Severity | Eski Versiyon | Yeni Versiyon | Durum | -|--------------|----------|---------------|---------------|-------| -| wasmtime (unsound API) | Low | 35.0.0 | 37.0.0 | ✅ | -| tracing-subscriber (ANSI escape) | Low | 0.3.18 | 0.3.20 | ✅ | -| ring (AES overflow) | Medium | 0.16.20 | 0.17.14 | ✅ | -| ring (duplicate) | Medium | 0.16.20 | 0.17.14 | ✅ | - ---- - -## TOOLCHAIN DURUMU - -| Tool | Durum | Versiyon | Notlar | -|------|-------|----------|--------| -| Rust | ✅ | 1.88.0 | rust-toolchain.toml'dan | -| wasm32-unknown-unknown | ✅ | installed | 1.88.0 toolchain'e eklendi | -| polkatool | ✅ | 0.30.0 | crates.io'dan kuruldu | -| resolc | ✅ | mevcut | ~/.local/bin/resolc | -| polkavm-linker | ✅ | 0.30.0 | ~/.cache/.polkavm-linker/ | - ---- - -## SONRAKİ ADIMLAR - -1. ✅ ~~check-links.yml düzelt~~ - TAMAMLANDI -2. ✅ ~~wasm32 target ekle~~ - TAMAMLANDI -3. ✅ ~~polkatool kur~~ - TAMAMLANDI -4. ✅ ~~check-core-crypto-features~~ - TAMAMLANDI -5. ✅ ~~check-getting-started.yml~~ - TAMAMLANDI -6. ✅ ~~pez-kitchensink-runtime derleme hatası~~ - TAMAMLANDI -7. ⏳ **try-runtime** - CI'da test et (lokal WASM build sorunu var) -8. ⏳ **tests-misc.yml** - CI'da test et -9. ⏳ **build-misc.yml** - CI'da test et - ---- - -## BİLİNEN SORUNLAR - -### try-runtime WASM Build Sorunu -``` -error[E0152]: duplicate lang item in crate `core` -error[E0152]: duplicate lang item in crate `alloc` -``` -- **Sebep:** WASM builder farklı std/core versiyonu kullanıyor -- **Çözüm:** CI Docker image'ında muhtemelen çözümlü -- **Aksiyon:** CI'da test et, lokal test'i atla - -### pezpallet-revive-fixtures PolkaVM Sorunu -``` -error: failed to run `rustc` to learn about target-specific information -target: riscv64emac-unknown-none-polkavm.json -``` -- **Sebep:** Custom RISC-V target CI'da tanımlı -- **Çözüm:** CI Docker image gerekli -- **Aksiyon:** CI'da test et - ---- - -## KRİTİK DOSYA YOLLARI - -``` -/home/mamostehp/pezkuwi-sdk/ -├── .github/workflows/ # Workflow dosyaları -├── .config/ -│ ├── lychee.toml # Link checker config -│ └── taplo.toml # TOML formatter config -├── .claude/ -│ ├── CLAUDE_RULES.md # Rebrand kuralları -│ ├── TERMINOLOGY.md # Terminoloji mapping -│ ├── WORKFLOW_PLAN.md # Bu dosya -│ ├── REBRAND_PROGRESS.md # Rebrand ilerleme listesi -│ ├── domains_repositories.md # Domain ve repo listesi -│ └── issue_mapping.txt # Upstream issue mapping (160 issue) -├── umbrella/ -│ ├── Cargo.toml # Umbrella crate dependencies -│ └── src/lib.rs # Umbrella re-exports -├── vendor/ -│ ├── pezkuwi-subxt/ # Vendored subxt (10 crate) -│ ├── pezkuwi-zombienet-sdk/ # Vendored zombienet (6 crate) -│ └── ss58-registry/ # SS58 registry -└── crate_placeholders/ # 150 placeholder crate +# Markdown düzelt +markdownlint --config .github/.markdownlint.yaml --ignore target --ignore vendor . --fix ``` --- -## ÖZET İSTATİSTİKLERİ +### 1.2 checks.yml -| Metrik | Değer | -|--------|-------| -| Toplam workflow job | 35 | -| Tamamlanan (lokal OK) | 28 | -| Beklemede (CI testi gerekli) | 6 | -| Bloklu (sistem gereksinimi) | 1 | -| Kırık link düzeltilen | 78 | -| Tracking issue oluşturulan | 160 | -| Güvenlik açığı kapatılan | 4 | -| Umbrella eksik crate düzeltilen | 2 | +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `cargo-clippy` | ❌ | `RUSTFLAGS="-D warnings" SKIP_WASM_BUILD=1 cargo clippy --all-targets --all-features --locked --workspace --quiet` | +| `check-try-runtime` | ❌ | Aşağıdaki 3 komut sırayla çalıştırılmalı | +| `check-core-crypto-features` | ✅ | Aşağıdaki 3 script çalıştırılmalı | + +**check-try-runtime komutları:** +```bash +cargo check --locked --all --features try-runtime --quiet +cargo check --locked -p teyrchain-template-node --features try-runtime +cargo check --locked --all --features try-runtime,experimental --quiet +``` + +**check-core-crypto-features komutları:** +```bash +./bizinikiwi/primitives/core/check-features-variants.sh +./bizinikiwi/primitives/application-crypto/check-features-variants.sh +./bizinikiwi/primitives/keyring/check-features-variants.sh +``` --- -## NOTLAR +### 1.3 docs.yml -- Her büyük değişiklikten önce git commit yap -- Hata düzeltirken rebrand'i bozma -- CI'da test edilmesi gereken job'lar için PR aç -- Lokal test geçenleri güvenle commit et +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `test-doc` | ❌ | `time cargo test --doc --workspace --locked --release --no-fail-fast --features=runtime-benchmarks,try-runtime` | +| `build-rustdoc` | ❌ | `time cargo doc --workspace --all-features --no-deps` | + +--- + +### 1.4 tests.yml + +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `cargo-check-all-benches` | ❌ | `cargo check --all --benches --locked` | +| `test-syscalls` | ❌ | CI-specific (syscall binary testi) | +| `quick-benchmarks` | ❌ | `cargo run --release -p pez-frame-benchmarking-cli` | + +--- + +### 1.5 tests-linux-stable.yml + +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `test-linux-stable` | ❌ | `cargo nextest run --workspace --locked --release --no-fail-fast` | +| `test-linux-stable-int` | ❌ | `cargo nextest run -p "*-integration-tests*" -j1 --locked --release --no-fail-fast` | +| `test-linux-stable-no-try-runtime` | ❌ | `cargo check --workspace --locked --no-default-features` | +| `test-linux-stable-runtime-benchmarks` | ❌ | `cargo check --workspace --locked --features runtime-benchmarks` | + +--- + +### 1.6 tests-misc.yml + +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `test-node-metrics` | ❌ | `cargo test -p pezsc-network --features "substrate-prometheus"` | +| `cargo-check-all-crate-macos` | ❌ | macOS runner gerekli | +| `test-pezframe-ui` | ❌ | `cargo test -p pezframe-ui-tests --locked` | +| `cargo-check-each-crate` | ❌ | `cargo check -p --locked` (her crate için ayrı) | + +--- + +### 1.7 tests-evm.yml + +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `evm-test-suite (test:pvm)` | ❌ | PolkaVM toolchain gerekli | +| `differential-tests` | ❌ | `resolc` compiler gerekli | + +--- + +### 1.8 build-misc.yml + +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `build-runtimes-polkavm` | ❌ | RISC-V target gerekli (`riscv64emac-unknown-none-polkavm`) | + +--- + +### 1.9 build-publish-images.yml + +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| `build-linux-stable` | ❌ | `cargo build --locked --release -p pez-pezkuwi` | +| `build-linux-stable-pezcumulus` | ❌ | `cargo build --locked --release -p pezkuwi-teyrchain` | +| `build-linux-bizinikiwi` | ❌ | `cargo build --locked --release -p pez-node` | +| `build-templates-node` | ❌ | `cargo build --locked --release -p teyrchain-template-node` | +| `build-malus` | ❌ | `cargo build --locked --release -p pez-test-malus` | +| `build-test-collators` | ❌ | `cargo build --locked --release -p test-parachain` | +| `prepare-bridges-zombienet-artifacts` | ❌ | Bridge binary'leri | +| `build-push-image-test-teyrchain` | ❌ | Docker image build | + +--- + +### 1.10 check-getting-started.yml + +| Job | Durum | Lokal Test Komutu | +|-----|-------|-------------------| +| Tüm distro testleri | ✅ DÜZELTILDI | Template URL'leri düzeltildi | + +--- + +## FAZ 2: Düzeltme Sırası + +``` +AŞAMA 1 - Kritik (PR merge için ZORUNLU): +├── quick-checks.yml +│ ├── taplo format --config .config/taplo.toml +│ └── markdownlint --fix +└── checks.yml + ├── cargo clippy düzeltmeleri + └── try-runtime feature düzeltmeleri + +AŞAMA 2 - Derleme Hataları: +├── build-publish-images.yml binary build'ler +├── build-misc.yml PolkaVM build +└── tests.yml benchmark compile + +AŞAMA 3 - Test Hataları: +├── tests-linux-stable.yml unit/integration tests +├── tests-misc.yml çeşitli testler +└── docs.yml doc tests + +AŞAMA 4 - EVM/PolkaVM: +├── tests-evm.yml PolkaVM toolchain +└── resolc compiler kurulumu +``` + +--- + +## Tamamlanan Düzeltmeler + +| Tarih | Düzeltme | Etki | +|-------|----------|------| +| 2024-12-23 | Umbrella'ya pezpallet-root-testing eklendi | check-try-runtime | +| 2024-12-23 | Umbrella'ya pezpallet-xcm-benchmarks eklendi | Runtime build | +| 2024-12-23 | Subxt runtime-full'dan çıkarıldı | getrandom WASM fix | +| 2024-12-23 | Template URL'leri düzeltildi | check-getting-started | +| 2024-12-22 | rustfmt.toml stable-only | fmt job | +| 2024-12-22 | Zepter feature propagation | check-zepter | + +--- + +## Şu An Yapılması Gereken + +1. `taplo format --config .config/taplo.toml` çalıştır +2. Değişiklikleri commit et +3. `RUSTFLAGS="-D warnings" SKIP_WASM_BUILD=1 cargo clippy --all-targets --all-features --locked --workspace --quiet` çalıştır +4. Hataları düzelt +5. Commit ve push yap +6. CI'da test et + +--- + +*Son Güncelleme: 2024-12-23* diff --git a/Cargo.lock b/Cargo.lock index 2247c876..bc2e0b47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14553,6 +14553,7 @@ dependencies = [ "hashbrown 0.15.5", "parity-scale-codec", "pezkuwi-subxt-codegen", + "pezkuwi-subxt-utils-stripmetadata", "pezsp-crypto-hashing", "scale-info", "scale-info-legacy", diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml index a51c4467..a548e0ca 100644 --- a/umbrella/Cargo.toml +++ b/umbrella/Cargo.toml @@ -173,11 +173,11 @@ std = [ "pezpallet-verify-signature?/std", "pezpallet-vesting?/std", "pezpallet-whitelist?/std", + "pezpallet-xcm-benchmarks?/std", "pezpallet-xcm-bridge-hub-router?/std", "pezpallet-xcm-bridge-hub?/std", "pezpallet-xcm-precompiles?/std", "pezpallet-xcm?/std", - "pezpallet-xcm-benchmarks?/std", "pezsc-executor?/std", "pezsp-api-proc-macro?/std", "pezsp-api?/std", @@ -465,11 +465,11 @@ runtime-benchmarks = [ "pezpallet-verify-signature?/runtime-benchmarks", "pezpallet-vesting?/runtime-benchmarks", "pezpallet-whitelist?/runtime-benchmarks", + "pezpallet-xcm-benchmarks?/runtime-benchmarks", "pezpallet-xcm-bridge-hub-router?/runtime-benchmarks", "pezpallet-xcm-bridge-hub?/runtime-benchmarks", "pezpallet-xcm-precompiles?/runtime-benchmarks", "pezpallet-xcm?/runtime-benchmarks", - "pezpallet-xcm-benchmarks?/runtime-benchmarks", "pezsc-authority-discovery?/runtime-benchmarks", "pezsc-basic-authorship?/runtime-benchmarks", "pezsc-block-builder?/runtime-benchmarks", diff --git a/vendor/pezkuwi-subxt/core/src/tx/payload.rs b/vendor/pezkuwi-subxt/core/src/tx/payload.rs index 8561392c..7533daef 100644 --- a/vendor/pezkuwi-subxt/core/src/tx/payload.rs +++ b/vendor/pezkuwi-subxt/core/src/tx/payload.rs @@ -222,7 +222,7 @@ mod tests { use scale_value::Composite; fn test_metadata() -> Metadata { - let metadata_bytes = include_bytes!("../../../artifacts/pezkuwi_metadata_small.scale"); + let metadata_bytes = include_bytes!("../../../artifacts/polkadot_metadata_small.scale"); Metadata::decode(&mut &metadata_bytes[..]).expect("Valid metadata") } diff --git a/vendor/pezkuwi-subxt/core/src/utils/account_id.rs b/vendor/pezkuwi-subxt/core/src/utils/account_id.rs index 91abd6aa..57c28df8 100644 --- a/vendor/pezkuwi-subxt/core/src/utils/account_id.rs +++ b/vendor/pezkuwi-subxt/core/src/utils/account_id.rs @@ -162,8 +162,8 @@ impl core::str::FromStr for AccountId32 { #[cfg(test)] mod test { use super::*; - use sp_core::{self, crypto::Ss58Codec}; - use sp_keyring::sr25519::Keyring; + use pezsp_core::{self, crypto::Ss58Codec}; + use pezsp_keyring::sr25519::Keyring; #[test] fn ss58_is_compatible_with_bizinikiwi_impl() { @@ -179,7 +179,7 @@ mod test { // Both should decode from ss58 back to the same: assert_eq!( - sp_core::crypto::AccountId32::from_ss58check(&bizinikiwi_ss58).unwrap(), + pezsp_core::crypto::AccountId32::from_ss58check(&bizinikiwi_ss58).unwrap(), bizinikiwi_account ); assert_eq!(AccountId32::from_ss58check(&bizinikiwi_ss58).unwrap(), local_account); diff --git a/vendor/pezkuwi-subxt/metadata/Cargo.toml b/vendor/pezkuwi-subxt/metadata/Cargo.toml index f218527b..65b7f780 100644 --- a/vendor/pezkuwi-subxt/metadata/Cargo.toml +++ b/vendor/pezkuwi-subxt/metadata/Cargo.toml @@ -50,6 +50,7 @@ bitvec = { workspace = true, features = ["alloc"] } criterion = { workspace = true } frame-decode = { workspace = true, features = ["legacy-types"] } pezkuwi-subxt-codegen = { workspace = true } +pezkuwi-subxt-utils-stripmetadata = { workspace = true } scale-info = { workspace = true, features = ["bit-vec"] } [lib] diff --git a/vendor/pezkuwi-subxt/metadata/benches/bench.rs b/vendor/pezkuwi-subxt/metadata/benches/bench.rs index d08bf6fd..c243a69a 100644 --- a/vendor/pezkuwi-subxt/metadata/benches/bench.rs +++ b/vendor/pezkuwi-subxt/metadata/benches/bench.rs @@ -11,7 +11,7 @@ use pezkuwi_subxt_metadata::Metadata; use std::{fs, path::Path}; fn load_metadata() -> Metadata { - let bytes = fs::read(Path::new("../artifacts/pezkuwi_metadata_full.scale")) + let bytes = fs::read(Path::new("../artifacts/polkadot_metadata_full.scale")) .expect("Cannot read metadata blob"); let meta: RuntimeMetadataPrefixed = Decode::decode(&mut &*bytes).expect("Cannot decode scale metadata"); diff --git a/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs b/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs index 24b17910..36ab5c7f 100644 --- a/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs +++ b/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs @@ -35,7 +35,8 @@ fn legacy_kusama_metadata(version: u8) -> (u64, RuntimeMetadata) { /// Load our kusama types. /// TODO: This is WRONG at the moment; change to point to kusama types when they exist: fn kusama_types() -> scale_info_legacy::ChainTypeRegistry { - frame_decode::legacy_types::pezkuwi::relay_chain() + // frame-decode is an external crate (v0.15.0) that uses original naming + frame_decode::legacy_types::polkadot::relay_chain() } /// Sanitizing paths changes things between old and new, so disable this in tests by default diff --git a/vendor/pezkuwi-subxt/signer/src/ecdsa.rs b/vendor/pezkuwi-subxt/signer/src/ecdsa.rs index d986af3b..30badcb8 100644 --- a/vendor/pezkuwi-subxt/signer/src/ecdsa.rs +++ b/vendor/pezkuwi-subxt/signer/src/ecdsa.rs @@ -352,7 +352,7 @@ mod test { use super::*; - use sp_core::{self, crypto::Pair as _, ecdsa::Pair as SpPair}; + use pezsp_core::{self, crypto::Pair as _, ecdsa::Pair as SpPair}; #[test] fn check_from_phrase_matches() { @@ -413,7 +413,7 @@ mod test { #[test] fn check_signing_and_verifying_matches() { - use sp_core::ecdsa::Signature as SpSignature; + use pezsp_core::ecdsa::Signature as SpSignature; for _ in 0..20 { let (sp_pair, phrase, _seed) = SpPair::generate_with_phrase(Some("Testing")); diff --git a/vendor/pezkuwi-subxt/signer/src/sr25519.rs b/vendor/pezkuwi-subxt/signer/src/sr25519.rs index ba89dce3..414b05c5 100644 --- a/vendor/pezkuwi-subxt/signer/src/sr25519.rs +++ b/vendor/pezkuwi-subxt/signer/src/sr25519.rs @@ -341,7 +341,7 @@ mod test { use super::*; - use sp_core::{self, crypto::Pair as _, sr25519::Pair as SpPair}; + use pezsp_core::{self, crypto::Pair as _, sr25519::Pair as SpPair}; #[test] fn check_from_phrase_matches() { @@ -399,7 +399,7 @@ mod test { #[test] fn check_dev_accounts_match() { - use sp_keyring::sr25519::Keyring::*; + use pezsp_keyring::sr25519::Keyring::*; assert_eq!(dev::alice().public_key().0, Alice.public().0); assert_eq!(dev::bob().public_key().0, Bob.public().0); @@ -413,7 +413,7 @@ mod test { #[test] fn check_signing_and_verifying_matches() { - use sp_core::sr25519::Signature as SpSignature; + use pezsp_core::sr25519::Signature as SpSignature; for _ in 0..20 { let (sp_pair, phrase, _seed) = SpPair::generate_with_phrase(Some("Testing")); diff --git a/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs b/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs index 8584e944..a6c2c8df 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs @@ -6,10 +6,10 @@ #![allow(missing_docs, unused)] -use pezkuwi_subxt::{config::bizinikiwi::MultiAddress, Config, OnlineClient, PezkuwiConfig}; -use sp_core::{sr25519, Pair as _}; +use pezkuwi_subxt::{Config, OnlineClient, PezkuwiConfig}; +use pezsp_core::{sr25519, Pair as _}; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} /// A concrete PairSigner implementation which relies on `sr25519::Pair` for signing @@ -20,7 +20,7 @@ mod pair_signer { config::bizinikiwi::{AccountId32, MultiSignature}, tx::Signer, }; - use sp_runtime::{ + use pezsp_runtime::{ traits::{IdentifyAccount, Verify}, MultiSignature as SpMultiSignature, }; @@ -90,7 +90,7 @@ async fn main() -> Result<(), Box> { let dest = { let acc = sr25519::Pair::from_string("//Bob", None)?; - MultiAddress::Address32(acc.public().0) + pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Address32(acc.public().0) }; // Build a balance transfer extrinsic. diff --git a/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs b/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs index 3fbaa044..93d39f06 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs @@ -1,15 +1,17 @@ #![allow(missing_docs)] use pezkuwi_subxt::{ - utils::{AccountId32, MultiAddress}, + utils::{AccountId32 as UtilAccountId32, MultiAddress as UtilMultiAddress}, OnlineClient, PezkuwiConfig, }; use codec::Decode; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} use pezkuwi::balances::calls::types::TransferKeepAlive; +use pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress; +use pezkuwi::runtime_types::sp_core::crypto::AccountId32; #[tokio::main] async fn main() -> Result<(), Box> { @@ -37,9 +39,10 @@ async fn main() -> Result<(), Box> { let addr_bytes = transfer.details.address_bytes().expect("TransferKeepAlive should be signed"); - let sender = MultiAddress::::decode(&mut &addr_bytes[..]) + // Use utility types for decoding as they implement the Decode trait + let sender = UtilMultiAddress::::decode(&mut &addr_bytes[..]) .expect("Decoding should work"); - let sender = display_address(&sender); + let sender = display_util_address(&sender); let receiver = display_address(&transfer.value.dest); let value = transfer.value.value; let tip = extensions.tip().expect("Should have tip"); @@ -56,6 +59,14 @@ async fn main() -> Result<(), Box> { fn display_address(addr: &MultiAddress) -> String { if let MultiAddress::Id(id32) = addr { + format!("{id32:?}") + } else { + "MultiAddress::...".into() + } +} + +fn display_util_address(addr: &UtilMultiAddress) -> String { + if let UtilMultiAddress::Id(id32) = addr { format!("{id32}") } else { "MultiAddress::...".into() diff --git a/vendor/pezkuwi-subxt/subxt/examples/blocks_subscribing.rs b/vendor/pezkuwi-subxt/subxt/examples/blocks_subscribing.rs index 5bca0b0d..a365bf12 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/blocks_subscribing.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/blocks_subscribing.rs @@ -1,7 +1,7 @@ #![allow(missing_docs)] use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] diff --git a/vendor/pezkuwi-subxt/subxt/examples/constants_static.rs b/vendor/pezkuwi-subxt/subxt/examples/constants_static.rs index f16017a0..f1a316ff 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/constants_static.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/constants_static.rs @@ -1,7 +1,7 @@ #![allow(missing_docs)] use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] diff --git a/vendor/pezkuwi-subxt/subxt/examples/events.rs b/vendor/pezkuwi-subxt/subxt/examples/events.rs index 297bd42e..482f53c7 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/events.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/events.rs @@ -1,7 +1,7 @@ #![allow(missing_docs)] use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] diff --git a/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs b/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs index 0403e15b..fb156254 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs @@ -3,12 +3,12 @@ use futures::StreamExt; use pezkuwi_subxt::{client::OnlineClient, lightclient::LightClient, PezkuwiConfig}; // Generate an interface that we can use from the node's metadata. -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} -const POLKADOT_SPEC: &str = include_str!("../../artifacts/demo_chain_specs/pezkuwi.json"); +const POLKADOT_SPEC: &str = include_str!("../../artifacts/demo_chain_specs/polkadot.json"); const ASSET_HUB_SPEC: &str = - include_str!("../../artifacts/demo_chain_specs/pezkuwi_asset_hub.json"); + include_str!("../../artifacts/demo_chain_specs/polkadot_asset_hub.json"); #[tokio::main] async fn main() -> Result<(), Box> { diff --git a/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs b/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs index 3fb488b5..5e57a454 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs @@ -8,7 +8,7 @@ use pezkuwi_subxt::{ use pezkuwi_subxt_signer::sr25519::dev; // Generate an interface that we can use from the node's metadata. -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -35,7 +35,9 @@ async fn main() -> Result<(), Box> { let api = OnlineClient::::from_rpc_client(chain_rpc).await?; // Build a balance transfer extrinsic. - let dest = dev::bob().public_key().into(); + let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id( + pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0), + ); let balance_transfer_tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000); // Submit the balance transfer extrinsic from Alice, and wait for it to be successful diff --git a/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs b/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs index f6dee0a6..2d05f3f6 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs @@ -6,7 +6,7 @@ use pezkuwi_subxt::{ }; use pezkuwi_subxt_signer::sr25519::dev; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -37,13 +37,17 @@ async fn main() -> Result<(), Box> { let bob = dev::bob(); loop { - let current_nonce = rpc.system_account_next_index(&alice.public_key().into()).await?; + let alice_account_id = pezkuwi_subxt::config::bizinikiwi::AccountId32(alice.public_key().0); + let current_nonce = rpc.system_account_next_index(&alice_account_id).await?; let ext_params = Params::new().mortal(8).nonce(current_nonce).build(); + let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id( + pezkuwi::runtime_types::sp_core::crypto::AccountId32(bob.public_key().0), + ); let balance_transfer = pezkuwi::tx() .balances() - .transfer_allow_death(bob.public_key().into(), 1_000_000); + .transfer_allow_death(dest, 1_000_000); let ext_hash = api .tx() diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs index 3b404ff0..d0074b46 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs @@ -12,7 +12,7 @@ async fn main() -> Result<(), Box> { // `scale_value::Value` type as output, and a vec of those as inputs, // but since we know the input + return types we can pass them directly. // There is one input argument, so the inputs are a tuple of one element. - let account: AccountId32 = dev::alice().public_key().into(); + let account = AccountId32(dev::alice().public_key().0); let runtime_api_call = pezkuwi_subxt::dynamic::runtime_api_call::<_, u64>( "AccountNonceApi", "account_nonce", diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs index 4c30f650..9c40bc5d 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs @@ -7,7 +7,7 @@ use pezkuwi_subxt::{ OnlineClient, PezkuwiConfig, }; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs index 6e9a4eff..370c551b 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs @@ -2,7 +2,7 @@ use pezkuwi_subxt::{config::PezkuwiConfig, OnlineClient}; use pezkuwi_subxt_signer::sr25519::dev; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -12,7 +12,7 @@ async fn main() -> Result<(), Box> { // Create a runtime API payload that calls into // `AccountNonceApi_account_nonce` function. - let account = dev::alice().public_key().into(); + let account = pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::alice().public_key().0); let runtime_api_call = pezkuwi::apis().account_nonce_api().account_nonce(account); // Submit the call and get back a result. diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs index 66736b53..d1ae279d 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs @@ -21,7 +21,7 @@ async fn main() -> Result<(), Box> { // 3. Metadata (I'll load it from the downloaded metadata, but you can use `subxt metadata > // file.scale` to download it): let metadata = { - let bytes = std::fs::read("./artifacts/pezkuwi_metadata_small.scale").unwrap(); + let bytes = std::fs::read("./artifacts/polkadot_metadata_small.scale").unwrap(); Metadata::decode(&mut &*bytes).unwrap() }; diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs index 3f4b6ee3..6c552a63 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs @@ -5,7 +5,7 @@ use pezkuwi_subxt::config::{ use pezkuwi_subxt_signer::sr25519::dev; #[pezkuwi_subxt::subxt( - runtime_metadata_path = "../artifacts/pezkuwi_metadata_full.scale", + runtime_metadata_path = "../artifacts/polkadot_metadata_full.scale", derive_for_type( path = "staging_xcm::v3::multilocation::MultiLocation", derive = "Clone, codec::Encode", diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs index 86c564eb..0d135cf5 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs @@ -9,7 +9,7 @@ use pezkuwi_subxt::{ }; use pezkuwi_subxt_signer::sr25519::dev; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_full.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_full.scale")] pub mod runtime {} // We don't need to construct this at runtime, diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs index bce6fea7..bd71f0e9 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs @@ -11,7 +11,7 @@ use pezkuwi_subxt_signer::sr25519::dev; use scale_encode::EncodeAsType; use scale_info::PortableRegistry; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod runtime {} // We don't need to construct this at runtime, diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs index d25bee58..0d1d41ec 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs @@ -15,7 +15,7 @@ use pezkuwi_subxt::{ }; // Generate an interface that we can use from the node's metadata. -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs index e5aeb5f2..0fde3e73 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs @@ -12,7 +12,7 @@ use pezkuwi_subxt::{ }; // Generate an interface that we can use from the node's metadata. -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs index 76f073ca..fe25784d 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs @@ -3,14 +3,14 @@ use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; use pezkuwi_subxt_signer::sr25519::dev; // Generate an interface that we can use from the node's metadata. -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] async fn main() -> Result<(), Box> { // Create a new API client, configured to talk to Pezkuwi nodes. let api = OnlineClient::::new().await?; - let account = dev::alice().public_key().into(); + let account = pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::alice().public_key().0); // Build a storage query to access account information. let storage_query = pezkuwi::storage().system().account(); diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs index 5e991a2c..ce2bf5d8 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs @@ -15,7 +15,7 @@ async fn main() -> Result<(), Box> { // here, we assume that there is one value to provide at this entry // to access a value; an AccountId32. In this example we don't know the // return type and so we set it to `Value`, which anything can decode into. - let account: AccountId32 = dev::alice().public_key().into(); + let account = AccountId32(dev::alice().public_key().0); let storage_query = pezkuwi_subxt::dynamic::storage::<(AccountId32,), Value>("System", "Account"); diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs index 6b312b91..84be614f 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs @@ -2,7 +2,7 @@ use pezkuwi_subxt::{ext::futures::StreamExt, OnlineClient, PezkuwiConfig}; // Generate an interface that we can use from the node's metadata. -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -34,7 +34,7 @@ async fn main() -> Result<(), Box> { let value = kv.value().decode()?; let value_data = value.data; - println!("{account_id32}:\n {value_data:?}"); + println!("{account_id32:?}:\n {value_data:?}"); } Ok(()) diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs index 56993482..31248390 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs @@ -3,7 +3,7 @@ use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; use pezkuwi_subxt_signer::sr25519::dev; // Generate an interface that we can use from the node's metadata. -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -12,7 +12,9 @@ async fn main() -> Result<(), Box> { let api = OnlineClient::::new().await?; // Build a balance transfer extrinsic. - let dest = dev::bob().public_key().into(); + let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id( + pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0), + ); let balance_transfer_tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000); // Submit the balance transfer extrinsic from Alice, and wait for it to be successful diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs index 941098ff..ec9386ef 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs @@ -2,7 +2,7 @@ use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; use pezkuwi_subxt_signer::sr25519::dev; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -27,7 +27,9 @@ async fn main() -> Result<(), Box> { } fn balance_transfer() -> Box { - let dest = dev::bob().public_key().into(); + let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id( + pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0), + ); Box::new(pezkuwi::tx().balances().transfer_allow_death(dest, 10_000)) } diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs index a37fa539..08f1b148 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs @@ -4,7 +4,7 @@ use pezkuwi_subxt_signer::sr25519::dev; type BoxedError = Box; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -19,7 +19,9 @@ async fn signing_example() -> Result<(), BoxedError> { let api = OnlineClient::::new().await?; // Build a balance transfer extrinsic. - let dest = dev::bob().public_key().into(); + let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id( + pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0), + ); let balance_transfer_tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000); let alice = dev::alice(); diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs index 88649850..fc408223 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs @@ -3,7 +3,7 @@ use pezkuwi_subxt::{tx::TxStatus, OnlineClient, PezkuwiConfig}; use pezkuwi_subxt_signer::sr25519::dev; // Generate an interface that we can use from the node's metadata. -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -12,7 +12,9 @@ async fn main() -> Result<(), Box> { let api = OnlineClient::::new().await?; // Build a balance transfer extrinsic. - let dest = dev::bob().public_key().into(); + let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id( + pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0), + ); let balance_transfer_tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000); // Submit the balance transfer extrinsic from Alice, and then monitor the diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs index 45a729a8..6532a49c 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs @@ -4,7 +4,7 @@ use pezkuwi_subxt::{ }; use pezkuwi_subxt_signer::sr25519::dev; -#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] +#[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_small.scale")] pub mod pezkuwi {} #[tokio::main] @@ -13,7 +13,9 @@ async fn main() -> Result<(), Box> { let api = OnlineClient::::new().await?; // Build a balance transfer extrinsic. - let dest = dev::bob().public_key().into(); + let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id( + pezkuwi::runtime_types::sp_core::crypto::AccountId32(dev::bob().public_key().0), + ); let tx = pezkuwi::tx().balances().transfer_allow_death(dest, 10_000); // Configure the transaction parameters; we give a small tip and set the diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs b/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs index 75dede66..031fa483 100644 --- a/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs @@ -468,7 +468,7 @@ mod test { // Decode the storage key as first item from sequence of params: let params = params.map(|p| p.get().to_string()); let rpc_params = jsonrpsee::types::Params::new(params.as_deref()); - let key: sp_core::Bytes = rpc_params.sequence().next().unwrap(); + let key: pezsp_core::Bytes = rpc_params.sequence().next().unwrap(); let key = std::str::from_utf8(&key.0).unwrap(); // Fetch the response to use from our map, popping it from the front. let values = values.get_mut(key).unwrap(); diff --git a/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs b/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs index 400000d3..ddaec37e 100644 --- a/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs +++ b/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs @@ -864,7 +864,7 @@ mod test { #[test] fn transaction_validity_decoding_is_ok() { - use sp_runtime::{ + use pezsp_runtime::{ transaction_validity as sp, transaction_validity::TransactionValidity as T, }; diff --git a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_omni_node.rs b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_omni_node.rs index e8629c96..79fc7998 100644 --- a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_omni_node.rs +++ b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_omni_node.rs @@ -40,7 +40,7 @@ async fn rococo_local_with_omni_node_and_wasm_runtime() { // omni-collator-1 let collator = network.get_node("omni-collator-1").unwrap(); - let client = collator.wait_client::().await.unwrap(); + let client = collator.wait_client::().await.unwrap(); // wait 1 blocks let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(1); @@ -50,7 +50,7 @@ async fn rococo_local_with_omni_node_and_wasm_runtime() { // omni-collator-2 let collator = network.get_node("omni-collator-2").unwrap(); - let client = collator.wait_client::().await.unwrap(); + let client = collator.wait_client::().await.unwrap(); // wait 1 blocks let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(1); diff --git a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_polkadot.rs b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_polkadot.rs index ab726291..d29aef71 100644 --- a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_polkadot.rs +++ b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/chain_spec_runtime_polkadot.rs @@ -41,7 +41,7 @@ async fn polkadot_local_with_chain_spec_runtime() { // asset-hub-collator-1 let collator = network.get_node("asset-hub-collator-1").unwrap(); - let client = collator.wait_client::().await.unwrap(); + let client = collator.wait_client::().await.unwrap(); // wait 1 blocks let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(1); @@ -51,7 +51,7 @@ async fn polkadot_local_with_chain_spec_runtime() { // asset-hub-collator-2 let collator = network.get_node("asset-hub-collator-2").unwrap(); - let client = collator.wait_client::().await.unwrap(); + let client = collator.wait_client::().await.unwrap(); // wait 1 blocks let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(1); diff --git a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/smoke.rs b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/smoke.rs index b4c28897..d31430c7 100644 --- a/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/smoke.rs +++ b/vendor/pezkuwi-zombienet-sdk/crates/sdk/tests/smoke.rs @@ -62,7 +62,7 @@ async fn ci_k8s_basic_functionalities_should_works() { let (_best_block_pass, client) = try_join!( alice.wait_metric(BEST_BLOCK_METRIC, |x| x > 5_f64), - alice.wait_client::() + alice.wait_client::() ) .unwrap(); @@ -104,7 +104,7 @@ async fn ci_k8s_basic_functionalities_should_works() { // collator let collator = network.get_node("collator").unwrap(); - let client = collator.wait_client::().await.unwrap(); + let client = collator.wait_client::().await.unwrap(); // wait 3 blocks let mut blocks = client.blocks().subscribe_finalized().await.unwrap().take(3); @@ -143,7 +143,7 @@ async fn ci_k8s_basic_functionalities_should_works() { collator.pause().await.unwrap(); tokio::time::sleep(tokio::time::Duration::from_millis(100)).await; - let r = collator.wait_client_with_timeout::(1_u32).await; + let r = collator.wait_client_with_timeout::(1_u32).await; assert!(r.is_err()); // tear down (optional if you don't detach the network)