From eed19733455c0fb3d857ca91eb43580f7dfd8caf Mon Sep 17 00:00:00 2001 From: b-rowan Date: Tue, 23 Jan 2024 14:23:57 -0700 Subject: [PATCH] feature: add auradine models. --- pyasic/miners/auradine/__init__.py | 1 + pyasic/miners/auradine/flux/AD/AT1.py | 6 ++++++ pyasic/miners/auradine/flux/AD/AT2.py | 10 ++++++++++ pyasic/miners/auradine/flux/AD/__init__.py | 2 ++ pyasic/miners/auradine/flux/AI/AI2.py | 6 ++++++ pyasic/miners/auradine/flux/AI/AI3.py | 6 ++++++ pyasic/miners/auradine/flux/AI/__init__.py | 2 ++ pyasic/miners/auradine/flux/AT/AD2.py | 6 ++++++ pyasic/miners/auradine/flux/AT/AD3.py | 6 ++++++ pyasic/miners/auradine/flux/AT/__init__.py | 2 ++ pyasic/miners/auradine/flux/__init__.py | 3 +++ pyasic/miners/backends/__init__.py | 2 ++ pyasic/miners/makes.py | 4 ++++ pyasic/miners/miner_factory.py | 19 ++++++++++--------- pyasic/miners/types/__init__.py | 1 + pyasic/miners/types/auradine/AD/AT1.py | 6 ++++++ pyasic/miners/types/auradine/AD/AT2.py | 11 +++++++++++ pyasic/miners/types/auradine/AD/__init__.py | 2 ++ pyasic/miners/types/auradine/AI/AI2.py | 6 ++++++ pyasic/miners/types/auradine/AI/AI3.py | 6 ++++++ pyasic/miners/types/auradine/AI/__init__.py | 2 ++ pyasic/miners/types/auradine/AT/AD2.py | 6 ++++++ pyasic/miners/types/auradine/AT/AD3.py | 6 ++++++ pyasic/miners/types/auradine/AT/__init__.py | 2 ++ pyasic/miners/types/auradine/__init__.py | 3 +++ 25 files changed, 117 insertions(+), 9 deletions(-) create mode 100644 pyasic/miners/auradine/__init__.py create mode 100644 pyasic/miners/auradine/flux/AD/AT1.py create mode 100644 pyasic/miners/auradine/flux/AD/AT2.py create mode 100644 pyasic/miners/auradine/flux/AD/__init__.py create mode 100644 pyasic/miners/auradine/flux/AI/AI2.py create mode 100644 pyasic/miners/auradine/flux/AI/AI3.py create mode 100644 pyasic/miners/auradine/flux/AI/__init__.py create mode 100644 pyasic/miners/auradine/flux/AT/AD2.py create mode 100644 pyasic/miners/auradine/flux/AT/AD3.py create mode 100644 pyasic/miners/auradine/flux/AT/__init__.py create mode 100644 pyasic/miners/auradine/flux/__init__.py create mode 100644 pyasic/miners/types/auradine/AD/AT1.py create mode 100644 pyasic/miners/types/auradine/AD/AT2.py create mode 100644 pyasic/miners/types/auradine/AD/__init__.py create mode 100644 pyasic/miners/types/auradine/AI/AI2.py create mode 100644 pyasic/miners/types/auradine/AI/AI3.py create mode 100644 pyasic/miners/types/auradine/AI/__init__.py create mode 100644 pyasic/miners/types/auradine/AT/AD2.py create mode 100644 pyasic/miners/types/auradine/AT/AD3.py create mode 100644 pyasic/miners/types/auradine/AT/__init__.py create mode 100644 pyasic/miners/types/auradine/__init__.py diff --git a/pyasic/miners/auradine/__init__.py b/pyasic/miners/auradine/__init__.py new file mode 100644 index 00000000..b6cc0d73 --- /dev/null +++ b/pyasic/miners/auradine/__init__.py @@ -0,0 +1 @@ +from .flux import * diff --git a/pyasic/miners/auradine/flux/AD/AT1.py b/pyasic/miners/auradine/flux/AD/AT1.py new file mode 100644 index 00000000..7ac0b7d6 --- /dev/null +++ b/pyasic/miners/auradine/flux/AD/AT1.py @@ -0,0 +1,6 @@ +from pyasic.miners.backends import Auradine +from pyasic.miners.types import AuradineAT1500 + + +class AuradineFluxAT1500(AuradineAT1500, Auradine): + pass diff --git a/pyasic/miners/auradine/flux/AD/AT2.py b/pyasic/miners/auradine/flux/AD/AT2.py new file mode 100644 index 00000000..208b6e7e --- /dev/null +++ b/pyasic/miners/auradine/flux/AD/AT2.py @@ -0,0 +1,10 @@ +from pyasic.miners.backends import Auradine +from pyasic.miners.types import AuradineAT2860, AuradineAT2880 + + +class AuradineFluxAT2860(AuradineAT2860, Auradine): + pass + + +class AuradineFluxAT2880(AuradineAT2880, Auradine): + pass diff --git a/pyasic/miners/auradine/flux/AD/__init__.py b/pyasic/miners/auradine/flux/AD/__init__.py new file mode 100644 index 00000000..0be7a6fe --- /dev/null +++ b/pyasic/miners/auradine/flux/AD/__init__.py @@ -0,0 +1,2 @@ +from .AT1 import AuradineFluxAT1500 +from .AT2 import AuradineFluxAT2860, AuradineFluxAT2880 diff --git a/pyasic/miners/auradine/flux/AI/AI2.py b/pyasic/miners/auradine/flux/AI/AI2.py new file mode 100644 index 00000000..ebf6506e --- /dev/null +++ b/pyasic/miners/auradine/flux/AI/AI2.py @@ -0,0 +1,6 @@ +from pyasic.miners.backends import Auradine +from pyasic.miners.types import AuradineAI2500 + + +class AuradineFluxAI2500(AuradineAI2500, Auradine): + pass diff --git a/pyasic/miners/auradine/flux/AI/AI3.py b/pyasic/miners/auradine/flux/AI/AI3.py new file mode 100644 index 00000000..d495c711 --- /dev/null +++ b/pyasic/miners/auradine/flux/AI/AI3.py @@ -0,0 +1,6 @@ +from pyasic.miners.backends import Auradine +from pyasic.miners.types import AuradineAI3680 + + +class AuradineFluxAI3680(AuradineAI3680, Auradine): + pass diff --git a/pyasic/miners/auradine/flux/AI/__init__.py b/pyasic/miners/auradine/flux/AI/__init__.py new file mode 100644 index 00000000..ebed7183 --- /dev/null +++ b/pyasic/miners/auradine/flux/AI/__init__.py @@ -0,0 +1,2 @@ +from .AI2 import AuradineFluxAI2500 +from .AI3 import AuradineFluxAI3680 diff --git a/pyasic/miners/auradine/flux/AT/AD2.py b/pyasic/miners/auradine/flux/AT/AD2.py new file mode 100644 index 00000000..051b139c --- /dev/null +++ b/pyasic/miners/auradine/flux/AT/AD2.py @@ -0,0 +1,6 @@ +from pyasic.miners.backends import Auradine +from pyasic.miners.types import AuradineAD2500 + + +class AuradineFluxAD2500(AuradineAD2500, Auradine): + pass diff --git a/pyasic/miners/auradine/flux/AT/AD3.py b/pyasic/miners/auradine/flux/AT/AD3.py new file mode 100644 index 00000000..650ae2aa --- /dev/null +++ b/pyasic/miners/auradine/flux/AT/AD3.py @@ -0,0 +1,6 @@ +from pyasic.miners.backends import Auradine +from pyasic.miners.types import AuradineAD3500 + + +class AuradineFluxAD3500(AuradineAD3500, Auradine): + pass diff --git a/pyasic/miners/auradine/flux/AT/__init__.py b/pyasic/miners/auradine/flux/AT/__init__.py new file mode 100644 index 00000000..3b29e4f2 --- /dev/null +++ b/pyasic/miners/auradine/flux/AT/__init__.py @@ -0,0 +1,2 @@ +from .AD2 import AuradineFluxAD2500 +from .AD3 import AuradineFluxAD3500 diff --git a/pyasic/miners/auradine/flux/__init__.py b/pyasic/miners/auradine/flux/__init__.py new file mode 100644 index 00000000..9a346701 --- /dev/null +++ b/pyasic/miners/auradine/flux/__init__.py @@ -0,0 +1,3 @@ +from .AD import * +from .AI import * +from .AT import * diff --git a/pyasic/miners/backends/__init__.py b/pyasic/miners/backends/__init__.py index 656662db..97121635 100644 --- a/pyasic/miners/backends/__init__.py +++ b/pyasic/miners/backends/__init__.py @@ -14,6 +14,7 @@ # limitations under the License. - # ------------------------------------------------------------------------------ from .antminer import AntminerModern, AntminerOld +from .auradine import Auradine from .avalonminer import AvalonMiner from .bfgminer import BFGMiner from .bmminer import BMMiner @@ -23,6 +24,7 @@ from .cgminer import CGMiner from .epic import ePIC from .goldshell import GoldshellMiner from .hiveon import Hiveon +from .innosilicon import Innosilicon from .luxminer import LUXMiner from .vnish import VNish from .whatsminer import M2X, M3X, M5X, M6X diff --git a/pyasic/miners/makes.py b/pyasic/miners/makes.py index 1d5c1187..de86dfd2 100644 --- a/pyasic/miners/makes.py +++ b/pyasic/miners/makes.py @@ -35,3 +35,7 @@ class InnosiliconMake(BaseMiner): class GoldshellMake(BaseMiner): make = "Goldshell" + + +class AuradineMake(BaseMiner): + make = "Auradine" diff --git a/pyasic/miners/miner_factory.py b/pyasic/miners/miner_factory.py index 32acdc5f..a4054475 100644 --- a/pyasic/miners/miner_factory.py +++ b/pyasic/miners/miner_factory.py @@ -26,20 +26,21 @@ import httpx from pyasic import settings from pyasic.logger import logger from pyasic.miners.antminer import * +from pyasic.miners.auradine import * from pyasic.miners.avalonminer import * from pyasic.miners.backends import ( + Auradine, AvalonMiner, BMMiner, BOSMiner, BTMiner, GoldshellMiner, Hiveon, + Innosilicon, LUXMiner, VNish, ePIC, ) -from pyasic.miners.backends.auradine import Auradine -from pyasic.miners.backends.innosilicon import Innosilicon from pyasic.miners.base import AnyMiner from pyasic.miners.goldshell import * from pyasic.miners.innosilicon import * @@ -396,13 +397,13 @@ MINER_CLASSES = { }, MinerTypes.AURADINE: { None: Auradine, - # "AT1500": None, - # "AT2860": None, - # "AT2880": None, - # "AI2500": None, - # "AI3680": None, - # "AD2500": None, - # "AD3500": None, + "AT1500": AuradineFluxAT1500, + "AT2860": AuradineFluxAT2860, + "AT2880": AuradineFluxAT2880, + "AI2500": AuradineFluxAI2500, + "AI3680": AuradineFluxAI3680, + "AD2500": AuradineFluxAD2500, + "AD3500": AuradineFluxAD3500, }, } diff --git a/pyasic/miners/types/__init__.py b/pyasic/miners/types/__init__.py index a35a8fa1..e9f4f41b 100644 --- a/pyasic/miners/types/__init__.py +++ b/pyasic/miners/types/__init__.py @@ -15,6 +15,7 @@ # ------------------------------------------------------------------------------ from .antminer import * +from .auradine import * from .avalonminer import * from .goldshell import * from .innosilicon import * diff --git a/pyasic/miners/types/auradine/AD/AT1.py b/pyasic/miners/types/auradine/AD/AT1.py new file mode 100644 index 00000000..2858a5ad --- /dev/null +++ b/pyasic/miners/types/auradine/AD/AT1.py @@ -0,0 +1,6 @@ +from pyasic.miners.makes import AuradineMake + + +class AuradineAT1500(AuradineMake): + raw_model = "AT1500" + expected_fans = 4 diff --git a/pyasic/miners/types/auradine/AD/AT2.py b/pyasic/miners/types/auradine/AD/AT2.py new file mode 100644 index 00000000..6ce2bc64 --- /dev/null +++ b/pyasic/miners/types/auradine/AD/AT2.py @@ -0,0 +1,11 @@ +from pyasic.miners.makes import AuradineMake + + +class AuradineAT2860(AuradineMake): + raw_model = "AT2860" + expected_fans = 4 + + +class AuradineAT2880(AuradineMake): + raw_model = "AT2880" + expected_fans = 4 diff --git a/pyasic/miners/types/auradine/AD/__init__.py b/pyasic/miners/types/auradine/AD/__init__.py new file mode 100644 index 00000000..070612a0 --- /dev/null +++ b/pyasic/miners/types/auradine/AD/__init__.py @@ -0,0 +1,2 @@ +from .AT1 import AuradineAT1500 +from .AT2 import AuradineAT2860, AuradineAT2880 diff --git a/pyasic/miners/types/auradine/AI/AI2.py b/pyasic/miners/types/auradine/AI/AI2.py new file mode 100644 index 00000000..8cb05218 --- /dev/null +++ b/pyasic/miners/types/auradine/AI/AI2.py @@ -0,0 +1,6 @@ +from pyasic.miners.makes import AuradineMake + + +class AuradineAI2500(AuradineMake): + raw_model = "AI2500" + expected_fans = 0 diff --git a/pyasic/miners/types/auradine/AI/AI3.py b/pyasic/miners/types/auradine/AI/AI3.py new file mode 100644 index 00000000..05a6bf0e --- /dev/null +++ b/pyasic/miners/types/auradine/AI/AI3.py @@ -0,0 +1,6 @@ +from pyasic.miners.makes import AuradineMake + + +class AuradineAI3680(AuradineMake): + raw_model = "AI3680" + expected_fans = 0 diff --git a/pyasic/miners/types/auradine/AI/__init__.py b/pyasic/miners/types/auradine/AI/__init__.py new file mode 100644 index 00000000..b6fa8ad3 --- /dev/null +++ b/pyasic/miners/types/auradine/AI/__init__.py @@ -0,0 +1,2 @@ +from .AI2 import AuradineAI2500 +from .AI3 import AuradineAI3680 diff --git a/pyasic/miners/types/auradine/AT/AD2.py b/pyasic/miners/types/auradine/AT/AD2.py new file mode 100644 index 00000000..a3e704b4 --- /dev/null +++ b/pyasic/miners/types/auradine/AT/AD2.py @@ -0,0 +1,6 @@ +from pyasic.miners.makes import AuradineMake + + +class AuradineAD2500(AuradineMake): + raw_model = "AD2500" + expected_fans = 0 diff --git a/pyasic/miners/types/auradine/AT/AD3.py b/pyasic/miners/types/auradine/AT/AD3.py new file mode 100644 index 00000000..e3b04add --- /dev/null +++ b/pyasic/miners/types/auradine/AT/AD3.py @@ -0,0 +1,6 @@ +from pyasic.miners.makes import AuradineMake + + +class AuradineAD3500(AuradineMake): + raw_model = "AD3500" + expected_fans = 0 diff --git a/pyasic/miners/types/auradine/AT/__init__.py b/pyasic/miners/types/auradine/AT/__init__.py new file mode 100644 index 00000000..a46be8b9 --- /dev/null +++ b/pyasic/miners/types/auradine/AT/__init__.py @@ -0,0 +1,2 @@ +from .AD2 import AuradineAD2500 +from .AD3 import AuradineAD3500 diff --git a/pyasic/miners/types/auradine/__init__.py b/pyasic/miners/types/auradine/__init__.py new file mode 100644 index 00000000..9a346701 --- /dev/null +++ b/pyasic/miners/types/auradine/__init__.py @@ -0,0 +1,3 @@ +from .AD import * +from .AI import * +from .AT import *