Unified client for regular and tracing nodes

.github/workflows/build.yml

@@ -223,6 +223,11 @@ jobs:
         run: |
           env
           cargo build --release --all
+      - name: Build Tracing Node
+        if: contains(github.event.pull_request.labels.*.name, 'A10-evmtracing')
+        run: |
+          env
+          cargo build --release -p moonbeam -p moonbase-runtime --features moonbase-runtime/evm-tracing
       - name: Verify node version
         run: |
           GIT_COMMIT=`git log -1 --format="%H" | cut -c1-7`
@@ -231,6 +236,9 @@ jobs:
           echo "$MB_VERSION" | grep $GIT_COMMIT
       - name: Unit tests
         run: cargo test --release --all
+      - name: Unit tests (tracing)
+        if: contains(github.event.pull_request.labels.*.name, 'A10-evmtracing')
+        run: cargo test --release -p moonbase-runtime -p moonbeam-runtime -p moonriver-runtime --test evm_tracing --features evm-tracing
 
       # We determine whether there are unmodified Cargo.lock files by:
       # 1. Asking git for a list of all modified files
@@ -294,6 +302,18 @@ jobs:
           cd ../tests
           npm install
           node_modules/.bin/mocha --parallel -j 7 -r ts-node/register 'tests/**/test-*.ts'
+      - name: Typescript evm-tracing tests (against dev service)
+        if: contains(github.event.pull_request.labels.*.name, 'A10-evmtracing')
+        env:
+          BINARY_PATH: ../build/moonbeam
+          # `debug` or `trace` require `--wasm-runtime-overrides`. For CI we can provide any directory.
+          ETHAPI_CMD: --ethapi=txpool,debug,trace --wasm-runtime-overrides ../build
+        run: |
+          cd moonbeam-types-bundle
+          npm install
+          cd ../tests
+          npm install
+          node_modules/.bin/mocha --parallel -j 7 -r ts-node/register 'tracing-tests/**/test-*.ts'
 
       # We determine whether there are unmodified package-lock.json files by:
       # 1. Asking git for a list of all modified files
@@ -367,7 +387,7 @@ jobs:
       - name: Build Tracing Node
         run: |
           env
-          cargo build --release -p moonbeam --features evm-tracing
+          cargo build --release -p moonbeam -p moonbase-runtime --features moonbase-runtime/evm-tracing
       - name: Save moonbeam tracing binary
         run: |
           mkdir -p build
@@ -408,7 +428,8 @@ jobs:
       - name: Typescript evm-tracing tests (against dev service)
         env:
           BINARY_PATH: ../build/moonbeam-tracing
-          ETHAPI_CMD: --ethapi=txpool,debug,trace
+          # `debug` or `trace` require `--wasm-runtime-overrides`. For CI we can provide any directory.
+          ETHAPI_CMD: --ethapi=txpool,debug,trace --wasm-runtime-overrides ../build
         run: |
           cd tests
           node_modules/.bin/mocha --parallel -j 7 -r ts-node/register 'tracing-tests/**/test-*.ts'

.vscode/tasks.json

@@ -10,6 +10,15 @@
         "panel": "new"
       }
     },
