Replace arwentools with vmtools where appropriate

Author: camilbancioiu

erdpy/CLI.md

@@ -1185,7 +1185,7 @@ usage: erdpy deps install [-h] ...
 Install dependencies or elrond-sdk modules.
 
 positional arguments:
-  {llvm,clang,cpp,arwentools,rust,nodejs,elrond_go,elrond_proxy_go,golang,mcl_signer}
+  {llvm,clang,cpp,vmtools,rust,nodejs,elrond_go,elrond_proxy_go,golang,mcl_signer}
                                                   the dependency to install
 
 optional arguments:
@@ -1204,7 +1204,7 @@ usage: erdpy deps check [-h] ...
 Check whether a dependency is installed.
 
 positional arguments:
-  {llvm,clang,cpp,arwentools,rust,nodejs,elrond_go,elrond_proxy_go,golang,mcl_signer}
+  {llvm,clang,cpp,vmtools,rust,nodejs,elrond_go,elrond_proxy_go,golang,mcl_signer}
                                                   the dependency to check
 
 optional arguments:

erdpy/config.py

@@ -148,10 +148,10 @@ def get_defaults() -> Dict[str, Any]:
         "proxy": "https://testnet-gateway.elrond.com",
         "chainID": "T",
         "txVersion": "1",
-        "dependencies.arwentools.tag": "latest",
+        "dependencies.vmtools.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.vmtools.urlTemplate.linux": "https://github.com/ElrondNetwork/wasm-vm/archive/{TAG}.tar.gz",
+        "dependencies.vmtools.urlTemplate.osx": "https://github.com/ElrondNetwork/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",

erdpy/constants.py

@@ -1,5 +1,5 @@
 VM_TYPE_SYSTEM = "0001"
-VM_TYPE_ARWEN = "0500"
+VM_TYPE_WASM_VM = "0500"
 SC_HEX_PUBKEY_PREFIX = "0" * 16
 SC_HEX_PUBKEY_PREFIX_SYSTEM = SC_HEX_PUBKEY_PREFIX + VM_TYPE_SYSTEM + "0" * 30
-SC_HEX_PUBKEY_PREFIX_ARWEN = SC_HEX_PUBKEY_PREFIX + VM_TYPE_ARWEN
+SC_HEX_PUBKEY_PREFIX_WASM_VM = SC_HEX_PUBKEY_PREFIX + VM_TYPE_WASM_VM

erdpy/contracts.py

@@ -52,7 +52,7 @@ def deploy(self, owner: Account, arguments: List[Any], gas_price: int, gas_limit
         return tx
 
     def prepare_deploy_transaction_data(self, arguments: List[Any]):
-        tx_data = f"{self.bytecode}@{constants.VM_TYPE_ARWEN}@{self.metadata.to_hex()}"
+        tx_data = f"{self.bytecode}@{constants.VM_TYPE_WASM_VM}@{self.metadata.to_hex()}"
 
         for arg in arguments:
             tx_data += f"@{_prepare_argument(arg)}"

erdpy/dependencies/install.py

@@ -3,7 +3,7 @@
 from typing import Dict, List
 
 from erdpy import config, errors
-from erdpy.dependencies.modules import (ArwenToolsModule, DependencyModule,
+from erdpy.dependencies.modules import (VMToolsModule, DependencyModule,
                                         GolangModule, MclSignerModule,
                                         NodejsModule, Rust, StandaloneModule)
 
@@ -47,7 +47,7 @@ def get_deps_dict() -> Dict[str, DependencyModule]:
 def get_all_deps() -> List[DependencyModule]:
     return [
         StandaloneModule(key="llvm", aliases=["clang", "cpp"]),
-        ArwenToolsModule(key="arwentools"),
+        VMToolsModule(key="vmtools"),
         Rust(key="rust"),
         NodejsModule(key="nodejs", aliases=[]),
         StandaloneModule(key="elrond_go", repo_name="elrond-go", organisation="ElrondNetwork"),

erdpy/dependencies/modules.py

@@ -143,22 +143,19 @@ def _get_archive_path(self, tag: str) -> Path:
         return archive
 
 
-class ArwenToolsModule(StandaloneModule):
+class VMToolsModule(StandaloneModule):
     def __init__(self, key: str, aliases: List[str] = None):
         if aliases is None:
             aliases = list()
 
         super().__init__(key, aliases)
-        self.repo_name = 'arwen-wasm-vm'
+        self.repo_name = 'wasm-vm'
         self.organisation = 'ElrondNetwork'
 
     def _post_install(self, tag: str):
         dependencies.install_module('golang')
 
-        self.build_binary(tag, 'arwendebug')
         self.build_binary(tag, 'test')
-
-        self.make_binary_symlink_in_parent_folder(tag, 'arwendebug', 'arwendebug')
         self.make_binary_symlink_in_parent_folder(tag, 'test', 'mandos-test')
         self.copy_libwasmer_in_parent_directory(tag)
 

erdpy/projects/core.py

@@ -58,7 +58,7 @@ def run_tests(args: Any):
 
     logger.info("run_tests.project: %s", project)
 
-    dependencies.install_module("arwentools")
+    dependencies.install_module("vmtools")
 
     guards.is_directory(project)
     project = load_project(project)

erdpy/projects/project_base.py

@@ -97,9 +97,9 @@ def default_config(self):
         return dict()
 
     def run_tests(self, tests_directory: str, wildcard: str = ""):
-        arwentools = cast(StandaloneModule, dependencies.get_module_by_key("arwentools"))
-        tool_env = arwentools.get_env()
-        tool = path.join(arwentools.get_parent_directory(), "mandos-test")
+        vmtools = cast(StandaloneModule, dependencies.get_module_by_key("vmtools"))
+        tool_env = vmtools.get_env()
+        tool = path.join(vmtools.get_parent_directory(), "mandos-test")
         test_folder = path.join(self.directory, tests_directory)
 
         if not wildcard:

erdpy/scope.py

@@ -25,7 +25,7 @@ def initialize():
             testnet_config = TestnetConfiguration.from_file(testnet_toml)
             proxy = f"http://localhost:{testnet_config.proxy_port()}"
         except FileNotFoundError:
-            logger.warn("components of the testnet may be missing")
+            pass
 
 
 def get_chain_id():

erdpy/testnet/config.py

@@ -296,16 +296,16 @@ def proxy_port(self):
     def loglevel(self) -> str:
         return self.features.get("loglevel", "")
 
-    def arwen_binary(self) -> bool:
-        return self.features.get("arwen_binary", False)
+    def wasm_vm_binary(self) -> bool:
+        return self.features.get("wasm_vm_binary", False)
 
     @classmethod
     def default(cls):
         config = dict()
         config['features'] = {
             'loglevel': '*:DEBUG',
             'proxy': True,
-            'arwen_binary': False
+            'wasm_vm_binary': False
         }
         config['folders'] = {
             'elrond_go':