Merge branch 'master' of https://github.com/MaynardMiner/SWARM

MaynardMiner · Oct 10, 2019 · 62b5f3f · 62b5f3f
2 parents b362c16 + 39681b9
commit 62b5f3f
Show file tree

Hide file tree

Showing 11 changed files with 148 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ To focus solely on SWARM's project mission: SWARM was written to integrate fully
 
 ### SMOS Integration
 
-After many user requests, SWARM now works in Simple Miner. See Wiki on how to setup. Simplemining.net is lighter than HiveOS, which makes it generally easier to use for an experienced miner, but non-experienced Linux user. I don't personally regularly use SMOS, so if you have an issue, post in issues section, and I will plug in and update SMOS compatibility.
+After many user requests, SWARM now works in Simple Miner. See Wiki on how to setup. Simplemining.net is lighter than HiveOS, which makes it generally easier to use for an experienced miner, but non-experienced Linux user. I don't personally regularly use SMOS, nor maintain SMOS support, so if you have an issue, post in issues section, and I will plug in and update SMOS compatibility.
 
 ### Highly Sophisticated Customization
 * OC Tuning by algorithm

diff --git a/SWARM.2.7.6.linux.conf → SWARM.2.7.7.linux.conf b/SWARM.2.7.6.linux.conf → SWARM.2.7.7.linux.conf
diff --git a/build/export/libcurl.so.3 b/build/export/libcurl.so.3
diff --git a/build/powershell/startup/remoteagent.psm1 b/build/powershell/startup/remoteagent.psm1
@@ -67,6 +67,7 @@ function Global:start-update {
         $PreviousVersions += "SWARM.2.7.3"
         $PreviousVersions += "SWARM.2.7.4"
         $PreviousVersions += "SWARM.2.7.5"
+        $PreviousVersions += "SWARM.2.7.6"
 
         $PreviousVersions | ForEach-Object {
             $PreviousVersions += "$($_).linux"
@@ -439,6 +440,17 @@ function Global:start-update {
                                         }
                                     }
                                 }
