[pallet-revive] rm checked-in metadata

prdoc/pr_9865.prdoc

@@ -0,0 +1,9 @@
+title: '[pallet-revive] rm checked-in metadata'
+doc:
+- audience: Runtime Dev
+  description: |-
+    Removed eth-rpc generated metadata.
+    The metadata file will now be generated from the build.rs using the AH-westend runtime
+crates:
+- name: pallet-revive-eth-rpc
+  bump: patch

substrate/frame/revive/dev-node/runtime/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "revive-dev-runtime"
 description = "A solochain dev runtime for revive."
-version = "0.0.0"
+version = "0.1.0"
+license = "Apache-2.0"
 authors.workspace = true
 homepage.workspace = true
 repository.workspace = true
 edition.workspace = true
-publish = false
 
 [dependencies]
 array-bytes = { workspace = true }

substrate/frame/revive/rpc/Cargo.toml

@@ -12,6 +12,9 @@ default-run = "eth-rpc"
 [lints]
 workspace = true
 
+[package.metadata.polkadot-sdk]
+exclude-from-umbrella = true
+
 [[bin]]
 name = "eth-rpc"
 path = "src/main.rs"
@@ -53,3 +56,6 @@ substrate-cli-test-utils = { workspace = true }
 
 [build-dependencies]
 git2 = { workspace = true }
+revive-dev-runtime = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }

substrate/frame/revive/rpc/build.rs

@@ -14,10 +14,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-use std::process::Command;
+use std::{fs, process::Command};
 
-/// Get the current branch and commit hash.
 fn main() {
+	generate_git_revision();
+	generate_metadata_file();
+}
+
+fn generate_git_revision() {
 	let output = Command::new("rustc")
 		.arg("--version")
 		.output()
@@ -47,3 +51,12 @@ fn main() {
 	println!("cargo:rustc-env=TARGET={target}");
 	println!("cargo:rustc-env=GIT_REVISION={branch}-{id}");
 }
+
+fn generate_metadata_file() {
+	let mut ext = sp_io::TestExternalities::new(Default::default());
+	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();
+	});
+}

substrate/frame/revive/rpc/dockerfiles/eth-rpc/Dockerfile

@@ -1,23 +1,17 @@
-FROM rust AS builder
-
-RUN apt-get update && \
-		DEBIAN_FRONTEND=noninteractive apt-get install -y \
-		protobuf-compiler \
-		clang libclang-dev
+FROM docker.io/paritytech/ci-unified:latest AS builder
 
 WORKDIR /polkadot
 COPY . /polkadot
-RUN rustup component add rust-src
-RUN cargo build --locked --profile production -p pallet-revive-eth-rpc --bin eth-rpc
+
+RUN cargo fetch
+RUN cargo build --workspace --locked --profile production -p pallet-revive-eth-rpc --bin eth-rpc
 
 FROM docker.io/parity/base-bin:latest
 COPY --from=builder /polkadot/target/production/eth-rpc /usr/local/bin
 
 USER root
 RUN useradd -m -u 1001 -U -s /bin/sh -d /polkadot polkadot && \
-# unclutter and minimize the attack surface
 	rm -rf /usr/bin /usr/sbin && \
-# check if executable works in this container
 	/usr/local/bin/eth-rpc --help
 
 USER polkadot

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.metadata",
+	runtime_metadata_path = "revive_chain.scale",
 	// TODO remove once subxt use the same U256 type
 	substitute_type(
 		path = "primitive_types::U256",

umbrella/Cargo.toml

@@ -874,7 +874,6 @@ node = [
 	"mmr-gadget",
 	"mmr-rpc",
 	"pallet-contracts-mock-network",
-	"pallet-revive-eth-rpc",
 	"pallet-transaction-payment-rpc",
 	"parachains-runtimes-test-utils",
 	"polkadot-approval-distribution",
@@ -2313,11 +2312,6 @@ default-features = false
 optional = true
 path = "../substrate/frame/contracts/mock-network"
 
-[dependencies.pallet-revive-eth-rpc]
-default-features = false
-optional = true
-path = "../substrate/frame/revive/rpc"
-
 [dependencies.pallet-transaction-payment-rpc]
 default-features = false
 optional = true

umbrella/src/lib.rs

@@ -636,10 +636,6 @@ pub use pallet_remark;
 #[cfg(feature = "pallet-revive")]
 pub use pallet_revive;
 
-/// An Ethereum JSON-RPC server for pallet-revive.
-#[cfg(feature = "pallet-revive-eth-rpc")]
-pub use pallet_revive_eth_rpc;
-
 /// Procedural macros used in pallet_revive.
 #[cfg(feature = "pallet-revive-proc-macro")]
 pub use pallet_revive_proc_macro;