C2C Feature and Testing

Makefile

@@ -1,8 +1,10 @@
+UNITS = "@unit.abijson or @unit.algod or @unit.applications or @unit.atomic_transaction_composer or @unit.dryrun or @unit.feetest or @unit.indexer or @unit.indexer.logs or @unit.offline or @unit.rekey or @unit.responses or @unit.responses.231 or @unit.tealsign or @unit.transactions or @unit.transactions.payment"
 unit:
-	behave --tags="@unit.offline or @unit.algod or @unit.indexer or @unit.rekey or @unit.tealsign or @unit.dryrun or @unit.applications or @unit.responses or @unit.transactions or @unit.transactions.payment or @unit.responses.231 or @unit.feetest or @unit.indexer.logs or @unit.abijson or @unit.atomic_transaction_composer" test -f progress2
+	behave --tags=$(UNITS) test -f progress2
 
+INTEGRATIONS = "@abi or @algod or @applications or @applications.verified or @assets or @auction or @c2c or @compile or @dryrun or @dryrun.testing or @indexer or @indexer.231 or @indexer.applications or @kmd or @rekey or @send"
 integration:
-	behave --tags="@algod or @assets or @auction or @kmd or @send or @template or @indexer or @indexer.applications or @rekey or @compile or @dryrun or @dryrun.testing or @applications or @applications.verified or @indexer.231 or @abi" test -f progress2
+	behave --tags=$(INTEGRATIONS) test -f progress2
 
 docker-test:
 	./run_integration.sh

algosdk/atomic_transaction_composer.py

@@ -2,10 +2,11 @@
 import base64
 import copy
 from enum import IntEnum
-from typing import Any, List, TypeVar, Union
+from typing import Any, Dict, List, TypeVar, Union
 
 from algosdk import abi, error
 from algosdk.abi.address_type import AddressType
+
 from algosdk.future import transaction
 from algosdk.v2client import algod
 
@@ -506,6 +507,7 @@ def execute(
                         raw_value=raw_value,
                         return_value=return_value,
                         decode_error=decode_error,
+                        tx_info=client.pending_transaction_info(tx_id),
                     )
                 )
                 continue
@@ -543,6 +545,7 @@ def execute(
                 raw_value=raw_value,
                 return_value=return_value,
                 decode_error=decode_error,
+                tx_info=resp,
             )
             method_results.append(abi_result)
 
@@ -689,16 +692,18 @@ def __init__(
         raw_value: bytes,
         return_value: Any,
         decode_error: error,
+        tx_info: dict,
     ) -> None:
         self.tx_id = tx_id
         self.raw_value = raw_value
         self.return_value = return_value
         self.decode_error = decode_error
+        self.tx_info = tx_info
 
 
 class AtomicTransactionResponse:
     def __init__(
-        self, confirmed_round: int, tx_ids: List[str], results: ABIResult
+        self, confirmed_round: int, tx_ids: List[str], results: List[ABIResult]
     ) -> None:
         self.confirmed_round = confirmed_round
         self.tx_ids = tx_ids

algosdk/logic.py

@@ -278,6 +278,12 @@ def get_application_address(appID: int) -> str:
     Returns:
         str: The address corresponding to that application's escrow account.
     """
+    assert isinstance(
+        appID, int
+    ), "(Expected an int for appID but got [{}] which has type [{}])".format(
+        appID, type(appID)
+    )
+
     to_sign = constants.APPID_PREFIX + appID.to_bytes(8, "big")
     checksum = encoding.checksum(to_sign)
     return encoding.encode_address(checksum)

algosdk/v2client/algod.py

@@ -1,14 +1,10 @@
-from urllib.request import Request, urlopen
+import base64
+import json
 from urllib import parse
 import urllib.error
-import json
-import base64
-from .. import error
-from .. import encoding
-from .. import constants
-from .. import future
-import msgpack
-from .. import util
+from urllib.request import Request, urlopen
+
+from .. import constants, encoding, error, future, logic, util
 
 api_version_path_prefix = "/v2"
 

requirements.txt

@@ -1,3 +1,4 @@
 .
 black==21.9b0
+glom==20.11.0
 git+https://github.com/behave/behave

run_integration.sh

@@ -7,7 +7,7 @@ pushd $rootdir
 
 # Reset test harness
 rm -rf test-harness
-git clone --single-branch --branch master https://github.com/algorand/algorand-sdk-testing.git test-harness
+git clone --single-branch --branch zc2c https://github.com/algorand/algorand-sdk-testing.git test-harness
 
 ## Copy feature files into the project resources
 mkdir -p test/features

test/environment.py

@@ -32,6 +32,7 @@ def encode_bytes(d):
                 encode_bytes(d[i])
             else:
                 if isinstance(d[i], bytes):
+                    assert False, "Zeph thinks this code is unreachable"
                     d[i] = base64.b64encode(v).decode()
     return d