merge: resolve conflicts from main (keep development changes)

bizinikiwi/pezframe/revive/rpc/dockerfiles/eth-rpc/Dockerfile

@@ -11,7 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 RUN cargo fetch
-RUN cargo build --locked --profile production -p pezpallet-revive-eth-rpc --bin eth-rpc
+# SKIP_WASM_BUILD=1 avoids serde_core + build-std conflict (upstream issue: serde-rs/serde#3021)
+RUN SKIP_WASM_BUILD=1 cargo build --locked --profile production -p pezpallet-revive-eth-rpc --bin eth-rpc
 
 FROM docker.io/parity/base-bin:latest
 COPY --from=builder /pezkuwi/target/production/eth-rpc /usr/local/bin

bizinikiwi/primitives/core/Cargo.toml

@@ -152,7 +152,6 @@ serde = [
 	"log/serde",
 	"parking_lot?/serde",
 	"pezsp-storage/serde",
-	"primitive-types/serde",
 	"primitive-types/serde_no_std",
 	"rand?/serde",
 	"scale-info/serde",

vendor/pezkuwi-subxt/signer/Cargo.toml

@@ -71,6 +71,7 @@ web = ["getrandom/js"]
 serde = [
 	"bip39/serde",
 	"codec/serde",
+	"dep:serde",
 	"hex/serde",
 	"pezsp-core/serde",
 	"schnorrkel?/serde",

zombienet-alpha.toml

@@ -0,0 +1,51 @@
+[settings]
+timeout = 300
+provider = "native"
+
+[relaychain]
+default_command = "/home/mamostehp/pezkuwi-sdk/target/release/pezkuwi"
+chain = "pezkuwichain-local"
+default_args = ["--unsafe-force-node-key-generation", "-lteyrchain=debug"]
+
+# Validator 1: Alice
+[[relaychain.nodes]]
+name = "alice"
+validator = true
+rpc_port = 9944
+
+# Validator 2: Bob
+[[relaychain.nodes]]
+name = "bob"
+validator = true
+rpc_port = 9946
+
+# Validator 3: Charlie
+[[relaychain.nodes]]
+name = "charlie"
+validator = true
+rpc_port = 9947
+
+# Validator 4: Dave
+[[relaychain.nodes]]
+name = "dave"
+validator = true
+rpc_port = 9948
+
+# Asset Hub Teyrchain
+[[teyrchains]]
+id = 1000
+chain = "asset-hub-pezkuwichain-local"
+cumulus_based = true
+add_to_genesis = true
+
+[[teyrchains.collators]]
+name = "asset-hub-collator-1"
+command = "/home/mamostehp/pezkuwi-sdk/target/release/pezkuwi-teyrchain"
+rpc_port = 9945
+args = ["--unsafe-force-node-key-generation", "-lteyrchain=debug"]
+
+[[teyrchains.collators]]
+name = "asset-hub-collator-2"
+command = "/home/mamostehp/pezkuwi-sdk/target/release/pezkuwi-teyrchain"
+rpc_port = 9949
+args = ["--unsafe-force-node-key-generation", "-lteyrchain=debug"]