Merge branch 'master' into 2025_blocknum

Author: valdok

README.md

@@ -62,8 +62,3 @@ us-nodes.mainnet.beam.mw:8100
 ### BUILD FROM SOURCE
 
 [Building Instructions](https://github.com/BeamMW/beam/wiki/How-to-build)
-
-If you build from source please use 'mainnet' branch for Mainnet
-
-
-

beam/cli.cpp

@@ -296,7 +296,6 @@ int main(int argc, char* argv[])
 		catch (const po::error& e)
 		{
 			cout << e.what() << std::endl;
-			printHelp(visibleOptions);
 
 			return 0;
 		}
@@ -679,7 +678,6 @@ int main(int argc, char* argv[])
 		catch (const po::error& e)
 		{
 			BEAM_LOG_ERROR() << e.what();
-			printHelp(visibleOptions);
 		}
 		catch (const std::runtime_error& e)
 		{

bvm/Shaders/Explorer/Parser.cpp

@@ -2874,7 +2874,7 @@ void ParserContext::OnMethod_DaoVote(uint32_t /* iVer */)
 	{
 		auto pArg = get_ArgsAs<DaoVote::Method::MoveFunds>();
 		if (pArg)
-			OnMethod(pArg->m_Lock ? "Funs Lock" : "Funds Unlock");
+			OnMethod(pArg->m_Lock ? "Funds Lock" : "Funds Unlock");
 	}
 	break;
 

explorer/explorer_node.cpp

@@ -228,8 +228,7 @@ bool parse_cmdline(int argc, char* argv[], Options& o, Rules& r) {
     }
     catch (const po::error& ex)
     {
-        cout << ex.what();
-        cout << cliOptions << std::endl;
+        cout << ex.what() << std::endl;
     }
     catch (const exception& ex)
     {
@@ -262,4 +261,4 @@ void setup_node(Node& node, const Options& o) {
         node.m_Cfg.m_ProcessorParams.m_RichInfoFlags |= NodeProcessor::StartParams::RichInfo::UpdShader;
         node.m_Cfg.m_ProcessorParams.m_RichParser = o.m_RichParser;
     }
-}
+}