Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EMR Wrapper SC #3272

Closed
wants to merge 6 commits into from
Closed

EMR Wrapper SC #3272

wants to merge 6 commits into from

Conversation

Toderean
Copy link
Contributor

{
"address": "erd16arrrc0daw46y52prfyz0httsdy4dr0a34hngdedz2fuzvsfmp3sld67zc",
"message": "0x65643364383038303864323136363731613063313466366530646565336536663363613231616334",
"signature": "0x214bda30b7de5382449beb81c68a1943431a711c3b2f6f1ff4b2a82717c0bd7ce141ee7c7ecd8d5aca3e3c1b4f42b195db5471858fa5ba26b888b61a64f50c0a",
"version": 1,
"signer": "ErdJS"
}

@paulmultiversx
Copy link
Collaborator

Hi, @Toderean

Your branch is behind our master. Please make sure you have all our updates in your forked repository so we can approve & merge the PR.


Thanks.

@Toderean
Copy link
Contributor Author

{
"address": "erd16arrrc0daw46y52prfyz0httsdy4dr0a34hngdedz2fuzvsfmp3sld67zc",
"message": "0x64376634333837383162343066663433356261343530646134326164613537643530643532306639",
"signature": "0xc5433ba711a55025266e7dd0a46be96ed52b5ee154cc0e6bed39a382304635265a064b3ad23272a53da1f963ccc6652c1b96b37579cffe6f3c29f0e61e8d9f00",
"version": 1,
"signer": "ErdJS"
}

paulmultiversx
paulmultiversx previously approved these changes Sep 13, 2024
@paulmultiversx
Copy link
Collaborator

@Toderean One of your files includes a space.

You currently have: accounts/ erd1qqqqqqqqqqqqqpgqrdkz05f3lfpf9csn7ck35xtl6pcmgec0mp3s4cwsp3.json

You should have: accounts/erd1qqqqqqqqqqqqqpgqrdkz05f3lfpf9csn7ck35xtl6pcmgec0mp3s4cwsp3.json

@Toderean
Copy link
Contributor Author

{
"address": "erd16arrrc0daw46y52prfyz0httsdy4dr0a34hngdedz2fuzvsfmp3sld67zc",
"message": "0x66393832396435656164353136333931383233613137396665653466373134353466303930666533",
"signature": "0x26dd2d5cc9342da9480795b54856ea48a13de7eb5187757039eda4fbb410ea4f03d595fda615359e2f8be7a27636bca462befe5fc25ac635df76715b044a4f0d",
"version": 1,
"signer": "ErdJS"
}

@Toderean
Copy link
Contributor Author

Latest update.
{
"address": "erd16arrrc0daw46y52prfyz0httsdy4dr0a34hngdedz2fuzvsfmp3sld67zc",
"message": "0x33626366393132373937386538363863373464353331613939646233386237656338613833356430",
"signature": "0x80aa90e295ce4768ecfc8233d6337c4f4c1c0a0f1a265980856b793b229d9ae2b8aba6c56d1288bcc56d3a55624fc645861b14ee05f4f49c0e95b570efaef00c",
"version": 1,
"signer": "ErdJS"
}

@paulmultiversx
Copy link
Collaborator

@Toderean it seems this branch has conflicts that must be resolved. You need to manually resolve the conflicts. In case you don't know how to do that, then just erase the fork from Github and re-start the process clean.

Thanks.

@Toderean
Copy link
Contributor Author

Toderean commented Sep 13, 2024

It is possible somehow to delete the erd1qqqqqqqqqqqqqpgqrdkz05f3lfpf9csn7ck35xtl6pcmgec0mp3s4cwsp3.json file from the master branch because it is wrong named?
And this fork is a good one, the EMRS/EMR Liquidity SC is the wrong one.

@bogdan-rosianu
Copy link
Contributor

It is possible somehow to delete the erd1qqqqqqqqqqqqqpgqrdkz05f3lfpf9csn7ck35xtl6pcmgec0mp3s4cwsp3.json file from the master branch because it is wrong named? And this fork is a good one, the EMRS/EMR Liquidity SC is the wrong one.

Hello. Your fork is outdated and has conflicts. As @paulmultiversx suggested, you can delete the fork and fork mx-assets again and then you will simply update the current branding for that address

@Toderean Toderean closed this Sep 13, 2024
@Toderean Toderean deleted the EMR-Wrapper-SC branch September 13, 2024 08:27
@Toderean Toderean restored the EMR-Wrapper-SC branch September 13, 2024 08:27
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