Skip to content

Repository migration fixes#175

Merged
popenta merged 7 commits into
mainfrom
migration-fixes
Jan 9, 2023
Merged

Repository migration fixes#175
popenta merged 7 commits into
mainfrom
migration-fixes

Conversation

@popenta
Copy link
Copy Markdown
Collaborator

@popenta popenta commented Jan 5, 2023

This PR aims to solve the issues created by the migration of the repositories to the new organization.

The word elrond still exists in the repository, mostly used for ElrondProxy, the integration of erdpy-network-providers will come in v4.0.0. There are some other places where the word is used, but the changes will be breaking changes, will come in a later PR, probably after the migration is complete.

Deleted the docs folder and the examples folder because we have the erdpy cookbook (https://github.com/multiversx/mx-sdk-erdpy-examples).

@popenta popenta self-assigned this Jan 5, 2023
@popenta popenta marked this pull request as draft January 5, 2023 14:11
@popenta popenta marked this pull request as ready for review January 6, 2023 15:25
Comment thread erdpy/config.py Outdated
Comment thread erdpy/testnet/setup.py Outdated
go_mod = testnet_config.node_source() / "go.mod"
lines = utils.read_lines(go_mod)
line = next(line for line in lines if "github.com/ElrondNetwork/arwen-wasm-vm" in line)
line = next(line for line in lines if "github.com/ElrondNetwork/wasm-vm" in line)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[optional] should maybe also switch to the new repo?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, this depends on go.mod:

https://github.com/multiversx/mx-chain-go/blob/master/go.mod

Thus, we have to actually use the oldest name (please revert this change).

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted to old name

Comment thread .github/workflows/erdpy-publish.yml Outdated
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo " - [CHANGELOG](https://github.com/ElrondNetwork/elrond-sdk-erdpy/blob/main/erdpy/CHANGELOG.md)" >> notes.txt
echo " - [CHANGELOG](https://github.com/multiversx/mx-sdk-erdpy/blob/main/erdpy/CHANGELOG.md)" >> notes.txt
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this link (since changelog has been removed). Actually, remove usage of notes.txt all-together?

For example:
https://github.com/multiversx/mx-sdk-erdjs/pull/247/files#diff-196c0cb5a15344d79f17f60d56331cfc388e9f5cbe28f8350f38724ad06aa139

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

Comment thread README.md

## Distribution
[erdpy-up](https://docs.elrond.com/sdk-and-tools/erdpy/installing-erdpy/) and [PyPi](https://pypi.org/project/erdpy/#history)
[erdpy-up](https://docs.multiversx.com/sdk-and-tools/erdpy/installing-erdpy/) and [PyPi](https://pypi.org/project/erdpy/#history)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The section below (changelog) can be removed.

Comment thread erdpy-up.py

def remove_installation():
old_folder = os.path.expanduser("~/ElrondSCTools")
def migrate_installation(sdk_path: str) -> None:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 we will call this method in a future release.

Comment thread erdpy-up.py
logger.info("""

For more information go to https://docs.elrond.com.
For more information go to https://docs.multiversx.com.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Telegram group has to be renamed as well (but not now, I think).

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if it's been renamed.

Comment thread erdpy/README.md Outdated
@@ -1,16 +1,16 @@
# Description
Elrond Python Command Line Tools and SDK for interacting with the Elrond Network (in general) and Smart Contracts (in particular).
MultiversX Python Command Line Tools and SDK for interacting with the MultiversX Network (in general) and Smart Contracts (in particular).
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only now I see that there are 2 readme files. Remove this one, and update the one at the top level?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted this file and update the one at the top level.

Comment thread erdpy/projects/templates_repository.py Outdated
def is_template(self, subfolder: str) -> bool:
elrond_json_file = self.get_metadata_file(subfolder)
return elrond_json_file.is_file()
multiversx_json_file = self.get_metadata_file(subfolder)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be renamed to project_config_file, perhaps.

Comment thread erdpy/testnet/config.py Outdated

def proxy_source(self) -> Path:
return self.folders['elrond_proxy_go']
return self.folders['max_chain_proxy_go']
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo, mx.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Comment thread erdpy/testnet/setup.py Outdated
# Now copy the binaries to the testnet folder
wasm_vm_version = _get_wasm_vm_version(testnet_config)
libwasmer_path = path.join(golang.get_gopath(), f"pkg/mod/github.com/!elrond!network/arwen-wasm-vm@{wasm_vm_version}/wasmer/libwasmer_darwin_amd64.dylib")
libwasmer_path = path.join(golang.get_gopath(), f"pkg/mod/github.com/!elrond!network/wasm-vm@{wasm_vm_version}/wasmer/libwasmer_darwin_amd64.dylib")
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert (arwen-wasm-vm, as it is in go.mod).

Comment thread erdpy/wallet/core.py Outdated
BIP39_PBKDF2_ROUNDS = 2048
BIP32_SEED_MODIFIER = b'ed25519 seed'
ELROND_DERIVATION_PATH = [44, 508, 0, 0]
MULTIVERSX_DERIVATION_PATH = [44, 508, 0, 0]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be HD_WALLET_DERIVATION_PATH or BIP39_WALLET_DERIVATION_PATH.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to BIP39_WALLET_DERIVATION_PATH

Comment thread setup.py Outdated
name="erdpy",
version=VERSION,
description="Elrond Smart Contracts Tools and Python SDK",
description="MultiversX Smart Contracts Tools and Python SDK",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove and Python SDK (since now we have the "eggs" libraries).

@popenta popenta merged commit 7d3848e into main Jan 9, 2023
@popenta popenta deleted the migration-fixes branch January 9, 2023 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants