Merge pull request #3064 from Taraxa-project/testnet

v1.13.4

Author: MatusKysel

CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 # Set current version of the project
 set(TARAXA_MAJOR_VERSION 1)
 set(TARAXA_MINOR_VERSION 13)
-set(TARAXA_PATCH_VERSION 3)
+set(TARAXA_PATCH_VERSION 4)
 set(TARAXA_VERSION ${TARAXA_MAJOR_VERSION}.${TARAXA_MINOR_VERSION}.${TARAXA_PATCH_VERSION})
 message(CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR})
 # Include Conan toolchain file

conanfile.py

@@ -23,7 +23,7 @@ def requirements(self):
         self.requires("rocksdb/9.10.0")
         self.requires("prometheus-cpp/1.3.0")
         self.requires("jsoncpp/1.9.6")
-        self.requires("mpfr/4.2.1")
+        self.requires("mpfr/4.2.2")
         self.requires("gmp/6.3.0")
         self.requires("rapidjson/1.1.0")
 
@@ -100,4 +100,4 @@ def generate(self):
         tc.generate()
 
         deps = CMakeDeps(self)
-        deps.generate()
+        deps.generate()

for_devs/local-net

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.9
 import click
 import subprocess
 import threading
@@ -300,7 +300,7 @@ def start_workers(binary, consensus_nodes, rpc_nodes, tps, enable_test_rpc):
 def node_worker(binary, worker_name, enable_test_rpc):
     cmd = f'{binary} --config ./{data_dir}/conf-{worker_name}.json --wallet ./{data_dir}/wallet-{worker_name}.json --genesis ./{data_dir}/genesis-{worker_name}.json'
     if enable_test_rpc:
-        cmd += ' --enable-test-rpc '
+        cmd += ' --rpc.enable-test-rpc '
 
     process = subprocess.Popen(cmd,
                                shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -312,7 +312,7 @@ def faucet_worker(tps):
     time.sleep(10)
     web3 = Web3(Web3.HTTPProvider('http://127.0.0.1:7017'))
     nonce = web3.eth.get_transaction_count(
-        Web3.to_checksum_address(faucet_public_address))
+        Web3.toChecksumAddress(faucet_public_address))
 
     consensus_nodes = list(consensus_nodes_public_addresses.keys())
 
@@ -322,8 +322,8 @@ def faucet_worker(tps):
             0, len(consensus_nodes)-1)]]
         tx = {
             'nonce': nonce,
-            'to': Web3.to_checksum_address(to),
-            'value': web3.to_wei(1, 'gwei'),
+            'to': Web3.toChecksumAddress(to),
+            'value': web3.toWei(1, 'gwei'),
             'gas': 21000,
             'gasPrice': web3.eth.gas_price,
             'chainId': int(chain_id)
@@ -337,7 +337,7 @@ def faucet_worker(tps):
         try:
             tx_hash = web3.eth.send_raw_transaction(signed_tx.rawTransaction)
             log_format(
-                'faucet', f'{t} Dripped to {to}, tx_hash: {web3.to_hex(tx_hash)}')
+                'faucet', f'{t} Dripped to {to}, tx_hash: {web3.toHex(tx_hash)}')
         except Exception as e:
             log_format('faucet', f'{t} Failed to drip to {to}. Error: {str(e)}')
             pass

libraries/app/CMakeLists.txt

