From 6f77f98093f7158af557b23ce5a52672ec78345b Mon Sep 17 00:00:00 2001 From: pgherveou Date: Tue, 9 Dec 2025 13:42:56 +0100 Subject: [PATCH 1/4] Fix eth-rpc publish --- Cargo.lock | 24 +++++++++---------- Cargo.toml | 2 +- substrate/frame/revive/rpc/build.rs | 4 +++- .../frame/revive/rpc/src/subxt_client.rs | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d129f4eea452c..22476b64cac60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6787,7 +6787,7 @@ dependencies = [ "sp-version", "sp-wasm-interface 20.0.0", "substrate-test-runtime", - "subxt 0.43.0", + "subxt 0.43.1", "subxt-signer 0.43.0", "thiserror 1.0.65", "thousands", @@ -13365,7 +13365,7 @@ dependencies = [ "sp-weights", "sqlx", "substrate-prometheus-endpoint", - "subxt 0.43.0", + "subxt 0.43.1", "subxt-signer 0.43.0", "thiserror 1.0.65", "tokio", @@ -17410,7 +17410,7 @@ dependencies = [ "sp-core 28.0.0", "sp-io", "substrate-build-script-utils", - "subxt 0.43.0", + "subxt 0.43.1", "tokio", "tokio-util", "zombienet-orchestrator", @@ -20882,7 +20882,7 @@ dependencies = [ "sp-state-machine", "sp-version", "sp-wasm-interface 20.0.0", - "subxt 0.43.0", + "subxt 0.43.1", "thiserror 1.0.65", ] @@ -24868,7 +24868,7 @@ dependencies = [ "anyhow", "env_logger 0.11.3", "log", - "subxt 0.43.0", + "subxt 0.43.1", "subxt-signer 0.43.0", "tokio", "zombienet-configuration", @@ -24933,9 +24933,9 @@ dependencies = [ [[package]] name = "subxt" -version = "0.43.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74791ddeaaa6de42e7cc8a715c83eb73303f513f90af701fd07eb2caad92ed84" +checksum = "f8c6dc0f90e23c521465b8f7e026af04a48cc6f00c51d88a8d313d33096149de" dependencies = [ "async-trait", "derive-where", @@ -24956,7 +24956,7 @@ dependencies = [ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "subxt-core 0.43.0", "subxt-lightclient 0.43.0", - "subxt-macro 0.43.0", + "subxt-macro 0.43.1", "subxt-metadata 0.43.0", "subxt-rpcs 0.43.0", "thiserror 2.0.12", @@ -25114,9 +25114,9 @@ dependencies = [ [[package]] name = "subxt-macro" -version = "0.43.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69516e8ff0e9340a0f21b8398da7f997571af4734ee81deada5150a2668c8443" +checksum = "c269228a2e5de4c0c61ed872b701967ee761df0f167d5b91ecec1185bca65793" dependencies = [ "darling 0.20.10", "parity-scale-codec", @@ -28693,7 +28693,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "sp-core 36.1.0", - "subxt 0.43.0", + "subxt 0.43.1", "subxt-signer 0.43.0", "thiserror 1.0.65", "tokio", @@ -28756,7 +28756,7 @@ dependencies = [ "async-trait", "futures", "lazy_static", - "subxt 0.43.0", + "subxt 0.43.1", "subxt-signer 0.43.0", "tokio", "zombienet-configuration", diff --git a/Cargo.toml b/Cargo.toml index afae7745fd78d..5cdfb909646a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1413,7 +1413,7 @@ substrate-test-runtime-client = { path = "substrate/test-utils/runtime/client" } substrate-test-runtime-transaction-pool = { path = "substrate/test-utils/runtime/transaction-pool" } substrate-test-utils = { path = "substrate/test-utils" } substrate-wasm-builder = { path = "substrate/utils/wasm-builder", default-features = false } -subxt = { version = "0.43", default-features = false } +subxt = { version = "0.43.1", default-features = false } subxt-metadata = { version = "0.43", default-features = false } subxt-signer = { version = "0.43" } syn = { version = "2.0.87" } diff --git a/substrate/frame/revive/rpc/build.rs b/substrate/frame/revive/rpc/build.rs index 5315bd4a0474f..b37b23d4562f5 100644 --- a/substrate/frame/revive/rpc/build.rs +++ b/substrate/frame/revive/rpc/build.rs @@ -57,6 +57,8 @@ fn generate_metadata_file() { ext.execute_with(|| { let metadata = revive_dev_runtime::Runtime::metadata_at_version(16).unwrap(); let bytes: &[u8] = &metadata; - fs::write("revive_chain.scale", bytes).unwrap(); + let out_dir = std::env::var("OUT_DIR").expect("OUT_DIR not set"); + let out_path = std::path::Path::new(&out_dir).join("revive_chain.scale"); + fs::write(out_path, bytes).unwrap(); }); } diff --git a/substrate/frame/revive/rpc/src/subxt_client.rs b/substrate/frame/revive/rpc/src/subxt_client.rs index bd9666aba8b3e..f36a565928e49 100644 --- a/substrate/frame/revive/rpc/src/subxt_client.rs +++ b/substrate/frame/revive/rpc/src/subxt_client.rs @@ -20,7 +20,7 @@ pub use subxt::config::PolkadotConfig as SrcChainConfig; #[subxt::subxt( - runtime_metadata_path = "revive_chain.scale", + runtime_metadata_path = "$OUT_DIR/revive_chain.scale", // TODO remove once subxt use the same U256 type substitute_type( path = "primitive_types::U256", From efedcbf1ed1d17d6f45195ea326e5b099144b9a1 Mon Sep 17 00:00:00 2001 From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 12:55:40 +0000 Subject: [PATCH 2/4] Update from github-actions[bot] running command 'prdoc --audience runtime_dev --bump patch' --- prdoc/pr_10580.prdoc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 prdoc/pr_10580.prdoc diff --git a/prdoc/pr_10580.prdoc b/prdoc/pr_10580.prdoc new file mode 100644 index 0000000000000..1acd600668cf6 --- /dev/null +++ b/prdoc/pr_10580.prdoc @@ -0,0 +1,20 @@ +title: Fix eth-rpc publish +doc: +- audience: Runtime Dev + description: |- + Use the update subxt macro to generatate the metadata in OUT_DIR + not doing so generate the following error when we try to publish the package + + + ``` + error: failed to publish to registry at https://crates.io + + Caused by: + the remote server responded with an error (status 403 Forbidden): this crate exists but you don't seem to be an owner. If you believe this is a mistake, perhaps you need to accept an invitation to be an owner before publishing. + + ``` + + see related subxt changes: https://github.com/paritytech/subxt/pull/2142 +crates: +- name: pallet-revive-eth-rpc + bump: patch From cb92e3015d1e954c98466165259eb1d72b4c411b Mon Sep 17 00:00:00 2001 From: PG Herveou Date: Tue, 9 Dec 2025 20:40:05 +0100 Subject: [PATCH 3/4] Update prdoc/pr_10580.prdoc Co-authored-by: xermicus --- prdoc/pr_10580.prdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prdoc/pr_10580.prdoc b/prdoc/pr_10580.prdoc index 1acd600668cf6..7ceca9e4ef850 100644 --- a/prdoc/pr_10580.prdoc +++ b/prdoc/pr_10580.prdoc @@ -2,7 +2,7 @@ title: Fix eth-rpc publish doc: - audience: Runtime Dev description: |- - Use the update subxt macro to generatate the metadata in OUT_DIR + Use the update subxt macro to generate the metadata in OUT_DIR; not doing so generate the following error when we try to publish the package From 0ea97b04f48b5d9fbe2d2584c4322628f5504d70 Mon Sep 17 00:00:00 2001 From: PG Herveou Date: Tue, 9 Dec 2025 20:40:13 +0100 Subject: [PATCH 4/4] Update prdoc/pr_10580.prdoc Co-authored-by: xermicus --- prdoc/pr_10580.prdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prdoc/pr_10580.prdoc b/prdoc/pr_10580.prdoc index 7ceca9e4ef850..98feed88eb08b 100644 --- a/prdoc/pr_10580.prdoc +++ b/prdoc/pr_10580.prdoc @@ -3,7 +3,7 @@ doc: - audience: Runtime Dev description: |- Use the update subxt macro to generate the metadata in OUT_DIR; - not doing so generate the following error when we try to publish the package + not doing so generates the following error when we try to publish the package: ```