version: bump version number

Fixes: #311

docs/miners/antminer/X19.md

@@ -157,6 +157,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19j Pro+ (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jProPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19j XP (Stock)
 
 - [x] Shutdowns
@@ -170,6 +183,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19j+ (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19j No PIC (Stock)
 
 - [x] Shutdowns
@@ -287,6 +313,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 XP Hydro (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19XPHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19+ (BOS+)
 
 - [x] Shutdowns
@@ -443,6 +482,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 Hydro (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19Hydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19 Pro (VNish)
 
 - [x] Shutdowns
@@ -456,6 +508,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 Pro A (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19ProA
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19 Pro Hydro (VNish)
 
 - [x] Shutdowns
@@ -469,6 +534,32 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 XP (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19 XP Hydro (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19XPHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19a (VNish)
 
 - [x] Shutdowns

docs/miners/antminer/X3.md

@@ -73,7 +73,7 @@
 - [x] Setpoints
 - [x] Presets
 
-::: pyasic.miners.antminer.vnish.X3.L3.VnishL3Plus
+::: pyasic.miners.antminer.vnish.X3.L3.VNishL3Plus
     handler: python
     options:
         show_root_heading: false

docs/miners/antminer/X7.md

@@ -47,7 +47,7 @@
 - [x] Setpoints
 - [x] Presets
 
-::: pyasic.miners.antminer.vnish.X7.L7.VnishL7
+::: pyasic.miners.antminer.vnish.X7.L7.VNishL7
     handler: python
     options:
         show_root_heading: false

docs/miners/antminer/X9.md

@@ -105,6 +105,19 @@
         show_root_heading: false
         heading_level: 0
 
+## L9 (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X9.L9.VNishL9
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## T9 (Hive)
 
 - [ ] Shutdowns

docs/miners/elphapex/DGX.md

@@ -1,6 +1,19 @@
 # pyasic
 ## DGX Models
 
+## DG1 (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.elphapex.daoge.DGX.DG1.ElphapexDG1
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## DG1+ (Stock)
 
 - [ ] Shutdowns
@@ -14,3 +27,16 @@
         show_root_heading: false
         heading_level: 0
 
+## DG1Home (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.elphapex.daoge.DGX.DG1.ElphapexDG1Home
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+

docs/miners/supported_types.md

@@ -86,6 +86,8 @@ details {
                     <li><a href="../antminer/X19#s19j-no-pic-stock">S19j No PIC (Stock)</a></li>
                     <li><a href="../antminer/X19#s19-pro_1-stock">S19 Pro+ (Stock)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-stock">S19j Pro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19j_1-stock">S19j+ (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-stock">S19j Pro+ (Stock)</a></li>
                     <li><a href="../antminer/X19#s19-xp-stock">S19 XP (Stock)</a></li>
                     <li><a href="../antminer/X19#s19a-stock">S19a (Stock)</a></li>
                     <li><a href="../antminer/X19#s19a-pro-stock">S19a Pro (Stock)</a></li>
@@ -656,6 +658,7 @@ details {
                     <li><a href="../antminer/X19#s19-xp-bos_1">S19 XP (BOS+)</a></li>
                     <li><a href="../antminer/X19#s19-pro_1-hydro-bos_1">S19 Pro+ Hydro (BOS+)</a></li>
                     <li><a href="../antminer/X19#t19-bos_1">T19 (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-hydro-bos_1">S19 XP Hydro (BOS+)</a></li>
                 </ul>
         </details>
         <details>
@@ -694,6 +697,12 @@ details {
                     <li><a href="../antminer/X7#l7-vnish">L7 (VNish)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>X9 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X9#l9-vnish">L9 (VNish)</a></li>
+                </ul>
+        </details>
         <details>
             <summary>X17 Series:</summary>
                 <ul>
@@ -709,11 +718,15 @@ details {
                     <li><a href="../antminer/X19#s19-pro-vnish">S19 Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19j-vnish">S19j (VNish)</a></li>
                     <li><a href="../antminer/X19#s19i-vnish">S19i (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-vnish">S19 XP (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-hydro-vnish">S19 XP Hydro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-vnish">S19j Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-vnish">S19j Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-vnish">S19j Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19a-vnish">S19a (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19-hydro-vnish">S19 Hydro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19a-pro-vnish">S19a Pro (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19-pro-a-vnish">S19 Pro A (VNish)</a></li>
                     <li><a href="../antminer/X19#s19-pro-hydro-vnish">S19 Pro Hydro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19k-pro-vnish">S19k Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#t19-vnish">T19 (VNish)</a></li>
@@ -922,6 +935,12 @@ details {
                     <li><a href="../iceriver/KSX#ks5m-stock">KS5M (Stock)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>ALX Series:</summary>
+                <ul>
+                    <li><a href="../iceriver/ALX#al3-stock">AL3 (Stock)</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -953,6 +972,8 @@ details {
             <summary>DGX Series:</summary>
                 <ul>
                     <li><a href="../elphapex/DGX#dg1_1-stock">DG1+ (Stock)</a></li>
+                    <li><a href="../elphapex/DGX#dg1-stock">DG1 (Stock)</a></li>
+                    <li><a href="../elphapex/DGX#dg1home-stock">DG1Home (Stock)</a></li>
                 </ul>
         </details>
     </ul>

pyasic/device/algorithm/__init__.py

@@ -1,5 +1,6 @@
 from .base import MinerAlgoType
 from .blake256 import Blake256Algo
+from .blockflow import BlockFlowAlgo
 from .eaglesong import EaglesongAlgo
 from .equihash import EquihashAlgo
 from .ethash import EtHashAlgo
@@ -24,3 +25,4 @@ class MinerAlgo:
     EAGLESONG = EaglesongAlgo
     ETHASH = EtHashAlgo
     EQUIHASH = EquihashAlgo
+    BLOCKFLOW = BlockFlowAlgo

pyasic/device/algorithm/blockflow.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from .base import MinerAlgoType
+from .hashrate import BlockFlowHashRate
+from .hashrate.unit import BlockFlowUnit
+
+
+class BlockFlowAlgo(MinerAlgoType):
+    hashrate: type[BlockFlowHashRate] = BlockFlowHashRate
+    unit: type[BlockFlowUnit] = BlockFlowUnit
+
+    name = "BlockFlow"

pyasic/device/algorithm/hashrate/__init__.py

@@ -1,5 +1,6 @@
 from .base import AlgoHashRateType
 from .blake256 import Blake256HashRate
+from .blockflow import BlockFlowHashRate
 from .eaglesong import EaglesongHashRate
 from .equihash import EquihashHashRate
 from .ethash import EtHashHashRate
@@ -22,3 +23,4 @@ class AlgoHashRate:
     EAGLESONG = EaglesongHashRate
     ETHASH = EtHashHashRate
     EQUIHASH = EquihashHashRate
+    BLOCKFLOW = BlockFlowHashRate

pyasic/device/algorithm/hashrate/blockflow.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from typing_extensions import Self
+
+from pyasic.device.algorithm.hashrate.base import AlgoHashRateType
+from pyasic.device.algorithm.hashrate.unit.blockflow import BlockFlowUnit
+
+from .unit import HashUnit
+
+
+class BlockFlowHashRate(AlgoHashRateType):
+    rate: float
+    unit: BlockFlowUnit = HashUnit.BLOCKFLOW.default
+
+    def into(self, other: BlockFlowUnit) -> Self:
+        return self.__class__(
+            rate=self.rate / (other.value / self.unit.value), unit=other
+        )

pyasic/device/algorithm/hashrate/unit/__init__.py

@@ -1,4 +1,5 @@
 from .blake256 import Blake256Unit
+from .blockflow import BlockFlowUnit
 from .eaglesong import EaglesongUnit
 from .equihash import EquihashUnit
 from .ethash import EtHashUnit
@@ -21,3 +22,4 @@ class HashUnit:
     EAGLESONG = EaglesongUnit
     ETHASH = EtHashUnit
     EQUIHASH = EquihashUnit
+    BLOCKFLOW = BlockFlowUnit

pyasic/device/algorithm/hashrate/unit/blockflow.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from .base import AlgoHashRateUnitType
+
+
+class BlockFlowUnit(AlgoHashRateUnitType):
+    H = 1
+    KH = int(H) * 1000
+    MH = int(KH) * 1000
+    GH = int(MH) * 1000
+    TH = int(GH) * 1000
+    PH = int(TH) * 1000
+    EH = int(PH) * 1000
+    ZH = int(EH) * 1000
+
+    default = MH

pyasic/device/models.py

@@ -43,6 +43,7 @@ class AntminerModels(MinerModelType):
     S19jNoPIC = "S19j No PIC"
     S19ProPlus = "S19 Pro+"
     S19jPro = "S19j Pro"
+    S19jPlus = "S19j+"
     S19jProNoPIC = "S19j Pro No PIC"
     S19jProPlus = "S19j Pro+"
     S19jProPlusNoPIC = "S19j Pro+ No PIC"
@@ -54,6 +55,7 @@ class AntminerModels(MinerModelType):
     S19ProPlusHydro = "S19 Pro+ Hydro"
     S19KPro = "S19K Pro"
     S19kPro = "S19k Pro"
+    S19ProA = "S19 Pro A"
     S19kProNoPIC = "S19k Pro No PIC"
     S19jXP = "S19j XP"
     T19 = "T19"
@@ -63,6 +65,7 @@ class AntminerModels(MinerModelType):
     S21Pro = "S21 Pro"
     S21Hydro = "S21 Hydro"
     T21 = "T21"
+    S19XPHydro = "S19 XP Hydro"
 
     def __str__(self):
         return self.value
@@ -532,6 +535,7 @@ class IceRiverModels(MinerModelType):
     KS5 = "KS5"
     KS5L = "KS5L"
     KS5M = "KS5M"
+    AL3 = "AL3"
 
     def __str__(self):
         return self.value
@@ -557,7 +561,9 @@ class BraiinsModels(MinerModelType):
 
 
 class ElphapexModels(MinerModelType):
+    DG1 = "DG1"
     DG1Plus = "DG1+"
+    DG1Home = "DG1Home"
 
 
 class MinerModel:

pyasic/miners/antminer/bmminer/X19/S19.py

@@ -25,7 +25,9 @@ from pyasic.miners.device.models import (
     S19i,
     S19j,
     S19jNoPIC,
+    S19jPlus,
     S19jPro,
+    S19jProPlus,
     S19jXP,
     S19KPro,
     S19Plus,
@@ -80,6 +82,10 @@ class BMMinerS19jPro(AntminerModern, S19jPro):
     pass
 
 
+class BMMinerS19jPlus(AntminerModern, S19jPlus):
+    pass
+
+
 class BMMinerS19L(AntminerModern, S19L):
     pass
 
@@ -102,3 +108,7 @@ class BMMinerS19KPro(AntminerModern, S19KPro):
 
 class BMMinerS19jXP(AntminerModern, S19jXP):
     pass
+
+
+class BMMinerS19jProPlus(AntminerModern, S19jProPlus):
+    pass

pyasic/miners/antminer/bmminer/X19/__init__.py

@@ -22,7 +22,9 @@ from .S19 import (
     BMMinerS19i,
     BMMinerS19j,
     BMMinerS19jNoPIC,
+    BMMinerS19jPlus,
     BMMinerS19jPro,
+    BMMinerS19jProPlus,
     BMMinerS19jXP,
     BMMinerS19KPro,
     BMMinerS19L,

pyasic/miners/antminer/bosminer/X19/S19.py

@@ -30,6 +30,7 @@ from pyasic.miners.device.models import (
     S19Plus,
     S19Pro,
     S19ProPlusHydro,
+    S19XPHydro,
 )
 
 
@@ -87,3 +88,7 @@ class BOSMinerS19XP(BOSer, S19XP):
 
 class BOSMinerS19ProPlusHydro(BOSer, S19ProPlusHydro):
     pass
+
+
+class BOSMinerS19XPHydro(BOSer, S19XPHydro):
+    pass

pyasic/miners/antminer/bosminer/X19/__init__.py

@@ -29,5 +29,6 @@ from .S19 import (
     BOSMinerS19Pro,
     BOSMinerS19ProPlusHydro,
     BOSMinerS19XP,
+    BOSMinerS19XPHydro,
 )
 from .T19 import BOSMinerT19

pyasic/miners/antminer/vnish/X19/S19.py

@@ -20,13 +20,16 @@ from pyasic.miners.device.models import (
     S19XP,
     S19a,
     S19aPro,
+    S19Hydro,
     S19i,
     S19j,
     S19jPro,
     S19kPro,
     S19NoPIC,
     S19Pro,
+    S19ProA,
     S19ProHydro,
+    S19XPHydro,
 )
 
 
@@ -42,10 +45,18 @@ class VNishS19Pro(VNish, S19Pro):
     pass
 
 
+class VNishS19Hydro(VNish, S19Hydro):
+    pass
+
+
 class VNishS19XP(VNish, S19XP):
     pass
 
 
+class VNishS19XPHydro(VNish, S19XPHydro):
+    pass
+
+
 class VNishS19a(VNish, S19a):
     pass
 
@@ -54,6 +65,10 @@ class VNishS19aPro(VNish, S19aPro):
     pass
 
 
+class VNishS19ProA(VNish, S19ProA):
+    pass
+
+
 class VNishS19i(VNish, S19i):
     pass
 
@@ -72,3 +87,7 @@ class VNishS19ProHydro(VNish, S19ProHydro):
 
 class VNishS19kPro(VNish, S19kPro):
     pass
+
+
+class VNishS19ProA(VNish, S19ProA):
+    pass

pyasic/miners/antminer/vnish/X19/__init__.py

@@ -18,13 +18,16 @@ from .S19 import (
     VNishS19,
     VNishS19a,
     VNishS19aPro,
+    VNishS19Hydro,
     VNishS19i,
     VNishS19j,
     VNishS19jPro,
     VNishS19kPro,
     VNishS19NoPIC,
     VNishS19Pro,
+    VNishS19ProA,
     VNishS19ProHydro,
     VNishS19XP,
+    VNishS19XPHydro,
 )
 from .T19 import VNishT19

pyasic/miners/antminer/vnish/X3/L3.py

@@ -18,5 +18,5 @@ from pyasic.miners.backends import VNish
 from pyasic.miners.device.models import L3Plus
 
 
-class VnishL3Plus(VNish, L3Plus):
+class VNishL3Plus(VNish, L3Plus):
     pass

pyasic/miners/antminer/vnish/X3/__init__.py

@@ -14,4 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .L3 import VnishL3Plus
+from .L3 import VNishL3Plus

pyasic/miners/antminer/vnish/X7/L7.py

@@ -18,5 +18,5 @@ from pyasic.miners.backends import VNish
 from pyasic.miners.device.models import L7
 
 
-class VnishL7(VNish, L7):
+class VNishL7(VNish, L7):
     pass

pyasic/miners/antminer/vnish/X7/__init__.py

@@ -14,4 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .L7 import VnishL7
+from .L7 import VNishL7

pyasic/miners/antminer/vnish/X9/L9.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import VNish
+from pyasic.miners.device.models import L9
+
+
+class VNishL9(VNish, L9):
+    pass

pyasic/miners/antminer/vnish/X9/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from .L9 import VNishL9

pyasic/miners/antminer/vnish/__init__.py

@@ -16,6 +16,7 @@
 
 from .X3 import *
 from .X7 import *
+from .X9 import *
 from .X17 import *
 from .X19 import *
 from .X21 import *

pyasic/miners/device/models/antminer/X19/S19.py

@@ -126,6 +126,15 @@ class S19jPro(AntMinerMake):
     algo = MinerAlgo.SHA256
 
 
+class S19jPlus(AntMinerMake):
+    raw_model = MinerModel.ANTMINER.S19jPlus
+
+    expected_chips = 108
+    expected_fans = 4
+    expected_hashboards = 3
+    algo = MinerAlgo.SHA256
+
+
 class S19jProNoPIC(AntMinerMake):
     raw_model = MinerModel.ANTMINER.S19jProNoPIC
 
@@ -216,6 +225,15 @@ class S19KPro(AntMinerMake):
     algo = MinerAlgo.SHA256
 
 
+class S19ProA(AntMinerMake):
+    raw_model = MinerModel.ANTMINER.S19ProA
+
+    expected_chips = 114
+    expected_fans = 4
+    expected_hashboards = 3
+    algo = MinerAlgo.SHA256
+
+
 class S19jXP(AntMinerMake):
     raw_model = MinerModel.ANTMINER.S19jXP
 
@@ -223,3 +241,12 @@ class S19jXP(AntMinerMake):
     expected_fans = 4
     expected_hashboards = 3
     algo = MinerAlgo.SHA256
+
+
+class S19XPHydro(AntMinerMake):
+    raw_model = MinerModel.ANTMINER.S19XPHydro
+
+    expected_chips = 204
+    expected_fans = 0
+    expected_hashboards = 3
+    algo = MinerAlgo.SHA256

pyasic/miners/device/models/antminer/X19/__init__.py

@@ -24,6 +24,7 @@ from .S19 import (
     S19i,
     S19j,
     S19jNoPIC,
+    S19jPlus,
     S19jPro,
     S19jProNoPIC,
     S19jProPlus,
@@ -35,8 +36,10 @@ from .S19 import (
     S19NoPIC,
     S19Plus,
     S19Pro,
+    S19ProA,
     S19ProHydro,
     S19ProPlus,
     S19ProPlusHydro,
+    S19XPHydro,
 )
 from .T19 import T19

pyasic/miners/device/models/elphapex/DGX/DG1.py

@@ -18,6 +18,15 @@ from pyasic.device.models import MinerModel
 from pyasic.miners.device.makes import ElphapexMake
 
 
+class DG1(ElphapexMake):
+    raw_model = MinerModel.ELPHAPEX.DG1
+
+    expected_chips = 144
+    expected_hashboards = 4
+    expected_fans = 4
+    algo = MinerAlgo.SCRYPT
+
+
 class DG1Plus(ElphapexMake):
     raw_model = MinerModel.ELPHAPEX.DG1Plus
 
@@ -25,3 +34,12 @@ class DG1Plus(ElphapexMake):
     expected_hashboards = 4
     expected_fans = 4
     algo = MinerAlgo.SCRYPT
+
+
+class DG1Home(ElphapexMake):
+    raw_model = MinerModel.ELPHAPEX.DG1Home
+
+    expected_chips = 120
+    expected_hashboards = 4
+    expected_fans = 4
+    algo = MinerAlgo.SCRYPT

pyasic/miners/device/models/elphapex/DGX/__init__.py

@@ -1 +1 @@
-from .DG1 import DG1Plus
+from .DG1 import DG1, DG1Home, DG1Plus

pyasic/miners/device/models/iceriver/ALX/AL3.py

@@ -0,0 +1,27 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2024 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from pyasic.device.algorithm import MinerAlgo
+from pyasic.device.models import MinerModel
+from pyasic.miners.device.makes import IceRiverMake
+
+
+class AL3(IceRiverMake):
+    raw_model = MinerModel.ICERIVER.AL3
+
+    expected_chips = 156
+    expected_fans = 4
+    expected_hashboards = 3
+    algo = MinerAlgo.BLOCKFLOW

pyasic/miners/device/models/iceriver/ALX/__init__.py

@@ -0,0 +1 @@
+from .AL3 import AL3

pyasic/miners/device/models/iceriver/__init__.py

@@ -1 +1,2 @@
+from .ALX import *
 from .KSX import *

pyasic/miners/elphapex/daoge/DGX/DG1.py

@@ -1,6 +1,14 @@
 from pyasic.miners.backends.elphapex import ElphapexMiner
-from pyasic.miners.device.models import DG1Plus
+from pyasic.miners.device.models import DG1, DG1Home, DG1Plus
 
 
 class ElphapexDG1Plus(ElphapexMiner, DG1Plus):
     pass
+
+
+class ElphapexDG1(ElphapexMiner, DG1):
+    pass
+
+
+class ElphapexDG1Home(ElphapexMiner, DG1Home):
+    pass

pyasic/miners/elphapex/daoge/DGX/__init__.py

@@ -1 +1 @@
-from .DG1 import ElphapexDG1Plus
+from .DG1 import ElphapexDG1, ElphapexDG1Home, ElphapexDG1Plus

pyasic/miners/factory.py

@@ -41,6 +41,7 @@ from pyasic.miners.elphapex import *
 from pyasic.miners.goldshell import *
 from pyasic.miners.hammer import *
 from pyasic.miners.iceriver import *
+from pyasic.miners.iceriver.iceminer.ALX import IceRiverAL3
 from pyasic.miners.innosilicon import *
 from pyasic.miners.luckyminer import *
 from pyasic.miners.volcminer import *
@@ -108,6 +109,8 @@ MINER_CLASSES = {
         "ANTMINER S19J88NOPIC": BMMinerS19jNoPIC,
         "ANTMINER S19PRO+": BMMinerS19ProPlus,
         "ANTMINER S19J PRO": BMMinerS19jPro,
+        "ANTMINER S19J+": BMMinerS19jPlus,
+        "ANTMINER S19J PRO+": BMMinerS19jProPlus,
         "ANTMINER S19 XP": BMMinerS19XP,
         "ANTMINER S19A": BMMinerS19a,
         "ANTMINER S19A PRO": BMMinerS19aPro,
@@ -561,12 +564,14 @@ MINER_CLASSES = {
         "ANTMINER T21": BOSMinerT21,
         "BRAIINS MINI MINER BMM 100": BraiinsBMM100,
         "BRAIINS MINI MINER BMM 101": BraiinsBMM101,
+        "ANTMINER S19 XP HYD.": BOSMinerS19XPHydro,
     },
     MinerTypes.VNISH: {
         None: VNish,
-        "L3+": VnishL3Plus,
+        "L3+": VNishL3Plus,
-        "ANTMINER L3+": VnishL3Plus,
+        "ANTMINER L3+": VNishL3Plus,
-        "ANTMINER L7": VnishL7,
+        "ANTMINER L7": VNishL7,
+        "ANTMINER L9": VNishL9,
         "ANTMINER S17+": VNishS17Plus,
         "ANTMINER S17 PRO": VNishS17Pro,
         "ANTMINER S19": VNishS19,
@@ -574,11 +579,15 @@ MINER_CLASSES = {
         "ANTMINER S19 PRO": VNishS19Pro,
         "ANTMINER S19J": VNishS19j,
         "ANTMINER S19I": VNishS19i,
+        "ANTMINER S19 XP": VNishS19XP,
+        "ANTMINER S19 XP HYD.": VNishS19XPHydro,
         "ANTMINER S19J PRO": VNishS19jPro,
         "ANTMINER S19J PRO A": VNishS19jPro,
         "ANTMINER S19J PRO BB": VNishS19jPro,
         "ANTMINER S19A": VNishS19a,
+        "ANTMINER S19 HYD.": VNishS19Hydro,
         "ANTMINER S19A PRO": VNishS19aPro,
+        "ANTMINER S19 PRO A": VNishS19ProA,
         "ANTMINER S19 PRO HYD.": VNishS19ProHydro,
         "ANTMINER S19K PRO": VNishS19kPro,
         "ANTMINER T19": VNishT19,
@@ -677,6 +686,7 @@ MINER_CLASSES = {
         "KS5": IceRiverKS5,
         "KS5L": IceRiverKS5L,
         "KS5M": IceRiverKS5M,
+        "10306": IceRiverAL3,
     },
     MinerTypes.HAMMER: {
         None: type("HammerUnknown", (BlackMiner, HammerMake), {}),
@@ -689,6 +699,8 @@ MINER_CLASSES = {
     MinerTypes.ELPHAPEX: {
         None: type("ElphapexUnknown", (ElphapexMiner, ElphapexMake), {}),
         "DG1+": ElphapexDG1Plus,
+        "DG1": ElphapexDG1,
+        "DG1-Home": ElphapexDG1Home,
     },
 }
 

pyasic/miners/iceriver/iceminer/ALX/AL3.py

@@ -0,0 +1,6 @@
+from pyasic.miners.backends.iceriver import IceRiver
+from pyasic.miners.device.models.iceriver import AL3
+
+
+class IceRiverAL3(IceRiver, AL3):
+    pass

pyasic/miners/iceriver/iceminer/ALX/__init__.py

@@ -0,0 +1 @@
+from .AL3 import IceRiverAL3

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyasic"
-version = "0.72.10"
+version = "0.73.0"
 
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = [{name = "UpstreamData", email = "brett@upstreamdata.ca"}]