chore: refactor contracts helper & fix utils comment

Author: bryanchriswhite

src/mappings/utils.ts

@@ -92,7 +92,9 @@ export async function trackUnprocessed(error: Error, primitives: Primitives): Pr
             block.block.id : error.stack;
     sha256.write(hashInput);
     sha256.end();
-    // NB: ID is base64 encoded representation of the sha256 of `raw`.
+    // NB: ID is base64 encoded representation of the sha256 of either:
+    // 1. the conventional ID of the "highest-level" primitive available or
+    // 2. the error stacktrace, if none are available (i.e. handle block error)
     const id = sha256.read().toString("base64");
     const eventId = event ? messageId(event) : undefined;
     const _messageId = event ? messageId(event) : undefined;

tests/helpers/contracts.py

@@ -36,24 +36,54 @@ class BridgeContractConfig:
 )
 
 
+def ensure_contract(name: str, url: str) -> str:
+    contract_path = f".contract/{name}.wasm"
+    if not os.path.exists(".contract"):
+        os.mkdir(".contract")
+    try:
+        temp = open(contract_path, "rb")
+        temp.close()
+    except OSError:
+        contract_request = requests.get(url)
+        with open(contract_path, "wb") as file:
+            file.write(contract_request.content)
+    finally:
+        return contract_path
+
+
+class DeployTestContract(LedgerContract):
+
+    def __init__(self, client: LedgerClient, admin: Wallet):
+        """ Using a slightly older version of CW20 contract as a test contract - as this will still be classified as the
+            CW20 interface, but is different enough to allow a unique store_code message during testing."""
+        url = "https://github.com/CosmWasm/cw-plus/releases/download/v0.14.0/cw20_base.wasm"
+        contract_path = ensure_contract("test_contract", url)
+        super().__init__(contract_path, client)
+
+        self.deploy({
+            "name": "test coin",
+            "symbol": "TEST",
+            "decimals": 6,
+            "initial_balances": [{
+                "amount": "3000000000000000000000000",
+                "address": str(admin.address())
+            }],
+            "mint": {"minter": str(admin.address())}
+        },
+            admin,
+            store_gas_limit=3000000
+        )
+
+
 class Cw20Contract(LedgerContract):
     admin: Wallet = None
     gas_limit: int = 3000000
 
     def __init__(self, client: LedgerClient, admin: Wallet):
         self.admin = admin
         url = "https://github.com/CosmWasm/cw-plus/releases/download/v0.16.0/cw20_base.wasm"
-        if not os.path.exists(".contract"):
-            os.mkdir(".contract")
-        try:
-            temp = open(".contract/cw20.wasm", "rb")
-            temp.close()
-        except:
-            contract_request = requests.get(url)
-            with open(".contract/cw20.wasm", "wb") as file:
-                file.write(contract_request.content)
-
-        super().__init__(".contract/cw20.wasm", client)
+        contract_path = ensure_contract("cw20", url)
+        super().__init__(contract_path, client)
 
     def _store(self) -> int:
         assert self.admin is not None
@@ -81,20 +111,12 @@ def _instantiate(self, code_id) -> Address:
 
 class BridgeContract(LedgerContract):
     def __init__(self, client: LedgerClient, admin: Wallet, cfg: BridgeContractConfig):
-        url = "https://github.com/fetchai/fetch-ethereum-bridge-v1/releases/download/v0.2.0/bridge.wasm"
-        if not os.path.exists(".contract"):
-            os.mkdir(".contract")
-        try:
-            temp = open(".contract/bridge.wasm", "rb")
-            temp.close()
-        except:
-            contract_request = requests.get(url)
-            with open(".contract/bridge.wasm", "wb") as file:
-                file.write(contract_request.content)
+        url = "https://github.com/fetchai/contract-agent-almanac/releases/download/v0.1.0/contract_agent_almanac.wasm"
+        contract_path = ensure_contract("bridge", url)
 
         # LedgerContract will attempt to discover any existing contract having the same bytecode hash
         # see https://github.com/fetchai/cosmpy/blob/master/cosmpy/aerial/contract/__init__.py#L74
-        super().__init__(".contract/bridge.wasm", client)
+        super().__init__(contract_path, client)
 
         # deploy will store the contract only if no existing contracts was found during init.
         # and it will instantiate the contract only if contract.address is None