Merge pull request vertcoin-project#50 from kr1z1s/master

Two fixes - Bitcoin Core 0.20 and BraiinsOS bugfixes
chadouming · Jul 12, 2020 · 6dac42e · 6dac42e
2 parents 87cde51 + 9d51733
commit 6dac42e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/p2pool/bitcoin/helper.py b/p2pool/bitcoin/helper.py
@@ -24,7 +24,10 @@ def check(bitcoind, net, args):
 
     try:
         blockchaininfo = yield bitcoind.rpc_getblockchaininfo()
-        softforks_supported = set(item['id'] for item in blockchaininfo.get('softforks', []))
+        try:
+            softforks_supported = set(item['id'] for item in blockchaininfo.get('softforks', [])) # not working with 0.19.0.1
+        except TypeError:
+            softforks_supported = set(item for item in blockchaininfo.get('softforks', [])) # fix for https://github.com/jtoomim/p2pool/issues/38
         try:
             softforks_supported |= set(item['id'] for item in blockchaininfo.get('bip9_softforks', []))
         except TypeError: # https://github.com/bitcoin/bitcoin/pull/7863

diff --git a/p2pool/bitcoin/stratum.py b/p2pool/bitcoin/stratum.py
@@ -30,7 +30,7 @@ def __init__(self, wb, other, transport):
         self.desired_pseudoshare_target = None
 
 
-    def rpc_subscribe(self, miner_version=None, session_id=None):
+    def rpc_subscribe(self, miner_version=None, session_id=None, *args):
         reactor.callLater(0, self._send_work)
 
         return [