Skip to content

/ ethereum-remote-client

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

Point to our fork of eth keyring controller #1

Merged
merged 4 commits into from Aug 13, 2019
Merged

Point to our fork of eth keyring controller #1

merged 4 commits into from Aug 13, 2019

Conversation

@diracdeltas
Copy link
Member

diracdeltas commented May 30, 2019 •
edited

Which in turn points at https://github.com/brave-experiments/eth-hd-keyring/tree/staging
Also does some UI changes to handle 24 words instead of 12 words

This will be used for key consolidation (see last section of https://docs.google.com/document/d/1oMC2gWPTzybQLxgTC3JFSssfNxqo-OWII1m0QT2OUFw/edit)
@bbondy
bbondy approved these changes May 31, 2019
View changes
Copy link
Member

bbondy left a comment

++ but I think @riastradh-brave should take a look.
@bbondy bbondy force-pushed the master branch from b478847 to acc9e1e Jun 11, 2019
@diracdeltas diracdeltas force-pushed the fix/key-gen branch from 6085c6a to 37215fd Jun 12, 2019
@diracdeltas
Copy link
Member Author

diracdeltas commented Jun 13, 2019

rebased
@ryanml ryanml requested a review from riastradh-brave Jun 15, 2019
@bbondy bbondy force-pushed the master branch 3 times, most recently from ef8d958 to 02a2721 Jun 19, 2019
@ryanml ryanml force-pushed the master branch 4 times, most recently from 5e9041c to 3defc26 Jul 9, 2019
@diracdeltas diracdeltas force-pushed the fix/key-gen branch 3 times, most recently from c91ad3c to f9ad886 Jul 24, 2019
cg505 pushed a commit that referenced this pull request Jul 29, 2019
filmendless @Gudahtt
[ImgBot] Optimize images (#1) (#6829)
45534d9 
*Total -- 5,450.78kb -> 4,473.66kb (17.93%)

/images/404.png -- 38.48kb -> 11.19kb (70.91%)
/images/deadface.png -- 8.14kb -> 4.50kb (44.67%)
/images/cancel.png -- 10.67kb -> 6.04kb (43.38%)
/app/images/key-32.png -- 1.08kb -> 0.68kb (37.66%)
/app/images/coinswitch_logo.png -- 3.06kb -> 1.94kb (36.43%)
/images/info-logo.png -- 31.80kb -> 20.43kb (35.77%)
/docs/transaction-flow.png -- 137.82kb -> 91.38kb (33.7%)
/ui/design/metamask-logo-eyes.png -- 142.65kb -> 94.94kb (33.45%)
/images/coinbase logo.png -- 9.55kb -> 6.43kb (32.64%)
/ui/design/chromeStorePics/screen_dao_accounts.png -- 505.47kb -> 347.03kb (31.34%)
/docs/architecture.png -- 136.94kb -> 94.15kb (31.25%)
/ui/design/chromeStorePics/screen_dao_locked.png -- 280.38kb -> 199.54kb (28.83%)
/app/images/logo.png -- 6.43kb -> 4.58kb (28.81%)
/ui/design/chromeStorePics/screen_wei_account.png -- 638.31kb -> 469.17kb (26.5%)
/images/pw-128x128.png -- 92.76kb -> 69.18kb (25.42%)
/app/images/pw128x128.png -- 92.76kb -> 69.18kb (25.42%)
/app/images/shapeshift logo.png -- 17.13kb -> 13.54kb (20.92%)
/ui/design/02b-metamask-AccDetails-Send.jpg -- 107.56kb -> 92.00kb (14.46%)
/images/icon-128.png -- 5.63kb -> 4.82kb (14.45%)
/ui/design/chromeStorePics/icon-128.png -- 5.63kb -> 4.82kb (14.45%)
/ui/design/02a-metamask-AccDetails.jpg -- 114.81kb -> 99.73kb (13.14%)
/ui/design/02a-metamask-AccDetails-OverTransaction.jpg -- 119.21kb -> 103.65kb (13.06%)
/ui/design/02a-metamask-AccDetails-OverToken.jpg -- 118.99kb -> 103.62kb (12.92%)
/ui/design/wireframes/metamask_wfs_jan_13.png -- 409.24kb -> 357.28kb (12.7%)
/ui/design/chromeStorePics/screen_dao_notification.png -- 289.55kb -> 254.49kb (12.11%)
/ui/design/05-metamask-Menu.jpg -- 127.21kb -> 111.93kb (12.01%)
/app/images/ethereum-metamask-chrome.png -- 58.62kb -> 51.86kb (11.52%)
/ui/design/chromeStorePics/final_screen_dao_accounts.png -- 243.86kb -> 217.46kb (10.82%)
/ui/design/chromeStorePics/promo1400560.png -- 255.51kb -> 228.52kb (10.56%)
/images/icon-512.png -- 41.09kb -> 36.95kb (10.08%)
/ui/design/chromeStorePics/promo920680.png -- 201.87kb -> 181.88kb (9.9%)
/ui/design/chromeStorePics/final_screen_wei_account.png -- 247.44kb -> 223.83kb (9.54%)
/ui/design/chromeStorePics/final_screen_dao_locked.png -- 215.13kb -> 196.06kb (8.87%)
/ui/design/chromeStorePics/final_screen_dao_notification.png -- 209.38kb -> 192.76kb (7.94%)
/ui/design/00-metamask-SignIn.jpg -- 56.49kb -> 53.22kb (5.79%)
/ui/design/03-metamask-Qr.jpg -- 64.50kb -> 60.89kb (5.6%)
/ui/design/01-metamask-SelectAcc.jpg -- 74.28kb -> 70.34kb (5.3%)
/ui/design/02-metamask-AccDetails.jpg -- 74.00kb -> 70.15kb (5.21%)
/ui/design/chromeStorePics/promo440280.png -- 56.12kb -> 53.92kb (3.93%)
/app/images/icon-64.png -- 3.49kb -> 3.40kb (2.66%)
/ui/design/chromeStorePics/icon-64.png -- 3.49kb -> 3.40kb (2.66%)
/images/pw-48x48.png -- 3.20kb -> 3.16kb (1.34%)
/ui/design/chromeStorePics/final_screen_wei_notification.png -- 189.32kb -> 187.93kb (0.73%)
/images/icon-32.png -- 1.69kb -> 1.68kb (0.46%)
@bbondy
bbondy reviewed Jul 30, 2019
View changes
app/_locales/en/messages.json Outdated Show resolved Hide resolved
@diracdeltas diracdeltas force-pushed the fix/key-gen branch 4 times, most recently from 3fab7e6 to 06b6c19 Jul 30, 2019
@diracdeltas diracdeltas force-pushed the fix/key-gen branch 3 times, most recently from 8bd3547 to c960b9c Aug 7, 2019
@diracdeltas
diracdeltas reviewed Aug 9, 2019
View changes
package.json
@@ -93,10 +93,10 @@
"eth-block-tracker": "^4.1.0",
"eth-contract-metadata": "github:MetaMask/eth-contract-metadata#dc68506221859bc90792bc5e0279a6835f2484d8",
"eth-ens-namehash": "^2.0.8",
"eth-hd-keyring": "^1.2.2",
"eth-hd-keyring": "github:brave-experiments/eth-hd-keyring#staging",

This comment has been minimized.

Sign in to view
Copy link
@diracdeltas

diracdeltas Aug 9, 2019

Author Member

once the eth-hd-keyring PR is merged, i will update this
@diracdeltas
diracdeltas reviewed Aug 9, 2019
View changes
package.json
"eth-json-rpc-filters": "^3.0.4",
"eth-json-rpc-infura": "^3.2.0",
"eth-keyring-controller": "^3.3.1",
"eth-keyring-controller": "github:brave-experiments/KeyringController",

This comment has been minimized.

Sign in to view
Copy link
@diracdeltas

diracdeltas Aug 9, 2019

Author Member

this repo also needs an update once the eth-hd-keyring PR is merged (to move it from brave-experiments to brave)
@bbondy
bbondy approved these changes Aug 12, 2019
View changes
bbondy pushed a commit that referenced this pull request Aug 12, 2019
@danjm
Address book send plus contact list (#6914)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
e9c7df2 
* Style Send Header

* Move Send to-row to send view and restyle

* Add "Recents" group to select recipient view

* Rename SendToRow to AddRecipient

* Basic UI and Layout

* New ENSInput component

* wip - fuzzy search for input

* small refactor

* Add Dialog

* contact list initial

* initial error on invalid address

* clean up edit

* Click to open modal

* Create AddToAddressBookModal component

* Modal styling and layout

* modal i18n

* Add to Addressbook

* ens wip

* ens wip

* ENS Resolution

* Reset input

* Send to explicit address

* Happy Path Complete

* Add back error checking

* Reset send-to when emptying input

* Add back warning object

* Fix linter

* Fix unit test #1 - fix import paths

* Remove dead tests

* One more to go

* Fix all unit tests

* add unit test for reducers and actions

* test rendering AddRecipient

* Add tests for dialog boxes in AddRecipient

* Add test for validating

* Fix linter

* Fix e2e tests

* Token send e2e fix

* Style View Contact

* Style edit-contact

* Fix e2e

* Fix from-import-beta-ui e2e spec

* Make section header say "add recipient” by default

* Auto-focus add recipient input

* Update placeholder text

* Update input title font size

* Auto advance to next step if user paste a valid address

* Ellipsify address when recipient is selected

* Fix app header background color on desktop

* Give each form row a margin of 16px

* Use .container/.component naming pattern for ens-input

* Auto-focus on input when add to addressbook modal is opened; Save on Enter

* Fix and add unit test

* Fix selectors name in e2e tests

* Correct e2e test token amount for address-book-send changes

* Adds e2e test for editing a transaction

* Delete test/integration/lib/send-new-ui.js

* Add tests for amount max button and high value error on send screen to test/e2e/metamask-ui.spec.js

* lint and revert to address as object keys

* add chainId based on current network to address book entry

* fix test

* only display contacts for the current network

* Improve ENS message when not found on current network

* Add error to indicate when network does not support ENS

* bump gaba

* address book, resolve comments

* Move contact-list to its own component

* De-duplicate getaddressbook selector and refactor name selection logic in contact-list-tab/

* Use contact-list component in contact-list-tab.component (i.e. in settings)

* Improve/fix settings headers for popup and browser views

* Lint fixes related to address book updates

* Add 'My accounts' page to settings address book

* Update add new contact button in settings to match floating circular design

* Improve styles of view contact page

* Improve styles and labels of the add-contact.component

* Further lint fixes related to address book updates

* Update unit tests as per address book updates

* Ensure that contact list groups are sorted alphabetically

* Refactor settings component to use a container for connection to redux; allow display of addressbook name in settings header

* Decouple ens-input.component from send context

* Add ens resolution to add contact screen in settings

* Switching networks when an ens address is shown on send form removes the ens address.

* Resolve send screen search for ensAddress to matching address book entry if it exists

* Show resolved ens icon and address if exists (settings: add-contact.component)

* Make the displayed and copied address in view-contact.component the checksummed address

* Default alias state prop in AddToAddressBookModal to empty string

* Use keyCode to detect enter key in AddToAddressBookModal

* Ensure add-contact component properly updates after QR code detection

* Fix display of all recents after clicking 'Load More' in contact list

* Fix send screen contact searching after network switching

* Code cleanup related to address book changes

* Update unit tests for address book changes

* Update ENS name not found on network message

* Add ens registration error message

* Cancel on edit mode takes user back to view screen

* Adds support for memo to settings contact list view and edit screens

* Modify designs of edit and view contact in popup environment

* Update settings content list UX to show split columns in fullscreen and proper internal navigation

* Correct background address book API usages in UI
@diracdeltas diracdeltas force-pushed the fix/key-gen branch from c960b9c to 06a1c83 Aug 12, 2019
@bbondy bbondy force-pushed the master branch from d302d35 to c7b9aa8 Aug 13, 2019
@bbondy bbondy force-pushed the fix/key-gen branch from 06a1c83 to 8bd3547 Aug 13, 2019
diracdeltas added 4 commits Jul 24, 2019
@diracdeltas @bbondy
Point to our fork of eth keyring controller
531a583
@diracdeltas @bbondy
Update locale files to specify 24 words instead of 12
0490ac1 
Some of the non-English locales may not be grammatical; will need manual
checking
@diracdeltas @bbondy
UI changes needed for 24-word migration
0460847
@diracdeltas @bbondy
add wasm-eval CSP to manifest
Loading status checks…
149bb25 
needed for argon2
@bbondy bbondy force-pushed the fix/key-gen branch from 8bd3547 to 149bb25 Aug 13, 2019
@bbondy
Copy link
Member

bbondy commented Aug 13, 2019

Rebased on Node v10, I'm going to merge to start cleaning up all the PRs since this isn't released yet.
@bbondy bbondy merged commit 225c7f7 into master Aug 13, 2019
1 check failed
1 check failed
Travis CI - Pull Request Build Errored
Details
@diracdeltas

This comment has been minimized.

Sign in to view
Copy link
Member Author

diracdeltas commented on app/manifest.json in 149bb25 Aug 13, 2019

oops, i thought i removed this but may have been lost in rebase. anyway this line should not be necessary.

This comment has been minimized.

Sign in to view
Copy link
Member

bbondy replied Aug 13, 2019

oops sorry if from the rebase, do you mind PR'ing @diracdeltas
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bbondy bbondy

@riastradh-brave riastradh-brave

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
@diracdeltas @bbondy
You can’t perform that action at this time.