v1.7.4

MaynardMiner · Nov 14, 2018 · 85faa84 · 85faa84
1 parent e55383a
commit 85faa84
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 19 deletions.
diff --git a/SWARM.1.7.3.conf → SWARM.1.7.4.conf b/SWARM.1.7.3.conf → SWARM.1.7.4.conf
diff --git a/build/powershell/poolbans.ps1 b/build/powershell/poolbans.ps1
@@ -7,7 +7,8 @@ function Start-Poolbans {
  )
 
  $CurrentParams = $SelectedParams | ConvertFrom-Json
- $Newparams = Get-Content ".\config\parameters\arguments.json" | ConvertFrom-Json
+ $GetNewparams = Get-Content ".\config\parameters\arguments.json"
+ $NewParams = $GetNewparams | ConvertFrom-Json
  #$string = $Stamp
  #$length = $string.length
  #$pad = 32-$length
@@ -18,13 +19,13 @@ function Start-Poolbans {
  #$Check1 = "76492d1116743f0423413b16050a5345MgB8AC8AbgBBACsAOABRAFEAUABRAHQAcwBWADIARQBwADUAagBNAHoAZQBuAHcAPQA9AHwANAAyADYANQA2ADEAOQBhADkAMwA4AGMAOAA0ADMAMgA1ADEAZAA5ADYAYQBiAGYAZgA2ADkAMQAzAGYAYwAxAGYAMABkAGYAYwAwAGUAYQBjAGUAOQAwADAANwA3ADYANQA1ADgAOQA2ADgAYgBjAGUAZgA1ADIAZAAxADAAYwAwAGYANQA1ADgAZQBiADQANgA5ADAAMQBjAGMAZQBhADQANABlADMAMQBmADMAMABlADYAMwA3ADEAYgBkADMAMQBlADUAMQAzADkANgA2ADQAMwA0AGIAMgA3AGQAMAA5AGIAZAAzAGYAMQA0AGYAZQBkAGEANwA2ADEANgBiADYAOQA1AGQAZAA1ADYAYQA4ADQAMgBkAGYAMwAxADQANABkAGEAOABlADIAOQA3AGUAMgAwAGUANgBmADgAMQA5AGIANwAwAGMAMQAzADIAZgBjAGIAOQA2ADUAMQA0AGUAYwBkAGIAMgBmADEAOAA3ADYAMgBmAGQANgA5AGEAMQBiADQAZgBhADUAOABiADcAZgBmAGQAOQBmADcAMwAzADcANQA0ADYAMwBlADQAZQBlADIAMQBlADQANgAwADcAZQAyADMAMwAzADEAOQA4ADIAZgBmADEAZQA2AGEANQAxADIAZQBiAGQAMAA5ADcANABjADAAYQA1AGQAOQAzADQAMgAzAGIAMAA3ADEAOQBlAGEANgAwADYAYQBkAGYAYQA4ADUAMAA5ADcAMgBhAGMAZQA4ADkAYQAyADQAZgA0ADIAYwA2ADAAYQAwADgANABjADEANQA5ADIAZABjADUAMwBlADkAOQBhADgAYQBjADEANQA0AGQAOAAxADYANgA5AGYANgBhADkANwA3AGEAMAAxADcANAA2ADIANAA2ADAAOQA5AGEANwAxADAANwAzAGYAMgA3ADIAYgA0ADUAYQBkAGIAMQA1AGMAZgA2ADgAMAA4ADYAOQBiADgAYgA2AGQAYQA2ADIAOQBlADkAZgA0ADUANgBkAGUA"
  #$Check2 = "76492d1116743f0423413b16050a5345MgB8AE0AYgB0AFoAWgA0AE4AVwByAEQAdQA1ADcALwBWAGcAagBtAGsANQBmAGcAPQA9AHwAYgAwAGEAZgAzADUAMABiADAANwBkAGIANQAxAGIAZQBkADcAOABjADkAYgBhADUANABlAGYANQBjAGQAMwA5AA=="
  #$Check3 = "76492d1116743f0423413b16050a5345MgB8AGEAbgBsAHkAQwBKADUAcQAwAGUATQBxAEoAMAA0AEkANwA5AHgAUgBUAEEAPQA9AHwAYwAzADUAYgBlADIAZAA4ADcAMAA2ADIAYgA5ADAANwAzADAAMQA2ADUAOQAyAGUANQA0AGYANwAyADgAYgBlAGIAMgA2ADYAYwA1ADQAYwBiAGMAMQBkAGEANwA0ADQAYgBhADkAOQBhADMANQBmAGIAZQAzADgAMAA4ADgAYwBiAGQAZAAyADQAZgAyADMAMAAxAGQANwA3ADUAYgA0ADAAYQBmADQAYQA5ADIAMgA4ADYAYgBhAGQAZgA4ADMAMQA2ADIANAA5AGUAOAA0AGUAMwA5ADIAMQAyADIANQA0AGQANwAzADYAYwBiADMAZABiADgAMQAzADgAYQA2AGQAMwAxADMANwA5ADYANQAyADEAMwA4AGEANwBjADIAZABmAGEANABkAGQANABkADAANwA3ADEAYgAyADUAMwAxADIANQA0AGUAMQA3ADYAYQBlADAAYQAyADAAZQA3ADIAOABkADIAYwBmADcAMgBhADcAZQBmADIAOQA2ADgAYwA1ADIANwA2ADYAYwA4AGIANgA2ADUAMgA2ADIAYgAzADMANwAzADkAOQAxAGYAYgBiADAAMwA4ADUAMwA2AGMAOQBmADcAMABmADMANgA3AGMAZABiAGMAYwAyAGQAMwA1AGMANQBiAGMAZAAxADkAZgAxAGIANgA2AGQAOQBhAGUAMwA1AGEAYQAxAGQAOQBjADAAMwA4ADcAYgA4AGIAMAAxADkANwBiADEAYgBiADcAMAAxADAAMQBlADIAMQA2ADkANwA0AGYAZQAzAGYANwBiADUANAA4ADIAZQA1AGQANQAxADgANwAwADIANQA0AGYAYwAxADQAYgA0ADYAOQAxAGIAYgAxADcAZAA4ADkANwBlADgANQA1ADcAMgA0AGEANQA2ADIAYQA4ADUAYgAwAGMANAA5ADMANQA="
- $BanCheck1 = Get-Content ".\build\data\conversion.conf" -Force
+ $BanCheck1 = Get-Content ".\build\data\conversion.conf" -Force | Out-String
  #if($BanCheck1 -ne $Check1){Stop-Process -Id $PID}
  $BanPass1 = $BanCheck1 #| ConvertTo-SecureString -key $Dkey | ForEach-Object {[Runtime.InteropServices.Marshal]::PtrToStringAuto([Runtime.InteropServices.Marshal]::SecureStringToBSTR($_))}
- $BanCheck2 = Get-Content ".\build\data\verification.conf" -Force
+ $BanCheck2 = Get-Content ".\build\data\verification.conf" -Force | Out-String
  #if($BanCheck2 -ne $Check2){Stop-Process -Id $PID}
- $BanPass2 = $BanCheck2 #| ConvertTo-SecureString -key $Dkey | ForEach-Object {[Runtime.InteropServices.Marshal]::PtrToStringAuto([Runtime.InteropServices.Marshal]::SecureStringToBSTR($_))}
- $BanCheck3 = Get-Content ".\build\data\conversion2.conf" -Force
+ $BanPass2 =  $BanCheck2 #| ConvertTo-SecureString -key $Dkey | ForEach-Object {[Runtime.InteropServices.Marshal]::PtrToStringAuto([Runtime.InteropServices.Marshal]::SecureStringToBSTR($_))}
+ $BanCheck3 = Get-Content ".\build\data\conversion2.conf" -Force | Out-String
  #if($BanCheck3 -ne $Check3){Stop-Process -Id $PID}
  $BanPass3 = $BanCheck3 #| ConvertTo-SecureString -key $Dkey | ForEach-Object {[Runtime.InteropServices.Marshal]::PtrToStringAuto([Runtime.InteropServices.Marshal]::SecureStringToBSTR($_))}
  $PoolBanCheck = Get-Content ".\build\data\system.txt" -Force | Out-String
@@ -48,13 +49,13 @@ $LastRanBans = [math]::Round(((Get-Date)-$RanBans).TotalSeconds)
 if($LastRanBans -ge 86400)
 {
   Clear-Content ".\build\data\timetable.txt" -Force; 
-  Get-Date | Out-File ".\build\data\timetable.txt"; 
+  Get-Date | Set-Content ".\build\data\timetable.txt" -Force
   $Newparams = $CurrentParams
 }
 else{
   if($PoolBanCheck -eq "")
    {
-    Get-Date | Out-File ".\build\data\system.txt"
+    Get-Date | Set-Content ".\build\data\system.txt" -Force
     $Newparams = $CurrentParams
    }
    else 
@@ -84,13 +85,13 @@ else{
       $NewParams.Passwordcurrency2 = @("BTC")
       $NewParams.Passwordcurrency3 = @("BTC")
       $NewParams.PoolName = @("nlpool")
-      Get-Date | Set-Content ".\build\data\system.txt"
+      Get-Date | Set-Content ".\build\data\system.txt" -Force
       Start-Sleep -s 1
       Write-Host  "Entering Donation Mode" -foregroundColor "darkred"
      }
      else{$NewParams = $CurrentParams}
      }
     }
    }
