Warp Wallet integration and some fixes#36
Open
bitcoincoltd wants to merge 10 commits intoOutCast3k:masterfrom
Open
Warp Wallet integration and some fixes#36bitcoincoltd wants to merge 10 commits intoOutCast3k:masterfrom
bitcoincoltd wants to merge 10 commits intoOutCast3k:masterfrom
Conversation
added 7 commits
December 21, 2015 17:36
Allow users to generate warp wallet address, and also use warp wallet/brain wallet phrases to sign transactions
QR codes were fixed 512px on mobile making them too large, now resizes on mobile.
Can now re-hide "shown" fields.
If private key on signing page is empty then hide the brainwallet options.
# Conflicts: # index.html # js/coinbin.js
Resolve conflicts with master
Contributor
Author
|
I've updated this branch from the master so that it can be automatically merged. |
|
This is great. Would be good to see this integrated into Coinbin. |
Core warpwallet code replaced with verifiable version.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request integrates warp wallet address generation ( https://keybase.io/warp/ ).
When generating new addresses users can choose the "Warp Wallet" option and enter a phrase/salt to generate a warp wallet address (which uses key stretching)
On the signing page if users enter a non-private key they will be prompted with options to convert their text into brainwallet key, or warpwallet key....so that users can sign directly with their brain wallet/warp wallet phrase.
Also includes a couple of fixes: