Permalink
Browse files

NeoScrypt support.

  • Loading branch information...
1 parent b25681f commit e6e3c6182d660d1dee4b556142ee3e2a7458b1b0 @StuffOfInterest StuffOfInterest committed Nov 7, 2014
@@ -177,7 +177,7 @@ private void InitializeComponent()
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(102, 13);
this.label13.TabIndex = 10;
- this.label13.Text = "Miner Control v1.5.2";
+ this.label13.Text = "Miner Control v1.5.3";
//
// notifyIcon
//
@@ -24,6 +24,7 @@
{ "name": "x15", "hashrate": 3270, "power": 52, "aparam1": "", "aparam2": "TestMiner.exe", "aparam3": "-a x15" },
{ "name": "quark", "hashrate": 7000, "power": 54, "aparam1": "", "aparam2": "TestMiner.exe", "aparam3": "-a quark" },
{ "name": "nist5", "hashrate": 15682, "power": 54, "aparam1": "", "aparam2": "TestMiner.exe", "aparam3": "-a nist5" },
+ { "name": "neoscrypt", "hashrate": 80, "power": 54, "aparam1": "", "aparam2": "TestMiner.exe", "aparam3": "-a neoscrypt" },
{ "name": "scrypt", "hashrate": 540, "power": 60, "aparam1": "c:\\windows\\system32", "aparam2": "cmd.exe", "aparam3": "/c test-run.bat -a scrypt -batch" },
{ "name": "scryptn", "hashrate": 253, "power": 60, "aparam1": "c:\\windows\\system32", "aparam2": "cmd.exe", "aparam3": "/c test-run.bat -a scryptn -batch" },
{ "name": "keccak", "hashrate": 34000, "power": 50, "aparam1": "", "aparam2": "TestMiner.exe", "aparam3": "-a keccak" },
@@ -43,6 +44,7 @@
{ "algo": "scryptn", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3335 -u _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "keccak", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3338 -u _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "nist5", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3340 -u _ACCOUNT_._WORKER_ _SPARAM2_" },
+ { "algo": "neoscrypt", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3341 -u _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "sha256", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3332 -u _ACCOUNT_._WORKER_ _SPARAM2_", "usewindow": true }
]
},
@@ -58,7 +60,8 @@
{ "algo": "scrypt", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3333 -u _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "scryptn", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3335 -u _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "keccak", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3338 -u _ACCOUNT_._WORKER_ _SPARAM2_" },
- { "algo": "nist5", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3340 -u _ACCOUNT_._WORKER_ _SPARAM2_" }
+ { "algo": "nist5", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3340 -u _ACCOUNT_._WORKER_ _SPARAM2_" },
+ { "algo": "neoscrypt", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3341 -u _ACCOUNT_._WORKER_ _SPARAM2_" }
]
},
"trademybit": {
@@ -72,6 +75,7 @@
{ "algo": "x13", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:5550 _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "x15", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:6660 _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "nist5", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:7770 _ACCOUNT_._WORKER_ _SPARAM2_" },
+ { "algo": "neoscrypt", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:8880 _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "scrypt", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:3330 _ACCOUNT_._WORKER_ _SPARAM2_" },
{ "algo": "scryptn", "folder": "_APARAM1_", "command": "_APARAM2_", "arguments": "_APARAM3_ _SPARAM1_:2220 _ACCOUNT_._WORKER_ _SPARAM2_" }
]
@@ -108,7 +108,9 @@ public void UpdateExchange()
{"scryptn", "Scrypt-N"},
{"sha256", "SHA256"},
{"nist5", "Nist5"},
- {"keccak", "Keccak"}
+ {"keccak", "Keccak"},
+ {"quark", "Quark"},
+ {"neoscrypt", "NeoScrypt"}
};
private string GetAlgoDisplayName(string rawname)
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]
@@ -116,7 +116,8 @@ private void ProcessBalances(object jsonData)
{"keccak", 5},
{"sha256", 1},
{"x15", 6},
- {"nist5", 7}
+ {"nist5", 7},
+ {"neoscrypt", 8}
};
private int GetAgorithmId(string algorithmName)

0 comments on commit e6e3c61

Please sign in to comment.