da7b7a0f60
## Issue Addressed Resolves #3159 ## Proposed Changes Sends transactions to the EE before requesting for a payload in the `execution_integration_tests`. Made some changes to the integration tests in order to be able to sign and publish transactions to the EE: 1. `genesis.json` for both geth and nethermind was modified to include pre-funded accounts that we know private keys for 2. Using the unauthenticated port again in order to make `eth_sendTransaction` and calls from the `personal` namespace to import keys Also added a `fcu` call with `PayloadAttributes` before calling `getPayload` in order to give EEs sufficient time to pack transactions into the payload.
123 lines
4.0 KiB
Rust
123 lines
4.0 KiB
Rust
use crate::build_utils;
|
|
use crate::execution_engine::GenericExecutionEngine;
|
|
use crate::genesis_json::nethermind_genesis_json;
|
|
use std::env;
|
|
use std::fs::File;
|
|
use std::path::{Path, PathBuf};
|
|
use std::process::{Child, Command, Output};
|
|
use tempfile::TempDir;
|
|
use unused_port::unused_tcp_port;
|
|
|
|
const NETHERMIND_BRANCH: &str = "master";
|
|
const NETHERMIND_REPO_URL: &str = "https://github.com/NethermindEth/nethermind";
|
|
|
|
fn build_result(repo_dir: &Path) -> Output {
|
|
Command::new("dotnet")
|
|
.arg("build")
|
|
.arg("src/Nethermind/Nethermind.sln")
|
|
.arg("-c")
|
|
.arg("Release")
|
|
.current_dir(repo_dir)
|
|
.output()
|
|
.expect("failed to make nethermind")
|
|
}
|
|
|
|
pub fn build(execution_clients_dir: &Path) {
|
|
let repo_dir = execution_clients_dir.join("nethermind");
|
|
|
|
if !repo_dir.exists() {
|
|
// Clone the repo
|
|
build_utils::clone_repo(execution_clients_dir, NETHERMIND_REPO_URL).unwrap()
|
|
}
|
|
|
|
// Get the latest tag
|
|
let last_release = build_utils::get_latest_release(&repo_dir, NETHERMIND_BRANCH).unwrap();
|
|
build_utils::checkout(&repo_dir, dbg!(&last_release)).unwrap();
|
|
|
|
// Build nethermind
|
|
build_utils::check_command_output(build_result(&repo_dir), || {
|
|
format!("nethermind build failed using release {last_release}")
|
|
});
|
|
|
|
// Build nethermind a second time to enable Merge-related features.
|
|
// Not sure why this is necessary.
|
|
build_utils::check_command_output(build_result(&repo_dir), || {
|
|
format!("nethermind build failed using release {last_release}")
|
|
});
|
|
}
|
|
|
|
/*
|
|
* Nethermind-specific Implementation for GenericExecutionEngine
|
|
*/
|
|
|
|
#[derive(Clone)]
|
|
pub struct NethermindEngine;
|
|
|
|
impl NethermindEngine {
|
|
fn binary_path() -> PathBuf {
|
|
let manifest_dir: PathBuf = env::var("CARGO_MANIFEST_DIR").unwrap().into();
|
|
manifest_dir
|
|
.join("execution_clients")
|
|
.join("nethermind")
|
|
.join("src")
|
|
.join("Nethermind")
|
|
.join("Nethermind.Runner")
|
|
.join("bin")
|
|
.join("Release")
|
|
.join("net6.0")
|
|
.join("Nethermind.Runner")
|
|
}
|
|
}
|
|
|
|
impl GenericExecutionEngine for NethermindEngine {
|
|
fn init_datadir() -> TempDir {
|
|
let datadir = TempDir::new().unwrap();
|
|
let genesis_json_path = datadir.path().join("genesis.json");
|
|
let mut file = File::create(&genesis_json_path).unwrap();
|
|
let json = nethermind_genesis_json();
|
|
serde_json::to_writer(&mut file, &json).unwrap();
|
|
datadir
|
|
}
|
|
|
|
fn start_client(
|
|
datadir: &TempDir,
|
|
http_port: u16,
|
|
http_auth_port: u16,
|
|
jwt_secret_path: PathBuf,
|
|
) -> Child {
|
|
let network_port = unused_tcp_port().unwrap();
|
|
let genesis_json_path = datadir.path().join("genesis.json");
|
|
|
|
Command::new(Self::binary_path())
|
|
.arg("--datadir")
|
|
.arg(datadir.path().to_str().unwrap())
|
|
.arg("--config")
|
|
.arg("kiln")
|
|
.arg("--Init.ChainSpecPath")
|
|
.arg(genesis_json_path.to_str().unwrap())
|
|
.arg("--Merge.TerminalTotalDifficulty")
|
|
.arg("0")
|
|
.arg("--JsonRpc.Enabled")
|
|
.arg("true")
|
|
.arg("--JsonRpc.EnabledModules")
|
|
.arg("net,eth,subscribe,web3,admin,personal")
|
|
.arg("--JsonRpc.Port")
|
|
.arg(http_port.to_string())
|
|
.arg("--JsonRpc.AdditionalRpcUrls")
|
|
.arg(format!(
|
|
"http://localhost:{}|http;ws|net;eth;subscribe;engine;web3;client",
|
|
http_auth_port
|
|
))
|
|
.arg("--Network.DiscoveryPort")
|
|
.arg(network_port.to_string())
|
|
.arg("--Network.P2PPort")
|
|
.arg(network_port.to_string())
|
|
.arg("--JsonRpc.JwtSecretFile")
|
|
.arg(jwt_secret_path.as_path().to_str().unwrap())
|
|
.stdout(build_utils::build_stdio())
|
|
.stderr(build_utils::build_stdio())
|
|
.spawn()
|
|
.expect("failed to start nethermind")
|
|
}
|
|
}
|