Merge branch 'main' into cleanup

Author: andreibancioiu

erdpy/CHANGELOG.md

@@ -7,6 +7,9 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 ## [Unreleased]
  - TBD 
 
+## [1.2.0] - 07.03.2022
+ - [On contract builld, reveal imported functions and check compatibility](https://github.com/ElrondNetwork/elrond-sdk-erdpy/pull/111)
+
 ## [1.1.0] - 01.03.2022
  - [Add reports: contract sizes and twiggy symbol checks](https://github.com/ElrondNetwork/elrond-sdk-erdpy/pull/106)
  - [Add `--recursive` option on contract build](https://github.com/ElrondNetwork/elrond-sdk-erdpy/pull/104)

erdpy/CLI.md

@@ -30,7 +30,7 @@ TOP-LEVEL OPTIONS:
 ----------------------
 COMMAND GROUPS summary
 ----------------------
-contract                       Build, deploy and interact with Smart Contracts
+contract                       Build, deploy, upgrade and interact with Smart Contracts
 tx                             Create and broadcast Transactions
 validator                      Stake, UnStake, UnBond, Unjail and other actions useful for Validators
 account                        Get Account data (nonce, balance) from the Network
@@ -54,7 +54,7 @@ dns                            Operations related to the Domain Name Service
 $ erdpy contract --help
 usage: erdpy contract COMMAND [-h] ...
 
-Build, deploy and interact with Smart Contracts
+Build, deploy, upgrade and interact with Smart Contracts
 
 COMMANDS:
   {new,templates,build,clean,test,report,deploy,call,upgrade,query}
@@ -131,6 +131,8 @@ optional arguments:
                                        analysing the bytecode. Creates larger wasm files. Avoid in production (default:
                                        False)
   --wasm-name WASM_NAME                for rust projects, optionally specify the name of the wasm bytecode output file
+  --skip-eei-checks                    skip EEI compatibility checks (default: False)
+  --ignore-eei-checks                  ignore EEI compatibility errors (default: False)
 
 ```
 ### Contract.Clean
@@ -1216,7 +1218,7 @@ usage: erdpy deps install [-h] ...
 Install dependencies or elrond-sdk modules.
 
 positional arguments:
-  {all,llvm,clang,cpp,rust,nodejs,golang,vmtools,elrond_go,elrond_proxy_go,mcl_signer,wasm-opt,twiggy}
+  {all,llvm,clang,cpp,rust,nodejs,golang,wabt,vmtools,elrond_go,elrond_proxy_go,mcl_signer,wasm-opt,twiggy}
                                                   the dependency to install
 
 optional arguments:
@@ -1235,7 +1237,7 @@ usage: erdpy deps check [-h] ...
 Check whether a dependency is installed.
 
 positional arguments:
-  {all,llvm,clang,cpp,rust,nodejs,golang,vmtools,elrond_go,elrond_proxy_go,mcl_signer,wasm-opt,twiggy}
+  {all,llvm,clang,cpp,rust,nodejs,golang,wabt,vmtools,elrond_go,elrond_proxy_go,mcl_signer,wasm-opt,twiggy}
                                                   the dependency to check
 
 optional arguments:

erdpy/_version.py

@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.2.0"

erdpy/cli_contracts.py

@@ -17,7 +17,7 @@
 
 
 def setup_parser(args: List[str], subparsers: Any) -> Any:
-    parser = cli_shared.add_group_subparser(subparsers, "contract", "Build, deploy and interact with Smart Contracts")
+    parser = cli_shared.add_group_subparser(subparsers, "contract", "Build, deploy, upgrade and interact with Smart Contracts")
     subparsers = parser.add_subparsers()
 
     sub = cli_shared.add_command_subparser(subparsers, "contract", "new",
@@ -46,6 +46,8 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
                      help="for rust projects, does not strip the symbols from the wasm output. Useful for analysing the bytecode. Creates larger wasm files. Avoid in production (default: %(default)s)")
     sub.add_argument("--wasm-name", type=str,
                      help="for rust projects, optionally specify the name of the wasm bytecode output file")
+    sub.add_argument("--skip-eei-checks", action="store_true", default=False, help="skip EEI compatibility checks (default: %(default)s)")
+    sub.add_argument("--ignore-eei-checks", action="store_true", default=False, help="ignore EEI compatibility errors (default: %(default)s)")
     sub.set_defaults(func=build)
 
     sub = cli_shared.add_command_subparser(subparsers, "contract", "clean", "Clean a Smart Contract project.")
@@ -211,7 +213,9 @@ def build(args: Any):
         "verbose": args.verbose,
         "cargo_target_dir": args.cargo_target_dir,
         "wasm_symbols": args.wasm_symbols,
-        "wasm_name": args.wasm_name
+        "wasm_name": args.wasm_name,
+        "skip-eei-checks": args.skip_eei_checks,
+        "ignore-eei-checks": args.ignore_eei_checks
     }
 
     for project in project_paths:

erdpy/config.py

@@ -177,6 +177,9 @@ def get_defaults() -> Dict[str, Any]:
         "dependencies.mcl_signer.urlTemplate.osx": "https://github.com/ElrondNetwork/elrond-sdk-go-tools/releases/download/{TAG}/mcl_signer_{TAG}_macos-latest.tar.gz",
         "dependencies.wasm-opt.tag": "latest",
         "dependencies.twiggy.tag": "latest",
+        "dependencies.wabt.tag": "1.0.27",
+        "dependencies.wabt.urlTemplate.linux": "https://github.com/WebAssembly/wabt/releases/download/{TAG}/wabt-{TAG}-ubuntu.tar.gz",
+        "dependencies.wabt.urlTemplate.osx": "https://github.com/WebAssembly/wabt/releases/download/{TAG}/wabt-{TAG}-macos.tar.gz",
         "testnet.validate_expected_keys": "false",
         "github_api_token": "",
     }

erdpy/dependencies/install.py

@@ -5,14 +5,14 @@
 from erdpy import config, errors
 from erdpy.dependencies.modules import (CargoModule, NpmModule, VMToolsModule, DependencyModule,
                                         GolangModule, MclSignerModule,
-                                        NodejsModule, Rust, StandaloneModule)
+                                        NodejsModule, Rust, StandaloneModule, WabtModule)
 
 logger = logging.getLogger("install")
 
 
 def install_module(key: str, tag: str = "", overwrite: bool = False):
     if key == 'all':
-        modules = get_all_deps_installable_via_cli()
+        modules = _get_all_deps_installable_via_cli()
     else:
         modules = [get_module_by_key(key)]
 
@@ -28,36 +28,39 @@ def get_module_directory(key: str) -> Path:
 
 
 def get_module_by_key(key: str) -> DependencyModule:
-    matches = [module for module in get_all_deps() if module.key == key or key in module.aliases]
+    matches = [module for module in _get_all_deps() if module.key == key or key in module.aliases]
     if len(matches) != 1:
         raise errors.UnknownDependency(key)
 
     return matches[0]
 
 
 def get_deps_dict() -> Dict[str, DependencyModule]:
-    deps = dict()
-    for module in get_all_deps():
+    deps: Dict[str, DependencyModule] = dict()
+
+    for module in _get_all_deps():
         deps[module.key] = module
         for alias in module.aliases:
             deps[alias] = module
+
     return deps
 
 
-def get_all_deps() -> List[DependencyModule]:
-    return get_all_implicit_deps() + get_all_deps_installable_via_cli()
+def _get_all_deps() -> List[DependencyModule]:
+    return _get_all_implicit_deps() + _get_all_deps_installable_via_cli()
 
 
-def get_all_implicit_deps() -> List[DependencyModule]:
+def _get_all_implicit_deps() -> List[DependencyModule]:
     return [
         StandaloneModule(key="llvm", aliases=["clang", "cpp"]),
         Rust(key="rust"),
         NodejsModule(key="nodejs", aliases=[]),
         GolangModule(key="golang"),
+        WabtModule(key="wabt", aliases=[])
     ]
 
 
-def get_all_deps_installable_via_cli() -> List[DependencyModule]:
+def _get_all_deps_installable_via_cli() -> List[DependencyModule]:
     return [
         VMToolsModule(key="vmtools"),
         StandaloneModule(key="elrond_go", repo_name="elrond-go", organisation="ElrondNetwork"),
@@ -68,7 +71,6 @@ def get_all_deps_installable_via_cli() -> List[DependencyModule]:
     ]
 
 
-
 def get_golang() -> GolangModule:
     golang = get_module_by_key('golang')
     assert isinstance(golang, GolangModule)

erdpy/dependencies/modules.py

@@ -245,6 +245,28 @@ def get_latest_release(self) -> str:
         raise errors.UnsupportedConfigurationValue("Nodejs tag must always be explicit, not latest")
 
 
+
+class WabtModule(StandaloneModule):
+    def __init__(self, key: str, aliases: List[str]):
+        super().__init__(key, aliases)
+
+    def _post_install(self, tag: str):
+        # We'll create a "latest" symlink
+        link_target = path.join(self.get_directory(tag), f"wabt-{tag}")
+        link = path.join(self.get_parent_directory(), "latest")
+        utils.symlink(link_target, link)
+
+    def get_env(self):
+        bin_folder = path.join(self.get_parent_directory(), "latest", "bin")
+
+        return {
+            "PATH": f"{bin_folder}:{os.environ['PATH']}",
+        }
+
+    def get_latest_release(self) -> str:
+        raise errors.UnsupportedConfigurationValue("WABT tag must be explicit")
+
+
 class NpmModule(DependencyModule):
     def __init__(self, key: str, aliases: List[str] = []):
         super().__init__(key, aliases)

erdpy/diskcache.py

@@ -0,0 +1,51 @@
+from pathlib import Path
+import time
+from typing import Any, Callable, Dict, cast
+
+from erdpy import utils, workstation
+
+
+class DiskCache:
+    def __init__(self, cache_name: str, max_age: int) -> None:
+        self.cache_name = Path(cache_name)
+        self.max_age = max_age
+
+    def get_path(self) -> Path:
+        return workstation.get_tools_folder() / f"{self.cache_name}.json"
+
+    def get_and_cache_item(self, key: str, item_provider: Callable[[], Any]) -> Any:
+        if not self.has_item(key):
+            item = item_provider()
+            self.save_item(key, item)
+        item = self._get_cached_item(key)
+        return item
+
+    def has_item(self, key: str):
+        payload = self.load_payload()
+        item = payload.get(key, None)
+        timestamp = payload.get(f"timestamp:{key}", 0)
+        age = abs(self._now() - timestamp)
+        expired = age > self.max_age
+        return True if item is not None and not expired else False
+
+    def save_item(self, key: str, item: Any):
+        cache = self.load_payload()
+        cache[key] = item
+        cache[f"timestamp:{key}"] = self._now()
+        self.store_payload(cache)
+
+    def _get_cached_item(self, key: str):
+        return self.load_payload().get(key)
+
+    def load_payload(self) -> Dict[str, Any]:
+        path = self.get_path()
+        if path.exists():
+            payload = utils.read_json_file(path)
+            return cast(Dict[str, Any], payload)
+        return dict()
+
+    def store_payload(self, cache: Any):
+        utils.write_json_file(str(self.get_path()), cache)
+
+    def _now(self):
+        return int(time.time())

erdpy/errors.py

@@ -63,6 +63,11 @@ def __init__(self, directory: str):
         super().__init__(f"Directory is not a supported project: {directory}")
 
 
+class NotSupportedProjectFeature(KnownError):
+    def __init__(self):
+        super().__init__(f"Project feature not yet supported.")
+
+
 class PlatformNotSupported(KnownError):
     def __init__(self, action_or_item: str, platform: str):
         super().__init__(f"[{action_or_item}] is not supported on platform [{platform}].")

erdpy/projects/eei_activation.py

@@ -0,0 +1,39 @@
+
+import logging
+import sys
+
+import requests
+import toml
+from erdpy.diskcache import DiskCache
+from erdpy.proxy.core import ElrondProxy
+
+logger = logging.getLogger("eei")
+
+
+class ActivationEpochsInfo(DiskCache):
+    def __init__(self, network_name: str, proxy_url: str, enable_epochs_url: str) -> None:
+        super().__init__(cache_name="projects.eei.ActivationEpochsInfo", max_age=60 * 30)
+        self.network_name = network_name
+        self.proxy_url = proxy_url
+        self.enable_epochs_url = enable_epochs_url
+
+    def is_flag_active(self, flag_name: str):
+        current_epoch_key = f"epoch:{self.proxy_url}"
+        enable_epochs_key = f"config:{self.enable_epochs_url}"
+
+        current_epoch = self.get_and_cache_item(current_epoch_key, self._fetch_current_epoch)
+        enable_epochs = self.get_and_cache_item(enable_epochs_key, self._fetch_enable_epochs)
+        enable_epoch = enable_epochs.get(flag_name, sys.maxsize)
+        return enable_epoch >= current_epoch
+
+    def _fetch_current_epoch(self):
+        logger.info(f"fetch_current_epoch: {self.proxy_url}")
+        proxy = ElrondProxy(self.proxy_url)
+        return proxy.get_epoch()
+
+    def _fetch_enable_epochs(self):
+        logger.info(f"fetch_enable_epochs: {self.enable_epochs_url}")
+        response = requests.get(self.enable_epochs_url)
+        response.raise_for_status()
+        enable_epochs = toml.loads(response.text).get("EnableEpochs", dict())
+        return dict(enable_epochs)