Merge pull request #8 from ElrondNetwork/main

Merge Main into Development

Author: camilbancioiu

.gitignore

@@ -0,0 +1,4 @@
+.eggs
+dist
+__pycache__
+*.egg-info

MANIFEST.in

@@ -0,0 +1,12 @@
+include erdpy/projects/*.txt
+include erdpy/projects/*.json
+
+include erdpy/testnet/wallets/users/*.pem
+include erdpy/testnet/wallets/users/*.json
+include erdpy/testnet/wallets/users/*.txt
+include erdpy/testnet/wallets/validators/*.pem
+include erdpy/testnet/wallets/validators/*.json
+include erdpy/testnet/wallets/validators/*.txt
+include erdpy/testnet/wallets/observers/*.pem
+include erdpy/testnet/wallets/observers/*.json
+include erdpy/testnet/wallets/observers/*.txt

erdpy/_version.py

@@ -1 +1 @@
-__version__ = "1.0.12"
+__version__ = "1.0.14"

erdpy/cli_contracts.py

@@ -52,6 +52,10 @@ def setup_parser(subparsers: Any) -> Any:
     cli_shared.add_proxy_arg(sub)
     cli_shared.add_tx_args(sub, with_receiver=False, with_data=False)
     _add_arguments_arg(sub)
+    sub.add_argument("--wait-result", action="store_true", default=False,
+                     help="signal to wait for the transaction result - only valid if --send is set")
+    sub.add_argument("--timeout", default=100, help="max num of seconds to wait for result"
+                                                    " - only valid if --wait-result is set")
     cli_shared.add_broadcast_args(sub)
 
     sub.set_defaults(func=deploy)
@@ -81,6 +85,10 @@ def setup_parser(subparsers: Any) -> Any:
     cli_shared.add_proxy_arg(sub)
     cli_shared.add_tx_args(sub, with_receiver=False, with_data=False)
     _add_arguments_arg(sub)
+    sub.add_argument("--wait-result", action="store_true", default=False,
+                     help="signal to wait for the transaction result - only valid if --send is set")
+    sub.add_argument("--timeout", default=100, help="max num of seconds to wait for result"
+                                                    " - only valid if --wait-result is set")
     cli_shared.add_broadcast_args(sub)
 
     sub.set_defaults(func=upgrade)

erdpy/testnet/setup.py

@@ -248,7 +248,7 @@ def build_binaries(testnet_config: TestnetConfiguration):
     myprocess.run_process(['go', 'build'], cwd=node_folder, env=golang_env)
 
     arwen_binary = testnet_config.arwen_binary()
-    logger.info("Arwen Binary: "+arwen_binary)
+    logger.info(f"Arwen Binary: {arwen_binary}")
     if arwen_binary:
         logger.info("Building arwen...")
         node_folder_root = testnet_config.node_source()

setup.py

@@ -3,10 +3,18 @@
 with open("README.md", "r") as fh:
     long_description = "https://github.com/ElrondNetwork/elrond-sdk-erdpy"
 
+VERSION = "1.0.15"
+
+try:
+    with open('./erdpy/_version.py', 'wt') as versionfile:
+        versionfile.write(f'__version__ = "{VERSION}"')
+except FileNotFoundError:
+    pass
+
 # See https://packaging.python.org/tutorials/packaging-projects/
 setuptools.setup(
     name="erdpy",
-    version="1.0.12",
+    version=VERSION,
     description="Elrond Smart Contracts Tools and Python SDK",
     long_description=long_description,
     long_description_content_type="text/markdown",