@@ -12,6 +12,7 @@ target_link_libraries(app PUBLIC
     common
     core_libs
     rpc_plugin
+    light_plugin
 )
 
 install(TARGETS app

libraries/app/include/app/app.hpp

@@ -28,6 +28,7 @@ class App : public std::enable_shared_from_this<App>, public AppBase {
   App& operator=(App&&) = delete;
   void init(const cli::Config& cli_conf);
   void start();
+  FullNodeConfig& getMutableConfig() { return conf_; }
   const FullNodeConfig& getConfig() const { return conf_; }
   std::shared_ptr<Network> getNetwork() const { return network_; }
   std::shared_ptr<TransactionManager> getTransactionManager() const { return trx_mgr_; }
@@ -43,8 +44,6 @@ class App : public std::enable_shared_from_this<App>, public AppBase {
   std::shared_ptr<GasPricer> getGasPricer() const { return gas_pricer_; }
   std::shared_ptr<pillar_chain::PillarChainManager> getPillarChainManager() const { return pillar_chain_mgr_; }
 
-  const dev::Address& getAddress() const { return kp_->address(); }
-
   void rebuildDb();
 
   void initialize(const std::filesystem::path& data_dir,

libraries/app/src/app.cpp

@@ -35,6 +35,14 @@ App::~App() { close(); }
 
 void App::addAvailablePlugin(std::shared_ptr<Plugin> plugin) { available_plugins_[plugin->name()] = plugin; }
 
+std::shared_ptr<Plugin> App::getPlugin(const std::string &name) const {
+  auto it = active_plugins_.find(name);
+  if (it != active_plugins_.end()) {
+    return it->second;
+  }
+  return nullptr;
+}
+
 void App::enablePlugin(const std::string &name) {
   if (available_plugins_[name] == nullptr) {
     throw std::runtime_error("Plugin " + name + " not found");
@@ -46,23 +54,30 @@ bool App::isPluginEnabled(const std::string &name) const { return active_plugins
 
 void App::init(const cli::Config &cli_conf) {
   conf_ = cli_conf.getNodeConfiguration();
-  kp_ = std::make_shared<dev::KeyPair>(conf_.node_secret);
 
   fs::create_directories(conf_.db_path);
   fs::create_directories(conf_.log_path);
 
   // Initialize logging
-  const auto &node_addr = kp_->address();
+  const auto &node_addr = conf_.getFirstWallet().node_addr;
   for (auto &logging : conf_.log_configs) {
     logging.InitLogging(node_addr);
   }
 
   LOG_OBJECTS_CREATE("FULLND");
 
-  LOG(log_si_) << "Node public key: " << EthGreen << kp_->pub().toString() << std::endl
-               << EthReset << "Node address: " << EthRed << node_addr.toString() << std::endl
-               << EthReset << "Node VRF public key: " << EthGreen
-               << vrf_wrapper::getVrfPublicKey(conf_.vrf_secret).toString() << EthReset;
+  std::string node_addresses;
+  std::string node_public_keys;
+  std::string node_vrf_public_keys;
+  std::for_each(conf_.wallets.begin(), conf_.wallets.end(), [&](const WalletConfig &wallet) {
+    node_addresses += wallet.node_addr.toString() + " ";
+    node_public_keys += wallet.node_pk.toString() + " ";
+    node_vrf_public_keys += wallet.vrf_pk.toString() + " ";
+  });
+
+  LOG(log_si_) << "Node public keys: " << EthGreen << "[" << node_public_keys << "]" << std::endl
+               << EthReset << "Node addresses: " << EthRed << "[" << node_addresses << "]" << std::endl
+               << EthReset << "Node VRF public keys: " << EthGreen << "[" << node_vrf_public_keys << "]" << EthReset;
 
   if (!conf_.genesis.dag_genesis_block.verifySig()) {
     LOG(log_er_) << "Genesis block is invalid";
@@ -117,9 +132,9 @@ void App::init(const cli::Config &cli_conf) {
   }
 
   final_chain_ = std::make_shared<final_chain::FinalChain>(db_, conf_, node_addr);
-  gas_pricer_ = std::make_shared<GasPricer>(conf_.genesis, conf_.is_light_node, db_);
   key_manager_ = std::make_shared<KeyManager>(final_chain_);
   trx_mgr_ = std::make_shared<TransactionManager>(conf_, db_, final_chain_, node_addr);
+  gas_pricer_ = std::make_shared<GasPricer>(conf_.genesis, conf_.is_light_node, conf_.blocks_gas_pricer, trx_mgr_, db_);
 
   auto genesis_hash = conf_.genesis.genesisHash();
   auto genesis_hash_from_db = db_->getGenesisHash();
@@ -143,9 +158,9 @@ void App::init(const cli::Config &cli_conf) {
                                             pillar_chain_mgr_);
   dag_block_proposer_ = std::make_shared<DagBlockProposer>(conf_, dag_mgr_, trx_mgr_, final_chain_, db_, key_manager_);
 
-  network_ =
-      std::make_shared<Network>(conf_, genesis_hash, conf_.net_file_path().string(), *kp_, db_, pbft_mgr_, pbft_chain_,
-                                vote_mgr_, dag_mgr_, trx_mgr_, std::move(slashing_manager), pillar_chain_mgr_);
+  network_ = std::make_shared<Network>(conf_, genesis_hash, conf_.net_file_path().string(), db_, pbft_mgr_, pbft_chain_,
+                                       vote_mgr_, dag_mgr_, trx_mgr_, std::move(slashing_manager), pillar_chain_mgr_,
+                                       final_chain_);
   auto cli_options = cli_conf.getCliOptions();
   for (auto &plugin : active_plugins_) {
     plugin.second->init(cli_options);
@@ -192,22 +207,23 @@ void App::start() {
     LOG(log_si_) << "DB migrated successfully, please restart the node without the flag";
     started_ = false;
     return;
-  } else {
-    network_->start();
-    dag_block_proposer_->setNetwork(network_);
-    dag_block_proposer_->start();
   }
 
+  for (auto &plugin : active_plugins_) {
+    LOG(log_nf_) << "Starting plugin " << plugin.first;
+    plugin.second->start();
+  }
+
+  network_->start();
+  dag_block_proposer_->setNetwork(network_);
+  dag_block_proposer_->start();
+
   pbft_mgr_->start();
 
   if (metrics_) {
     setupMetricsUpdaters();
     metrics_->start();
   }
-  for (auto &plugin : active_plugins_) {
-    LOG(log_nf_) << "Starting plugin " << plugin.first;
-    plugin.second->start();
-  }
   started_ = true;
   LOG(log_nf_) << "Node started ... ";
 }
@@ -218,7 +234,6 @@ void App::scheduleLoggingConfigUpdate() {
     return;
   }
 
-  static auto node_address = dev::KeyPair(conf_.node_secret).address();
   config_update_executor_.post([&]() {
     while (started_ && !stopped_) {
       auto path = std::filesystem::path(conf_.json_file_name);
@@ -234,7 +249,7 @@ void App::scheduleLoggingConfigUpdate() {
       try {
         auto config = getJsonFromFileOrString(conf_.json_file_name);
         conf_.log_configs = conf_.loadLoggingConfigs(config["logging"]);
-        conf_.InitLogging(node_address);
+        conf_.InitLogging(conf_.getFirstWallet().node_addr);
       } catch (const ConfigException &e) {
         std::cerr << "FullNodeConfig: Failed to update logging config: " << e.what() << std::endl;
         continue;

libraries/cli/include/cli/config.hpp

@@ -25,7 +25,6 @@ static constexpr const char* HELP = "help";
 static constexpr const char* VERSION = "version";
 static constexpr const char* PLUGINS = "plugins";
 static constexpr const char* WALLET = "wallet";
-static constexpr const char* PRUNE_STATE_DB = "prune-state-db";
 
 static constexpr const char* NODE_COMMAND = "node";
 static constexpr const char* ACCOUNT_COMMAND = "account";
@@ -79,9 +78,10 @@ class Config {
 
   bool overwrite_config;
   std::string data_dir;
+
   std::string genesis;
   std::string config;
-  std::string wallet;
+  std::vector<std::string> wallets;
 };
 
 }  // namespace taraxa::cli