+
+                                if ($ChangeFile -eq "swarm-miner.json") {
+                                    $Data | Get-Member -MemberType NoteProperty | Select -ExpandProperty Name | foreach {
+                                        if ($_ -ne "name") {
+                                            $Data.$_.commands | Add-Member "x12" "" -ErrorAction SilentlyContinue
+                                            $Data.$_.difficulty | Add-Member "x12" "" -ErrorAction SilentlyContinue 
+                                            $Data.$_.naming | Add-Member "x12" "x12" -ErrorAction SilentlyContinue
+                                            $Data.$_.fee | Add-Member "x12" 0 -ErrorAction SilentlyContinue
+                                        }
+                                    }
+                                }
 
                                 if($ChangeFile -eq "pool-algos.json") {
                                     $Data | add-Member "x25x" @{alt_names = @("x25x"); exclusions = @("add pool or miner here","comma seperated")} -ErrorAction SilentlyContinue
@@ -452,7 +464,8 @@ function Global:start-update {
                                     $Data | add-Member "equihash_150/5" @{alt_names = @("equihash_150/5","equihash150","beam"); exclusions = @("add pool or miner here","comma seperated")} -ErrorAction SilentlyContinue -Force                                   
                                     $Data | add-Member "argon2d500" @{alt_names = @("argon2d500"); exclusions = @("add pool or miner here","comma seperated")} -ErrorAction SilentlyContinue -Force         
                                     $Data | add-Member "argon2d-dyn" @{alt_names = @("argon2d-dyn"); exclusions = @("add pool or miner here","comma seperated")} -ErrorAction SilentlyContinue -Force                                                             
-                                    $Data | add-Member "beamv2" @{alt_names = @("beamv2"); exclusions = @("add pool or miner here","comma seperated")} -ErrorAction SilentlyContinue -Force                                                             
+                                    $Data | add-Member "beamv2" @{alt_names = @("beamv2"); exclusions = @("add pool or miner here","comma seperated")} -ErrorAction SilentlyContinue -Force           
+                                    $Data | add-Member "x12" @{alt_names = @("x12"); exclusions = @("add pool or miner here","comma seperated")} -ErrorAction SilentlyContinue -Force                                                                                                               
                                 } 
 
 

diff --git a/config/miners/cryptodredge.json b/config/miners/cryptodredge.json
@@ -50,7 +50,7 @@
             "x21s": "",
             "lyra2rev3": "",
             "x16rt": "",
-            "x16rv2": "8",
+            "x16rv2": "",
             "veil": "",
             "lyra2zz": "",
             "mtp": "",

diff --git a/config/update/README.md b/config/update/README.md
@@ -0,0 +1,56 @@
+# Update Configs
+
+## What Are Update Configs For?
+They are used to set the current versions, links, and exectubles for each miner in SWARM.
+They can be edited while SWARM is running, SWARM checks these files each loop.
+
+## Example Of A Miner Config:
+```
+  "claymore-amd": {
+    "name": "claymore-amd",
+    "type": "amd",
+    "AMD1": ".\\bin\\claymore-amd-1\\ethdcrminer64",
+    "AMD2": ".\\bin\\claymore-amd-2\\ethdcrminer64",
+    "AMD3": ".\\bin\\claymore-amd-3\\ethdcrminer64",
+    "minername": "ethdcrminer64",
+    "version": "15.0",
+    "optional": "No",
+    "uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v5.0/Claymore-Linux-AMD.tar.gz"
+  },
+```
+
+### Name [string]
+The name of the file the configs are stored in. Used for internal reference.
+
+### Miner [hashtable]
+The data container for the miner information. Is named after the miner itself.
+
+### Miner : Name [string]
+The name of the miner.
+
+### Miner : Type [string]
+The platform type (AMD,NVIDIA,CPU)
+
+### Miner: AMD1,NVIDIA1,NVIDIA2,NVIDIA3,CPU [string]
+These are the reference paths for each miner, as SWARM will create one
+miner for each device group. Miner are stored in the bin folder, and the
+directory is usually named after the miner itself.
+
+### Miner: MinerName [string]
+The name of the executable file. This is what SWARM uses to launch the miner,
+and is also what SWARM uses to detect within a .zip folder where the main directory
+of the miner is at (in cases like a folder within a folder).
+
+### Miner : Version [string]
+This is the version of the miner. If this changes- SWARM will attempt to download
+the miner from the uri.
+
+### Miner : Optional [string]
+This denotes whether or not the miner is a default miner or an optional miner.
+See ``-Optional`` argument.
+
+### Miner : uri [string]
+This is the download link. Note the following:
+* Miner must be contained in a folder when unzipped.
+* Must use direct downloads (mega will not work).
+* Recommended to use tar.gz for linux, .zip for windows.
diff --git a/config/update/nvidia-linux.json b/config/update/nvidia-linux.json
@@ -84,9 +84,9 @@
     "NVIDIA2": ".\\bin\\z-enemy-2\\z-enemy",
     "NVIDIA3": ".\\bin\\z-enemy-3\\z-enemy",
     "minername": "z-enemy",
-    "version": "2.2",
+    "version": "2.3",
     "optional": "No",
-    "uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v4.0/z-enemy-linux.tar.gz"
+    "uri": "https://github.com/z-enemy/z-enemy/releases/download/ver-2.3/z-enemy-2.3-linux-cuda100.tar.gz"
   },
   "ewbf": {
     "name": "ewbf",
@@ -293,7 +293,7 @@
     "NVIDIA2": ".\\bin\\tt-miner-2\\TT-Miner",
     "NVIDIA3": ".\\bin\\tt-miner-3\\TT-Miner",
     "minername": "TT-Miner",
-    "version": "3.0.9",
+    "version": "3.0.10",
     "optional": "No",
     "uri": "https://tradeproject.de/download/Miner/TT-Miner.tar.xz"
   },

diff --git a/config/update/nvidia-win.json b/config/update/nvidia-win.json
@@ -128,9 +128,9 @@
         "NVIDIA2": ".\\bin\\z-enemy-2\\z-enemy.exe",
         "NVIDIA3": ".\\bin\\z-enemy-3\\z-enemy.exe",
         "minername": "z-enemy.exe",
-        "version": "2.2",
+        "version": "2.3",
         "optional": "No",
