Multiple fixes

Author: camilbancioiu

erdpy/config.py

@@ -134,7 +134,8 @@ def get_defaults() -> Dict[str, Any]:
         "proxy": "https://testnet-gateway.elrond.com",
         "chainID": "T",
         "txVersion": "1",
-        "dependencies.arwentools.tag": "v1.1.2",
+        "dependencies.arwentools.tag": "v1.3.27",
+        "dependencies.elrond_wasm_rs.tag": "v0.17.2",
         "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",
@@ -157,7 +158,6 @@ def get_defaults() -> Dict[str, Any]:
         "dependencies.mcl_signer.tag": "v1.0.0",
         "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",
-        "dependencies.elrond_wasm_rs.tag": "v0.10.2",
     }
 
 

erdpy/projects/project_rust.py

@@ -79,10 +79,10 @@ def _generate_abi(self):
         utils.prettify_json_file(self._get_abi_filepath())
 
     def _has_abi(self):
-        return Path(self._get_abi_folder(), "Cargo.toml").is_file()
+        return (self._get_abi_folder() / "Cargo.toml").exists()
 
     def _get_abi_filepath(self):
-        return Path(self._get_abi_folder(), "abi.json")
+        return self._get_abi_folder() / "abi.json"
 
     def _get_abi_folder(self):
         return Path(self.directory, "abi")

erdpy/projects/templates.py

@@ -35,26 +35,26 @@ def __init__(self, name, repository):
         self.language = repository.get_language(name)
 
 
-def create_from_template(name: str, template_name: str, directory: Union[Path, str]):
+def create_from_template(project_name: str, template_name: str, directory: Union[Path, str]):
     directory = path.expanduser(directory)
 
-    logger.info("create_from_template.name: %s", name)
+    logger.info("create_from_template.project_name: %s", project_name)
     logger.info("create_from_template.template_name: %s", template_name)
     logger.info("create_from_template.directory: %s", directory)
 
     if not directory:
         logger.info("Using current directory")
         directory = os.getcwd()
 
-    project_directory = path.join(directory, name)
+    project_directory = path.join(directory, project_name)
     if path.exists(project_directory):
         raise errors.BadDirectory(project_directory)
 
     _download_templates_repositories()
     _copy_template(template_name, project_directory)
 
     template = _load_as_template(project_directory)
-    template.apply(template_name, name)
+    template.apply(template_name, project_name)
 
     logger.info("Project created, template applied.")
 
@@ -210,11 +210,15 @@ def _patch_source_code_abi(self):
         if not path.exists(abi_main_path):
             return
 
+        template_name = self.template_name.replace('-', '_')
+        project_name = self.project_name.replace('-', '_')
+
         self._replace_in_files(
             [abi_main_path],
             [
                 # Example: replace "use simple-erc20::*" to "use my_token::*"
-                (f"use {self.template_name.replace('-', '_')}::*", f"use {self.project_name.replace('-', '_')}::*")
+                (f"use {template_name}::*", f"use {project_name}::*"),
+                (f"<{template_name}::AbiProvider>()", f"<{project_name}::AbiProvider>()")
             ]
         )
 

erdpy/projects/templates_config.py

@@ -7,7 +7,7 @@
 def get_templates_repositories():
     timestamp = int(time.time())
     examples_rs_tag = config.get_dependency_tag('elrond_wasm_rs')
-    examples_rs_tag_no_v = examples_rs_tag[1:]
+    examples_rs_tag_no_v = remove_initial_v_from_version(examples_rs_tag)
 
     return [
         TemplatesRepository(
@@ -24,3 +24,16 @@ def get_templates_repositories():
             relative_path=f"elrond-wasm-rs-{examples_rs_tag_no_v}/contracts/examples"
         )
     ]
+
+
+def remove_initial_v_from_version(version: str) -> str:
+    """Remove the initial 'v' from semver strings 'vX.XX.XX', but leave branch
+    names or non-semver tags unchanged"""
+    if version[0] != 'v':
+        return version
+
+    version_no_v = version[1:]
+    if not version_no_v[0].isnumeric():
+        return version
+
+    return version_no_v

erdpy/projects/templates_repository.py

@@ -34,7 +34,6 @@ def _download_if_old(self):
 
         downloader.download(self.url, archive)
 
-
     def _get_archive_path(self):
         tools_folder = workstation.get_tools_folder()
         archive = path.join(tools_folder, f"{self.key}.zip")