From 4bb10f86d31546d3bf98fc3c76481089ac4fe7e8 Mon Sep 17 00:00:00 2001 From: random-zebra Date: Wed, 11 Nov 2020 21:09:28 +0100 Subject: [PATCH 1/2] [BUG] IsPayToColdStaking tries to parse empty rawTX with Trezor api --- src/tabRewards.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/tabRewards.py b/src/tabRewards.py index dccad07..bf43e48 100644 --- a/src/tabRewards.py +++ b/src/tabRewards.py @@ -216,16 +216,18 @@ def load_utxos_thread(self, ctrl): printDbg("Unable to get raw TX with hash=%s from RPC server." % u['txid']) # Don't save UTXO if raw TX is unavailable continue + u['raw_tx'] = rawtx + p2cs, u['coinstake'] = IsPayToColdStaking(rawtx, u['vout']) + if p2cs: + u['staker'] = GetDelegatedStaker(rawtx, u['vout'], self.caller.isTestnetRPC) else: - rawtx = "" + # block cold-staking features for Trezor + u['raw_tx'] = "" + u['coinstake'] = False + u['staker'] = "" # Save utxo to db u['receiver'] = self.curr_addr - u['raw_tx'] = rawtx - u['staker'] = "" - p2cs, u['coinstake'] = IsPayToColdStaking(rawtx, u['vout']) - if p2cs: - u['staker'] = GetDelegatedStaker(rawtx, u['vout'], self.caller.isTestnetRPC) self.caller.parent.db.addReward(u) # emit percent From 7a66ea70e034139ada66e31e23598e373dbc28a0 Mon Sep 17 00:00:00 2001 From: random-zebra Date: Thu, 12 Nov 2020 04:27:25 +0100 Subject: [PATCH 2/2] Update requirements.txt with max supported versions of packages --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index b933f8e..a17cb58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -python-bitcoinrpc>=1.0 -bitcoin>=1.1.42 -btchip-python>=0.1.27 -trezor>=0.11.1 +python-bitcoinrpc==1.0 +bitcoin==1.1.42 +btchip-python==0.1.27 +trezor==0.11.1 PyQt5>=5.9,<5.14.1 -requests>=2.18.4 -simplejson -ecdsa +requests>=2.18.4,<=2.23 +simplejson<=3.13.2 +ecdsa<=0.13.2