-        "uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v.3.0/z-enemy-windows.zip"
+        "uri": "https://github.com/z-enemy/z-enemy/releases/download/ver-2.3/z-enemy-2.3-win-cuda10.1.zip"
     },
     "ewbf": {
         "name": "ewbf",
@@ -238,7 +238,7 @@
         "NVIDIA2": ".\\bin\\tt-miner-2\\TT-Miner.exe",
         "NVIDIA3": ".\\bin\\tt-miner-3\\TT-Miner.exe",
         "minername": "TT-Miner.exe",
-        "version": "3.0.9",
+        "version": "3.0.10",
         "optional": "No",
         "uri": "https://tradeproject.de/download/Miner/TT-Miner.zip"
     },

diff --git a/h-manifest.conf b/h-manifest.conf
@@ -5,7 +5,7 @@ SWARMDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CUSTOM_NAME=${SWARMDIR##*/}
 
 # Optional version of your custom miner package
-CUSTOM_VERSION=2.7.6
+CUSTOM_VERSION=2.7.7
 
 # Full path to miner config file
 CUSTOM_CONFIG_FILENAME=/hive/miners/custom/${CUSTOM_NAME}/${CUSTOM_NAME}.conf

diff --git a/help/Change.log b/help/Change.log
@@ -1170,3 +1170,45 @@ OR NEWER- UPDATE IMMEDIATELY.
   when user used guided help.
 * Missed port for x16rv2 on nicehash- fixed.
 * T-rex x16rv instead of x16rv2 - fixed.
+
+############################################
+############################################
+
+# SWARM 2.7.7
+
+## What's New?
+* Added x12 algorithm to SWARM-MINER and
+  SWARM.
+* Improved AI to make better miner choices
+  when multiple bans start occurring.
+* Removed miner_hashtable variable - previous
+  optimization made feature no longer needed.
+* Set Claymore argument -eres to 0 to help
+  with Windows mining. You can change in
+  respective claymore and claymore-amd.ps1
+  files in the "Arguments=" line.
+* AMD no longer requires voltages to be set
+  for overclocking in windows, and vice-versa
+  in HiveOS. (still need to change in local
+  SWARM oc if used, and it requires both voltages
+  and clock speed)
+* ``-Coin`` Parameter behaves differently now.
+  * ``Auto_Coin`` set to "No", you will direct mine
+    the coin (c=``-PasswordCurrency1``) in pool.
+  * ``Auto_Coin`` set to Yes, you will auto-exchange
+    coin. (c=``-PasswordCurrency1``,mc=``-Coin``)
+  * Examples of both:
+    ``-Algorithm x16rv2 -Auto_Coin No -Coin RVN -Wallet1 [RAVEN ADDRESS] -PasswordCurrency1 RVN`` 
+      You will mine RVN to RVN wallet.
+    ``-Algorithm x16rv2 -Auto_Coin Yes -Coin RVN -Wallet1 [BTC ADDRESS] -PasswordCurrency1 BTC`` 
+      You will mine RVN and auto-exchange to BTC wallet.
+    ``-Algorithm mtp,x16rv2 -Auto_Coin Yes -Coin RVN,XZC -Wallet1 [BTC ADDRESS] -PasswordCurrency1 BTC``
+      You will mine either RVN and XZC (which ever one is more profitable), and auto-exchange to BTC
+* Remember: -Auto_Coin on works on pools with mc= argument. If you add other pools, SWARM
+   will default auto-algo switch with them instead using algorithms in ``-Algorithm`` argument.
+
+## Updates
+* z-enemy updated
+* cryptodredge updated
+* tt-miner updated
+* nbminer updated
diff --git a/help/SWARM_help.txt b/help/SWARM_help.txt
@@ -177,7 +177,7 @@ Argument          Options           Explanation
                                           Used when -Type NVIDIA2 is specified. Will not
                                           work with Pools that only use BTC.
 
--AltWallet2  [Wallet Address]           Altcoin wallet adddress. Is used in combinatation of -Wallet1
+-AltWallet3  [Wallet Address]           Altcoin wallet adddress. Is used in combinatation of -Wallet1
                                          argument. This will tell SWARM if it switches to pool
                                          to auto-exchange into a coin other than BTC.
                                          Used when -Type NVIDIA2 is specified. Will not
@@ -223,8 +223,8 @@ Argument          Options           Explanation
 -Auto_Coin      [Yes,No]            Turns on Auto_Coin switching for pools that are capable of it.
                                     Default is "No".
 
--Auto_Algo     [Yes,No]		    Default is "Yes". Should always be set to "Yes", except when using the -Coin
-				                      Parameter with multiple coins. See -Coin for more information.
+-Auto_Algo     [Yes,No]		    Default is "Yes". Should always be set to "Yes", even when single
+                                    coin mining. Only avaiable for debug purposes.
 
 -Volume         [0-100]             Default is No. Volume calculates pool hashrate % in comparision
                                     to other pools, and will penalize pools based on percent difference
@@ -256,7 +256,8 @@ Argument          Options           Explanation
 -Switch_Threshold   0-1000          Expression is in percentage. This will add a percentage based
                                     increase in profit of current miner, in order to decrease
                                     switching unless profit breaks over x%, where x is the number
-                                    specified. Default is 1%.
+                                    specified. Default is 1%. This increase is set on INCOMING
+                                    estimates, not its current profit/day.
 
 -Threshold     [.1 - 100000]	    Expressed in BTC/day. Default is .02. If the total daily profits of a
 				    particular algo/coin exceed the -Threshold argument, it will be removed
@@ -461,13 +462,25 @@ Argument          Options           Explanation
 
 Quickly Switch Between Profit Switching To Direct Coin Mining
 
--Coin        [Pool Symbol Of Coin]      When this is specified, SWARM will convert
-                                        c= in pool string to this symbol, allowing
-                                        you to mine a single coin. Must be used in
-                                        conjuction with Algorithm parameter, only
-                                        one coin can be selected. 
-                                        -Wallet1 should be coin address
-                                        -PasswordCurrency1 should be coin Symbol.
+-Coin        [Pool Symbol Of Coin]      Coin has two different modes:
+                                        1.) If used with Auto_Coin "Yes", you can
+                                            mine a sub-set of specific coins, and
+                                            auto-exchange them. Works only with pools
+                                            capable of -Auto_Coin. For example:
+
+                                        -Algorithm mtp,x16rv2 -Coin RVN,XZC -Auto_Coin Yes -PasswordCurrency1 BTC
+
+                                          This will allow you to switch between either RVN or XZC, which ever is
+                                          more profitable, and auto-exchange to BTC wallet (-Wallet1 parameter).
+                                          You can mine just one coin, or mutliple.
+
+                                        2.) If used with -Auto_Coin "No", you will directly mine
+                                            a single coin.
+
+                                        -Algorithm x16rv2 -Coin RVN -Auto_Coin No -PasswordCurrency1 RVN
+
+                                          This will allow you to switch to single coin mining, and mine to
+                                          RVN wallet.
 
 ***********************************************************************************************************
 ************* Coin Parameters *****************************************************************************
@@ -518,7 +531,7 @@ They will be enabled when coin is most profitable.
                                                      (Note: this would be a RVN address)
 
 ***********************************************************************************************************
-************** Whalesburg Pool Paramters*******************************************************************
+************** Whalesburg Pool Paramters ******************************************************************
 ***********************************************************************************************************
 
         Required If Using -Poolname Whalesburg
@@ -547,7 +560,7 @@ Dividing Miner
 
 SWARM has the capability of dividing miner into seperate device groups. By default, 
 it is set to use Wallet1 & PasswordCurrency1. You can however choose to divide you miner, up to three 
-different groups. This is the commands/options you must add to do so:
+different groups with NVIDIA. This is the commands/options you must add to do so:
 
 -Type
 
@@ -646,5 +659,5 @@ Example of use;
 
 This will tell miner to use NVIDIA1 with Wallet1 which is BTC, and to use same wallet for CPU which is 
 BTC. It will use wallet1 when mining on nlpool, and -Nicehash_Wallet1 when mining on nicehash. 
-Both are BTC wallets.
+Both are BTC wallets. CPU miner will use 3 cpu cores.
 **************************