update help

MaynardMiner · Aug 7, 2019 · 72a0cde · 72a0cde
1 parent 325f776
commit 72a0cde
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 7 deletions.
diff --git a/build/powershell/help/profit.psm1 b/build/powershell/help/profit.psm1
@@ -0,0 +1,141 @@
+function Global:Get-Admin_Fee {
+    Write-Host "Doing Admin_Fee"
+    Start-Sleep -S 3
+    do {
+        Clear-Host
+
+        $ans = Read-Host -Prompt "-Admin_Fee    [0-50]                
+        
+        
+Expressed as Percentage. 
+        Admin_Fee allows users to set a seperate wallet, and specify
+        a certain percentage of time mined on that wallet a day. Admin
+        Mode is done first, and then normal mode begins. Every 24 hours-
+        Admin_Mode starts again, mining % of day specified by this parameter.
+        If SWARM enters donation mode, time is either added to Admin_Fee, or
+        removed, to encompass an even distribution between admin mode and user mode.
+        Simple timestamp of when last Admin ran occurred will be
+        placed in `".\admin`" folder for reference. They will be transferred on update.
+        -Admin must be specified if using -Admin_Fee.
+
+
+Please enter the percent you wish to mine for yourself
+
+Answer"
+        do {
+            clear-host
+            $Confirm = Read-Host -Prompt "You have entered a % figure of $ans
+    
+Is this correct?
+
+1 Yes
+2 No
+
+Answer"
+            $Check = Global:Confirm-Answer $Confirm @("1", "2")
+        }while ($Check -eq 1)
+        if ($Confirm -ne "1") {
+            Write-Host "Okay, lets try again"
+            Start-Sleep -S 3
+        }
+    }while ($Confirm -ne "1")
+    if ( $(vars).config.Containskey("Admin_Fee") ) { $(vars).config.Admin_Fee = $ans }else { $(vars).config.Add("Admin_Fee", $ans) }
+}
+
+
+function Global:Get-Admin {
+    Write-Host "Doing Admin"
+    Start-Sleep -S 3
+    do {
+        Clear-Host
+
+        $ans = Read-Host -Prompt "-Admin        
+        
+[address]             
+
+Admin Wallet for -Admin_Fee Parameter. Only needed if you are using
+Admin. It is also advised to set -Admin_Pass
+
+
+Please enter your wallet address:
+
+Answer"
+        do {
+            clear-host
+            $Confirm = Read-Host -Prompt "You have entered a wallet address of $ans
+    
+Is this correct?
+
+1 Yes
+2 No
+
+Answer"
+            $Check = Global:Confirm-Answer $Confirm @("1", "2")
+        }while ($Check -eq 1)
+        if ($Confirm -ne "1") {
+            Write-Host "Okay, lets try again"
+            Start-Sleep -S 3
+        }
+    }while ($Confirm -ne "1")
+    if ( $(vars).config.Containskey("Admin") ) { $(vars).config.Admin = $ans }else { $(vars).config.Add("Admin", $ans) }
+}
+
+function Global:Get-Admin_Pass {
+    Write-Host "Doing Admin_Pass"
+    Start-Sleep -S 3
+    do {
+        Clear-Host
+
+        $ans = Read-Host -Prompt "-Admin_Pass        
+        
+[address]             
+
+Admin Password for -Admin_Fee Parameter. Only needed if you are using
+Admin. It is also advised to set -Admin_Wallet
+
+
+Please enter Coin symbol of your wallet address:
+
+Answer"
+        do {
+            clear-host
+            $Confirm = Read-Host -Prompt "You have entered the symbol of $ans
+    
+Is this correct?
+
+1 Yes
+2 No
+
+Answer"
+            $Check = Global:Confirm-Answer $Confirm @("1", "2")
+        }while ($Check -eq 1)
+        if ($Confirm -ne "1") {
+            Write-Host "Okay, lets try again"
+            Start-Sleep -S 3
+        }
+    }while ($Confirm -ne "1")
+    if ( $(vars).config.Containskey("Admin_Pass") ) { $(vars).config.Admin_Pass = $ans }else { $(vars).config.Add("Admin_Pass", $ans) }
+}
+
+function Global:Get-Profit { 
+    switch ($(vars).input) {
+        "19" { Global:Get-Admin_Fee }
+        "20" { Global:Get-Admin }
+        "20" { Global:Get-Admin_Pass }
+    }
+
+    do {
+        clear-host
+        $Confirm = Read-Host -Prompt "Do You Wish To Continue?
+    
+1 Yes
+2 No
+
+Answer"
+        $check = Global:Confirm-Answer $Confirm @("1", "2")
+        Switch ($Confirm) {
+            "1" { $(vars).continue = $true }
+            "2" { $(vars).continue = $false }
+        }
+    }while ($check -eq 1)
+}
diff --git a/build/powershell/help/statistics.psm1 b/build/powershell/help/statistics.psm1
@@ -342,7 +342,7 @@ Note: -Stat_Algo Custom and -Stat_Coin Custom should be specified.
 Please enter a custom moving average value"
         do{
             clear-host
-            $Confirm = Read-Host "You have entered custom moving average of $ans periods
+            $Confirm = Read-Host -Prompt "You have entered custom moving average of $ans periods
             
 Is this correct?
 
@@ -359,6 +359,54 @@ Answer"
      }while($Confirm -ne "1")
      if ( $(vars).config.Containskey("Custom_Periods") ) { $(vars).config.Custom_Periods = $ans }else { $(vars).config.Add("Custom_Periods", $ans) }
 }
