implement suggested params

CHANGELOG.md

@@ -1,4 +1,14 @@
 # Changelog
+# 2.0.0
+# Added
+- Added support for Algorand Smart Contracts (ASC) 
+    - Dynamic fee contract
+    - Limit order contract
+    - Periodic payment contract
+
+# Changed
+- Transactions and templates now take suggested params obtained from algod as an argument; the SuggestedParams object contains fee, first valid round, last valid round, genesis hash, and genesis ID
+
 # 1.1.1
 # Added
 - Added asset decimals field.

README.md

@@ -139,15 +139,11 @@ acl = algod.AlgodClient(params.algod_token, params.algod_address)
 kcl = kmd.KMDClient(params.kmd_token, params.kmd_address)
 
 # get suggested parameters
-params = acl.suggested_params()
-gen = params["genesisID"]
-gh = params["genesishashb64"]
-last_round = params["lastRound"]
-fee = params["fee"]
+sp = acl.suggested_params()
 
 # create a transaction
 amount = 10000
-txn = transaction.PaymentTxn(sender, fee, last_round, last_round+100, gh, receiver, amount)
+txn = transaction.PaymentTxn(sender, sp, receiver, amount)
 
 # write to file
 txns = [txn]
@@ -180,16 +176,12 @@ threshold = 2  # how many signatures are necessary
 msig = transaction.Multisig(version, threshold, [account_1, account_2])
 
 # get suggested parameters
-params = acl.suggested_params()
-gen = params["genesisID"]
-gh = params["genesishashb64"]
-last_round = params["lastRound"]
-fee = params["fee"]
+sp = acl.suggested_params()
 
 # create a transaction
 sender = msig.address()
 amount = 10000
-txn = transaction.PaymentTxn(sender, fee, last_round, last_round+100, gh, account_3, amount)
+txn = transaction.PaymentTxn(sender, sp, account_3, amount)
 
 # create a SignedTransaction object
 mtx = transaction.MultisigTransaction(txn, msig)
@@ -216,19 +208,15 @@ acl = algod.AlgodClient("API-TOKEN", "API-Address")
 sk = mnemonic.to_private_key(passphrase)
 
 # get suggested parameters
-params = acl.suggested_params()
-gen = params["genesisID"]
-gh = params["genesishashb64"]
-last_round = params["lastRound"]
-fee = params["fee"]
+sp = acl.suggested_params()
 
 # Set other parameters
 amount = 100000
 note = "Some Text".encode()
 receiver = "receiver Algorand Address"
 
 # create the transaction
-txn = transaction.PaymentTxn(account.address_from_private_key(sk), fee, last_round, last_round+1000, gh, receiver, amount, note=note)
+txn = transaction.PaymentTxn(account.address_from_private_key(sk), sp, receiver, amount, note=note)
 
 # sign it
 stx = txn.sign(sk)
@@ -257,16 +245,12 @@ acl = algod.AlgodClient(params.algod_token, params.algod_address)
 kcl = kmd.KMDClient(params.kmd_token, params.kmd_address)
 
 # get suggested parameters
-params = acl.suggested_params()
-gen = params["genesisID"]
-gh = params["genesishashb64"]
-last_round = params["lastRound"]
-fee = params["fee"]
+sp = acl.suggested_params()
 
 # create a transaction
 amount = 10000
-txn1 = transaction.PaymentTxn(sender, fee, last_round, last_round+100, gh, receiver, amount)
-txn2 = transaction.PaymentTxn(receiver, fee, last_round, last_round+100, gh, sender, amount)
+txn1 = transaction.PaymentTxn(sender, sp, receiver, amount)
+txn2 = transaction.PaymentTxn(receiver, sp, sender, amount)
 
 # get group id and assign it to transactions
 gid = transaction.calculate_group_id([txn1, txn2])
@@ -297,15 +281,11 @@ sender = lsig.address()
 acl = algod.AlgodClient(params.algod_token, params.algod_address)
 
 # get suggested parameters
-params = acl.suggested_params()
-gen = params["genesisID"]
-gh = params["genesishashb64"]
-last_round = params["lastRound"]
-fee = params["fee"]
+sp = acl.suggested_params()
 
 # create a transaction
 amount = 10000
-txn = transaction.PaymentTxn(sender, fee, last_round, last_round+100, gh, receiver, amount)
+txn = transaction.PaymentTxn(sender, sp, receiver, amount)
 
 # note, transaction is signed by logic only (no delegation)
 # that means sender address must match to program hash
@@ -341,8 +321,8 @@ metadata = bytes("fACPO4nRgO55j1ndAK3W6Sgc4APkcyFh", "ascii") # should be a 32-b
 default_frozen = False # whether accounts should be frozen by default
 
 # create the asset creation transaction
