1 files changed, 71 insertions, 4 deletions

diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 943799f..2743429 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -123,6 +123,9 @@ static void PrintUsage()
     printf("Mining mode:\n");
     printf("  /operator\n");
     printf("  /participant=POOL_BTF_ADDRESS\n");
+    printf("  /payoutaddr=BTF_ADDRESS  (participant: pay shares to this address, no wallet needed)\n");
+    printf("  /payoutfile=FILE         (participant: rotate payout addresses from file)\n");
+    printf("  /hashthreads=N           (participant: mining threads, default cores-1)\n");
     printf("  /stratumbridge=POOL_BTF_ADDRESS\n");
     printf("  /stratumbridgeport=N       (default 3333; listen on 127.0.0.1)\n");
     printf("  /solomine\n");
@@ -147,6 +150,7 @@ static void PrintUsage()
     printf("  /socks=HOST:PORT           (SOCKS5 proxy for Nostr, .btf relay, and onion dials)\n");
     printf("  /tor[=HOST:PORT]           (Tor mode; default SOCKS5 proxy is 127.0.0.1:9050)\n");
     printf("  /managedtor[=PATH]         (start Tor, create a hidden service, advertise its onion)\n");
+    printf("  /automanagedtor            (auto-start a bundled Tor if one sits next to the executable)\n");
     printf("  /nomanagedtor              (disable automatic bundled Tor startup)\n");
     printf("  /oniononly                 (do not fall back to rendezvous when a .btf onion dial fails)\n");
     printf("  /btfseed=ADDRESS:ENCHEX    (extra bootstrap peer, repeatable)\n");
@@ -234,7 +238,7 @@ static void ParseStartupArguments(int argc, char* argv[])
     if (!strProcLimit.empty())
     {
         int n = atoi(strProcLimit.c_str());
-        unsigned int nCores = std::thread::hardware_concurrency();
+        unsigned int nCores = AvailableCoreCount();
         if (n < 0)
             fprintf(stderr, "Ignoring /genproclimit=%s: not a thread count\n",
                     strProcLimit.c_str());
@@ -260,6 +264,18 @@ static void ParseStartupArguments(int argc, char* argv[])
         fMineModeFromCommandLine = true;
     }
 
+    string payoutAddr = argval2(argc, argv, "/payoutaddr", "-payoutaddr");
+    if (!payoutAddr.empty())
+        strPayoutAddress = payoutAddr;
+
+    string payoutFile = argval2(argc, argv, "/payoutfile", "-payoutfile");
+    if (!payoutFile.empty())
+        strPayoutFile = payoutFile;
+
+    string hashThreads = argval2(argc, argv, "/hashthreads", "-hashthreads");
+    if (!hashThreads.empty())
+        nHashThreads = atoi(hashThreads.c_str());
+
     if (arg(argc,argv,"/stratumbridge") || arg(argc,argv,"-stratumbridge"))
     {
         fStratumBridge = true;
@@ -286,6 +302,12 @@ static void ParseStartupArguments(int argc, char* argv[])
     if (!poolDash.empty())
         strPoolDashboardUrl = poolDash;
 
+    if (arg(argc,argv,"/noannounce") || arg(argc,argv,"-noannounce"))
+        fPoolNoAnnounce = true;
+
+    if (arg(argc,argv,"/poolmineblind") || arg(argc,argv,"-poolmineblind"))
+        fPoolMineBlind = true;
+
     string poolFee = argval2(argc, argv, "/poolfee", "-poolfee");
     if (!poolFee.empty())
         dPoolFeePercent = atof(poolFee.c_str());
@@ -306,8 +328,20 @@ static void ParseStartupArguments(int argc, char* argv[])
     string rvRelay = argval2(argc, argv, "/rvrelay", "-rvrelay");
     if (!rvRelay.empty())
     {
-        vBtfMeetingRelays.clear();
-        vBtfMeetingRelays.push_back(rvRelay);
+        if (!LooksLikeRelay(rvRelay))
+        {
+            // A malformed pin must not replace the seed list: with the pin
+            // set, no discovered relay can ever mask the typo, and the pool
+            // would publish a garbage (or no) meeting node forever.
+            fprintf(stderr, "Ignoring /rvrelay=%s: expected host:port\n",
+                    rvRelay.c_str());
+        }
+        else
+        {
+            vBtfMeetingRelays.clear();
+            vBtfMeetingRelays.push_back(rvRelay);
+            fBtfRelayPinned = true;
+        }
     }
 
     // net.cpp has described nListenPort as "tunable via /port" since it was
@@ -348,8 +382,16 @@ static void ParseStartupArguments(int argc, char* argv[])
     bool fTorMode = arg(argc, argv, "/tor") || arg(argc, argv, "-tor");
     string socksProxy = argval2(argc, argv, "/socks", "-socks");
     string bundledTorPath;
+    // Managed Tor is opt-in on this fork. Upstream 1.2.19 auto-starts a
+    // bundled tor whenever one sits next to the executable, which silently
+    // moves Nostr/.btf traffic onto Tor, creates a hidden service, and starts
+    // publishing descriptors with meeting_node="rendezvous-pending" on nodes
+    // that never asked for it -- against our pinned-relay posture. The
+    // upstream behavior remains available under the explicit /automanagedtor.
     bool fAutoManagedTor = !fManagedTor && !fNoManagedTor && !fTorMode &&
-                            socksProxy.empty() && BtfBundledTorPath(bundledTorPath);
+                            socksProxy.empty() &&
+                            (arg(argc, argv, "/automanagedtor") || arg(argc, argv, "-automanagedtor")) &&
+                            BtfBundledTorPath(bundledTorPath);
     if (fManagedTor || fAutoManagedTor)
     {
         if (fManagedTor && (fTorMode || !socksProxy.empty()))
@@ -1030,6 +1072,31 @@ int main(int argc, char* argv[])
 
     ReacceptWalletTransactions();
 
+    // /dumpaddresses=N:FILE -- generate N fresh wallet keys and write their
+    // addresses (one per line) to FILE, then exit. Keys stay in this wallet;
+    // the file alone is enough for a miner elsewhere to rotate payout
+    // addresses via /payoutfile. (No HD/xpub exists in this wallet format.)
+    string dumpSpec = argval2(argc, argv, "/dumpaddresses", "-dumpaddresses");
+    if (!dumpSpec.empty())
+    {
+        size_t colon = dumpSpec.rfind(':');
+        if (colon == string::npos) { fprintf(stderr, "usage: /dumpaddresses=N:FILE\n"); return 1; }
+        int n = atoi(dumpSpec.substr(0, colon).c_str());
+        string file = dumpSpec.substr(colon + 1);
+        FILE* f = fopen(file.c_str(), "w");
+        if (!f) { fprintf(stderr, "cannot open %s\n", file.c_str()); return 1; }
+        for (int i = 0; i < n; i++)
+        {
+            CKey key;
+            key.MakeNewKey();
+            if (!AddKey(key)) { fclose(f); fprintf(stderr, "AddKey failed at %d\n", i); return 1; }
+            fprintf(f, "%s\n", PubKeyToAddress(key.GetPubKey()).c_str());
+        }
+        fclose(f);
+        printf("wrote %d fresh wallet addresses to %s\n", n, file.c_str());
+        return 0;
+    }
+
     if (!StartNode(strErrors))
     {
         fprintf(stderr,"StartNode: %s\n",strErrors.c_str());