Creating telos-reth binary which uses TelosNode from the telos crate

telosnetwork · Aug 12, 2024 · a6011b2 · a6011b2
1 parent 5709852
commit a6011b2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -113,6 +113,7 @@ discv5.workspace = true
 # telos
 reth-node-telos = { workspace = true, optional = true }
 reth-telos-rpc = { workspace = true, optional = true }
+antelope-client = { workspace = true, optional = true }
 
 [target.'cfg(unix)'.dependencies]
 tikv-jemallocator = { version = "0.5.0", optional = true }
@@ -153,8 +154,12 @@ optimism = [
 ethereum = []
 
 telos = [
+    "dep:antelope-client",
     "dep:reth-node-telos",
     "dep:reth-telos-rpc",
+#    "reth-rpc/telos",
+#    "reth-network/telos",
+#    "reth-node-core/telos",
 ]
 
 [[bin]]

diff --git a/bin/reth/src/telos.rs b/bin/reth/src/telos.rs
@@ -2,6 +2,7 @@
 
 use std::sync::Arc;
 use clap::Parser;
+use reth::cli::Cli;
 use reth_node_telos::TelosArgs;
 use reth_node_telos::TelosNode;
 use reth_telos_rpc::TelosClient;

diff --git a/crates/telos/node/src/args.rs b/crates/telos/node/src/args.rs
@@ -1,5 +1,7 @@
 //! clap [Args](clap::Args) for telos configuration
 
+use serde::{Deserialize, Serialize};
+
 #[derive(Debug, Clone, Default, PartialEq, Eq, clap::Args)]
 #[clap(next_help_heading = "Telos")]
 pub struct TelosArgs {

diff --git a/crates/telos/node/src/node.rs b/crates/telos/node/src/node.rs
@@ -3,6 +3,7 @@ use reth_evm_ethereum::EthEvmConfig;
 use reth_node_api::{FullNodeTypes, NodeTypes};
 use reth_node_builder::components::ComponentsBuilder;
 use reth_node_builder::{Node, PayloadTypes};
+use reth_node_ethereum::EthereumNode;
 use reth_node_ethereum::node::{EthereumAddOns, EthereumConsensusBuilder, EthereumExecutorBuilder, EthereumNetworkBuilder, EthereumPayloadBuilder, EthereumPoolBuilder};
 use crate::args::TelosArgs;
 

diff --git a/crates/telos/rpc/src/client.rs b/crates/telos/rpc/src/client.rs
@@ -25,7 +25,7 @@ struct TelosClientInner {
 }
 
 #[derive(StructPacker)]
-struct RawActionData {
+pub struct RawActionData {
     pub ram_payer: Name,
     pub tx: Vec<u8>,
     pub estimate_gas: bool,