From 6417fdcd0ccbf90cb34c1828e83b9af318babc8f Mon Sep 17 00:00:00 2001 From: Niven Date: Thu, 20 Apr 2023 17:24:41 +0800 Subject: [PATCH 1/2] New port in chain params for eth-json-rpc. includes pipeline to read new arg ethrpcport when starting node. --- src/chainparamsbase.cpp | 10 +++++----- src/chainparamsbase.h | 4 +++- src/defid.cpp | 3 ++- src/init.cpp | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index b32da62382..883e51dc38 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -37,17 +37,17 @@ const CBaseChainParams& BaseParams() std::unique_ptr CreateBaseChainParams(const std::string& chain) { if (chain == CBaseChainParams::MAIN) { - return std::make_unique("", 8554, 8559); + return std::make_unique("", 8554, 8559, put-number); } else if (chain == CBaseChainParams::TESTNET) { - return std::make_unique("testnet3", 18554, 9558); + return std::make_unique("testnet3", 18554, 9558, put-number); } else if (chain == CBaseChainParams::DEVNET) { if (gArgs.IsArgSet("-devnet-bootstrap")) { - return std::make_unique("devnet", 18554, 9558); + return std::make_unique("devnet", 18554, 9558, put-number); } else { - return std::make_unique("devnet", 20554, 10558); + return std::make_unique("devnet", 20554, 10558, put-number); } } else if (chain == CBaseChainParams::REGTEST) { - return std::make_unique("regtest", 19554, 11558); + return std::make_unique("regtest", 19554, 11558, put-number); } else { throw std::runtime_error(strprintf("%s: Unknown chain %s.", __func__, chain)); } diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 301934841f..6009937990 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -24,13 +24,15 @@ class CBaseChainParams const std::string& DataDir() const { return strDataDir; } int RPCPort() const { return nRPCPort; } int GRPCPort() const { return nGRPCPort; } + int ETHRPCPort() const { return nETHRPCPort; } CBaseChainParams() = delete; - CBaseChainParams(const std::string& data_dir, int rpc_port, int grpc_port) : nRPCPort(rpc_port), nGRPCPort(grpc_port), strDataDir(data_dir) {} + CBaseChainParams(const std::string& data_dir, int rpc_port, int grpc_port, int ethrpc_port) : nRPCPort(rpc_port), nGRPCPort(grpc_port), nETHRPCPort(ethrpc_port), strDataDir(data_dir) {} private: int nRPCPort; int nGRPCPort; + int nETHRPCPort; std::string strDataDir; }; diff --git a/src/defid.cpp b/src/defid.cpp index ed979091ae..5b346c772d 100644 --- a/src/defid.cpp +++ b/src/defid.cpp @@ -113,7 +113,8 @@ static bool AppInit(int argc, char* argv[]) // Start GRPC after BaseParams() has been initialised init_runtime(); int grpc_port = gArgs.GetArg("-grpcport", BaseParams().GRPCPort()); - start_servers("127.0.0.1:" + std::to_string(grpc_port), "127.0.0.1:" + std::to_string(grpc_port + 1)); + int eth_rpc_port = gArgs.GetArg("-ethrpcport", BaseParams().ETHRPCPort()); + start_servers("127.0.0.1:" + std::to_string(eth_rpc_port), "127.0.0.1:" + std::to_string(grpc_port)); // Error out when loose non-argument tokens are encountered on command line for (int i = 1; i < argc; i++) { diff --git a/src/init.cpp b/src/init.cpp index cf8b935294..d5c57654a8 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -639,6 +639,7 @@ void SetupServerArgs() gArgs.AddArg("-maxaddrratepersecond=", strprintf("Sets MAX_ADDR_RATE_PER_SECOND limit for ADDR messages(default: %f)", MAX_ADDR_RATE_PER_SECOND), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION); gArgs.AddArg("-maxaddrprocessingtokenbucket=", strprintf("Sets MAX_ADDR_PROCESSING_TOKEN_BUCKET limit for ADDR messages(default: %d)", MAX_ADDR_PROCESSING_TOKEN_BUCKET), ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION); gArgs.AddArg("-grpcport=", strprintf("Start GRPC connections on and (default: %u, testnet: %u, devnet: %u, regtest: %u)", defaultBaseParams->GRPCPort(), testnetBaseParams->GRPCPort(), devnetBaseParams->GRPCPort(), regtestBaseParams->GRPCPort()), ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::RPC); + gArgs.AddArg("-ethrpcport=", strprintf("Listen for ETH-JASON-RPC connections on > (default: %u, testnet: %u, devnet: %u, regtest: %u)", defaultBaseParams->ETHRPCPort(), testnetBaseParams->ETHRPCPort(), devnetBaseParams->ETHRPCPort(), regtestBaseParams->ETHRPCPort()), ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::RPC); #if HAVE_DECL_DAEMON gArgs.AddArg("-daemon", "Run in the background as a daemon and accept commands", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); From 928fb9f5bee158d179ea8a9a01bd17337bb42db7 Mon Sep 17 00:00:00 2001 From: Niven Date: Thu, 20 Apr 2023 17:41:33 +0800 Subject: [PATCH 2/2] Using ..50 for GRPC and ..51 for ETH JRPC --- src/chainparamsbase.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 883e51dc38..858bc62a22 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -37,17 +37,17 @@ const CBaseChainParams& BaseParams() std::unique_ptr CreateBaseChainParams(const std::string& chain) { if (chain == CBaseChainParams::MAIN) { - return std::make_unique("", 8554, 8559, put-number); + return std::make_unique("", 8554, 8550, 8551); } else if (chain == CBaseChainParams::TESTNET) { - return std::make_unique("testnet3", 18554, 9558, put-number); + return std::make_unique("testnet3", 18554, 9550, 9551); } else if (chain == CBaseChainParams::DEVNET) { if (gArgs.IsArgSet("-devnet-bootstrap")) { - return std::make_unique("devnet", 18554, 9558, put-number); + return std::make_unique("devnet", 18554, 9550, 9551); } else { - return std::make_unique("devnet", 20554, 10558, put-number); + return std::make_unique("devnet", 20554, 10550, 10551); } } else if (chain == CBaseChainParams::REGTEST) { - return std::make_unique("regtest", 19554, 11558, put-number); + return std::make_unique("regtest", 19554, 11550, 11551); } else { throw std::runtime_error(strprintf("%s: Unknown chain %s.", __func__, chain)); }