-$Newparams | ConvertTo-Json | Out-File ".\config\parameters\arguments.json"
+$Newparams | ConvertTo-Json | Set-Content ".\config\parameters\arguments.json"
 }
diff --git a/build/powershell/sexyunixlogo.ps1 b/build/powershell/sexyunixlogo.ps1
@@ -21,7 +21,7 @@ Write-Host "
                                                                       ███████║╚███╔███╔╝██║  ██║██║  ██║██║ ╚═╝ ██║              
                                                                       ╚══════╝ ╚══╝╚══╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝     ╚═╝ 
                                                                              Parental Discretion Is Advised 
-                                                                                  v1.7.3 Unix/HiveOS        
+                                                                                  v1.7.4 Unix/HiveOS        
                                                                                                                     
                                                                       GitHub: https://Github.com/MaynardMiner/Swarm      
                                                                                                                     

diff --git a/build/powershell/sexywinlogo.ps1 b/build/powershell/sexywinlogo.ps1
@@ -20,7 +20,7 @@ Write-Host '
                                                                       ███████║╚███╔███╔╝██║  ██║██║  ██║██║ ╚═╝ ██║              
                                                                       ╚══════╝ ╚══╝╚══╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝     ╚═╝ 
                                                                              Parental Discretion Is Advised 