+
+function Global:Get-Historical_Bias {
+    Write-Host "Doing Historical_Bias"
+    Start-Sleep -S 3
+    do {
+        Clear-Host
+
+        $ans = Read-Host -Prompt "-Historical_Bias [0-100]          
+        
+Expressed as Percentage. 
+Will only affect Auto_Algo.
+Will not affect niechash.
+Historical_Bias bias does two things:
+ -Reduces algorithms that have no 24h returns to 100%
+ -Compares the deviation between 24hr estimates and 24hr
+  returns into a %, which then creates a EMA with each
+  value. (for smoothing). SWARM then applies a bonus/penality
+  to the algorithm based on how well it has performed
+  over time historically. SWARM will only apply a % penality
+  or bonus of x%, where x is -Historical_Bias figure.
+  Deviations will be listed in stat files.
+  If you use, reccommended starting values are somewhere
+  around 25-35% historical bias.
+
+Please enter a number 0-100 on the maximum % bias penalty you wish to
+place on algorithms that do not return well over 24 hours.
+
+Answer"
+do{
+    clear-host
+    $Confirm = Read-Host -Prompt "You have entered a % bias of $ans
+    
+Is this correct?
+
+1 Yes
+2 No
+
+Answer"
+    $Check = Global:Confirm-Answer $Confirm @("1","2")
+}while($Check -eq 1)
+if($Confirm -ne "1"){
+    Write-Host "Okay, lets try again"
+    Start-Sleep -S 3
+}
+}while($Confirm -ne "1")
+if ( $(vars).config.Containskey("Historical_Bias") ) { $(vars).config.Historical_Bias = $ans }else { $(vars).config.Add("Historical_Bias", $ans) }
+}
+
 function Global:Get-Statistics { 
     switch ($(vars).input) {
         "13" { Global:Get-Stat_Algo }
@@ -369,6 +417,7 @@ function Global:Get-Statistics {
         "18" { Global:Get-Max_Periods }
         "19" { Global:Get-Stat_All }
         "20" { Global:Get-Custom_Periods }
+        "20" { Global:Get-Historical_Bias }
     }
 
     do {

diff --git a/build/powershell/scripts/help.ps1 b/build/powershell/scripts/help.ps1
@@ -94,8 +94,8 @@ Please choose an advanced setting you wish to modify:
 16 I wish to turn off/on WattOMeter for power/day calculations. (-WattOMeter)
 17 I wish to specify my kilowatt/hour cost of electricity. (-KWH)
 18 I wish to change the maximum periods of estimates SWARM will save (-Max_Periods)
-19 I wish to stat all coins all the time, not just when it is most profitable (-Stat_All)
-20 I wish to define a custom period rather than time frame from statistics (-Custom_Periods)
+19 I wish to define a custom period rather than time frame from statistics (-Custom_Periods)
+20 I wish to place a bias on current profit estimate calculations using historical data (-historical_bias)
 
 [Admin]
 21 There is an algorithm/miner/pool giving me problems. I wish to disable it (-Bans)
@@ -130,6 +130,15 @@ Please choose an advanced setting you wish to modify:
 44 I wish to turn on updates (-Update)
 45 I wish to increase the maximum number of issues before SWARM restarts computer (-TypeBanCount)
 
+[Self-Profit]
+46 I am controlling SWARM for someone else, and wish to add an admin fee. (-Admin_Fee)
+47 I would like to specify the wallet for my admin fee. (-Admin)
+48 I would like to specify the coin symbol for my admin wallet. (-Admin_Pass)
+
+I wish to use an optional miner from the optional miner folder (-Optional)
+      * Note you can just move the file into nvida or amd folder.
+        This help option not available yet.
+
 Answer"
         $Check = Global:Confirm-Answer $ans @(1 .. 44)
     }While ($Check -eq 1)
@@ -803,6 +812,11 @@ Answer"
                         Global:Get-Maintenance
                         Global:Remove-Modules
                     }
+                    elseif ($(vars).input -in 46 .. 48) {
+                        Add-Module "$hd\profit.psm1"
+                        Global:Get-profit
+                        Global:Remove-Modules
+                    }
                 }
                 "2" {
                     do {

diff --git a/config/update/nvidia-win.json b/config/update/nvidia-win.json
@@ -238,9 +238,9 @@
         "NVIDIA2": ".\\bin\\tt-miner-2\\TT-Miner.exe",
         "NVIDIA3": ".\\bin\\tt-miner-3\\TT-Miner.exe",
         "minername": "TT-Miner.exe",
-        "version": "3.0.0",
+        "version": "3.0.1",
         "optional": "No",
-        "uri": "https://TradeProject.de/download/Miner/TT-Miner.tar.xz"
+        "uri": "https://tradeproject.de/download/Miner/TT-Miner.zip"
     },
     "xmrig-nv": {
         "name": "xmrig-nv",

diff --git a/help/Change.log b/help/Change.log
@@ -653,7 +653,9 @@ to roll them back.
   main screen while "waiting for miners to start"
   message appears.
 
-# SWARM 2.5.6 (beta)
+###########################################
+###########################################
+# SWARM 2.5.7
 
 ## Beta changes
 * Includes all new features from beta.
@@ -670,4 +672,31 @@ to roll them back.
 * Removed -Volume errors caused by
   typo in pool files.
 * Removed easy-mode message (not
-  used feature).
+  used feature).
+###########################################
+###########################################
+
+# SWARM 2.5.8
+
+## Note: Cuckaroo29 will likely timeout.
+This is due to miners switching to 29d fork.
+You can prevent needlessy benchmarking by use
+-Bans argument, or you can downgrade miner to
+an older version using ``version update`` command.
+I will work on splitting miners for each algo.
+
+## NEW FEATURES!
+* Fan control now works for RTX cards in
+  Windows- Program created by me. (beta).
+  * Will control dual fan-control GPUS.
+
+## Updates
+* TeamRedMiner updated
+* SWARM-MINER updated
+  * New windows version
+  * improved performance on bmw512
+* TT-Miner updated
+  * Did not do linux yet.
+    Read api specs may have changed.
+    Need to test further.
+* Swarm help programs/commands updated.