Compare commits

...

5 Commits

Author SHA1 Message Date
Brett Rowan
67da56a03b version: bump version number. 2024-05-17 21:06:23 -06:00
Brett Rowan
be8633185d bug: remove StrEnum references. 2024-05-17 21:02:57 -06:00
Upstream Data
189deae3d1 version: bump version number. 2024-05-17 09:05:00 -06:00
Brett Rowan
46188ad52b Merge pull request #146 from UpstreamData/fix_typo
fix typo
2024-05-17 09:02:22 -06:00
John-Paul Compagnone
19e232ddb9 fix typo 2024-05-17 11:01:01 -04:00
5 changed files with 41 additions and 14 deletions

View File

@@ -14,10 +14,10 @@
# limitations under the License. -
# ------------------------------------------------------------------------------
from enum import StrEnum
from enum import Enum
class MinerFirmware(StrEnum):
class MinerFirmware(str, Enum):
STOCK = "Stock"
BRAIINS_OS = "BOS+"
VNISH = "VNish"
@@ -25,3 +25,6 @@ class MinerFirmware(StrEnum):
HIVEON = "Hive"
LUXOS = "LuxOS"
MARATHON = "MaraFW"
def __str__(self):
return self.value

View File

@@ -14,10 +14,10 @@
# limitations under the License. -
# ------------------------------------------------------------------------------
from enum import StrEnum
from enum import Enum
class MinerMake(StrEnum):
class MinerMake(str, Enum):
WHATSMINER = "WhatsMiner"
ANTMINER = "AntMiner"
AVALONMINER = "AvalonMiner"
@@ -25,3 +25,6 @@ class MinerMake(StrEnum):
GOLDSHELL = "Goldshell"
AURADINE = "Auradine"
EPIC = "ePIC"
def __str__(self):
return self.value

View File

@@ -1,7 +1,7 @@
from enum import StrEnum
from enum import Enum
class AntminerModels(StrEnum):
class AntminerModels(str, Enum):
D3 = "D3"
HS3 = "HS3"
L3Plus = "L3+"
@@ -46,8 +46,11 @@ class AntminerModels(StrEnum):
S21 = "S21"
T21 = "T21"
def __str__(self):
return self.value
class WhatsminerModels(StrEnum):
class WhatsminerModels(str, Enum):
M20V10 = "M20 V10"
M20SV10 = "M20S V10"
M20SV20 = "M20S V20"
@@ -263,8 +266,11 @@ class WhatsminerModels(StrEnum):
M66SVK30 = "M66S VK30"
M66SVK40 = "M66S VK40"
def __str__(self):
return self.value
class AvalonminerModels(StrEnum):
class AvalonminerModels(str, Enum):
Avalon721 = "Avalon 721"
Avalon741 = "Avalon 741"
Avalon761 = "Avalon 761"
@@ -278,13 +284,19 @@ class AvalonminerModels(StrEnum):
Avalon1166Pro = "Avalon 1166 Pro"
Avalon1246 = "Avalon 1246"
def __str__(self):
return self.value
class InnosiliconModels(StrEnum):
class InnosiliconModels(str, Enum):
T3HPlus = "T3H+"
A10X = "A10X"
def __str__(self):
return self.value
class GoldshellModels(StrEnum):
class GoldshellModels(str, Enum):
CK5 = "CK5"
HS5 = "HS5"
KD5 = "KD5"
@@ -292,13 +304,19 @@ class GoldshellModels(StrEnum):
KDBoxII = "KD Box II"
KDBoxPro = "KD Box Pro"
def __str__(self):
return self.value
class ePICModels(StrEnum):
class ePICModels(str, Enum):
BM520i = "BlockMiner 520i"
BM720i = "BlockMiner 720i"
def __str__(self):
return self.value
class AuradineModels(StrEnum):
class AuradineModels(str, Enum):
AT1500 = "AT1500"
AT2860 = "AT2860"
AT2880 = "AT2880"
@@ -307,6 +325,9 @@ class AuradineModels(StrEnum):
AD2500 = "AD2500"
AD3500 = "AD3500"
def __str__(self):
return self.value
class MinerModel:
ANTMINER = AntminerModels

View File

@@ -270,7 +270,7 @@ class ePIC(ePICFirmware):
ideal = hb["Hashrate"][1] / 100
hashrate += hb["Hashrate"][0] / ideal
return AlgoHashRate.SHA256(hashrate, HashUnit.SHA256.GH).int(
return AlgoHashRate.SHA256(hashrate, HashUnit.SHA256.MH).into(
self.algo.unit.default
)
except (LookupError, ValueError, TypeError):

View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "pyasic"
version = "0.57.1"
version = "0.57.3"
description = "A simplified and standardized interface for Bitcoin ASICs."
authors = ["UpstreamData <brett@upstreamdata.ca>"]
repository = "https://github.com/UpstreamData/pyasic"