Merge pull request #27 from dragonchain/master

Release 4.3.0

Author: cheeseandcereal

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-Copyright 2019 Dragonchain, Inc. or its affiliates. All Rights Reserved.
+Copyright 2020 Dragonchain, Inc. or its affiliates. All Rights Reserved.
 
                                  Apache License
                            Version 2.0, January 2004

LICENSE

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+4.3.0
+-----
+
+Features:
+  * Allow for deleting of smart contracts by transaction type
+  * Add support for publishing signed interchain transactions
+Development:
+  * Fix tests for python 3.8.1
+  * Fix integration tests for redisearch update
+  * Fix installation requirements for python 3.4 testing
+  * Fix linting error with new bugbear version
+  * Remove duplicate integration test and fix openfaas logs schema for newer openfaas versions
+  * Remove codeowners
+
 4.2.1
 -----
 

docs/changelog.rst

@@ -32,7 +32,7 @@ def get_version():
 # -- Project information -----------------------------------------------------
 
 project = "Dragonchain Python SDK"
-copyright = "2019, Dragonchain, Inc."  # noqa: A001
+copyright = "2020, Dragonchain, Inc."  # noqa: A001
 author = "Dragonchain, Inc."
 
 # The short X.Y version

docs/conf.py

@@ -1,4 +1,4 @@
-# Copyright 2019 Dragonchain, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2020 Dragonchain, Inc. or its affiliates. All Rights Reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -16,7 +16,7 @@
 from dragonchain_sdk import dragonchain_client
 
 __author__ = "Dragonchain, Inc."
-__version__ = "4.2.1"
+__version__ = "4.3.0"
 
 ASYNC_SUPPORT = False
 

dragonchain_sdk/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2019 Dragonchain, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2020 Dragonchain, Inc. or its affiliates. All Rights Reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

dragonchain_sdk/async_helpers.py

@@ -1,4 +1,4 @@
-# Copyright 2019 Dragonchain, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2020 Dragonchain, Inc. or its affiliates. All Rights Reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -193,7 +193,7 @@ def _get_credentials_as_smart_contract() -> Tuple[str, str]:
         auth_key = open(os.path.join(base_path, "sc-{}-secret-key".format(os.environ.get("SMART_CONTRACT_ID"))), "r").read()
         auth_key_id = open(os.path.join(base_path, "sc-{}-auth-key-id".format(os.environ.get("SMART_CONTRACT_ID"))), "r").read()
         return auth_key_id, auth_key
-    except (OSError, IOError, FileNotFoundError):
+    except OSError:
         return "", ""
 
 

dragonchain_sdk/configuration.py

@@ -1,4 +1,4 @@
-# Copyright 2019 Dragonchain, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2020 Dragonchain, Inc. or its affiliates. All Rights Reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

dragonchain_sdk/credentials.py

@@ -1,4 +1,4 @@
-# Copyright 2019 Dragonchain, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2020 Dragonchain, Inc. or its affiliates. All Rights Reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -304,21 +304,30 @@ def update_smart_contract(  # noqa: C901
 
         return self.request.put("/v1/contract/{}".format(smart_contract_id), body)
 
-    def delete_smart_contract(self, smart_contract_id: str) -> "request_response":
+    def delete_smart_contract(self, smart_contract_id: Optional[str] = None, transaction_type: Optional[str] = None) -> "request_response":
         """Delete an existing contract
 
         Args:
-            smart_contract_id (str): Transaction type of the contract to delete
+            smart_contract_id (str, optional): Contract ID of the contract to delete
+            transaction_type (str, optional): Transaction type of the contract to delete
 
         Raises:
             TypeError: with bad parameter types
 
         Returns:
             The results of the delete request
         """
-        if not isinstance(smart_contract_id, str):
-            raise TypeError('Parameter "state" must be of type str.')
-        return self.request.delete("/v1/contract/{}".format(smart_contract_id))
+        if smart_contract_id and transaction_type:
+            raise TypeError('Only one of "smart_contract_id" or "transaction_type" can be specified')
+        if smart_contract_id and not isinstance(smart_contract_id, str):
+            raise TypeError('Parameter "smart_contract_id" must be of type str.')
+        if transaction_type and not isinstance(transaction_type, str):
+            raise TypeError('Parameter "transaction_type" must be of type str.')
+        if smart_contract_id:
+            return self.request.delete("/v1/contract/{}".format(smart_contract_id))
+        if transaction_type:
+            return self.request.delete("/v1/contract/txn_type/{}".format(transaction_type))
+        raise TypeError('At least one of "smart_contract_id" or "transaction_type" must be supplied')
 
     def query_transactions(
         self,
@@ -1178,6 +1187,30 @@ def get_default_interchain_network(self) -> "request_response":
         """
         return self.request.get("/v1/interchains/default")
 
+    def publish_interchain_transaction(self, blockchain: str, name: str, signed_transaction: str) -> "request_response":
+        """Publish an interchain transaction that's already been signed
+
+        Args:
+            blockchain (str): The blockchain type to set (i.e. 'bitcoin', 'ethereum')
+            name (str): The name of the that blockchain's network to use (set when creating the network)
+            signed_transaction (str): Signed transaction string (return from sign_<network>_transaction function)
+
+        Raises:
+            TypeError: with bad parameter type
+
+        Returns:
+            The transaction hash (or equivalent) of the published transaction
+        """
+        if not isinstance(blockchain, str):
+            raise TypeError('Parameter "blockchain" must be of type str.')
+        if not isinstance(name, str):
+            raise TypeError('Parameter "name" must be of type str.')
+        if not isinstance(signed_transaction, str):
+            raise TypeError('Parameter "signed_transaction" must be of type str.')
+        return self.request.post(
+            "/v1/interchains/transaction/publish", {"version": "1", "blockchain": blockchain, "name": name, "signed_txn": signed_transaction}
+        )
+
     def create_bitcoin_transaction(
         self,
         network: str,

dragonchain_sdk/dragonchain_client.py

@@ -1,4 +1,4 @@
-# Copyright 2019 Dragonchain, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2020 Dragonchain, Inc. or its affiliates. All Rights Reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at