From 248571b7a8304d1a5e2889358d1ad5e8f4c0ff15 Mon Sep 17 00:00:00 2001
From: vtexier <vit@free.fr>
Date: Sun, 16 Feb 2020 19:45:40 +0100
Subject: [PATCH] [fix] fix duniterpy OutputSource.condition attribute renamed
---
src/sakia/data/entities/transaction.py | 10 +++++-----
src/sakia/services/documents.py | 2 +-
src/sakia/services/sources.py | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/sakia/data/entities/transaction.py b/src/sakia/data/entities/transaction.py
index 0fdf0e59..82096a04 100644
--- a/src/sakia/data/entities/transaction.py
+++ b/src/sakia/data/entities/transaction.py
@@ -21,15 +21,15 @@ def parse_transaction_doc(tx_doc, pubkey, block_number, mediantime, txid):
:return: the found transaction
"""
receivers = [
- o.conditions.left.pubkey
+ o.condition.left.pubkey
for o in tx_doc.outputs
- if o.conditions.left.pubkey != tx_doc.issuers[0]
+ if o.condition.left.pubkey != tx_doc.issuers[0]
]
in_issuers = len([i for i in tx_doc.issuers if i == pubkey]) > 0
in_outputs = (
- len([o for o in tx_doc.outputs if o.conditions.left.pubkey == pubkey]) > 0
+ len([o for o in tx_doc.outputs if o.condition.left.pubkey == pubkey]) > 0
)
if len(receivers) == 0 and in_issuers:
@@ -43,14 +43,14 @@ def parse_transaction_doc(tx_doc, pubkey, block_number, mediantime, txid):
elif in_issuers or in_outputs:
# If the wallet pubkey is in the issuers we sent this transaction
if in_issuers:
- outputs = [o for o in tx_doc.outputs if o.conditions.left.pubkey != pubkey]
+ outputs = [o for o in tx_doc.outputs if o.condition.left.pubkey != pubkey]
amount = 0
for o in outputs:
amount += o.amount * math.pow(10, o.base)
# If we are not in the issuers,
# maybe we are in the recipients of this transaction
else:
- outputs = [o for o in tx_doc.outputs if o.conditions.left.pubkey == pubkey]
+ outputs = [o for o in tx_doc.outputs if o.condition.left.pubkey == pubkey]
amount = 0
for o in outputs:
amount += o.amount * math.pow(10, o.base)
diff --git a/src/sakia/services/documents.py b/src/sakia/services/documents.py
index 254c9a53..512f73b5 100644
--- a/src/sakia/services/documents.py
+++ b/src/sakia/services/documents.py
@@ -420,7 +420,7 @@ class DocumentsService:
:return:
"""
for offset, output in enumerate(txdoc.outputs):
- if output.conditions.left.pubkey == pubkey:
+ if output.condition.left.pubkey == pubkey:
source = Source(
currency=currency,
pubkey=pubkey,
diff --git a/src/sakia/services/sources.py b/src/sakia/services/sources.py
index 70ac3b7b..9c6b47ae 100644
--- a/src/sakia/services/sources.py
+++ b/src/sakia/services/sources.py
@@ -53,7 +53,7 @@ class SourcesServices(QObject):
"""
txdoc = TransactionDoc.from_signed_raw(transaction.raw)
for offset, output in enumerate(txdoc.outputs):
- if output.conditions.left.pubkey == pubkey:
+ if output.condition.left.pubkey == pubkey:
source = Source(
currency=self.currency,
pubkey=pubkey,
@@ -218,7 +218,7 @@ class SourcesServices(QObject):
"""
txdoc = TransactionDoc.from_signed_raw(tx.raw)
for offset, output in enumerate(txdoc.outputs):
- if output.conditions.left.pubkey == pubkey:
+ if output.condition.left.pubkey == pubkey:
source = Source(
currency=self.currency,
pubkey=pubkey,
--
GitLab