-txn = transaction.AssetConfigTxn(address, fee_per_byte, first_valid_round,
-            last_valid_round, genesis_hash, total=total, manager=manager,
+sp = transaction.SuggestedParams(first_valid_round, last_valid_round, genesis_hash, None, fee_per_byte)
+txn = transaction.AssetConfigTxn(address, sp, total=total, manager=manager,
             reserve=reserve, freeze=freeze, clawback=clawback,
             unit_name=unitname, asset_name=assetname, url=url,
             metadata_hash=metadata, default_frozen=default_frozen)
@@ -370,8 +350,8 @@ genesis_hash = "SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI="
 index = 1234 # identifying index of the asset
 
 # create the asset config transaction
-txn = transaction.AssetConfigTxn(manager_address, fee_per_byte, first_valid_round,
-            last_valid_round, genesis_hash, manager=new_manager, reserve=new_reserve,
+sp = transaction.SuggestedParams(first_valid_round, last_valid_round, genesis_hash, None, fee_per_byte)
+txn = transaction.AssetConfigTxn(manager_address, sp, manager=new_manager, reserve=new_reserve,
             freeze=new_freeze, clawback=new_clawback, index=index)
 
 # sign the transaction
@@ -394,8 +374,9 @@ genesis_hash = "SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI="
 index = 1234 # identifying index of the asset
 
 # create the asset destroy transaction
-txn = transaction.AssetConfigTxn(creator_address, fee_per_byte, first_valid_round, last_valid_round, genesis_hash,
-                                         index=index, strict_empty_address_check=False)
+sp = transaction.SuggestedParams(first_valid_round, last_valid_round, genesis_hash, None, fee_per_byte)
+txn = transaction.AssetConfigTxn(creator_address, sp, index=index, strict_empty_address_check=False)
+
 # sign the transaction
 signed_txn = txn.sign(creator_private_key)
 ```
@@ -417,8 +398,8 @@ freeze_target = "address to be frozen or unfrozen"
 index = 1234 # identifying index of the asset
 
 # create the asset freeze transaction
-txn = transaction.AssetFreezeTxn(freeze_address, fee_per_byte, first_valid_round,
-            last_valid_round, genesis_hash, index=index, target=freeze_target,
+sp = transaction.SuggestedParams(first_valid_round, last_valid_round, genesis_hash, None, fee_per_byte)
+txn = transaction.AssetFreezeTxn(freeze_address, sp, index=index, target=freeze_target,
             new_freeze_state=True)
 
 # sign the transaction
@@ -443,8 +424,8 @@ amount = 100 # amount of assets to transfer
 index = 1234 # identifying index of the asset
 
 # create the asset transfer transaction
-txn = transaction.AssetTransferTxn(sender_address, fee_per_byte, 
-                first_valid_round, last_valid_round, genesis_hash,
+sp = transaction.SuggestedParams(first_valid_round, last_valid_round, genesis_hash, None, fee_per_byte)
+txn = transaction.AssetTransferTxn(sender_address, sp,
                 receiver, amount, index, close_assets_to)
 
 # sign the transaction
@@ -468,8 +449,8 @@ amount = 0 # to start accepting assets, set amount to 0
 index = 1234 # identifying index of the asset
 
 # create the asset accept transaction
-txn = transaction.AssetTransferTxn(address, fee_per_byte, 
-                first_valid_round, last_valid_round, genesis_hash,
+sp = transaction.SuggestedParams(first_valid_round, last_valid_round, genesis_hash, None, fee_per_byte)
+txn = transaction.AssetTransferTxn(address, sp,
                 receiver, amount, index)
 
 # sign the transaction
@@ -495,8 +476,8 @@ amount = 100
 index = 1234 # identifying index of the asset
 
 # create the asset transfer transaction
-txn = transaction.AssetTransferTxn(clawback_address, fee_per_byte, 
-                first_valid_round, last_valid_round, genesis_hash,
+sp = transaction.SuggestedParams(first_valid_round, last_valid_round, genesis_hash, None, fee_per_byte)
+txn = transaction.AssetTransferTxn(clawback_address, sp,
                 receiver, amount, index, revocation_target=target)
 
 # sign the transaction

algosdk/algod.py

@@ -6,6 +6,7 @@
 from . import error
 from . import encoding
 from . import constants
+from . import transaction
 
 
 class AlgodClient:
@@ -225,7 +226,15 @@ def suggested_fee(self, **kwargs):
     def suggested_params(self, **kwargs):
         """Return suggested transaction parameters."""
         req = "/transactions/params"
-        return self.algod_request("GET", req, **kwargs)
+        res = self.algod_request("GET", req, **kwargs)
+
+        return transaction.SuggestedParams(
+            res["lastRound"],
+            res["lastRound"] + 1000,
+            res["genesishashb64"],
+            res["genesisID"],
+            res["fee"],
+            False)
 
     def send_raw_transaction(self, txn, **kwargs):
         """