Merge main into feat/v4 (05.01.2023)

erdpy/CHANGELOG.md

@@ -7,6 +7,12 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 ## [Unreleased]
  - TBD
 
+## [3.0.3]
+ - Fixes after repository migrations
+
+## [3.0.2]
+ - Fixes after repository migrations
+
 ## [3.0.1]
  - [Contract verify: fix CLI arguments & json request](https://github.com/ElrondNetwork/elrond-sdk-erdpy/pull/171)
 

erdpy/_version.py

@@ -1 +1 @@
-__version__ = "3.0.1"
+__version__ = "3.0.3"

erdpy/config.py

@@ -153,7 +153,7 @@ def get_defaults() -> Dict[str, Any]:
         "chainID": "T",
         "txVersion": "1",
         "dependencies.vmtools.tag": "latest",
-        "dependencies.elrond_wasm_rs.tag": "latest",
+        "dependencies.mx_sdk_rs.tag": "latest",
         "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",

erdpy/dependencies/modules.py

@@ -150,8 +150,8 @@ def __init__(self, key: str, aliases: List[str] = None):
             aliases = list()
 
         super().__init__(key, aliases)
-        self.repo_name = 'wasm-vm'
-        self.organisation = 'ElrondNetwork'
+        self.repo_name = 'mx-chain-vm-go'
+        self.organisation = 'multiversx'
 
     def _post_install(self, tag: str):
         dependencies.install_module('golang')
@@ -406,8 +406,8 @@ def _post_install(self, tag: str):
 class TestWalletsModule(StandaloneModule):
     def __init__(self, key: str):
         super().__init__(key, [])
-        self.organisation = "ElrondNetwork"
-        self.repo_name = "elrond-sdk-testwallets"
+        self.organisation = "multiversx"
+        self.repo_name = "mx-sdk-testwallets"
 
     def _post_install(self, tag: str):
         # We'll create a "latest" symlink

erdpy/projects/templates_config.py

@@ -7,26 +7,26 @@
 
 def get_templates_repositories():
     timestamp = int(time.time())
-    examples_rs_tag = config.get_dependency_tag('elrond_wasm_rs')
+    examples_rs_tag = config.get_dependency_tag('mx_sdk_rs')
 
     if examples_rs_tag == 'latest':
-        examples_rs_tag = query_latest_release_tag('ElrondNetwork/elrond-wasm-rs')
+        examples_rs_tag = query_latest_release_tag('multiversx/mx-sdk-rs')
 
     examples_rs_tag_no_v = remove_initial_v_from_version(examples_rs_tag)
 
     return [
         TemplatesRepository(
             key="sc-examples",
-            url=f"https://github.com/ElrondNetwork/sc-examples/archive/master.zip?t={timestamp}",
-            github="ElrondNetwork/sc-examples",
-            relative_path="sc-examples-master"
+            url=f"https://github.com/multiversx/mx-sc-examples/archive/master.zip?t={timestamp}",
+            github="multiversx/mx-sc-examples",
+            relative_path="mx-sc-examples-master"
         ),
 
         TemplatesRepository(
-            key="elrond-wasm-rs",
-            url=f"https://github.com/ElrondNetwork/elrond-wasm-rs/archive/{examples_rs_tag}.zip?t={timestamp}",
-            github="ElrondNetwork/elrond-wasm-rs",
-            relative_path=f"elrond-wasm-rs-{examples_rs_tag_no_v}/contracts/examples"
+            key="mx-sdk-rs",
+            url=f"https://github.com/multiversx/mx-sdk-rs/archive/{examples_rs_tag}.zip?t={timestamp}",
+            github="multiversx/mx-sdk-rs",
+            relative_path=f"mx-sdk-rs-{examples_rs_tag_no_v}/contracts/examples"
         )
     ]
 

setup.py

@@ -1,9 +1,9 @@
 import setuptools
 
 with open("README.md", "r") as fh:
-    long_description = "https://github.com/ElrondNetwork/elrond-sdk-erdpy"
+    long_description = "https://github.com/multiversx/mx-sdk-erdpy"
 
-VERSION = "3.0.1"
+VERSION = "3.0.3"
 
 try:
     with open('./erdpy/_version.py', 'wt') as versionfile:
@@ -18,7 +18,7 @@
     description="Elrond Smart Contracts Tools and Python SDK",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/ElrondNetwork/elrond-sdk-erdpy",
+    url="https://github.com/multiversx/mx-sdk-erdpy",
     author="Elrond Network",
     license="GPL",
     packages=setuptools.find_packages(