status-im
/
MyCrypto
mirror of https://github.com/status-im/MyCrypto.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2054 from MyCryptoHQ/develop 

Release 1.2.0 (additional commits)
This commit is contained in:
Daniel Ternyak 2018-07-11 18:37:09 -05:00 committed by GitHub
parent 99809d4c4d 97bfbba51f
commit cea1774fd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 480 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/components/WalletDecrypt/WalletDecrypt.scss
View File

@ -17,7 +17,7 @@ $speed: 500ms;
@mixin decrypt-title {
text-align: center;
line-height: 1;
margin: 0 0 30px;
margin: $space 0 2rem;
font-weight: normal;
animation: decrypt-enter $speed ease 1;
}
@ -50,7 +50,7 @@ $speed: 500ms;
&-generate {
text-align: center;
font-weight: 300;
margin-top: $space;
margin: $space 0;
}
}

2
common/config/tokens/eth.json
View File

@ -2310,7 +2310,7 @@
"decimal": 8
},
{
"address": "0xE94327D07Fc17907b4DB788E5aDf2ed424adDff6",
"address": "0x1985365e9f78359a9B6AD760e32412f4a445E862",
"symbol": "REP",
"decimal": 18
},

43
common/containers/Tabs/SendTransaction/components/Fields/Fields.tsx
View File

