Merge pull request #52 from ElrondNetwork/development

Version 1.0.20

Author: camilbancioiu

erdpy-up.py

@@ -182,7 +182,7 @@ def run_in_venv(args):
         del os.environ["PYTHONHOME"]
 
     process = subprocess.Popen(args, env={
-        "PATH": os.path.join(get_erdpy_path(), "bin"),
+        "PATH": os.path.join(get_erdpy_path(), "bin") + ":" + os.environ["PATH"],
         "VIRTUAL_ENV": get_erdpy_path()
     })
 

erdpy/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [1.0.20] - 26.10.2021
+ - Bugfix by [phanletrunghieu](https://github.com/phanletrunghieu): use $PATH in `erdpy-up`
+ - Bugfix by [x2ocoder](https://github.com/x2ocoder): add missing `enable_epochs` configurations
+ - Dependency tags now accept `latest`
+ - New optional configuration value `github_api_token` for querying latest versions from Github
+ - The command `erdpy deps install` now accepts `all` as an argument
+ - More fixes for `erdpy testnet`
+
 ## [1.0.19] - 05.10.2021
  - Bugfix by [MWFIAE](https://github.com/MWFIAE): add missing `enable_epochs` configurations
 

erdpy/_version.py

@@ -1 +1 @@
-__version__ = "1.0.19"
+__version__ = "1.0.20"

erdpy/cli.py

@@ -19,7 +19,7 @@
 import erdpy.cli_transactions
 import erdpy.cli_validators
 import erdpy.cli_wallet
-import erdpy.cli_delagation
+import erdpy.cli_delegation
 import erdpy.cli_dns
 from erdpy import config, errors, scope
 from erdpy._version import __version__
@@ -99,7 +99,7 @@ def setup_parser(args: List[str] = sys.argv[1:]):
     commands.append(erdpy.cli_block.setup_parser(subparsers))
     commands.append(erdpy.cli_testnet.setup_parser(args, subparsers))
     commands.append(erdpy.cli_data.setup_parser(subparsers))
-    commands.append(erdpy.cli_delagation.setup_parser(args, subparsers))
+    commands.append(erdpy.cli_delegation.setup_parser(args, subparsers))
     commands.append(erdpy.cli_dns.setup_parser(args, subparsers))
 
     parser.epilog = """

erdpy/cli_config.py

@@ -13,6 +13,7 @@ def setup_parser(subparsers: Any) -> Any:
     subparsers = parser.add_subparsers()
 
     sub = cli_shared.add_command_subparser(subparsers, "config", "dump", "Dumps configuration.")
+    sub.add_argument('--defaults', required=False, help='dump defaults instead of local config', action='store_true')
     sub.set_defaults(func=dump)
 
     sub = cli_shared.add_command_subparser(subparsers, "config", "get", "Gets a configuration value.")
@@ -24,6 +25,10 @@ def setup_parser(subparsers: Any) -> Any:
     sub.add_argument("value", help="the new value")
     sub.set_defaults(func=set_value)
 
+    sub = cli_shared.add_command_subparser(subparsers, "config", "delete", "Deletes a configuration value.")
+    _add_name_arg(sub)
+    sub.set_defaults(func=delete_value)
+
     sub = cli_shared.add_command_subparser(subparsers, "config", "new", "Creates a new configuration.")
     _add_name_arg(sub)
     sub.add_argument("--template", required=False, help="template from which to create the new config")
@@ -45,7 +50,11 @@ def _add_name_arg(sub: Any):
 
 
 def dump(args: Any):
-    data = config.get_active()
+    if args.defaults:
+        data = config.get_defaults()
+    else:
+        data = config.get_active()
+
     utils.dump_out_json(data, sys.stdout)
 
 
@@ -58,6 +67,10 @@ def set_value(args: Any):
     config.set_value(args.name, args.value)
 
 
+def delete_value(args: Any):
+    config.delete_value(args.name)
+
+
 def new_config(args: Any):
     config.create_new_config(name=args.name, template=args.template)
     dump(None)

erdpy/cli_delagation.py erdpy/cli_delegation.pyerdpy/cli_delagation.py renamed to erdpy/cli_delegation.py

@@ -11,7 +11,7 @@ def setup_parser(subparsers: Any) -> Any:
     parser = cli_shared.add_group_subparser(subparsers, "deps", "Manage dependencies or elrond-sdk modules")
     subparsers = parser.add_subparsers()
 
-    choices = list(get_deps_dict().keys())
+    choices = ['all'] + list(get_deps_dict().keys())
 
     sub = cli_shared.add_command_subparser(subparsers, "deps", "install", "Install dependencies or elrond-sdk modules.")
     sub.add_argument("name", choices=choices, help="the dependency to install")

erdpy/cli_deps.py

@@ -1,9 +1,9 @@
-from itertools import chain
-from logging import Logger
 import os.path
+import semver
 from typing import Any, Dict, List
+from pathlib import Path
 
-from erdpy import errors, utils
+from erdpy import errors, utils, workstation
 
 ROOT_FOLDER_NAME = "elrondsdk"
 LOCAL_CONFIG_PATH = os.path.join(os.getcwd(), "erdpy.json")
@@ -57,7 +57,8 @@ def get_dependency_url(key: str, tag: str, platform: str) -> str:
 def get_value(name: str) -> str:
     _guard_valid_name(name)
     data = get_active()
-    value = data.get(name, get_defaults()[name])
+    default_value = get_defaults()[name]
+    value = data.get(name, default_value)
     assert isinstance(value, str)
     return value
 
@@ -72,6 +73,16 @@ def set_value(name: str, value: Any):
     write_file(data)
 
 
+def delete_value(name: str):
+    _guard_valid_config_deletion(name)
+    data = read_file()
+    active_config = data.get("active", "default")
+    data.setdefault("configurations", {})
+    data["configurations"].setdefault(active_config, {})
+    del data["configurations"][active_config][name]
+    write_file(data)
+
+
 def get_active():
     data = read_file()
     configs = data.get("configurations", {})
@@ -137,30 +148,32 @@ def get_defaults() -> Dict[str, Any]:
         "proxy": "https://testnet-gateway.elrond.com",
         "chainID": "T",
         "txVersion": "1",
-        "dependencies.arwentools.tag": "v1.1.2",
-        "dependencies.elrond_wasm_rs.tag": "v0.12.0",
+        "dependencies.arwentools.tag": "latest",
+        "dependencies.elrond_wasm_rs.tag": "latest",
         "dependencies.arwentools.urlTemplate.linux": "https://github.com/ElrondNetwork/arwen-wasm-vm/archive/{TAG}.tar.gz",
         "dependencies.arwentools.urlTemplate.osx": "https://github.com/ElrondNetwork/arwen-wasm-vm/archive/{TAG}.tar.gz",
         "dependencies.llvm.tag": "v9-19feb",
         "dependencies.llvm.urlTemplate.linux": "https://ide.elrond.com/vendor-llvm/{TAG}/linux-amd64.tar.gz?t=19feb",
         "dependencies.llvm.urlTemplate.osx": "https://ide.elrond.com/vendor-llvm/{TAG}/darwin-amd64.tar.gz?t=19feb",
-        "dependencies.rust.tag": "",
+        "dependencies.rust.tag": "nightly",
         "dependencies.nodejs.tag": "v12.18.3",
         "dependencies.nodejs.urlTemplate.linux": "https://nodejs.org/dist/{TAG}/node-{TAG}-linux-x64.tar.gz",
         "dependencies.nodejs.urlTemplate.osx": "https://nodejs.org/dist/{TAG}/node-{TAG}-darwin-x64.tar.gz",
-        "dependencies.elrond_go.tag": "master",
+        "dependencies.elrond_go.tag": "latest",
         "dependencies.elrond_go.urlTemplate.linux": "https://github.com/ElrondNetwork/elrond-go/archive/{TAG}.tar.gz",
         "dependencies.elrond_go.urlTemplate.osx": "https://github.com/ElrondNetwork/elrond-go/archive/{TAG}.tar.gz",
         "dependencies.elrond_go.url": "https://github.com/ElrondNetwork/elrond-go/archive/{TAG}.tar.gz",
-        "dependencies.elrond_proxy_go.tag": "master",
+        "dependencies.elrond_proxy_go.tag": "latest",
         "dependencies.elrond_proxy_go.urlTemplate.linux": "https://github.com/ElrondNetwork/elrond-proxy-go/archive/{TAG}.tar.gz",
         "dependencies.elrond_proxy_go.urlTemplate.osx": "https://github.com/ElrondNetwork/elrond-proxy-go/archive/{TAG}.tar.gz",
         "dependencies.golang.tag": "go1.15.2",
         "dependencies.golang.urlTemplate.linux": "https://golang.org/dl/{TAG}.linux-amd64.tar.gz",
         "dependencies.golang.urlTemplate.osx": "https://golang.org/dl/{TAG}.darwin-amd64.tar.gz",
-        "dependencies.mcl_signer.tag": "v1.0.0",
+        "dependencies.mcl_signer.tag": "latest",
         "dependencies.mcl_signer.urlTemplate.linux": "https://github.com/ElrondNetwork/elrond-sdk-go-tools/releases/download/{TAG}/mcl_signer_{TAG}_ubuntu-latest.tar.gz",
         "dependencies.mcl_signer.urlTemplate.osx": "https://github.com/ElrondNetwork/elrond-sdk-go-tools/releases/download/{TAG}/mcl_signer_{TAG}_macos-latest.tar.gz",
+        "testnet.validate_expected_keys": "false",
+        "github_api_token": "",
     }
 
 
@@ -227,3 +240,44 @@ def determine_final_args(argv: List[str], config_args: Dict[str, Any]) -> List[s
         pre_args = [verbose_flag]
 
     return pre_args + argv + extra_args
+
+
+def get_dependency_directory(key: str, tag: str) -> Path:
+    parent_directory = get_dependency_parent_directory(key)
+    if tag == 'latest':
+        tag = get_latest_semver_from_directory(parent_directory)
+
+    return parent_directory / tag
+
+
+def get_dependency_parent_directory(key: str) -> Path:
+    tools_folder = Path(workstation.get_tools_folder())
+    return tools_folder / key
+
+
+def get_latest_semver_from_directory(directory: Path) -> str:
+    subdirs = [subdir.name for subdir in directory.iterdir()]
+    versions = parse_strings_to_semver(subdirs)
+    if len(versions) == 0:
+        raise Exception(f'no versions found in {directory}')
+
+    if len(versions) == 1:
+        latest_version = versions[0]
+    else:
+        latest_version = sorted(versions).pop()
+    return 'v' + str(latest_version)
+
+
+def parse_strings_to_semver(version_strings: List[str]) -> List[semver.VersionInfo]:
+    versions = []
+    for version_string in version_strings:
+        try:
+            # Omit the 'v' prefix of the version string
+            version_string = version_string[1:]
+            version = semver.VersionInfo.parse(version_string)
+        except ValueError:
+            continue
+
+        versions.append(version)
+
+    return versions

erdpy/config.py

@@ -1,4 +1,5 @@
 import logging
+from pathlib import Path
 from typing import Dict, List
 
 from erdpy import config, errors
@@ -10,11 +11,16 @@
 
 
 def install_module(key: str, tag: str = "", overwrite: bool = False):
-    module = get_module_by_key(key)
-    module.install(tag, overwrite)
+    if key == 'all':
+        modules = get_all_deps()
+    else:
+        modules = [get_module_by_key(key)]
+
+    for module in modules:
+        module.install(tag, overwrite)
 
 
-def get_module_directory(key: str) -> str:
+def get_module_directory(key: str) -> Path:
     module = get_module_by_key(key)
     default_tag = config.get_dependency_tag(key)
     directory = module.get_directory(default_tag)
@@ -44,8 +50,8 @@ def get_all_deps() -> List[DependencyModule]:
         ArwenToolsModule(key="arwentools"),
         Rust(key="rust"),
         NodejsModule(key="nodejs", aliases=[]),
-        StandaloneModule(key="elrond_go"),
-        StandaloneModule(key="elrond_proxy_go"),
+        StandaloneModule(key="elrond_go", repo_name="elrond-go", organisation="ElrondNetwork"),
+        StandaloneModule(key="elrond_proxy_go", repo_name="elrond-proxy-go", organisation="ElrondNetwork"),
         GolangModule(key="golang"),
         MclSignerModule(key="mcl_signer")
     ]