From 31d51df24f19ef5a77699d081241b9a073b6c7a8 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Mon, 28 Jan 2019 14:52:25 +0100
Subject: [PATCH] =?UTF-8?q?[mod]=20#184:=20Do=20no=20longer=20pass=20allSo?=
=?UTF-8?q?urces/all=5Finput=20variable=20trough=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
… all transaction f().
---
silkaj/tx.py | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/silkaj/tx.py b/silkaj/tx.py
index 995a5c18..d4dff047 100644
--- a/silkaj/tx.py
+++ b/silkaj/tx.py
@@ -86,13 +86,7 @@ async def send_transaction(
== "yes"
):
await generate_and_send_transaction(
- key,
- issuer_pubkey,
- tx_amount,
- outputAddresses,
- comment,
- allsources,
- outputbackchange,
+ key, issuer_pubkey, tx_amount, outputAddresses, comment, outputbackchange
)
@@ -174,19 +168,12 @@ async def transaction_confirmation(
async def generate_and_send_transaction(
- key,
- issuers,
- AmountTransfered,
- outputAddresses,
- Comment="",
- all_input=False,
- OutputbackChange=None,
+ key, issuers, AmountTransfered, outputAddresses, Comment="", OutputbackChange=None
):
-
client = ClientInstance().client
while True:
listinput_and_amount = await get_list_input_for_transaction(
- issuers, AmountTransfered * len(outputAddresses), all_input
+ issuers, AmountTransfered * len(outputAddresses)
)
intermediatetransaction = listinput_and_amount[2]
@@ -221,13 +208,7 @@ async def generate_and_send_transaction(
print(" - From: " + issuers)
for outputAddress in outputAddresses:
print(" - To: " + outputAddress)
- if all_input:
- print(" - Amount: " + str(listinput_and_amount[1] / 100))
- else:
- print(
- " - Amount: "
- + str(AmountTransfered / 100 * len(outputAddresses))
- )
+ print(" - Amount: " + str(AmountTransfered / 100 * len(outputAddresses)))
transaction = await generate_transaction_document(
issuers,
AmountTransfered,
@@ -336,7 +317,7 @@ def generate_output(listoutput, unitbase, rest, recipient_address):
unitbase = unitbase - 1
-async def get_list_input_for_transaction(pubkey, TXamount, allinput=False):
+async def get_list_input_for_transaction(pubkey, TXamount):
listinput, amount = await get_sources(pubkey)
# generate final list source
@@ -351,7 +332,7 @@ async def get_list_input_for_transaction(pubkey, TXamount, allinput=False):
if len(listinputfinal) >= 40:
intermediatetransaction = True
break
- if TXamount <= 0 and not allinput:
+ if TXamount <= 0:
break
if TXamount > 0 and not intermediatetransaction:
message_exit("Error: you don't have enough money")
--
GitLab