+    {
+      "label": "Build Moonbeam (debug symbols + tracing)",
+      "type": "shell",
+      "command": "RUSTFLAGS=-g cargo build --release --features=evm-tracing",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      }
+    },
     {
       "label": "Run single test file in debug mode",
       "type": "shell",

Cargo.toml

@@ -19,6 +19,6 @@ panic = 'unwind'
 
 # Fix EVM tracing impact in block production pipeline.
 [patch.crates-io]
-evm = { git = "https://github.com/purestake/evm", branch = "jeremy-optimize-disabled-tracing"}
-evm-runtime = { git = "https://github.com/purestake/evm", branch = "jeremy-optimize-disabled-tracing" }
-evm-gasometer = { git = "https://github.com/purestake/evm", branch = "jeremy-optimize-disabled-tracing" }
+evm = { git = "https://github.com/purestake/evm", branch = "runtime-substitutes-0.30.1"}
+evm-runtime = { git = "https://github.com/purestake/evm", branch = "runtime-substitutes-0.30.1" }
+evm-gasometer = { git = "https://github.com/purestake/evm", branch = "runtime-substitutes-0.30.1" }

client/evm-tracing/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "moonbeam-client-evm-tracing"
+version = '0.1.0'
+authors = ['PureStake']
+edition = '2018'
+homepage = 'https://moonbeam.network'
+license = 'GPL-3.0-only'
+repository = 'https://github.com/PureStake/moonbeam/'
+
+[dependencies]
+moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug" }
+evm-tracing-events = { path = "../../primitives/rpc/evm-tracing-events" }
+ethereum-types = { version = "0.12.0" }
+serde = { version = "1.0", features = ["derive"] }

primitives/rpc/debug/src/proxy/formats/blockscout.rs → client/evm-tracing/src/formatters/blockscout.rs

@@ -14,17 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::proxy::v2::call_list::Listener;
-use crate::single::TransactionTrace;
+use crate::listeners::call_list::Listener;
+use moonbeam_rpc_primitives_debug::api::single::TransactionTrace;
 
-pub struct Response;
+pub struct Formatter;
 
-#[cfg(feature = "std")]
-impl super::TraceResponseBuilder for Response {
+impl super::ResponseFormatter for Formatter {
 	type Listener = Listener;
 	type Response = TransactionTrace;
 
-	fn build(listener: Listener) -> Option<TransactionTrace> {
+	fn format(listener: Listener) -> Option<TransactionTrace> {
 		if let Some(entry) = listener.entries.last() {
 			return Some(TransactionTrace::CallList(
 				entry.into_iter().map(|(_, value)| value.clone()).collect(),

primitives/rpc/debug/src/proxy/formats/mod.rs → client/evm-tracing/src/formatters/mod.rs

@@ -18,14 +18,16 @@ pub mod blockscout;
 pub mod raw;
 pub mod trace_filter;
 
-use crate::proxy::v2::Listener;
-#[cfg(feature = "std")]
+pub use blockscout::Formatter as Blockscout;
+pub use raw::Formatter as Raw;
+pub use trace_filter::Formatter as TraceFilter;
+
+use evm_tracing_events::Listener;
 use serde::Serialize;
 
-#[cfg(feature = "std")]
-pub trait TraceResponseBuilder {
+pub trait ResponseFormatter {
 	type Listener: Listener;
 	type Response: Serialize;
 
-	fn build(listener: Self::Listener) -> Option<Self::Response>;
+	fn format(listener: Self::Listener) -> Option<Self::Response>;
 }

primitives/rpc/debug/src/proxy/formats/raw.rs → client/evm-tracing/src/formatters/raw.rs

@@ -14,17 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::proxy::v2::raw::Listener;
-use crate::single::TransactionTrace;
+use crate::listeners::raw::Listener;
+use moonbeam_rpc_primitives_debug::api::single::TransactionTrace;
 
-pub struct Response;
+pub struct Formatter;
 
-#[cfg(feature = "std")]
-impl super::TraceResponseBuilder for Response {
+impl super::ResponseFormatter for Formatter {
 	type Listener = Listener;
 	type Response = TransactionTrace;
 
-	fn build(listener: Listener) -> Option<TransactionTrace> {
+	fn format(listener: Listener) -> Option<TransactionTrace> {
 		Some(TransactionTrace::Raw {
 			step_logs: listener.step_logs,
 			gas: listener.final_gas.into(),

primitives/rpc/debug/src/proxy/formats/trace_filter.rs → client/evm-tracing/src/formatters/trace_filter.rs

@@ -14,22 +14,23 @@
 // You should have received a copy of the GNU General Public License
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::block::{
-	TransactionTrace, TransactionTraceAction, TransactionTraceOutput, TransactionTraceResult,
+use crate::listeners::call_list::Listener;
+use ethereum_types::H256;
+use moonbeam_rpc_primitives_debug::api::{
+	block::{
+		TransactionTrace, TransactionTraceAction, TransactionTraceOutput, TransactionTraceResult,
+	},
+	single::CallInner,
+	CallResult, CreateResult, CreateType,
 };
-use crate::proxy::v2::call_list::Listener;
-use crate::{single::CallInner, CallResult, CreateResult, CreateType};
 
-pub use ethereum_types::{H160, H256, U256};
+pub struct Formatter;
 
-pub struct Response;
-
-#[cfg(feature = "std")]
-impl super::TraceResponseBuilder for Response {
+impl super::ResponseFormatter for Formatter {
 	type Listener = Listener;
 	type Response = Vec<TransactionTrace>;
 
-	fn build(mut listener: Listener) -> Option<Vec<TransactionTrace>> {
+	fn format(mut listener: Listener) -> Option<Vec<TransactionTrace>> {
 		// Remove empty BTreeMaps pushed to `entries`.
 		// I.e. InvalidNonce or other pallet_evm::runner exits
 		listener.entries.retain(|x| !x.is_empty());

primitives/rpc/debug/src/proxy/types/mod.rs → client/evm-tracing/src/lib.rs

@@ -14,10 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
-pub mod evm_gasometer_types;
-pub mod evm_runtime_types;
-pub mod evm_types;
+//! This crate contains the client-side part that interacts with our "v2" tracing design.
 
-pub use evm_gasometer_types::GasometerEvent;
-pub use evm_runtime_types::RuntimeEvent;
-pub use evm_types::EvmEvent;
+pub mod formatters;
+pub mod listeners;