Merge pull request #2931 from Taraxa-project/master_to_develop

Master to develop
Taraxa-project · Jan 14, 2025 · d8307f1 · d8307f1
2 parents afbb716 + fe6b66a
commit d8307f1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/libraries/cli/include/cli/config_jsons/mainnet/mainnet_genesis.json b/libraries/cli/include/cli/config_jsons/mainnet/mainnet_genesis.json
@@ -1655,7 +1655,7 @@
       "bridge_contract_address": "0xe126E0BaeAE904b8Cfd619Be1A8667A173b763a1"
     },
     "cornus_hf": {
-      "block_num": -1,
+      "block_num": 15610000,
       "delegation_locking_period": 163459,
       "dag_gas_limit": "0x1908B100",
       "pbft_gas_limit": "0x7d2b7500"

diff --git a/libraries/core_libs/consensus/src/pbft/pbft_manager.cpp b/libraries/core_libs/consensus/src/pbft/pbft_manager.cpp
@@ -830,7 +830,7 @@ void PbftManager::gossipVote(const std::shared_ptr<PbftVote> &vote, const std::s
   auto net = network_.lock();
   if (!net) {
     LOG(log_er_) << "Could not obtain net - cannot gossip new vote";
-    assert(false);
+    // assert(false);
     return;
   }
 

diff --git a/libraries/core_libs/network/rpc/jsonrpc_ws_server.cpp b/libraries/core_libs/network/rpc/jsonrpc_ws_server.cpp
@@ -84,8 +84,6 @@ std::string JsonRpcWsSession::handleSubscription(const Json::Value &req) {
       if (params.size() == 2 && params[1].asString() == "includeSignatures") {
         include_pillar_block_signatures = true;
       }
-    } else {
-      throw std::runtime_error("Invalid subscription type");
     }
   }
 

diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm