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

Amend NEP-2 #17

Merged
merged 2 commits into from
Nov 2, 2017
Merged

Amend NEP-2 #17

merged 2 commits into from
Nov 2, 2017

Conversation

ixje
Copy link
Contributor

@ixje ixje commented Oct 28, 2017

See individual commit messages for detailed reasoning

ixje added 2 commits October 28, 2017 17:56
decryption results in a plaintext key, not encrypted key
Make text more consistent by using the actual name provided in step 1.
The name ‘salt’ is only relevant for the scrypt function, not for the
actual final key data structure. It also more closely matches the
actual implementation @
https://github.com/neo-project/neo/blob/master/neo/Wallets/KeyPair.cs#L7
5
@erikzhang erikzhang merged commit 3f4ca08 into neo-project:master Nov 2, 2017
lerider added a commit to lerider/proposals that referenced this pull request Nov 2, 2017
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.

2 participants