[pallet-revive] Add Ethereum JSON-RPC server

Cargo.toml

@@ -399,6 +399,7 @@ members = [
 	"substrate/frame/revive/fixtures",
 	"substrate/frame/revive/mock-network",
 	"substrate/frame/revive/proc-macro",
+	"substrate/frame/revive/rpc",
 	"substrate/frame/revive/uapi",
 	"substrate/frame/root-offences",
 	"substrate/frame/root-testing",
@@ -958,6 +959,7 @@ pallet-recovery = { path = "substrate/frame/recovery", default-features = false
 pallet-referenda = { path = "substrate/frame/referenda", default-features = false }
 pallet-remark = { default-features = false, path = "substrate/frame/remark" }
 pallet-revive = { path = "substrate/frame/revive", default-features = false }
+pallet-revive-eth-rpc = { path = "substrate/frame/revive/rpc", default-features = false }
 pallet-revive-fixtures = { path = "substrate/frame/revive/fixtures", default-features = false }
 pallet-revive-mock-network = { default-features = false, path = "substrate/frame/revive/mock-network" }
 pallet-revive-proc-macro = { path = "substrate/frame/revive/proc-macro", default-features = false }

prdoc/pr_5953.prdoc

@@ -0,0 +1,11 @@
+title: "[pallet-revive] Ethereum JSON-RPC"
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Add a new Ethereum JSON-RPC server that can be used a substrate chain configured with pallet-revive
+crates:
+  - name: pallet-revive-eth-rpc
+    bump: patch
+  - name: pallet-revive-fixtures
+    bump: patch

substrate/bin/node/runtime/Cargo.toml

@@ -59,6 +59,7 @@ std = [
 	"serde_json/std",
 	"sp-debug-derive/std",
 	"substrate-wasm-builder",
+	"sp-debug-derive/std"
 ]
 runtime-benchmarks = [
 	"pallet-example-mbm/runtime-benchmarks",

substrate/frame/revive/fixtures/build.rs

@@ -65,7 +65,6 @@ mod build {
 	}
 
 	/// Collect all contract entries from the given source directory.
-	/// Contracts that have already been compiled are filtered out.
 	fn collect_entries(contracts_dir: &Path) -> Vec<Entry> {
 		fs::read_dir(contracts_dir)
 			.expect("src dir exists; qed")
@@ -184,7 +183,13 @@ mod build {
 		let fixtures_dir: PathBuf = env::var("CARGO_MANIFEST_DIR")?.into();
 		let contracts_dir = fixtures_dir.join("contracts");
 		let uapi_dir = fixtures_dir.parent().expect("uapi dir exits; qed").join("uapi");
-		let out_dir: PathBuf = env::var("OUT_DIR")?.into();
+		let ws_dir: PathBuf = env::var("CARGO_WORKSPACE_ROOT_DIR")?.into();
+		let out_dir: PathBuf = ws_dir.join("target").join("pallet-revive-fixtures");
+
+		// create out_dir if it does not exist
+		if !out_dir.exists() {
+			fs::create_dir_all(&out_dir)?;
+		}
 
 		// the fixtures have a dependency on the uapi crate
 		println!("cargo::rerun-if-changed={}", fixtures_dir.display());

substrate/frame/revive/fixtures/contracts/demo.rs

@@ -0,0 +1,36 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+#![no_std]
+#![no_main]
+
+use common::input;
+use uapi::{HostFn, HostFnImpl as api};
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {
+	input!(128, data: [u8],);
+	api::deposit_event(&[], data);
+}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+	input!(128, data: [u8],);
+	api::deposit_event(&[], data);
+}

substrate/frame/revive/fixtures/src/lib.rs

@@ -22,10 +22,14 @@ extern crate alloc;
 /// Load a given wasm module and returns a wasm binary contents along with it's hash.
 #[cfg(feature = "std")]
 pub fn compile_module(fixture_name: &str) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
-	let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
+	use anyhow::Context;
+	use std::{env, path::PathBuf};
+	let ws_dir: PathBuf = env::var("CARGO_WORKSPACE_ROOT_DIR")?.into();
+	let out_dir: PathBuf = ws_dir.join("target").join("pallet-revive-fixtures");
 	let fixture_path = out_dir.join(format!("{fixture_name}.polkavm"));
 	log::debug!("Loading fixture from {fixture_path:?}");
-	let binary = std::fs::read(fixture_path)?;
+	let binary = std::fs::read(fixture_path.clone())
+		.with_context(|| format!("fixture not found {fixture_path:?}"))?;
 	let code_hash = sp_io::hashing::keccak_256(&binary);
 	Ok((binary, sp_core::H256(code_hash)))
 }
@@ -40,7 +44,12 @@ pub mod bench {
 	#[cfg(feature = "riscv")]
 	macro_rules! fixture {
 		($name: literal) => {
-			include_bytes!(concat!(env!("OUT_DIR"), "/", $name, ".polkavm"))
+			include_bytes!(concat!(
+				env!("CARGO_WORKSPACE_ROOT_DIR"),
+				"target/pallet-revive-fixtures/",
+				$name,
+				".polkavm"
+			))
 		};
 	}
 	#[cfg(not(feature = "riscv"))]
@@ -63,12 +72,3 @@ pub mod bench {
 		dummy
 	}
 }
-
-#[cfg(test)]
-mod test {
-	#[test]
-	fn out_dir_should_have_compiled_mocks() {
-		let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
-		assert!(out_dir.join("dummy.polkavm").exists());
-	}
-}