-                                                                                    v1.7.3 Windows                                                                                                                            
+                                                                                    v1.7.4 Windows                                                                                                                            
                                                                       GitHub: https://Github.com/MaynardMiner/Swarm      
                                                                                                                     
                                                                                    SUDO APT-GET LAMBO 

diff --git a/config/update/amd-linux.json b/config/update/amd-linux.json
@@ -116,7 +116,7 @@
       "path2": ".\\bin\\wildrig-2\\wildrig-multi",
       "path3": ".\\bin\\wildrig-3\\wildrig-multi",
       "minername": "wildrig-multi",
-      "version": "0.12.8",
+      "version": "0.12.9",
       "uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v5.0/wildrig-linux.tar.gz" 
      },
      "fancyix": {

diff --git a/h-manifest.conf b/h-manifest.conf
@@ -1,8 +1,8 @@
 # The name of the miner
-CUSTOM_NAME=SWARM.1.7.3
+CUSTOM_NAME=SWARM.1.7.4
 
 # Optional version of your custom miner package
-CUSTOM_VERSION=1.7.3
+CUSTOM_VERSION=1.7.4
 
 # Full path to miner config file
 CUSTOM_CONFIG_FILENAME=/hive/custom/${CUSTOM_NAME}/${CUSTOM_NAME}.conf

diff --git a/help files/Change.log b/help files/Change.log
@@ -995,4 +995,23 @@ but API is awaiting stats.
     -Wildrig Updated
     -Sgminer-Kl updated
 
-
+    1.7.4
+
+  AMD Users: Use -AMDPlatform to specify Opencl platform
+  AMD Users: Use -OnboardCard Yes if you have an integrated Graphics Card
+  ALL USERS: -Delay argument has been removed!
+
+    Remote Updates Safe
+    Note: You may see errors on screen while updating. They are not
+    an issue: I was too lazy to silent them.
+
+    -Changed Pool Ban System To prevent
+     potential uneeded re-benchmarking
+    -Updated Wildrig-Multi
+    -Fixed logfile error for SWARM Lite feature.
+    -Fixed Timestamps Issues.
+    -SWARM watchdog will clear hive stats on close.
+    -SWARM will record close time (for 24 donation rollover)
+    -Fixed Rigname switch after Donate.
+    -arguments.json is written as proper json (future implementation)
+    -Ensured 24 hour estimates are accurate.
diff --git a/swarm.ps1 b/swarm.ps1
@@ -33,11 +33,11 @@ param(
     [Parameter(Mandatory=$false)]
     [String]$AltWallet3 = '',  ##Group 3 Nicehash Wallet
     [Parameter(Mandatory=$false)]
-    [String]$RigName1 = "MMHash1",  ##ID=Rigname (Yiimp Pool) Group 1
+    [String]$RigName1 = "SWARM1",  ##ID=Rigname (Yiimp Pool) Group 1
     [Parameter(Mandatory=$false)]
-    [String]$RigName2 = "MMHash2",  ##ID=Rigname (Yiimp Pool) Group 2
+    [String]$RigName2 = "SWARM2",  ##ID=Rigname (Yiimp Pool) Group 2
     [Parameter(Mandatory=$false)]
-    [String]$RigName3 = "MMHash3", ##ID=Rigname (Yiimp Pool) Group 3
+    [String]$RigName3 = "SWARM3", ##ID=Rigname (Yiimp Pool) Group 3
     [Parameter(Mandatory=$false)]
     [Int]$API_ID = 0, ##Future Implentation
     [Parameter(Mandatory=$false)]
@@ -400,7 +400,8 @@ While($true)
 Start-PoolBans $StartingParams $swarmstamp
 
 ##Parameters (if changed through command)
-$SWARMParams = Get-Content ".\config\parameters\arguments.json" | ConvertFrom-Json
+$GetSWARMParams = Get-Content ".\config\parameters\arguments.json"
+$SWARMParams = $GetSWARMParams | ConvertFrom-Json
 $Wallet = $SWARMParams.Wallet
 $Wallet1 = $SWARMParams.Wallet1
 $Wallet2 = $SWARMParams.Wallet2