@ -1,11 +1,12 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
import translate from 'translations';
import translate, { translateRaw } from 'translations';
import { AppState } from 'features/reducers';
import * as selectors from 'features/selectors';
import { getOffline, getNetworkConfig } from 'features/config';
import { scheduleSelectors } from 'features/schedule';
import { notificationsActions } from 'features/notifications';
import {
AddressField,
AmountField,
@ -38,7 +39,26 @@ interface StateProps {
useScheduling: scheduleSelectors.ICurrentSchedulingToggle['value'];
}
class FieldsClass extends Component<StateProps> {
interface DispatchProps {
showNotification: notificationsActions.TShowNotification;
}
class FieldsClass extends Component<StateProps & DispatchProps> {
public componentDidCatch(error: Error) {
if (error.message === 'Serialized transaction not found') {
/**
* @desc Occasionally, when a new signed transaction matches a previous transaction,
* the nonce does not update, since the transaction has not yet been confirmed. This triggers
* the <Amounts /> component inside the <ConfirmationModal /> of <TXMetaDataPanel /> to throw
* an error when selecting the current transaction's serialized parameters.
* A longer term fix will involve finding a better way to calculate nonces to avoid
* nonce duplication on serial transactions.
*/
this.props.showNotification('danger', translateRaw('SIMILAR_TRANSACTION_ERROR'));
this.forceUpdate();
}
}
public render() {
const { shouldDisplay, schedulingAvailable, useScheduling } = this.props;
@ -106,10 +126,15 @@ class FieldsClass extends Component<StateProps> {
}
}
export const Fields = connect((state: AppState) => ({
schedulingAvailable:
getNetworkConfig(state).name === 'Kovan' && selectors.getUnit(state) === 'ETH',
shouldDisplay: !selectors.isAnyOfflineWithWeb3(state),
offline: getOffline(state),
useScheduling: scheduleSelectors.getCurrentSchedulingToggle(state).value
}))(FieldsClass);
export const Fields = connect(
(state: AppState) => ({
schedulingAvailable:
getNetworkConfig(state).name === 'Kovan' && selectors.getUnit(state) === 'ETH',
shouldDisplay: !selectors.isAnyOfflineWithWeb3(state),
offline: getOffline(state),
useScheduling: scheduleSelectors.getCurrentSchedulingToggle(state).value
}),
{
showNotification: notificationsActions.showNotification
}
)(FieldsClass);

3
common/translations/lang/en.json
View File

@ -664,6 +664,7 @@
"PAYMENT_ID_WARNING": "Don't forget to send your XMR with the payment ID [[?]](https://getmonero.org/resources/moneropedia/paymentid.html) above, or you WILL lose your funds.",
"WHAT_IS_PAYMENT_ID": "what's a payment ID?",
"ANNOUNCEMENT_MESSAGE": "MyCrypto.com no longer allows the use of private keys, mnemonics, or keystore files in the browser. To continue using them, please download the [MyCrypto Desktop App](https://download.mycrypto.com).",
"U2F_NOT_SUPPORTED": "The U2F standard that hardware wallets use does not seem to be supported by your browser. Please try again using Google Chrome."
"U2F_NOT_SUPPORTED": "The U2F standard that hardware wallets use does not seem to be supported by your browser. Please try again using Google Chrome.",
"SIMILAR_TRANSACTION_ERROR": "This transaction is very similar to a recent transaction. Please wait a few moments and try again, or click 'Advanced' and manually set the nonce to a new value."
}
}

154
shared/enclave/server/views/passphrase.html Normal file
View File

@ -0,0 +1,154 @@
<html>
<head>
<title>TREZOR - Enter Passphrase </title>
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'nonce-$scriptNonce'; style-src 'unsafe-inline'">
</head>
<body>
<!-- TEMPLATE -->
<h1>Enter your passphrase</h1>
<div class="passphrase-controls">
<input type="password" class="passphrase-input">
<button class="passphrase-unlock">
Unlock
</button>
</div>
<button class="close">
<svg viewPort="0 0 12 12" width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
<line x1="1" y1="11" x2="11" y2="1" stroke="white" stroke-width="2" />
<line x1="1" y1="1" x2="11" y2="11" stroke="white" stroke-width="2" />
</svg>
</button>
<!-- SCRIPT -->
<script nonce="$scriptNonce">
var ipcRenderer = require('electron').ipcRenderer;
var remote = require('electron').remote;
var body = document.querySelector('body');
var input = document.querySelector('.passphrase-input');
var unlock = document.querySelector('.passphrase-unlock');
var close = document.querySelector('.close');
var passphrase = "";
function unlockWithPassphrase() {
if (!passphrase.length) return;
ipcRenderer.send('$EVENT', passphrase);
}
body.addEventListener('keydown', function (e) {
// On enter press,
if (e.keyCode === 13) {
unlockWithPassphrase();
}
});
input.addEventListener('input', function (e) {
passphrase = e.target.value
});
unlock.addEventListener('click', unlockWithPassphrase);
close.addEventListener('click', function () {
var window = remote.getCurrentWindow();
window.close();
});
</script>
<!-- STYLES -->
<style>
body {
color: #FFF;
padding: 20px;
margin: 0;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
box-sizing: border-box;
}
body * {
box-sizing: inherit;
}
h1,
h2 {
text-align: center;
}
h1 {
font-size: 28px;
font-weight: 100;
margin-bottom: 3px;
letter-spacing: 1.2px;
}
.passphrase-controls {
position: relative;
width: 220px;
margin: 0 auto;
}
.passphrase-input {
width: 100%;
background: none;
border: none;
border-bottom: 1px solid #FFF;
opacity: 0.7;
font-size: 16px;
padding: 4px;
margin-bottom: 10px;
letter-spacing: 1px;
color: #FFF;
margin-top: 5rem;
}
.passphrase-unlock {
width: 100%;
padding: 6px;
opacity: 0.6;
text-align: center;
font-size: 10px;
border: 1px solid #FFF;
border-radius: 2px;
text-transform: uppercase;
letter-spacing: 1.2px;
}
.passphrase-unlock:hover {
opacity: 0.8;
}
.passphrase-unlock:active {
opacity: 1;
}
.close {
position: absolute;
top: 10px;
right: 10px;
width: 14px;
height: 14px;
opacity: 0.3;
overflow: hidden;
}
.close:hover,
.close:focus {
opacity: 1;
}
button {
display: block;
background: none;
border: none;
padding: 0;
cursor: pointer;
color: #FFF;
outline: none;
}
</style>
</body>
</html>

8
shared/enclave/server/views/passphrase.ts Normal file
View File

@ -0,0 +1,8 @@
import showPrompt from './showPrompt';
import template from './passphrase.html';
const EVENT = 'enclave:passphrase';
export function showPassphrasePrompt(): Promise<string> {
return showPrompt(template, EVENT);
}

420
shared/enclave/server/views/pin.html
View File

@ -1,226 +1,248 @@
<html>
<head>
<title>TREZOR - Enter PIN</title>
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'nonce-$scriptNonce'; style-src 'unsafe-inline'">
</head>
<body>
<h1>Enter your PIN</h1>
<h2>Look at your device for the number positions</h2>
<div class="pin-buttons">
<button class="pin-button" data-number="7"></button>
<button class="pin-button" data-number="8"></button>
<button class="pin-button" data-number="9"></button>
<head>
<title>TREZOR - Enter PIN</title>
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'nonce-$scriptNonce'; style-src 'unsafe-inline'">
</head>
<button class="pin-button" data-number="4"></button>
<button class="pin-button" data-number="5"></button>
<button class="pin-button" data-number="6"></button>
<body>
<h1>Enter your PIN</h1>
<h2>Look at your device for the number positions</h2>
<button class="pin-button" data-number="1"></button>
<button class="pin-button" data-number="2"></button>
<button class="pin-button" data-number="3"></button>
</div>
<div class="pin-buttons">
<button class="pin-button" data-number="7"></button>
<button class="pin-button" data-number="8"></button>
<button class="pin-button" data-number="9"></button>
<div class="pin-controls">
<input class="pin-input" type="password" readonly/>
<button class="pin-clear">
<svg viewPort="0 0 8 8" width="8" height="8" version="1.1" xmlns="http://www.w3.org/2000/svg">
<line x1="1" y1="7" x2="7" y2="1" stroke="white" stroke-width="2"/>
<line x1="1" y1="1" x2="7" y2="7" stroke="white" stroke-width="2"/>
</svg>
</button>
<button class="pin-button" data-number="4"></button>
<button class="pin-button" data-number="5"></button>
<button class="pin-button" data-number="6"></button>
<button class="pin-unlock">
Unlock
</button>
</div>
<button class="pin-button" data-number="1"></button>
<button class="pin-button" data-number="2"></button>
<button class="pin-button" data-number="3"></button>
</div>
<button class="close">
<svg viewPort="0 0 12 12" width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
<line x1="1" y1="11" x2="11" y2="1" stroke="white" stroke-width="2"/>
<line x1="1" y1="1" x2="11" y2="11" stroke="white" stroke-width="2"/>
<div class="pin-controls">
<input class="pin-input" type="password" readonly/>
<button class="pin-clear">
<svg viewPort="0 0 8 8" width="8" height="8" version="1.1" xmlns="http://www.w3.org/2000/svg">
<line x1="1" y1="7" x2="7" y2="1" stroke="white" stroke-width="2" />
<line x1="1" y1="1" x2="7" y2="7" stroke="white" stroke-width="2" />
</svg>
</button>
<button class="pin-unlock">
Unlock
</button>
</div>
<button class="close">
<svg viewPort="0 0 12 12" width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
<line x1="1" y1="11" x2="11" y2="1" stroke="white" stroke-width="2" />
<line x1="1" y1="1" x2="11" y2="11" stroke="white" stroke-width="2" />
</svg>
</button>
<!-- SCRIPT -->
<script nonce="$scriptNonce">
var ipcRenderer = require('electron').ipcRenderer;
var remote = require('electron').remote;
var pin = [];
var pinButtons = document.querySelectorAll('.pin-button');
var input = document.querySelector('.pin-input');
var unlock = document.querySelector('.pin-unlock');
var clear = document.querySelector('.pin-clear');
var close = document.querySelector('.close');
<!-- SCRIPT -->
pinButtons.forEach(function(el) {
el.addEventListener('click', function(ev) {
pin.push(ev.currentTarget.getAttribute('data-number'));
input.value = pin.join('');
});
<script nonce="$scriptNonce">
var ipcRenderer = require('electron').ipcRenderer;
var remote = require('electron').remote;
var pin = [];
var pinButtons = document.querySelectorAll('.pin-button');
var input = document.querySelector('.pin-input');
var unlock = document.querySelector('.pin-unlock');
var clear = document.querySelector('.pin-clear');
var close = document.querySelector('.close');
pinButtons.forEach(function (el) {
el.addEventListener('click', function (ev) {
pin.push(ev.currentTarget.getAttribute('data-number'));
input.value = pin.join('');
});
});
clear.addEventListener('click', function() {
pin = [];
input.value = '';
});
clear.addEventListener('click', function () {
pin = [];
input.value = '';
});
unlock.addEventListener('click', function() {
if (!pin.length) return;
ipcRenderer.send('$EVENT', pin.join(''));
});
unlock.addEventListener('click', function () {
if (!pin.length) return;
ipcRenderer.send('$EVENT', pin.join(''));
});
close.addEventListener('click', function() {
var window = remote.getCurrentWindow();
window.close();
});
</script>
close.addEventListener('click', function () {
var window = remote.getCurrentWindow();
window.close();
});
</script>
<!-- STYLES -->
<!-- STYLES -->
<style>
body {
color: #FFF;
padding: 20px;
margin: 0;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
box-sizing: border-box;
}
body * {
box-sizing: inherit;
}
<style>
body {
color: #FFF;
padding: 20px;
margin: 0;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
box-sizing: border-box;
}
h1,
h2 {
text-align: center;
}
h1 {
font-size: 28px;
font-weight: 100;
margin-bottom: 3px;
letter-spacing: 1.2px;
}
h2 {
opacity: 0.5;
font-size: 13px;
font-weight: 400;
}
body * {
box-sizing: inherit;
}
.pin-buttons {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
margin: 0 auto;
width: 180px;
height: 180px;
}
.pin-button {
position: relative;
width: 54px;
height: 54px;
border-radius: 4px;
border: 1px solid #FFF;
background: rgba(255, 255, 255, 0.1);
transition: all 120ms ease;
opacity: 0.4;
}
.pin-button:hover {
opacity: 0.8;
}
.pin-button:active {
opacity: 1;
}
.pin-button:after {
content: '';
position: absolute;
width: 8px;
height: 8px;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
border-radius: 100%;
background: #FFF;
}
h1,
h2 {
text-align: center;
}
.pin-controls {
position: relative;
width: 180px;
margin: 0 auto;
}
.pin-input {
width: 100%;
background: none;
border: none;
border-bottom: 1px solid #FFF;
opacity: 0.7;
font-size: 32px;
padding: 0 4px;
margin-bottom: 10px;
letter-spacing: 3px;
color: #FFF;
}
.pin-clear {
position: absolute;
right: 0;
top: 11px;
padding: 4px;
border-radius: 100%;
border: 2px solid;
opacity: 0.6;
}
.pin-clear:hover {
opacity: 0.8;
}
.pin-clear:active {
opacity: 1;
}
.pin-unlock {
width: 100%;
padding: 6px;
opacity: 0.6;
text-align: center;
font-size: 10px;
border: 1px solid #FFF;
border-radius: 2px;
text-transform: uppercase;
letter-spacing: 1.2px;
}
.pin-unlock:hover {
opacity: 0.8;
}
.pin-unlock:active {
opacity: 1;
}
h1 {
font-size: 28px;
font-weight: 100;
margin-bottom: 3px;
letter-spacing: 1.2px;
}
.close {
position: absolute;
top: 10px;
right: 10px;
width: 14px;
height: 14px;
opacity: 0.3;
overflow: hidden;
}
.close:hover,
.close:focus {
opacity: 1;
}
h2 {
opacity: 0.5;
font-size: 13px;
font-weight: 400;
}
button {
display: block;
background: none;
border: none;
padding: 0;
cursor: pointer;
color: #FFF;
outline: none;
}
</style>
</body>
</html>
.pin-buttons {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
margin: 0 auto;
width: 180px;
height: 180px;
}
.pin-button {
position: relative;
width: 54px;
height: 54px;
border-radius: 4px;
border: 1px solid #FFF;
background: rgba(255, 255, 255, 0.1);
transition: all 120ms ease;
opacity: 0.4;
}
.pin-button:hover {
opacity: 0.8;
}
.pin-button:active {
opacity: 1;
}
.pin-button:focus {
opacity: 1;
}
.pin-button:after {
content: '';
position: absolute;
width: 8px;
height: 8px;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
border-radius: 100%;
background: #FFF;
}
.pin-controls {
position: relative;
width: 180px;
margin: 0 auto;
}
.pin-input {
width: 100%;
background: none;
border: none;
border-bottom: 1px solid #FFF;
opacity: 0.7;
font-size: 32px;
padding: 0 4px;
margin-bottom: 10px;
letter-spacing: 3px;
color: #FFF;
}
.pin-clear {
position: absolute;
right: 0;
top: 11px;
padding: 4px;
border-radius: 100%;
border: 2px solid;
opacity: 0.6;
}
.pin-clear:hover {
opacity: 0.8;
}
.pin-clear:active {
opacity: 1;
}
.pin-unlock {
width: 100%;
padding: 6px;
opacity: 0.6;
text-align: center;
font-size: 10px;
border: 1px solid #FFF;
border-radius: 2px;
text-transform: uppercase;
letter-spacing: 1.2px;
}
.pin-unlock:hover {
opacity: 0.8;
}
.pin-unlock:active {
opacity: 1;
}
.close {
position: absolute;
top: 10px;
right: 10px;
width: 14px;
height: 14px;
opacity: 0.3;
overflow: hidden;
}
.close:hover,
.close:focus {
opacity: 1;
}
button {
display: block;
background: none;
border: none;
padding: 0;
cursor: pointer;
color: #FFF;
outline: none;
}
</style>
</body>
</html>

36
shared/enclave/server/views/pin.ts
View File

@ -1,40 +1,8 @@
import { BrowserWindow, ipcMain, IpcMessageEvent } from 'electron';
import showPrompt from './showPrompt';
import template from './pin.html';
const EVENT = 'enclave:pin';
export function showPinPrompt(): Promise<string> {
return new Promise((resolve, reject) => {
const scriptNonce = Math.floor(Math.random() * 1000000000000);
const html = template
.replace(/\$scriptNonce/g, scriptNonce.toString())
.replace(/\$EVENT/g, EVENT);
let hasResolved = false;
const window = new BrowserWindow({
width: 320,
height: 380,
frame: false,
backgroundColor: '#21252B',
darkTheme: true
});
window.on('closed', () => {
if (hasResolved) {
return;
}
reject(new Error('ENCLAVE_TREZOR_CANCELED'));
});
ipcMain.once(EVENT, (_: IpcMessageEvent, pin: string) => {
resolve(pin);
hasResolved = true;
window.close();
});
window.loadURL(`data:text/html;charset=UTF-8,${encodeURIComponent(html)}`);
window.show();
window.focus();
});
return showPrompt(template, EVENT);
}

45
shared/enclave/server/views/showPrompt.ts Normal file
View File

@ -0,0 +1,45 @@
import { BrowserWindow, ipcMain, IpcMessageEvent } from 'electron';
export default function showPrompt(template: string, event: string): Promise<string> {
return new Promise((resolve, reject) => {
const scriptNonce = Math.floor(Math.random() * 1000000000000);
const html = template
.replace(/\$scriptNonce/g, scriptNonce.toString())
.replace(/\$EVENT/g, event);
let hasResolved = false;
const window = new BrowserWindow({
width: 320,
height: 380,
frame: false,
backgroundColor: '#21252B',
darkTheme: true
});
window.on('closed', () => {
if (hasResolved) {
return;
}
reject(new Error('ENCLAVE_TREZOR_CANCELED'));
});
ipcMain.once(event, (_: IpcMessageEvent, value: string) => {
try {
resolve(value);
hasResolved = true;
window.close();
} catch (e) {
/**
* @desc The window.close call sometimes fails
* if the window has already been destroyed.
*/
console.error(e);
}
});
window.loadURL(`data:text/html;charset=UTF-8,${encodeURIComponent(html)}`);
window.show();
window.focus();
});
}

11
shared/enclave/server/wallets/trezor.ts
View File

@ -7,6 +7,7 @@ import { WalletLib } from 'shared/enclave/types';
import { padLeftEven } from 'libs/values';
import { stripHexPrefixAndLower } from 'libs/formatters';
import { showPinPrompt } from '../views/pin';
import { showPassphrasePrompt } from '../views/passphrase';
const deviceList = new DeviceList({ debug: false });
@ -35,6 +36,16 @@ async function getSession() {
cb(err);
});
});
device.on('passphrase', (cb: (err?: Error, passphrase?: string) => void) => {
showPassphrasePrompt()
.then(passphrase => {
cb(undefined, passphrase);
})
.catch(err => {
console.error('Passphrase entry failed', err);
cb(err);
});
});
currentSession = session;
return currentSession;