Merge pull request #41 from onuralken/main

Add 'txid' field to txinfo returned by algosdk.future.transaction.wait_for_confirmation

Author: fergalwalsh

tinyman/utils.py

@@ -52,7 +52,9 @@ def sign_and_submit_transactions(client, transactions, signed_transactions, send
             signed_transactions[i] = txn.sign(sender_sk)
 
     txid = client.send_transactions(signed_transactions)
-    return wait_for_confirmation_algosdk(client, txid)
+    txinfo = wait_for_confirmation_algosdk(client, txid)
+    txinfo["txid"] = txid
+    return txinfo
 
 
 def wait_for_confirmation(client, txid):
@@ -62,6 +64,7 @@ def wait_for_confirmation(client, txid):
     """
     warnings.warn('tinyman.utils.wait_for_confirmation is deprecated. Use algosdk.future.transaction.wait_for_confirmation instead if you are importing individually.', DeprecationWarning, stacklevel=2)
     txinfo = wait_for_confirmation_algosdk(client, txid)
+    txinfo["txid"] = txid
     return txinfo
 
 
@@ -108,7 +111,9 @@ def submit(self, algod, wait=False):
         except AlgodHTTPError as e:
             raise Exception(str(e))
         if wait:
-            return wait_for_confirmation_algosdk(algod, txid)
+            txinfo = wait_for_confirmation_algosdk(algod, txid)
+            txinfo["txid"] = txid
+            return txinfo
         return {'txid': txid}
 
 

tinyman/v1/client.py

@@ -30,7 +30,9 @@ def fetch_asset(self, asset_id):
     def submit(self, transaction_group, wait=False):
         txid = self.algod.send_transactions(transaction_group.signed_transactions)
         if wait:
-            return wait_for_confirmation(self.algod, txid)
+            txinfo = wait_for_confirmation(self.algod, txid)
+            txinfo["txid"] = txid
+            return txinfo
         return {'txid': txid}
 
     def prepare_app_optin_transactions(self, user_address=None):