[pallet-revive] Add metrics to eth-rpc

prdoc/pr_6288.prdoc

@@ -0,0 +1,7 @@
+title: '[pallet-revive] Add metrics to eth-rpc'
+doc:
+- audience: Runtime Dev
+  description: Add metrics for eth-rpc
+crates:
+- name: pallet-revive-eth-rpc
+  bump: minor

substrate/client/cli/src/signals.rs

@@ -89,4 +89,19 @@ impl Signals {
 
 		Ok(())
 	}
+
+	/// Execute the future task and returns it's value if it completes before the signal.
+	pub async fn try_until_signal<F, T>(self, func: F) -> Result<T, ()>
+	where
+		F: Future<Output = T> + future::FusedFuture,
+	{
+		let signals = self.future().fuse();
+
+		pin_mut!(func, signals);
+
+		select! {
+			s = signals => Err(s),
+			res = func => Ok(res),
+		}
+	}
 }

substrate/frame/revive/rpc/Cargo.toml

@@ -51,16 +51,14 @@ subxt = { workspace = true, default-features = true, features = [
 tokio = { workspace = true, features = ["full"] }
 codec = { workspace = true, features = ["derive"] }
 log.workspace = true
-tracing-subscriber.workspace = true
 pallet-revive = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-weights = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
-
-tower.workspace = true
-tower-http = { workspace = true, features = ["full"] }
-hyper.workspace = true
+sc-cli = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
 
 rlp = { workspace = true, optional = true }
 subxt-signer = { workspace = true, optional = true, features = [
@@ -73,7 +71,6 @@ secp256k1 = { workspace = true, optional = true, features = ["recovery"] }
 env_logger = { workspace = true }
 
 [features]
-dev = []
 example = ["hex", "hex-literal", "rlp", "secp256k1", "subxt-signer"]
 riscv = ["pallet-revive/riscv"]
 

substrate/frame/revive/rpc/Dockerfile

@@ -2,7 +2,8 @@ FROM rust AS builder
 
 RUN apt-get update && \
 		DEBIAN_FRONTEND=noninteractive apt-get install -y \
-		protobuf-compiler
+		protobuf-compiler \
+		clang libclang-dev
 
 WORKDIR /polkadot
 COPY . /polkadot
@@ -19,5 +20,11 @@ RUN useradd -m -u 1001 -U -s /bin/sh -d /polkadot polkadot && \
 	/usr/local/bin/eth-rpc --help
 
 USER polkadot
-EXPOSE 8545
+
+# 8545 is the default port for the RPC server
+# 9616 is the default port for the prometheus metrics
+EXPOSE 8545 9616
 ENTRYPOINT ["/usr/local/bin/eth-rpc"]
+
+# We call the help by default
+CMD ["--help"]

substrate/frame/revive/rpc/examples/js/src/script.ts

@@ -18,7 +18,7 @@ function str_to_bytes(str: string): Uint8Array {
 async function deploy() {
   console.log(`Deploying Contract...`);
 
-  const bytecode = readFileSync("rpc_demo.polkavm");
+  const bytecode = readFileSync("../rpc_demo.polkavm");
   const contractFactory = new ContractFactory(
     [
       "constructor(bytes memory _data)",