mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-22 17:33:23 +01:00
Fix merge conflicts.
This commit is contained in:
Kevin Serrano
commit
0a3849ec84
@ -3,10 +3,11 @@
|
||||
## Current Master
|
||||
|
||||
- Add two most recently used custom RPCs to network dropdown menu.
|
||||
- Add personal_sign method support.
|
||||
- Add ability to customize gas and gasPrice on the transaction approval screen.
|
||||
|
||||
## 3.3.0 2017-2-20
|
||||
|
||||
- Add personal_sign and personal_ecRecover support.
|
||||
- net_version has been made synchronous.
|
||||
- Test suite for migrations expanded.
|
||||
- Network now changeable from lock screen.
|
||||
|
||||
@ -15,6 +15,10 @@ const firstTimeState = require('./first-time-state')
|
||||
const STORAGE_KEY = 'metamask-config'
|
||||
const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
|
||||
|
||||
const log = require('loglevel')
|
||||
window.log = log
|
||||
log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn')
|
||||
|
||||
let popupIsOpen = false
|
||||
|
||||
// state persistence
|
||||
|
||||
@ -5,10 +5,11 @@ const EventEmitter = require('events').EventEmitter
|
||||
const ObservableStore = require('obs-store')
|
||||
const filter = require('promise-filter')
|
||||
const encryptor = require('browser-passworder')
|
||||
const normalizeAddress = require('./lib/sig-util').normalize
|
||||
const sigUtil = require('eth-sig-util')
|
||||
const normalizeAddress = sigUtil.normalize
|
||||
// Keyrings:
|
||||
const SimpleKeyring = require('./keyrings/simple')
|
||||
const HdKeyring = require('./keyrings/hd')
|
||||
const SimpleKeyring = require('eth-simple-keyring')
|
||||
const HdKeyring = require('eth-hd-keyring')
|
||||
const keyringTypes = [
|
||||
SimpleKeyring,
|
||||
HdKeyring,
|
||||
@ -262,6 +263,21 @@ class KeyringController extends EventEmitter {
|
||||
})
|
||||
}
|
||||
|
||||
// Sign Personal Message
|
||||
// @object msgParams
|
||||
//
|
||||
// returns Promise(@buffer rawSig)
|
||||
//
|
||||
// Attempts to sign the provided @object msgParams.
|
||||
// Prefixes the hash before signing as per the new geth behavior.
|
||||
signPersonalMessage (msgParams) {
|
||||
const address = normalizeAddress(msgParams.from)
|
||||
return this.getKeyringForAccount(address)
|
||||
.then((keyring) => {
|
||||
return keyring.signPersonalMessage(address, msgParams.data)
|
||||
})
|
||||
}
|
||||
|
||||
// PRIVATE METHODS
|
||||
//
|
||||
// THESE METHODS ARE ONLY USED INTERNALLY TO THE KEYRING-CONTROLLER
|
||||
@ -471,6 +487,7 @@ class KeyringController extends EventEmitter {
|
||||
// the specified `address` if one exists.
|
||||
getKeyringForAccount (address) {
|
||||
const hexed = normalizeAddress(address)
|
||||
log.debug(`KeyringController - getKeyringForAccount: ${hexed}`)
|
||||
|
||||
return Promise.all(this.keyrings.map((keyring) => {
|
||||
return Promise.all([
|
||||
|
||||
@ -1,125 +0,0 @@
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const hdkey = require('ethereumjs-wallet/hdkey')
|
||||
const bip39 = require('bip39')
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
|
||||
// *Internal Deps
|
||||
const sigUtil = require('../lib/sig-util')
|
||||
|
||||
// Options:
|
||||
const hdPathString = `m/44'/60'/0'/0`
|
||||
const type = 'HD Key Tree'
|
||||
|
||||
class HdKeyring extends EventEmitter {
|
||||
|
||||
/* PUBLIC METHODS */
|
||||
|
||||
constructor (opts = {}) {
|
||||
super()
|
||||
this.type = type
|
||||
this.deserialize(opts)
|
||||
}
|
||||
|
||||
serialize () {
|
||||
return Promise.resolve({
|
||||
mnemonic: this.mnemonic,
|
||||
numberOfAccounts: this.wallets.length,
|
||||
})
|
||||
}
|
||||
|
||||
deserialize (opts = {}) {
|
||||
this.opts = opts || {}
|
||||
this.wallets = []
|
||||
this.mnemonic = null
|
||||
this.root = null
|
||||
|
||||
if (opts.mnemonic) {
|
||||
this._initFromMnemonic(opts.mnemonic)
|
||||
}
|
||||
|
||||
if (opts.numberOfAccounts) {
|
||||
return this.addAccounts(opts.numberOfAccounts)
|
||||
}
|
||||
|
||||
return Promise.resolve([])
|
||||
}
|
||||
|
||||
addAccounts (numberOfAccounts = 1) {
|
||||
if (!this.root) {
|
||||
this._initFromMnemonic(bip39.generateMnemonic())
|
||||
}
|
||||
|
||||
const oldLen = this.wallets.length
|
||||
const newWallets = []
|
||||
for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {
|
||||
const child = this.root.deriveChild(i)
|
||||
const wallet = child.getWallet()
|
||||
newWallets.push(wallet)
|
||||
this.wallets.push(wallet)
|
||||
}
|
||||
const hexWallets = newWallets.map(w => w.getAddress().toString('hex'))
|
||||
return Promise.resolve(hexWallets)
|
||||
}
|
||||
|
||||
getAccounts () {
|
||||
return Promise.resolve(this.wallets.map(w => w.getAddress().toString('hex')))
|
||||
}
|
||||
|
||||
// tx is an instance of the ethereumjs-transaction class.
|
||||
signTransaction (address, tx) {
|
||||
const wallet = this._getWalletForAccount(address)
|
||||
var privKey = wallet.getPrivateKey()
|
||||
tx.sign(privKey)
|
||||
return Promise.resolve(tx)
|
||||
}
|
||||
|
||||
// For eth_sign, we need to sign transactions:
|
||||
// hd
|
||||
signMessage (withAccount, data) {
|
||||
const wallet = this._getWalletForAccount(withAccount)
|
||||
const message = ethUtil.stripHexPrefix(data)
|
||||
var privKey = wallet.getPrivateKey()
|
||||
var msgSig = ethUtil.ecsign(new Buffer(message, 'hex'), privKey)
|
||||
var rawMsgSig = ethUtil.bufferToHex(sigUtil.concatSig(msgSig.v, msgSig.r, msgSig.s))
|
||||
return Promise.resolve(rawMsgSig)
|
||||
}
|
||||
|
||||
// For eth_sign, we need to sign transactions:
|
||||
newGethSignMessage (withAccount, msgHex) {
|
||||
const wallet = this._getWalletForAccount(withAccount)
|
||||
const privKey = wallet.getPrivateKey()
|
||||
const msgBuffer = ethUtil.toBuffer(msgHex)
|
||||
const msgHash = ethUtil.hashPersonalMessage(msgBuffer)
|
||||
const msgSig = ethUtil.ecsign(msgHash, privKey)
|
||||
const rawMsgSig = ethUtil.bufferToHex(sigUtil.concatSig(msgSig.v, msgSig.r, msgSig.s))
|
||||
return Promise.resolve(rawMsgSig)
|
||||
}
|
||||
|
||||
exportAccount (address) {
|
||||
const wallet = this._getWalletForAccount(address)
|
||||
return Promise.resolve(wallet.getPrivateKey().toString('hex'))
|
||||
}
|
||||
|
||||
|
||||
/* PRIVATE METHODS */
|
||||
|
||||
_initFromMnemonic (mnemonic) {
|
||||
this.mnemonic = mnemonic
|
||||
const seed = bip39.mnemonicToSeed(mnemonic)
|
||||
this.hdWallet = hdkey.fromMasterSeed(seed)
|
||||
this.root = this.hdWallet.derivePath(hdPathString)
|
||||
}
|
||||
|
||||
|
||||
_getWalletForAccount (account) {
|
||||
const targetAddress = sigUtil.normalize(account)
|
||||
return this.wallets.find((w) => {
|
||||
const address = w.getAddress().toString('hex')
|
||||
return ((address === targetAddress) ||
|
||||
(sigUtil.normalize(address) === targetAddress))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
HdKeyring.type = type
|
||||
module.exports = HdKeyring
|
||||
@ -1,100 +0,0 @@
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const Wallet = require('ethereumjs-wallet')
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const type = 'Simple Key Pair'
|
||||
const sigUtil = require('../lib/sig-util')
|
||||
|
||||
class SimpleKeyring extends EventEmitter {
|
||||
|
||||
/* PUBLIC METHODS */
|
||||
|
||||
constructor (opts) {
|
||||
super()
|
||||
this.type = type
|
||||
this.opts = opts || {}
|
||||
this.wallets = []
|
||||
}
|
||||
|
||||
serialize () {
|
||||
return Promise.resolve(this.wallets.map(w => w.getPrivateKey().toString('hex')))
|
||||
}
|
||||
|
||||
deserialize (privateKeys = []) {
|
||||
return new Promise((resolve, reject) => {
|
||||
try {
|
||||
this.wallets = privateKeys.map((privateKey) => {
|
||||
const stripped = ethUtil.stripHexPrefix(privateKey)
|
||||
const buffer = new Buffer(stripped, 'hex')
|
||||
const wallet = Wallet.fromPrivateKey(buffer)
|
||||
return wallet
|
||||
})
|
||||
} catch (e) {
|
||||
reject(e)
|
||||
}
|
||||
resolve()
|
||||
})
|
||||
}
|
||||
|
||||
addAccounts (n = 1) {
|
||||
var newWallets = []
|
||||
for (var i = 0; i < n; i++) {
|
||||
newWallets.push(Wallet.generate())
|
||||
}
|
||||
this.wallets = this.wallets.concat(newWallets)
|
||||
const hexWallets = newWallets.map(w => ethUtil.bufferToHex(w.getAddress()))
|
||||
return Promise.resolve(hexWallets)
|
||||
}
|
||||
|
||||
getAccounts () {
|
||||
return Promise.resolve(this.wallets.map(w => ethUtil.bufferToHex(w.getAddress())))
|
||||
}
|
||||
|
||||
// tx is an instance of the ethereumjs-transaction class.
|
||||
signTransaction (address, tx) {
|
||||
const wallet = this._getWalletForAccount(address)
|
||||
var privKey = wallet.getPrivateKey()
|
||||
tx.sign(privKey)
|
||||
return Promise.resolve(tx)
|
||||
}
|
||||
|
||||
// For eth_sign, we need to sign transactions:
|
||||
signMessage (withAccount, data) {
|
||||
const wallet = this._getWalletForAccount(withAccount)
|
||||
const message = ethUtil.stripHexPrefix(data)
|
||||
var privKey = wallet.getPrivateKey()
|
||||
var msgSig = ethUtil.ecsign(new Buffer(message, 'hex'), privKey)
|
||||
var rawMsgSig = ethUtil.bufferToHex(sigUtil.concatSig(msgSig.v, msgSig.r, msgSig.s))
|
||||
return Promise.resolve(rawMsgSig)
|
||||
}
|
||||
|
||||
// For eth_sign, we need to sign transactions:
|
||||
|
||||
newGethSignMessage (withAccount, msgHex) {
|
||||
const wallet = this._getWalletForAccount(withAccount)
|
||||
const privKey = wallet.getPrivateKey()
|
||||
const msgBuffer = ethUtil.toBuffer(msgHex)
|
||||
const msgHash = ethUtil.hashPersonalMessage(msgBuffer)
|
||||
const msgSig = ethUtil.ecsign(msgHash, privKey)
|
||||
const rawMsgSig = ethUtil.bufferToHex(sigUtil.concatSig(msgSig.v, msgSig.r, msgSig.s))
|
||||
return Promise.resolve(rawMsgSig)
|
||||
}
|
||||
|
||||
exportAccount (address) {
|
||||
const wallet = this._getWalletForAccount(address)
|
||||
return Promise.resolve(wallet.getPrivateKey().toString('hex'))
|
||||
}
|
||||
|
||||
|
||||
/* PRIVATE METHODS */
|
||||
|
||||
_getWalletForAccount (account) {
|
||||
const address = sigUtil.normalize(account)
|
||||
let wallet = this.wallets.find(w => ethUtil.bufferToHex(w.getAddress()) === address)
|
||||
if (!wallet) throw new Error('Simple Keyring - Unable to find matching address.')
|
||||
return wallet
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
SimpleKeyring.type = type
|
||||
module.exports = SimpleKeyring
|
||||
@ -1,6 +1,6 @@
|
||||
const MetamaskConfig = require('../config.js')
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const normalize = require('./sig-util').normalize
|
||||
const normalize = require('eth-sig-util').normalize
|
||||
|
||||
const TESTNET_RPC = MetamaskConfig.network.testnet
|
||||
const MAINNET_RPC = MetamaskConfig.network.mainnet
|
||||
@ -228,18 +228,6 @@ ConfigManager.prototype._emitUpdates = function (state) {
|
||||
})
|
||||
}
|
||||
|
||||
ConfigManager.prototype.getGasMultiplier = function () {
|
||||
var data = this.getData()
|
||||
return data.gasMultiplier
|
||||
}
|
||||
|
||||
ConfigManager.prototype.setGasMultiplier = function (gasMultiplier) {
|
||||
var data = this.getData()
|
||||
|
||||
data.gasMultiplier = gasMultiplier
|
||||
this.setData(data)
|
||||
}
|
||||
|
||||
ConfigManager.prototype.setLostAccounts = function (lostAccounts) {
|
||||
var data = this.getData()
|
||||
data.lostAccounts = lostAccounts
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const BN = ethUtil.BN
|
||||
const Transaction = require('ethereumjs-tx')
|
||||
|
||||
module.exports = IdManagement
|
||||
@ -25,13 +24,9 @@ function IdManagement (opts) {
|
||||
}
|
||||
|
||||
this.signTx = function (txParams) {
|
||||
// calculate gas with custom gas multiplier
|
||||
var gasMultiplier = this.configManager.getGasMultiplier() || 1
|
||||
var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16)
|
||||
gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10))
|
||||
txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
|
||||
// normalize values
|
||||
|
||||
// normalize values
|
||||
txParams.gasPrice = ethUtil.intToHex(txParams.gasPrice)
|
||||
txParams.to = ethUtil.addHexPrefix(txParams.to)
|
||||
txParams.from = ethUtil.addHexPrefix(txParams.from.toLowerCase())
|
||||
txParams.value = ethUtil.addHexPrefix(txParams.value)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
const IdentityStore = require('./idStore')
|
||||
const HdKeyring = require('../keyrings/hd')
|
||||
const sigUtil = require('./sig-util')
|
||||
const HdKeyring = require('eth-hd-keyring')
|
||||
const sigUtil = require('eth-sig-util')
|
||||
const normalize = sigUtil.normalize
|
||||
const denodeify = require('denodeify')
|
||||
|
||||
|
||||
@ -95,7 +95,6 @@ IdentityStore.prototype.getState = function () {
|
||||
isUnlocked: this._isUnlocked(),
|
||||
seedWords: seedWords,
|
||||
selectedAddress: configManager.getSelectedAccount(),
|
||||
gasMultiplier: configManager.getGasMultiplier(),
|
||||
}))
|
||||
}
|
||||
|
||||
|
||||
@ -33,6 +33,7 @@ module.exports = class MessageManager extends EventEmitter{
|
||||
msgParams: msgParams,
|
||||
time: time,
|
||||
status: 'unapproved',
|
||||
type: 'eth_sign',
|
||||
}
|
||||
this.addMsg(msgData)
|
||||
|
||||
|
||||
119
app/scripts/lib/personal-message-manager.js
Normal file
119
app/scripts/lib/personal-message-manager.js
Normal file
@ -0,0 +1,119 @@
|
||||
const EventEmitter = require('events')
|
||||
const ObservableStore = require('obs-store')
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const createId = require('./random-id')
|
||||
|
||||
|
||||
module.exports = class PersonalMessageManager extends EventEmitter{
|
||||
constructor (opts) {
|
||||
super()
|
||||
this.memStore = new ObservableStore({
|
||||
unapprovedPersonalMsgs: {},
|
||||
unapprovedPersonalMsgCount: 0,
|
||||
})
|
||||
this.messages = []
|
||||
}
|
||||
|
||||
get unapprovedPersonalMsgCount () {
|
||||
return Object.keys(this.getUnapprovedMsgs()).length
|
||||
}
|
||||
|
||||
getUnapprovedMsgs () {
|
||||
return this.messages.filter(msg => msg.status === 'unapproved')
|
||||
.reduce((result, msg) => { result[msg.id] = msg; return result }, {})
|
||||
}
|
||||
|
||||
addUnapprovedMessage (msgParams) {
|
||||
msgParams.data = normalizeMsgData(msgParams.data)
|
||||
// create txData obj with parameters and meta data
|
||||
var time = (new Date()).getTime()
|
||||
var msgId = createId()
|
||||
var msgData = {
|
||||
id: msgId,
|
||||
msgParams: msgParams,
|
||||
time: time,
|
||||
status: 'unapproved',
|
||||
type: 'personal_sign',
|
||||
}
|
||||
this.addMsg(msgData)
|
||||
|
||||
// signal update
|
||||
this.emit('update')
|
||||
return msgId
|
||||
}
|
||||
|
||||
addMsg (msg) {
|
||||
this.messages.push(msg)
|
||||
this._saveMsgList()
|
||||
}
|
||||
|
||||
getMsg (msgId) {
|
||||
return this.messages.find(msg => msg.id === msgId)
|
||||
}
|
||||
|
||||
approveMessage (msgParams) {
|
||||
this.setMsgStatusApproved(msgParams.metamaskId)
|
||||
return this.prepMsgForSigning(msgParams)
|
||||
}
|
||||
|
||||
setMsgStatusApproved (msgId) {
|
||||
this._setMsgStatus(msgId, 'approved')
|
||||
}
|
||||
|
||||
setMsgStatusSigned (msgId, rawSig) {
|
||||
const msg = this.getMsg(msgId)
|
||||
msg.rawSig = rawSig
|
||||
this._updateMsg(msg)
|
||||
this._setMsgStatus(msgId, 'signed')
|
||||
}
|
||||
|
||||
prepMsgForSigning (msgParams) {
|
||||
delete msgParams.metamaskId
|
||||
return Promise.resolve(msgParams)
|
||||
}
|
||||
|
||||
rejectMsg (msgId) {
|
||||
this._setMsgStatus(msgId, 'rejected')
|
||||
}
|
||||
|
||||
//
|
||||
// PRIVATE METHODS
|
||||
//
|
||||
|
||||
_setMsgStatus (msgId, status) {
|
||||
const msg = this.getMsg(msgId)
|
||||
if (!msg) throw new Error('PersonalMessageManager - Message not found for id: "${msgId}".')
|
||||
msg.status = status
|
||||
this._updateMsg(msg)
|
||||
this.emit(`${msgId}:${status}`, msg)
|
||||
if (status === 'rejected' || status === 'signed') {
|
||||
this.emit(`${msgId}:finished`, msg)
|
||||
}
|
||||
}
|
||||
|
||||
_updateMsg (msg) {
|
||||
const index = this.messages.findIndex((message) => message.id === msg.id)
|
||||
if (index !== -1) {
|
||||
this.messages[index] = msg
|
||||
}
|
||||
this._saveMsgList()
|
||||
}
|
||||
|
||||
_saveMsgList () {
|
||||
const unapprovedPersonalMsgs = this.getUnapprovedMsgs()
|
||||
const unapprovedPersonalMsgCount = Object.keys(unapprovedPersonalMsgs).length
|
||||
this.memStore.updateState({ unapprovedPersonalMsgs, unapprovedPersonalMsgCount })
|
||||
this.emit('updateBadge')
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function normalizeMsgData(data) {
|
||||
if (data.slice(0, 2) === '0x') {
|
||||
// data is already hex
|
||||
return data
|
||||
} else {
|
||||
// data is unicode, convert to hex
|
||||
return ethUtil.bufferToHex(new Buffer(data, 'utf8'))
|
||||
}
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
|
||||
module.exports = {
|
||||
|
||||
concatSig: function (v, r, s) {
|
||||
const rSig = ethUtil.fromSigned(r)
|
||||
const sSig = ethUtil.fromSigned(s)
|
||||
const vSig = ethUtil.bufferToInt(v)
|
||||
const rStr = padWithZeroes(ethUtil.toUnsigned(rSig).toString('hex'), 64)
|
||||
const sStr = padWithZeroes(ethUtil.toUnsigned(sSig).toString('hex'), 64)
|
||||
const vStr = ethUtil.stripHexPrefix(ethUtil.intToHex(vSig))
|
||||
return ethUtil.addHexPrefix(rStr.concat(sStr, vStr)).toString('hex')
|
||||
},
|
||||
|
||||
normalize: function (address) {
|
||||
if (!address) return
|
||||
return ethUtil.addHexPrefix(address.toLowerCase())
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
function padWithZeroes (number, length) {
|
||||
var myString = '' + number
|
||||
while (myString.length < length) {
|
||||
myString = '0' + myString
|
||||
}
|
||||
return myString
|
||||
}
|
||||
@ -2,7 +2,7 @@ const async = require('async')
|
||||
const EthQuery = require('eth-query')
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const Transaction = require('ethereumjs-tx')
|
||||
const normalize = require('./sig-util').normalize
|
||||
const normalize = require('eth-sig-util').normalize
|
||||
const BN = ethUtil.BN
|
||||
|
||||
/*
|
||||
@ -92,11 +92,10 @@ module.exports = class txProviderUtils {
|
||||
}
|
||||
|
||||
// builds ethTx from txParams object
|
||||
buildEthTxFromParams (txParams, gasMultiplier = 1) {
|
||||
buildEthTxFromParams (txParams) {
|
||||
// apply gas multiplyer
|
||||
let gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16)
|
||||
// multiply and divide by 100 so as to add percision to integer mul
|
||||
gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10))
|
||||
txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
|
||||
// normalize values
|
||||
txParams.to = normalize(txParams.to)
|
||||
@ -106,6 +105,7 @@ module.exports = class txProviderUtils {
|
||||
txParams.gasLimit = normalize(txParams.gasLimit || txParams.gas)
|
||||
txParams.nonce = normalize(txParams.nonce)
|
||||
// build ethTx
|
||||
log.info(`Prepared tx for signing: ${JSON.stringify(txParams)}`)
|
||||
const ethTx = new Transaction(txParams)
|
||||
return ethTx
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@ const CurrencyController = require('./lib/controllers/currency')
|
||||
const NoticeController = require('./notice-controller')
|
||||
const ShapeShiftController = require('./lib/controllers/shapeshift')
|
||||
const MessageManager = require('./lib/message-manager')
|
||||
const PersonalMessageManager = require('./lib/personal-message-manager')
|
||||
const TxManager = require('./transaction-manager')
|
||||
const ConfigManager = require('./lib/config-manager')
|
||||
const extension = require('./lib/extension')
|
||||
@ -105,6 +106,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
|
||||
this.lookupNetwork()
|
||||
this.messageManager = new MessageManager()
|
||||
this.personalMessageManager = new PersonalMessageManager()
|
||||
this.publicConfigStore = this.initPublicConfigStore()
|
||||
|
||||
// TEMPORARY UNTIL FULL DEPRECATION:
|
||||
@ -137,6 +139,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
this.ethStore.subscribe(this.sendUpdate.bind(this))
|
||||
this.txManager.memStore.subscribe(this.sendUpdate.bind(this))
|
||||
this.messageManager.memStore.subscribe(this.sendUpdate.bind(this))
|
||||
this.personalMessageManager.memStore.subscribe(this.sendUpdate.bind(this))
|
||||
this.keyringController.memStore.subscribe(this.sendUpdate.bind(this))
|
||||
this.preferencesController.store.subscribe(this.sendUpdate.bind(this))
|
||||
this.currencyController.store.subscribe(this.sendUpdate.bind(this))
|
||||
@ -149,6 +152,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
//
|
||||
|
||||
initializeProvider () {
|
||||
|
||||
let provider = MetaMaskProvider({
|
||||
static: {
|
||||
eth_syncing: false,
|
||||
@ -163,8 +167,11 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
},
|
||||
// tx signing
|
||||
processTransaction: (txParams, cb) => this.newUnapprovedTransaction(txParams, cb),
|
||||
// msg signing
|
||||
// old style msg signing
|
||||
processMessage: this.newUnsignedMessage.bind(this),
|
||||
|
||||
// new style msg signing
|
||||
processPersonalMessage: this.newUnsignedPersonalMessage.bind(this),
|
||||
})
|
||||
return provider
|
||||
}
|
||||
@ -209,6 +216,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
this.ethStore.getState(),
|
||||
this.txManager.memStore.getState(),
|
||||
this.messageManager.memStore.getState(),
|
||||
this.personalMessageManager.memStore.getState(),
|
||||
this.keyringController.memStore.getState(),
|
||||
this.preferencesController.store.getState(),
|
||||
this.currencyController.store.getState(),
|
||||
@ -231,7 +239,6 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
const keyringController = this.keyringController
|
||||
const preferencesController = this.preferencesController
|
||||
const txManager = this.txManager
|
||||
const messageManager = this.messageManager
|
||||
const noticeController = this.noticeController
|
||||
|
||||
return {
|
||||
@ -241,7 +248,6 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
setProviderType: this.setProviderType.bind(this),
|
||||
useEtherscanProvider: this.useEtherscanProvider.bind(this),
|
||||
setCurrentCurrency: this.setCurrentCurrency.bind(this),
|
||||
setGasMultiplier: this.setGasMultiplier.bind(this),
|
||||
markAccountsFound: this.markAccountsFound.bind(this),
|
||||
// coinbase
|
||||
buyEth: this.buyEth.bind(this),
|
||||
@ -272,10 +278,15 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
// txManager
|
||||
approveTransaction: txManager.approveTransaction.bind(txManager),
|
||||
cancelTransaction: txManager.cancelTransaction.bind(txManager),
|
||||
updateAndApproveTransaction: this.updateAndApproveTx.bind(this),
|
||||
|
||||
// messageManager
|
||||
signMessage: this.signMessage.bind(this),
|
||||
cancelMessage: messageManager.rejectMsg.bind(messageManager),
|
||||
signMessage: nodeify(this.signMessage).bind(this),
|
||||
cancelMessage: this.cancelMessage.bind(this),
|
||||
|
||||
// personalMessageManager
|
||||
signPersonalMessage: nodeify(this.signPersonalMessage).bind(this),
|
||||
cancelPersonalMessage: this.cancelPersonalMessage.bind(this),
|
||||
|
||||
// notices
|
||||
checkNotices: noticeController.updateNoticesList.bind(noticeController),
|
||||
@ -397,6 +408,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
//
|
||||
|
||||
newUnapprovedTransaction (txParams, cb) {
|
||||
log.debug(`MetaMaskController newUnapprovedTransaction ${JSON.stringify(txParams)}`)
|
||||
const self = this
|
||||
self.txManager.addUnapprovedTransaction(txParams, (err, txMeta) => {
|
||||
if (err) return cb(err)
|
||||
@ -425,19 +437,47 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
case 'signed':
|
||||
return cb(null, data.rawSig)
|
||||
case 'rejected':
|
||||
return cb(new Error('MetaMask Message Signature: User denied transaction signature.'))
|
||||
return cb(new Error('MetaMask Message Signature: User denied message signature.'))
|
||||
default:
|
||||
return cb(new Error(`MetaMask Message Signature: Unknown problem: ${JSON.stringify(msgParams)}`))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
newUnsignedPersonalMessage (msgParams, cb) {
|
||||
if (!msgParams.from) {
|
||||
return cb(new Error('MetaMask Message Signature: from field is required.'))
|
||||
}
|
||||
|
||||
let msgId = this.personalMessageManager.addUnapprovedMessage(msgParams)
|
||||
this.sendUpdate()
|
||||
this.opts.showUnconfirmedMessage()
|
||||
this.personalMessageManager.once(`${msgId}:finished`, (data) => {
|
||||
switch (data.status) {
|
||||
case 'signed':
|
||||
return cb(null, data.rawSig)
|
||||
case 'rejected':
|
||||
return cb(new Error('MetaMask Message Signature: User denied message signature.'))
|
||||
default:
|
||||
return cb(new Error(`MetaMask Message Signature: Unknown problem: ${JSON.stringify(msgParams)}`))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
updateAndApproveTx(txMeta, cb) {
|
||||
log.debug(`MetaMaskController - updateAndApproveTx: ${JSON.stringify(txMeta)}`)
|
||||
const txManager = this.txManager
|
||||
txManager.updateTx(txMeta)
|
||||
txManager.approveTransaction(txMeta.id, cb)
|
||||
}
|
||||
|
||||
signMessage (msgParams, cb) {
|
||||
log.info('MetaMaskController - signMessage')
|
||||
const msgId = msgParams.metamaskId
|
||||
promiseToCallback(
|
||||
|
||||
// sets the status op the message to 'approved'
|
||||
// and removes the metamaskId for signing
|
||||
this.messageManager.approveMessage(msgParams)
|
||||
return this.messageManager.approveMessage(msgParams)
|
||||
.then((cleanMsgParams) => {
|
||||
// signs the message
|
||||
return this.keyringController.signMessage(cleanMsgParams)
|
||||
@ -446,10 +486,60 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
// tells the listener that the message has been signed
|
||||
// and can be returned to the dapp
|
||||
this.messageManager.setMsgStatusSigned(msgId, rawSig)
|
||||
return this.getState()
|
||||
})
|
||||
)(cb)
|
||||
}
|
||||
|
||||
cancelMessage(msgId, cb) {
|
||||
const messageManager = this.messageManager
|
||||
messageManager.rejectMsg(msgId)
|
||||
if (cb && typeof cb === 'function') {
|
||||
cb(null, this.getState())
|
||||
}
|
||||
}
|
||||
|
||||
// Prefixed Style Message Signing Methods:
|
||||
approvePersonalMessage (msgParams, cb) {
|
||||
let msgId = this.personalMessageManager.addUnapprovedMessage(msgParams)
|
||||
this.sendUpdate()
|
||||
this.opts.showUnconfirmedMessage()
|
||||
this.personalMessageManager.once(`${msgId}:finished`, (data) => {
|
||||
switch (data.status) {
|
||||
case 'signed':
|
||||
return cb(null, data.rawSig)
|
||||
case 'rejected':
|
||||
return cb(new Error('MetaMask Message Signature: User denied transaction signature.'))
|
||||
default:
|
||||
return cb(new Error(`MetaMask Message Signature: Unknown problem: ${JSON.stringify(msgParams)}`))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
signPersonalMessage (msgParams) {
|
||||
log.info('MetaMaskController - signPersonalMessage')
|
||||
const msgId = msgParams.metamaskId
|
||||
// sets the status op the message to 'approved'
|
||||
// and removes the metamaskId for signing
|
||||
return this.personalMessageManager.approveMessage(msgParams)
|
||||
.then((cleanMsgParams) => {
|
||||
// signs the message
|
||||
return this.keyringController.signPersonalMessage(cleanMsgParams)
|
||||
})
|
||||
.then((rawSig) => {
|
||||
// tells the listener that the message has been signed
|
||||
// and can be returned to the dapp
|
||||
this.personalMessageManager.setMsgStatusSigned(msgId, rawSig)
|
||||
return this.getState()
|
||||
})
|
||||
}
|
||||
|
||||
cancelPersonalMessage(msgId, cb) {
|
||||
const messageManager = this.personalMessageManager
|
||||
messageManager.rejectMsg(msgId)
|
||||
if (cb && typeof cb === 'function') {
|
||||
cb(null, this.getState())
|
||||
}
|
||||
}
|
||||
|
||||
markAccountsFound (cb) {
|
||||
this.configManager.setLostAccounts([])
|
||||
@ -563,15 +653,6 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
this.shapeshiftController.createShapeShiftTx(depositAddress, depositType)
|
||||
}
|
||||
|
||||
setGasMultiplier (gasMultiplier, cb) {
|
||||
try {
|
||||
this.txManager.setGasMultiplier(gasMultiplier)
|
||||
cb()
|
||||
} catch (err) {
|
||||
cb(err)
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// network
|
||||
//
|
||||
|
||||
@ -13,7 +13,6 @@ module.exports = class TransactionManager extends EventEmitter {
|
||||
super()
|
||||
this.store = new ObservableStore(extend({
|
||||
transactions: [],
|
||||
gasMultiplier: 1,
|
||||
}, opts.initState))
|
||||
this.memStore = new ObservableStore({})
|
||||
this.networkStore = opts.networkStore || new ObservableStore({})
|
||||
@ -52,14 +51,6 @@ module.exports = class TransactionManager extends EventEmitter {
|
||||
return fullTxList.filter(txMeta => txMeta.metamaskNetworkId === network)
|
||||
}
|
||||
|
||||
getGasMultiplier () {
|
||||
return this.store.getState().gasMultiplier
|
||||
}
|
||||
|
||||
setGasMultiplier (gasMultiplier) {
|
||||
return this.store.updateState({ gasMultiplier })
|
||||
}
|
||||
|
||||
// Adds a tx to the txlist
|
||||
addTx (txMeta) {
|
||||
var txList = this.getTxList()
|
||||
@ -129,7 +120,6 @@ module.exports = class TransactionManager extends EventEmitter {
|
||||
id: txId,
|
||||
time: time,
|
||||
status: 'unapproved',
|
||||
gasMultiplier: this.getGasMultiplier(),
|
||||
metamaskNetworkId: this.getNetwork(),
|
||||
txParams: txParams,
|
||||
}
|
||||
@ -147,16 +137,15 @@ module.exports = class TransactionManager extends EventEmitter {
|
||||
|
||||
setMaxTxCostAndFee (txMeta) {
|
||||
var txParams = txMeta.txParams
|
||||
var gasMultiplier = txMeta.gasMultiplier
|
||||
var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txMeta.estimatedGas), 16)
|
||||
var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16)
|
||||
gasPrice = gasPrice.mul(new BN(gasMultiplier * 100), 10).div(new BN(100, 10))
|
||||
var txFee = gasCost.mul(gasPrice)
|
||||
var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16)
|
||||
var maxCost = txValue.add(txFee)
|
||||
txMeta.txFee = txFee
|
||||
txMeta.txValue = txValue
|
||||
txMeta.maxCost = maxCost
|
||||
txMeta.gasPrice = gasPrice
|
||||
this.updateTx(txMeta)
|
||||
}
|
||||
|
||||
@ -209,7 +198,7 @@ module.exports = class TransactionManager extends EventEmitter {
|
||||
let txMeta = this.getTx(txId)
|
||||
let txParams = txMeta.txParams
|
||||
let fromAddress = txParams.from
|
||||
let ethTx = this.txProviderUtils.buildEthTxFromParams(txParams, txMeta.gasMultiplier)
|
||||
let ethTx = this.txProviderUtils.buildEthTxFromParams(txParams)
|
||||
this.signEthTx(ethTx, fromAddress).then(() => {
|
||||
this.setTxStatusSigned(txMeta.id)
|
||||
cb(null, ethUtil.bufferToHex(ethTx.serialize()))
|
||||
|
||||
211
development/states/conf-tx.json
Normal file
211
development/states/conf-tx.json
Normal file
File diff suppressed because one or more lines are too long
99
development/states/personal-sign.json
Normal file
99
development/states/personal-sign.json
Normal file
@ -0,0 +1,99 @@
|
||||
{
|
||||
"metamask": {
|
||||
"isInitialized": true,
|
||||
"isUnlocked": true,
|
||||
"rpcTarget": "https://rawtestrpc.metamask.io/",
|
||||
"identities": {
|
||||
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||
"name": "Account 1"
|
||||
},
|
||||
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||
"name": "Account 2"
|
||||
},
|
||||
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||
"name": "Account 3"
|
||||
}
|
||||
},
|
||||
"unapprovedTxs": {},
|
||||
"currentFiat": "USD",
|
||||
"conversionRate": 13.2126613,
|
||||
"conversionDate": 1487888522,
|
||||
"noActiveNotices": true,
|
||||
"network": "3",
|
||||
"accounts": {
|
||||
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||
"balance": "0x6ae7c45a61c0e8d2",
|
||||
"nonce": "0x12",
|
||||
"code": "0x",
|
||||
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
|
||||
},
|
||||
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||
"balance": "0x2892a7aece555480",
|
||||
"nonce": "0x7",
|
||||
"code": "0x",
|
||||
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"
|
||||
},
|
||||
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||
"balance": "0x0",
|
||||
"nonce": "0x0",
|
||||
"code": "0x",
|
||||
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||
}
|
||||
},
|
||||
"transactions": {},
|
||||
"selectedAddressTxList": [],
|
||||
"unapprovedMsgs": {},
|
||||
"unapprovedMsgCount": 0,
|
||||
"unapprovedPersonalMsgs": {
|
||||
"2971973686529444": {
|
||||
"id": 2971973686529444,
|
||||
"msgParams": {
|
||||
"from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||
"data": "0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e01"
|
||||
},
|
||||
"time": 1487888668426,
|
||||
"status": "unapproved",
|
||||
"type": "personal_sign"
|
||||
}
|
||||
},
|
||||
"unapprovedPersonalMsgCount": 1,
|
||||
"keyringTypes": [
|
||||
"Simple Key Pair",
|
||||
"HD Key Tree"
|
||||
],
|
||||
"keyrings": [
|
||||
{
|
||||
"type": "HD Key Tree",
|
||||
"accounts": [
|
||||
"fdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||
"c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||
"2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||
]
|
||||
}
|
||||
],
|
||||
"selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||
"currentCurrency": "USD",
|
||||
"provider": {
|
||||
"type": "testnet"
|
||||
},
|
||||
"shapeShiftTxList": [],
|
||||
"lostAccounts": []
|
||||
},
|
||||
"appState": {
|
||||
"menuOpen": false,
|
||||
"currentView": {
|
||||
"name": "confTx",
|
||||
"context": 0
|
||||
},
|
||||
"accountDetail": {
|
||||
"subview": "transactions"
|
||||
},
|
||||
"transForward": true,
|
||||
"isLoading": false,
|
||||
"warning": null
|
||||
},
|
||||
"identities": {}
|
||||
}
|
||||
@ -52,8 +52,11 @@
|
||||
"end-of-stream": "^1.1.0",
|
||||
"ensnare": "^1.0.0",
|
||||
"eth-bin-to-ops": "^1.0.1",
|
||||
"eth-hd-keyring": "^1.1.1",
|
||||
"eth-lightwallet": "^2.3.3",
|
||||
"eth-query": "^1.0.3",
|
||||
"eth-sig-util": "^1.1.1",
|
||||
"eth-simple-keyring": "^1.1.0",
|
||||
"ethereumjs-tx": "^1.0.0",
|
||||
"ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
|
||||
"ethereumjs-wallet": "^0.6.0",
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
const ObservableStore = require('obs-store')
|
||||
const ConfigManager = require('../../../app/scripts/lib/config-manager')
|
||||
const IdStoreMigrator = require('../../../app/scripts/lib/idStore-migrator')
|
||||
const SimpleKeyring = require('../../../app/scripts/keyrings/simple')
|
||||
const normalize = require('../../../app/scripts/lib/sig-util').normalize
|
||||
const SimpleKeyring = require('eth-simple-keyring')
|
||||
const normalize = require('eth-sig-util').normalize
|
||||
|
||||
const oldStyleVault = require('../mocks/oldVault.json').data
|
||||
const badStyleVault = require('../mocks/badVault.json').data
|
||||
|
||||
@ -52,7 +52,7 @@ describe('tx confirmation screen', function() {
|
||||
clearSeedWordCache(cb) { cb() },
|
||||
})
|
||||
|
||||
let action = actions.cancelTx({id: firstTxId})
|
||||
let action = actions.cancelTx({value: firstTxId})
|
||||
result = reducers(initialState, action)
|
||||
done()
|
||||
})
|
||||
@ -121,7 +121,7 @@ describe('tx confirmation screen', function() {
|
||||
metamask: {
|
||||
unapprovedTxs: {
|
||||
'1457634084250832': {
|
||||
id: 1457634084250832,
|
||||
id: firstTxId,
|
||||
status: "unconfirmed",
|
||||
time: 1457634084250,
|
||||
},
|
||||
@ -135,8 +135,9 @@ describe('tx confirmation screen', function() {
|
||||
}
|
||||
freeze(initialState)
|
||||
|
||||
// Mocking a background connection:
|
||||
actions._setBackgroundConnection({
|
||||
approveTransaction(txId, cb) { cb() },
|
||||
approveTransaction(firstTxId, cb) { cb() },
|
||||
})
|
||||
|
||||
let action = actions.sendTx({id: firstTxId})(function(action) {
|
||||
@ -152,11 +153,6 @@ describe('tx confirmation screen', function() {
|
||||
it('should transition to the first tx', function() {
|
||||
assert.equal(result.appState.currentView.context, 0)
|
||||
})
|
||||
|
||||
it('should only have one unconfirmed tx remaining', function() {
|
||||
var count = getUnconfirmedTxCount(result)
|
||||
assert.equal(count, 1)
|
||||
})
|
||||
})
|
||||
})
|
||||
});
|
||||
|
||||
@ -1,127 +0,0 @@
|
||||
const assert = require('assert')
|
||||
const extend = require('xtend')
|
||||
const HdKeyring = require('../../../app/scripts/keyrings/hd')
|
||||
|
||||
// Sample account:
|
||||
const privKeyHex = 'b8a9c05beeedb25df85f8d641538cbffedf67216048de9c678ee26260eb91952'
|
||||
|
||||
const sampleMnemonic = 'finish oppose decorate face calm tragic certain desk hour urge dinosaur mango'
|
||||
const firstAcct = '1c96099350f13d558464ec79b9be4445aa0ef579'
|
||||
const secondAcct = '1b00aed43a693f3a957f9feb5cc08afa031e37a0'
|
||||
|
||||
describe('hd-keyring', function() {
|
||||
|
||||
let keyring
|
||||
beforeEach(function() {
|
||||
keyring = new HdKeyring()
|
||||
})
|
||||
|
||||
describe('constructor', function(done) {
|
||||
keyring = new HdKeyring({
|
||||
mnemonic: sampleMnemonic,
|
||||
numberOfAccounts: 2,
|
||||
})
|
||||
|
||||
const accounts = keyring.getAccounts()
|
||||
.then((accounts) => {
|
||||
assert.equal(accounts[0], firstAcct)
|
||||
assert.equal(accounts[1], secondAcct)
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
describe('Keyring.type', function() {
|
||||
it('is a class property that returns the type string.', function() {
|
||||
const type = HdKeyring.type
|
||||
assert.equal(typeof type, 'string')
|
||||
})
|
||||
})
|
||||
|
||||
describe('#type', function() {
|
||||
it('returns the correct value', function() {
|
||||
const type = keyring.type
|
||||
const correct = HdKeyring.type
|
||||
assert.equal(type, correct)
|
||||
})
|
||||
})
|
||||
|
||||
describe('#serialize empty wallets.', function() {
|
||||
it('serializes a new mnemonic', function() {
|
||||
keyring.serialize()
|
||||
.then((output) => {
|
||||
assert.equal(output.numberOfAccounts, 0)
|
||||
assert.equal(output.mnemonic, null)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('#deserialize a private key', function() {
|
||||
it('serializes what it deserializes', function(done) {
|
||||
keyring.deserialize({
|
||||
mnemonic: sampleMnemonic,
|
||||
numberOfAccounts: 1
|
||||
})
|
||||
.then(() => {
|
||||
assert.equal(keyring.wallets.length, 1, 'restores two accounts')
|
||||
return keyring.addAccounts(1)
|
||||
}).then(() => {
|
||||
return keyring.getAccounts()
|
||||
}).then((accounts) => {
|
||||
assert.equal(accounts[0], firstAcct)
|
||||
assert.equal(accounts[1], secondAcct)
|
||||
assert.equal(accounts.length, 2)
|
||||
|
||||
return keyring.serialize()
|
||||
}).then((serialized) => {
|
||||
assert.equal(serialized.mnemonic, sampleMnemonic)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('#addAccounts', function() {
|
||||
describe('with no arguments', function() {
|
||||
it('creates a single wallet', function(done) {
|
||||
keyring.addAccounts()
|
||||
.then(() => {
|
||||
assert.equal(keyring.wallets.length, 1)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('with a numeric argument', function() {
|
||||
it('creates that number of wallets', function(done) {
|
||||
keyring.addAccounts(3)
|
||||
.then(() => {
|
||||
assert.equal(keyring.wallets.length, 3)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('#getAccounts', function() {
|
||||
it('calls getAddress on each wallet', function(done) {
|
||||
|
||||
// Push a mock wallet
|
||||
const desiredOutput = 'foo'
|
||||
keyring.wallets.push({
|
||||
getAddress() {
|
||||
return {
|
||||
toString() {
|
||||
return desiredOutput
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
const output = keyring.getAccounts()
|
||||
.then((output) => {
|
||||
assert.equal(output[0], desiredOutput)
|
||||
assert.equal(output.length, 1)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
@ -1,149 +0,0 @@
|
||||
const assert = require('assert')
|
||||
const extend = require('xtend')
|
||||
const Web3 = require('web3')
|
||||
const web3 = new Web3()
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const SimpleKeyring = require('../../../app/scripts/keyrings/simple')
|
||||
const TYPE_STR = 'Simple Key Pair'
|
||||
|
||||
// Sample account:
|
||||
const privKeyHex = 'b8a9c05beeedb25df85f8d641538cbffedf67216048de9c678ee26260eb91952'
|
||||
|
||||
describe('simple-keyring', function() {
|
||||
|
||||
let keyring
|
||||
beforeEach(function() {
|
||||
keyring = new SimpleKeyring()
|
||||
})
|
||||
|
||||
describe('Keyring.type', function() {
|
||||
it('is a class property that returns the type string.', function() {
|
||||
const type = SimpleKeyring.type
|
||||
assert.equal(type, TYPE_STR)
|
||||
})
|
||||
})
|
||||
|
||||
describe('#type', function() {
|
||||
it('returns the correct value', function() {
|
||||
const type = keyring.type
|
||||
assert.equal(type, TYPE_STR)
|
||||
})
|
||||
})
|
||||
|
||||
describe('#serialize empty wallets.', function() {
|
||||
it('serializes an empty array', function(done) {
|
||||
keyring.serialize()
|
||||
.then((output) => {
|
||||
assert.deepEqual(output, [])
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('#deserialize a private key', function() {
|
||||
it('serializes what it deserializes', function() {
|
||||
keyring.deserialize([privKeyHex])
|
||||
.then(() => {
|
||||
assert.equal(keyring.wallets.length, 1, 'has one wallet')
|
||||
const serialized = keyring.serialize()
|
||||
assert.equal(serialized[0], privKeyHex)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('#signMessage', function() {
|
||||
const address = '0x9858e7d8b79fc3e6d989636721584498926da38a'
|
||||
const message = '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0'
|
||||
const privateKey = '0x7dd98753d7b4394095de7d176c58128e2ed6ee600abe97c9f6d9fd65015d9b18'
|
||||
const expectedResult = '0x28fcb6768e5110144a55b2e6ce9d1ea5a58103033632d272d2b5cf506906f7941a00b539383fd872109633d8c71c404e13dba87bc84166ee31b0e36061a69e161c'
|
||||
|
||||
it('passes the dennis test', function(done) {
|
||||
keyring.deserialize([ privateKey ])
|
||||
.then(() => {
|
||||
return keyring.signMessage(address, message)
|
||||
})
|
||||
.then((result) => {
|
||||
assert.equal(result, expectedResult)
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
it('reliably can decode messages it signs', function (done) {
|
||||
|
||||
const message = 'hello there!'
|
||||
const msgHashHex = web3.sha3(message)
|
||||
let address
|
||||
let addresses = []
|
||||
|
||||
keyring.deserialize([ privateKey ])
|
||||
.then(() => {
|
||||
keyring.addAccounts(9)
|
||||
})
|
||||
.then(() => {
|
||||
return keyring.getAccounts()
|
||||
})
|
||||
.then((addrs) => {
|
||||
addresses = addrs
|
||||
return Promise.all(addresses.map((address) => {
|
||||
return keyring.signMessage(address, msgHashHex)
|
||||
}))
|
||||
})
|
||||
.then((signatures) => {
|
||||
|
||||
signatures.forEach((sgn, index) => {
|
||||
const address = addresses[index]
|
||||
|
||||
var r = ethUtil.toBuffer(sgn.slice(0,66))
|
||||
var s = ethUtil.toBuffer('0x' + sgn.slice(66,130))
|
||||
var v = ethUtil.bufferToInt(ethUtil.toBuffer('0x' + sgn.slice(130,132)))
|
||||
var m = ethUtil.toBuffer(msgHashHex)
|
||||
var pub = ethUtil.ecrecover(m, v, r, s)
|
||||
var adr = '0x' + ethUtil.pubToAddress(pub).toString('hex')
|
||||
|
||||
assert.equal(adr, address, 'recovers address from signature correctly')
|
||||
})
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('#addAccounts', function() {
|
||||
describe('with no arguments', function() {
|
||||
it('creates a single wallet', function() {
|
||||
keyring.addAccounts()
|
||||
.then(() => {
|
||||
assert.equal(keyring.wallets.length, 1)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('with a numeric argument', function() {
|
||||
it('creates that number of wallets', function() {
|
||||
keyring.addAccounts(3)
|
||||
.then(() => {
|
||||
assert.equal(keyring.wallets.length, 3)
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('#getAccounts', function() {
|
||||
it('calls getAddress on each wallet', function(done) {
|
||||
|
||||
// Push a mock wallet
|
||||
const desiredOutput = '0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761'
|
||||
keyring.wallets.push({
|
||||
getAddress() {
|
||||
return ethUtil.toBuffer(desiredOutput)
|
||||
}
|
||||
})
|
||||
|
||||
keyring.getAccounts()
|
||||
.then((output) => {
|
||||
assert.equal(output[0], desiredOutput)
|
||||
assert.equal(output.length, 1)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
89
test/unit/personal-message-manager-test.js
Normal file
89
test/unit/personal-message-manager-test.js
Normal file
@ -0,0 +1,89 @@
|
||||
const assert = require('assert')
|
||||
const extend = require('xtend')
|
||||
const EventEmitter = require('events')
|
||||
|
||||
const PersonalMessageManager = require('../../app/scripts/lib/personal-message-manager')
|
||||
|
||||
describe('Transaction Manager', function() {
|
||||
let messageManager
|
||||
|
||||
beforeEach(function() {
|
||||
messageManager = new PersonalMessageManager()
|
||||
})
|
||||
|
||||
describe('#getMsgList', function() {
|
||||
it('when new should return empty array', function() {
|
||||
var result = messageManager.messages
|
||||
assert.ok(Array.isArray(result))
|
||||
assert.equal(result.length, 0)
|
||||
})
|
||||
it('should also return transactions from local storage if any', function() {
|
||||
|
||||
})
|
||||
})
|
||||
|
||||
describe('#addMsg', function() {
|
||||
it('adds a Msg returned in getMsgList', function() {
|
||||
var Msg = { id: 1, status: 'approved', metamaskNetworkId: 'unit test' }
|
||||
messageManager.addMsg(Msg)
|
||||
var result = messageManager.messages
|
||||
assert.ok(Array.isArray(result))
|
||||
assert.equal(result.length, 1)
|
||||
assert.equal(result[0].id, 1)
|
||||
})
|
||||
})
|
||||
|
||||
describe('#setMsgStatusApproved', function() {
|
||||
it('sets the Msg status to approved', function() {
|
||||
var Msg = { id: 1, status: 'unapproved', metamaskNetworkId: 'unit test' }
|
||||
messageManager.addMsg(Msg)
|
||||
messageManager.setMsgStatusApproved(1)
|
||||
var result = messageManager.messages
|
||||
assert.ok(Array.isArray(result))
|
||||
assert.equal(result.length, 1)
|
||||
assert.equal(result[0].status, 'approved')
|
||||
})
|
||||
})
|
||||
|
||||
describe('#rejectMsg', function() {
|
||||
it('sets the Msg status to rejected', function() {
|
||||
var Msg = { id: 1, status: 'unapproved', metamaskNetworkId: 'unit test' }
|
||||
messageManager.addMsg(Msg)
|
||||
messageManager.rejectMsg(1)
|
||||
var result = messageManager.messages
|
||||
assert.ok(Array.isArray(result))
|
||||
assert.equal(result.length, 1)
|
||||
assert.equal(result[0].status, 'rejected')
|
||||
})
|
||||
})
|
||||
|
||||
describe('#_updateMsg', function() {
|
||||
it('replaces the Msg with the same id', function() {
|
||||
messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
|
||||
messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
|
||||
messageManager._updateMsg({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: 'unit test' })
|
||||
var result = messageManager.getMsg('1')
|
||||
assert.equal(result.hash, 'foo')
|
||||
})
|
||||
})
|
||||
|
||||
describe('#getUnapprovedMsgs', function() {
|
||||
it('returns unapproved Msgs in a hash', function() {
|
||||
messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
|
||||
messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
|
||||
let result = messageManager.getUnapprovedMsgs()
|
||||
assert.equal(typeof result, 'object')
|
||||
assert.equal(result['1'].status, 'unapproved')
|
||||
assert.equal(result['2'], undefined)
|
||||
})
|
||||
})
|
||||
|
||||
describe('#getMsg', function() {
|
||||
it('returns a Msg with the requested id', function() {
|
||||
messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
|
||||
messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
|
||||
assert.equal(messageManager.getMsg('1').status, 'unapproved')
|
||||
assert.equal(messageManager.getMsg('2').status, 'approved')
|
||||
})
|
||||
})
|
||||
})
|
||||
@ -90,8 +90,11 @@ var actions = {
|
||||
PREVIOUS_TX: 'PREV_TX',
|
||||
signMsg: signMsg,
|
||||
cancelMsg: cancelMsg,
|
||||
signPersonalMsg,
|
||||
cancelPersonalMsg,
|
||||
sendTx: sendTx,
|
||||
signTx: signTx,
|
||||
updateAndApproveTx,
|
||||
cancelTx: cancelTx,
|
||||
completedTx: completedTx,
|
||||
txError: txError,
|
||||
@ -178,7 +181,7 @@ function tryUnlockMetamask (password) {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
dispatch(actions.unlockInProgress())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.submitPassword`)
|
||||
log.debug(`background.submitPassword`)
|
||||
background.submitPassword(password, (err) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) {
|
||||
@ -206,7 +209,7 @@ function transitionBackward () {
|
||||
function confirmSeedWords () {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.clearSeedWordCache`)
|
||||
log.debug(`background.clearSeedWordCache`)
|
||||
background.clearSeedWordCache((err, account) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) {
|
||||
@ -222,7 +225,7 @@ function confirmSeedWords () {
|
||||
function createNewVaultAndRestore (password, seed) {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.createNewVaultAndRestore`)
|
||||
log.debug(`background.createNewVaultAndRestore`)
|
||||
background.createNewVaultAndRestore(password, seed, (err) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
@ -234,12 +237,12 @@ function createNewVaultAndRestore (password, seed) {
|
||||
function createNewVaultAndKeychain (password) {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.createNewVaultAndKeychain`)
|
||||
log.debug(`background.createNewVaultAndKeychain`)
|
||||
background.createNewVaultAndKeychain(password, (err) => {
|
||||
if (err) {
|
||||
return dispatch(actions.displayWarning(err.message))
|
||||
}
|
||||
if (global.METAMASK_DEBUG) console.log(`background.placeSeedWords`)
|
||||
log.debug(`background.placeSeedWords`)
|
||||
background.placeSeedWords((err) => {
|
||||
if (err) {
|
||||
return dispatch(actions.displayWarning(err.message))
|
||||
@ -260,10 +263,10 @@ function revealSeedConfirmation () {
|
||||
function requestRevealSeed (password) {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.submitPassword`)
|
||||
log.debug(`background.submitPassword`)
|
||||
background.submitPassword(password, (err) => {
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
if (global.METAMASK_DEBUG) console.log(`background.placeSeedWords`)
|
||||
log.debug(`background.placeSeedWords`)
|
||||
background.placeSeedWords((err) => {
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
@ -275,7 +278,7 @@ function requestRevealSeed (password) {
|
||||
function addNewKeyring (type, opts) {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.addNewKeyring`)
|
||||
log.debug(`background.addNewKeyring`)
|
||||
background.addNewKeyring(type, opts, (err) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
@ -287,11 +290,11 @@ function addNewKeyring (type, opts) {
|
||||
function importNewAccount (strategy, args) {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication('This may take a while, be patient.'))
|
||||
if (global.METAMASK_DEBUG) console.log(`background.importAccountWithStrategy`)
|
||||
log.debug(`background.importAccountWithStrategy`)
|
||||
background.importAccountWithStrategy(strategy, args, (err) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
if (global.METAMASK_DEBUG) console.log(`background.getState`)
|
||||
log.debug(`background.getState`)
|
||||
background.getState((err, newState) => {
|
||||
if (err) {
|
||||
return dispatch(actions.displayWarning(err.message))
|
||||
@ -313,7 +316,7 @@ function navigateToNewAccountScreen() {
|
||||
}
|
||||
|
||||
function addNewAccount () {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.addNewAccount`)
|
||||
log.debug(`background.addNewAccount`)
|
||||
return callBackgroundThenUpdate(background.addNewAccount)
|
||||
}
|
||||
|
||||
@ -326,7 +329,7 @@ function showInfoPage () {
|
||||
function setCurrentFiat (currencyCode) {
|
||||
return (dispatch) => {
|
||||
dispatch(this.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.setCurrentFiat`)
|
||||
log.debug(`background.setCurrentFiat`)
|
||||
background.setCurrentCurrency(currencyCode, (err, data) => {
|
||||
dispatch(this.hideLoadingIndication())
|
||||
if (err) {
|
||||
@ -346,14 +349,38 @@ function setCurrentFiat (currencyCode) {
|
||||
}
|
||||
|
||||
function signMsg (msgData) {
|
||||
log.debug('action - signMsg')
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
|
||||
if (global.METAMASK_DEBUG) console.log(`background.signMessage`)
|
||||
background.signMessage(msgData, (err) => {
|
||||
log.debug(`actions calling background.signMessage`)
|
||||
background.signMessage(msgData, (err, newState) => {
|
||||
log.debug('signMessage called back')
|
||||
dispatch(actions.updateMetamaskState(newState))
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
|
||||
if (err) log.error(err)
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
|
||||
dispatch(actions.completedTx(msgData.metamaskId))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function signPersonalMsg (msgData) {
|
||||
log.debug('action - signPersonalMsg')
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
|
||||
log.debug(`actions calling background.signPersonalMessage`)
|
||||
background.signPersonalMessage(msgData, (err, newState) => {
|
||||
log.debug('signPersonalMessage called back')
|
||||
dispatch(actions.updateMetamaskState(newState))
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
|
||||
if (err) log.error(err)
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
|
||||
dispatch(actions.completedTx(msgData.metamaskId))
|
||||
})
|
||||
}
|
||||
@ -361,9 +388,6 @@ function signMsg (msgData) {
|
||||
|
||||
function signTx (txData) {
|
||||
return (dispatch) => {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.setGasMultiplier`)
|
||||
background.setGasMultiplier(txData.gasMultiplier, (err) => {
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
web3.eth.sendTransaction(txData, (err, data) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) return dispatch(actions.displayWarning(err.message))
|
||||
@ -371,13 +395,13 @@ function signTx (txData) {
|
||||
dispatch(actions.goHome())
|
||||
})
|
||||
dispatch(this.showConfTxPage())
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function sendTx (txData) {
|
||||
log.info(`actions - sendTx: ${JSON.stringify(txData.txParams)}`)
|
||||
return (dispatch) => {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.approveTransaction`)
|
||||
log.debug(`actions calling background.approveTransaction`)
|
||||
background.approveTransaction(txData.id, (err) => {
|
||||
if (err) {
|
||||
dispatch(actions.txError(err))
|
||||
@ -388,10 +412,24 @@ function sendTx (txData) {
|
||||
}
|
||||
}
|
||||
|
||||
function updateAndApproveTx (txData) {
|
||||
log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData))
|
||||
return (dispatch) => {
|
||||
log.debug(`actions calling background.updateAndApproveTx`)
|
||||
background.updateAndApproveTransaction(txData, (err) => {
|
||||
if (err) {
|
||||
dispatch(actions.txError(err))
|
||||
return console.error(err.message)
|
||||
}
|
||||
dispatch(actions.completedTx(txData.id))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function completedTx (id) {
|
||||
return {
|
||||
type: actions.COMPLETED_TX,
|
||||
id,
|
||||
value: id,
|
||||
}
|
||||
}
|
||||
|
||||
@ -403,13 +441,19 @@ function txError (err) {
|
||||
}
|
||||
|
||||
function cancelMsg (msgData) {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.cancelMessage`)
|
||||
log.debug(`background.cancelMessage`)
|
||||
background.cancelMessage(msgData.id)
|
||||
return actions.completedTx(msgData.id)
|
||||
}
|
||||
|
||||
function cancelPersonalMsg (msgData) {
|
||||
const id = msgData.id
|
||||
background.cancelPersonalMessage(id)
|
||||
return actions.completedTx(id)
|
||||
}
|
||||
|
||||
function cancelTx (txData) {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.cancelTransaction`)
|
||||
log.debug(`background.cancelTransaction`)
|
||||
background.cancelTransaction(txData.id)
|
||||
return actions.completedTx(txData.id)
|
||||
}
|
||||
@ -505,14 +549,14 @@ function updateMetamaskState (newState) {
|
||||
}
|
||||
|
||||
function lockMetamask () {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.setLocked`)
|
||||
log.debug(`background.setLocked`)
|
||||
return callBackgroundThenUpdate(background.setLocked)
|
||||
}
|
||||
|
||||
function showAccountDetail (address) {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.setSelectedAddress`)
|
||||
log.debug(`background.setSelectedAddress`)
|
||||
background.setSelectedAddress(address, (err) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) {
|
||||
@ -585,7 +629,7 @@ function goBackToInitView () {
|
||||
function markNoticeRead (notice) {
|
||||
return (dispatch) => {
|
||||
dispatch(this.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.markNoticeRead`)
|
||||
log.debug(`background.markNoticeRead`)
|
||||
background.markNoticeRead(notice, (err, notice) => {
|
||||
dispatch(this.hideLoadingIndication())
|
||||
if (err) {
|
||||
@ -617,7 +661,7 @@ function clearNotices () {
|
||||
}
|
||||
|
||||
function markAccountsFound() {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.markAccountsFound`)
|
||||
log.debug(`background.markAccountsFound`)
|
||||
return callBackgroundThenUpdate(background.markAccountsFound)
|
||||
}
|
||||
|
||||
@ -643,7 +687,7 @@ function setRpcTarget (newRpc) {
|
||||
}
|
||||
|
||||
function setProviderType (type) {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.setProviderType`)
|
||||
log.debug(`background.setProviderType`)
|
||||
background.setProviderType(type)
|
||||
return {
|
||||
type: actions.SET_PROVIDER_TYPE,
|
||||
@ -652,7 +696,7 @@ function setProviderType (type) {
|
||||
}
|
||||
|
||||
function useEtherscanProvider () {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.useEtherscanProvider`)
|
||||
log.debug(`background.useEtherscanProvider`)
|
||||
background.useEtherscanProvider()
|
||||
return {
|
||||
type: actions.USE_ETHERSCAN_PROVIDER,
|
||||
@ -709,7 +753,7 @@ function exportAccount (address) {
|
||||
return function (dispatch) {
|
||||
dispatch(self.showLoadingIndication())
|
||||
|
||||
if (global.METAMASK_DEBUG) console.log(`background.exportAccount`)
|
||||
log.debug(`background.exportAccount`)
|
||||
background.exportAccount(address, function (err, result) {
|
||||
dispatch(self.hideLoadingIndication())
|
||||
|
||||
@ -733,7 +777,7 @@ function showPrivateKey (key) {
|
||||
function saveAccountLabel (account, label) {
|
||||
return (dispatch) => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
if (global.METAMASK_DEBUG) console.log(`background.saveAccountLabel`)
|
||||
log.debug(`background.saveAccountLabel`)
|
||||
background.saveAccountLabel(account, label, (err) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) {
|
||||
@ -755,7 +799,7 @@ function showSendPage () {
|
||||
|
||||
function buyEth (address, amount) {
|
||||
return (dispatch) => {
|
||||
if (global.METAMASK_DEBUG) console.log(`background.buyEth`)
|
||||
log.debug(`background.buyEth`)
|
||||
background.buyEth(address, amount)
|
||||
dispatch({
|
||||
type: actions.BUY_ETH,
|
||||
@ -835,7 +879,7 @@ function coinShiftRquest (data, marketData) {
|
||||
if (response.error) return dispatch(actions.displayWarning(response.error))
|
||||
var message = `
|
||||
Deposit your ${response.depositType} to the address bellow:`
|
||||
if (global.METAMASK_DEBUG) console.log(`background.createShapeShiftTx`)
|
||||
log.debug(`background.createShapeShiftTx`)
|
||||
background.createShapeShiftTx(response.deposit, response.depositType)
|
||||
dispatch(actions.showQrView(response.deposit, [message].concat(marketData)))
|
||||
})
|
||||
@ -915,7 +959,7 @@ function callBackgroundThenUpdate (method, ...args) {
|
||||
}
|
||||
|
||||
function forceUpdateMetamaskState(dispatch){
|
||||
if (global.METAMASK_DEBUG) console.log(`background.getState`)
|
||||
log.debug(`background.getState`)
|
||||
background.getState((err, newState) => {
|
||||
if (err) {
|
||||
return dispatch(actions.displayWarning(err.message))
|
||||
|
||||
@ -65,6 +65,7 @@ function mapStateToProps (state) {
|
||||
App.prototype.render = function () {
|
||||
var props = this.props
|
||||
const { isLoading, loadingMessage, transForward } = props
|
||||
log.debug('Main ui render function')
|
||||
|
||||
return (
|
||||
|
||||
@ -352,6 +353,7 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
|
||||
}
|
||||
|
||||
App.prototype.renderPrimary = function () {
|
||||
log.debug('rendering primary')
|
||||
var props = this.props
|
||||
|
||||
// notices
|
||||
|
||||
76
ui/app/components/hex-as-decimal-input.js
Normal file
76
ui/app/components/hex-as-decimal-input.js
Normal file
@ -0,0 +1,76 @@
|
||||
const Component = require('react').Component
|
||||
const h = require('react-hyperscript')
|
||||
const inherits = require('util').inherits
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const BN = ethUtil.BN
|
||||
const extend = require('xtend')
|
||||
|
||||
module.exports = HexAsDecimalInput
|
||||
|
||||
inherits(HexAsDecimalInput, Component)
|
||||
function HexAsDecimalInput () {
|
||||
Component.call(this)
|
||||
}
|
||||
|
||||
/* Hex as Decimal Input
|
||||
*
|
||||
* A component for allowing easy, decimal editing
|
||||
* of a passed in hex string value.
|
||||
*
|
||||
* On change, calls back its `onChange` function parameter
|
||||
* and passes it an updated hex string.
|
||||
*/
|
||||
|
||||
HexAsDecimalInput.prototype.render = function () {
|
||||
const props = this.props
|
||||
const { value, onChange } = props
|
||||
const toEth = props.toEth
|
||||
const suffix = props.suffix
|
||||
const decimalValue = decimalize(value, toEth)
|
||||
const style = props.style
|
||||
|
||||
return (
|
||||
h('.flex-row', {
|
||||
style: {
|
||||
alignItems: 'flex-end',
|
||||
lineHeight: '13px',
|
||||
fontFamily: 'Montserrat Light',
|
||||
textRendering: 'geometricPrecision',
|
||||
},
|
||||
}, [
|
||||
h('input.ether-balance.ether-balance-amount', {
|
||||
style: extend({
|
||||
display: 'block',
|
||||
textAlign: 'right',
|
||||
backgroundColor: 'transparent',
|
||||
border: '1px solid #bdbdbd',
|
||||
}, style),
|
||||
value: decimalValue,
|
||||
onChange: (event) => {
|
||||
const hexString = hexify(event.target.value)
|
||||
onChange(hexString)
|
||||
},
|
||||
}),
|
||||
h('div', {
|
||||
style: {
|
||||
color: ' #AEAEAE',
|
||||
fontSize: '12px',
|
||||
marginLeft: '5px',
|
||||
marginRight: '6px',
|
||||
width: '20px',
|
||||
},
|
||||
}, suffix),
|
||||
])
|
||||
)
|
||||
}
|
||||
|
||||
function hexify (decimalString) {
|
||||
const hexBN = new BN(decimalString, 10)
|
||||
return '0x' + hexBN.toString('hex')
|
||||
}
|
||||
|
||||
function decimalize (input, toEth) {
|
||||
const strippedInput = ethUtil.stripHexPrefix(input)
|
||||
const inputBN = new BN(strippedInput, 'hex')
|
||||
return inputBN.toString(10)
|
||||
}
|
||||
61
ui/app/components/pending-personal-msg-details.js
Normal file
61
ui/app/components/pending-personal-msg-details.js
Normal file
@ -0,0 +1,61 @@
|
||||
const Component = require('react').Component
|
||||
const h = require('react-hyperscript')
|
||||
const inherits = require('util').inherits
|
||||
|
||||
const AccountPanel = require('./account-panel')
|
||||
|
||||
module.exports = PendingMsgDetails
|
||||
|
||||
inherits(PendingMsgDetails, Component)
|
||||
function PendingMsgDetails () {
|
||||
Component.call(this)
|
||||
}
|
||||
|
||||
PendingMsgDetails.prototype.render = function () {
|
||||
var state = this.props
|
||||
var msgData = state.txData
|
||||
|
||||
var msgParams = msgData.msgParams || {}
|
||||
var address = msgParams.from || state.selectedAddress
|
||||
var identity = state.identities[address] || { address: address }
|
||||
var account = state.accounts[address] || { address: address }
|
||||
|
||||
var { data } = msgParams
|
||||
|
||||
return (
|
||||
h('div', {
|
||||
key: msgData.id,
|
||||
style: {
|
||||
margin: '10px 20px',
|
||||
},
|
||||
}, [
|
||||
|
||||
// account that will sign
|
||||
h(AccountPanel, {
|
||||
showFullAddress: true,
|
||||
identity: identity,
|
||||
account: account,
|
||||
imageifyIdenticons: state.imageifyIdenticons,
|
||||
}),
|
||||
|
||||
// message data
|
||||
h('div', [
|
||||
h('label.font-small', { style: { display: 'block' } }, 'MESSAGE'),
|
||||
h('textarea.font-small', {
|
||||
readOnly: true,
|
||||
style: {
|
||||
width: '315px',
|
||||
maxHeight: '210px',
|
||||
resize: 'none',
|
||||
border: 'none',
|
||||
background: 'white',
|
||||
padding: '3px',
|
||||
},
|
||||
defaultValue: data,
|
||||
}),
|
||||
]),
|
||||
|
||||
])
|
||||
)
|
||||
}
|
||||
|
||||
47
ui/app/components/pending-personal-msg.js
Normal file
47
ui/app/components/pending-personal-msg.js
Normal file
@ -0,0 +1,47 @@
|
||||
const Component = require('react').Component
|
||||
const h = require('react-hyperscript')
|
||||
const inherits = require('util').inherits
|
||||
const PendingTxDetails = require('./pending-personal-msg-details')
|
||||
|
||||
module.exports = PendingMsg
|
||||
|
||||
inherits(PendingMsg, Component)
|
||||
function PendingMsg () {
|
||||
Component.call(this)
|
||||
}
|
||||
|
||||
PendingMsg.prototype.render = function () {
|
||||
var state = this.props
|
||||
var msgData = state.txData
|
||||
|
||||
return (
|
||||
|
||||
h('div', {
|
||||
key: msgData.id,
|
||||
}, [
|
||||
|
||||
// header
|
||||
h('h3', {
|
||||
style: {
|
||||
fontWeight: 'bold',
|
||||
textAlign: 'center',
|
||||
},
|
||||
}, 'Sign Message'),
|
||||
|
||||
// message details
|
||||
h(PendingTxDetails, state),
|
||||
|
||||
// sign + cancel
|
||||
h('.flex-row.flex-space-around', [
|
||||
h('button', {
|
||||
onClick: state.cancelPersonalMessage,
|
||||
}, 'Cancel'),
|
||||
h('button', {
|
||||
onClick: state.signPersonalMessage,
|
||||
}, 'Sign'),
|
||||
]),
|
||||
])
|
||||
|
||||
)
|
||||
}
|
||||
|
||||
@ -1,12 +1,16 @@
|
||||
const Component = require('react').Component
|
||||
const h = require('react-hyperscript')
|
||||
const inherits = require('util').inherits
|
||||
const extend = require('xtend')
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const BN = ethUtil.BN
|
||||
|
||||
const MiniAccountPanel = require('./mini-account-panel')
|
||||
const EthBalance = require('./eth-balance')
|
||||
const util = require('../util')
|
||||
const addressSummary = util.addressSummary
|
||||
const nameForAddress = require('../../lib/contract-namer')
|
||||
const HexInput = require('./hex-as-decimal-input')
|
||||
|
||||
module.exports = PendingTxDetails
|
||||
|
||||
@ -19,7 +23,8 @@ const PTXP = PendingTxDetails.prototype
|
||||
|
||||
PTXP.render = function () {
|
||||
var props = this.props
|
||||
var txData = props.txData
|
||||
var state = this.state || {}
|
||||
var txData = state.txMeta || props.txData
|
||||
|
||||
var txParams = txData.txParams || {}
|
||||
var address = txParams.from || props.selectedAddress
|
||||
@ -27,11 +32,18 @@ PTXP.render = function () {
|
||||
var account = props.accounts[address]
|
||||
var balance = account ? account.balance : '0x0'
|
||||
|
||||
var txFee = txData.txFee || ''
|
||||
var maxCost = txData.maxCost || ''
|
||||
const gas = state.gas || txParams.gas
|
||||
const gasPrice = state.gasPrice || txData.gasPrice
|
||||
const gasDefault = txParams.gas
|
||||
const gasPriceDefault = txData.gasPrice
|
||||
|
||||
var txFee = state.txFee || txData.txFee || ''
|
||||
var maxCost = state.maxCost || txData.maxCost || ''
|
||||
var dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0
|
||||
var imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons
|
||||
|
||||
log.debug(`rendering gas: ${gas}, gasPrice: ${gasPrice}, txFee: ${txFee}, maxCost: ${maxCost}`)
|
||||
|
||||
return (
|
||||
h('div', [
|
||||
|
||||
@ -97,11 +109,63 @@ PTXP.render = function () {
|
||||
|
||||
h('.table-box', [
|
||||
|
||||
// Ether Value
|
||||
// Currently not customizable, but easily modified
|
||||
// in the way that gas and gasLimit currently are.
|
||||
h('.row', [
|
||||
h('.cell.label', 'Amount'),
|
||||
h(EthBalance, { value: txParams.value }),
|
||||
]),
|
||||
|
||||
// Gas Limit (customizable)
|
||||
h('.cell.row', [
|
||||
h('.cell.label', 'Gas Limit'),
|
||||
h('.cell.value', {
|
||||
}, [
|
||||
h(HexInput, {
|
||||
value: gas,
|
||||
suffix: 'UNITS',
|
||||
style: {
|
||||
position: 'relative',
|
||||
top: '5px',
|
||||
},
|
||||
onChange: (newHex) => {
|
||||
log.info(`Gas limit changed to ${newHex}`)
|
||||
if (newHex === '0x0') {
|
||||
this.setState({gas: gasDefault})
|
||||
} else {
|
||||
this.setState({ gas: newHex })
|
||||
}
|
||||
},
|
||||
}),
|
||||
]),
|
||||
]),
|
||||
|
||||
// Gas Price (customizable)
|
||||
h('.cell.row', [
|
||||
h('.cell.label', 'Gas Price'),
|
||||
h('.cell.value', {
|
||||
}, [
|
||||
h(HexInput, {
|
||||
value: gasPrice,
|
||||
suffix: 'WEI',
|
||||
style: {
|
||||
position: 'relative',
|
||||
top: '5px',
|
||||
},
|
||||
onChange: (newHex) => {
|
||||
log.info(`Gas price changed to: ${newHex}`)
|
||||
if (newHex === '0x0') {
|
||||
this.setState({gasPrice: gasPriceDefault})
|
||||
} else {
|
||||
this.setState({ gasPrice: newHex })
|
||||
}
|
||||
},
|
||||
}),
|
||||
]),
|
||||
]),
|
||||
|
||||
// Max Transaction Fee (calculated)
|
||||
h('.cell.row', [
|
||||
h('.cell.label', 'Max Transaction Fee'),
|
||||
h(EthBalance, { value: txFee.toString(16) }),
|
||||
@ -130,6 +194,7 @@ PTXP.render = function () {
|
||||
]),
|
||||
]),
|
||||
|
||||
// Data size row:
|
||||
h('.cell.row', {
|
||||
style: {
|
||||
background: '#f7f7f7',
|
||||
@ -191,6 +256,80 @@ PTXP.miniAccountPanelForRecipient = function () {
|
||||
}
|
||||
}
|
||||
|
||||
PTXP.componentDidUpdate = function (prevProps, previousState) {
|
||||
log.debug(`pending-tx-details componentDidUpdate`)
|
||||
const state = this.state || {}
|
||||
const prevState = previousState || {}
|
||||
const { gas, gasPrice } = state
|
||||
|
||||
// Only if gas or gasPrice changed:
|
||||
if (!prevState ||
|
||||
(gas !== prevState.gas ||
|
||||
gasPrice !== prevState.gasPrice)) {
|
||||
log.debug(`recalculating gas since prev state change: ${JSON.stringify({ prevState, state })}`)
|
||||
this.calculateGas()
|
||||
}
|
||||
}
|
||||
|
||||
PTXP.calculateGas = function () {
|
||||
const txMeta = this.gatherParams()
|
||||
log.debug(`pending-tx-details calculating gas for ${JSON.stringify(txMeta)}`)
|
||||
|
||||
var txParams = txMeta.txParams
|
||||
var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txMeta.estimatedGas), 16)
|
||||
var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16)
|
||||
var txFee = gasCost.mul(gasPrice)
|
||||
var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16)
|
||||
var maxCost = txValue.add(txFee)
|
||||
|
||||
const txFeeHex = '0x' + txFee.toString('hex')
|
||||
const maxCostHex = '0x' + maxCost.toString('hex')
|
||||
const gasPriceHex = '0x' + gasPrice.toString('hex')
|
||||
|
||||
txMeta.txFee = txFeeHex
|
||||
txMeta.maxCost = maxCostHex
|
||||
txMeta.txParams.gasPrice = gasPriceHex
|
||||
|
||||
this.setState({
|
||||
txFee: '0x' + txFee.toString('hex'),
|
||||
maxCost: '0x' + maxCost.toString('hex'),
|
||||
})
|
||||
|
||||
if (this.props.onTxChange) {
|
||||
this.props.onTxChange(txMeta)
|
||||
}
|
||||
}
|
||||
|
||||
PTXP.resetGasFields = function () {
|
||||
log.debug(`pending-tx-details#resetGasFields`)
|
||||
const txData = this.props.txData
|
||||
this.setState({
|
||||
gas: txData.txParams.gas,
|
||||
gasPrice: txData.gasPrice,
|
||||
})
|
||||
}
|
||||
|
||||
// After a customizable state value has been updated,
|
||||
PTXP.gatherParams = function () {
|
||||
log.debug(`pending-tx-details#gatherParams`)
|
||||
const props = this.props
|
||||
const state = this.state || {}
|
||||
const txData = state.txData || props.txData
|
||||
const txParams = txData.txParams
|
||||
|
||||
const gas = state.gas || txParams.gas
|
||||
const gasPrice = state.gasPrice || txParams.gasPrice
|
||||
const resultTx = extend(txParams, {
|
||||
gas,
|
||||
gasPrice,
|
||||
})
|
||||
const resultTxMeta = extend(txData, {
|
||||
txParams: resultTx,
|
||||
})
|
||||
log.debug(`UI has computed tx params ${JSON.stringify(resultTx)}`)
|
||||
return resultTxMeta
|
||||
}
|
||||
|
||||
function forwardCarrat () {
|
||||
return (
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@ const Component = require('react').Component
|
||||
const h = require('react-hyperscript')
|
||||
const inherits = require('util').inherits
|
||||
const PendingTxDetails = require('./pending-tx-details')
|
||||
const extend = require('xtend')
|
||||
|
||||
module.exports = PendingTx
|
||||
|
||||
@ -11,8 +12,9 @@ function PendingTx () {
|
||||
}
|
||||
|
||||
PendingTx.prototype.render = function () {
|
||||
var state = this.props
|
||||
var txData = state.txData
|
||||
const props = this.props
|
||||
const newProps = extend(props, {ref: 'details'})
|
||||
const txData = props.txData
|
||||
|
||||
return (
|
||||
|
||||
@ -21,7 +23,7 @@ PendingTx.prototype.render = function () {
|
||||
}, [
|
||||
|
||||
// tx info
|
||||
h(PendingTxDetails, state),
|
||||
h(PendingTxDetails, newProps),
|
||||
|
||||
h('style', `
|
||||
.conf-buttons button {
|
||||
@ -39,7 +41,7 @@ PendingTx.prototype.render = function () {
|
||||
}, 'Transaction Error. Exception thrown in contract code.')
|
||||
: null,
|
||||
|
||||
state.insufficientBalance ?
|
||||
props.insufficientBalance ?
|
||||
h('span.error', {
|
||||
style: {
|
||||
marginLeft: 50,
|
||||
@ -57,20 +59,26 @@ PendingTx.prototype.render = function () {
|
||||
},
|
||||
}, [
|
||||
|
||||
state.insufficientBalance ?
|
||||
props.insufficientBalance ?
|
||||
h('button.btn-green', {
|
||||
onClick: state.buyEth,
|
||||
onClick: props.buyEth,
|
||||
}, 'Buy Ether')
|
||||
: null,
|
||||
|
||||
h('button.confirm', {
|
||||
disabled: state.insufficientBalance,
|
||||
onClick: state.sendTransaction,
|
||||
disabled: props.insufficientBalance,
|
||||
onClick: props.sendTransaction,
|
||||
}, 'Accept'),
|
||||
|
||||
h('button.cancel.btn-red', {
|
||||
onClick: state.cancelTransaction,
|
||||
onClick: props.cancelTransaction,
|
||||
}, 'Reject'),
|
||||
|
||||
h('button', {
|
||||
onClick: () => {
|
||||
this.refs.details.resetGasFields()
|
||||
},
|
||||
}, 'Reset'),
|
||||
]),
|
||||
])
|
||||
)
|
||||
|
||||
@ -15,11 +15,7 @@ TransactionIcon.prototype.render = function () {
|
||||
const { transaction, txParams, isMsg } = this.props
|
||||
switch (transaction.status) {
|
||||
case 'unapproved':
|
||||
return h( !isMsg ? '.unapproved-tx-icon' : 'i.fa.fa-certificate.fa-lg', {
|
||||
style: {
|
||||
width: '24px',
|
||||
},
|
||||
})
|
||||
return h( !isMsg ? '.unapproved-tx-icon' : 'i.fa.fa-certificate.fa-lg')
|
||||
|
||||
case 'rejected':
|
||||
return h('i.fa.fa-exclamation-triangle.fa-lg.warning', {
|
||||
|
||||
@ -12,6 +12,8 @@ const BN = ethUtil.BN
|
||||
|
||||
const PendingTx = require('./components/pending-tx')
|
||||
const PendingMsg = require('./components/pending-msg')
|
||||
const PendingPersonalMsg = require('./components/pending-personal-msg')
|
||||
const Loading = require('./components/loading')
|
||||
|
||||
module.exports = connect(mapStateToProps)(ConfirmTxScreen)
|
||||
|
||||
@ -22,6 +24,7 @@ function mapStateToProps (state) {
|
||||
selectedAddress: state.metamask.selectedAddress,
|
||||
unapprovedTxs: state.metamask.unapprovedTxs,
|
||||
unapprovedMsgs: state.metamask.unapprovedMsgs,
|
||||
unapprovedPersonalMsgs: state.metamask.unapprovedPersonalMsgs,
|
||||
index: state.appState.currentView.context,
|
||||
warning: state.appState.warning,
|
||||
network: state.metamask.network,
|
||||
@ -35,21 +38,18 @@ function ConfirmTxScreen () {
|
||||
}
|
||||
|
||||
ConfirmTxScreen.prototype.render = function () {
|
||||
var state = this.props
|
||||
const props = this.props
|
||||
const { network, provider, unapprovedTxs,
|
||||
unapprovedMsgs, unapprovedPersonalMsgs } = props
|
||||
|
||||
var network = state.network
|
||||
var provider = state.provider
|
||||
var unapprovedTxs = state.unapprovedTxs
|
||||
var unapprovedMsgs = state.unapprovedMsgs
|
||||
|
||||
var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, network)
|
||||
var index = state.index !== undefined && unconfTxList[index] ? state.index : 0
|
||||
var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network)
|
||||
var index = props.index !== undefined && unconfTxList[index] ? props.index : 0
|
||||
var txData = unconfTxList[index] || {}
|
||||
var txParams = txData.params || {}
|
||||
var isNotification = isPopupOrNotification() === 'notification'
|
||||
|
||||
log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`)
|
||||
if (unconfTxList.length === 0) return null
|
||||
if (unconfTxList.length === 0) return h(Loading)
|
||||
|
||||
return (
|
||||
|
||||
@ -75,20 +75,20 @@ ConfirmTxScreen.prototype.render = function () {
|
||||
}, [
|
||||
h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
|
||||
style: {
|
||||
display: state.index === 0 ? 'none' : 'inline-block',
|
||||
display: props.index === 0 ? 'none' : 'inline-block',
|
||||
},
|
||||
onClick: () => state.dispatch(actions.previousTx()),
|
||||
onClick: () => props.dispatch(actions.previousTx()),
|
||||
}),
|
||||
` ${state.index + 1} of ${unconfTxList.length} `,
|
||||
` ${props.index + 1} of ${unconfTxList.length} `,
|
||||
h('i.fa.fa-arrow-right.fa-lg.cursor-pointer', {
|
||||
style: {
|
||||
display: state.index + 1 === unconfTxList.length ? 'none' : 'inline-block',
|
||||
display: props.index + 1 === unconfTxList.length ? 'none' : 'inline-block',
|
||||
},
|
||||
onClick: () => state.dispatch(actions.nextTx()),
|
||||
onClick: () => props.dispatch(actions.nextTx()),
|
||||
}),
|
||||
]),
|
||||
|
||||
warningIfExists(state.warning),
|
||||
warningIfExists(props.warning),
|
||||
|
||||
h(ReactCSSTransitionGroup, {
|
||||
className: 'css-transition-group',
|
||||
@ -101,16 +101,20 @@ ConfirmTxScreen.prototype.render = function () {
|
||||
// Properties
|
||||
txData: txData,
|
||||
key: txData.id,
|
||||
selectedAddress: state.selectedAddress,
|
||||
accounts: state.accounts,
|
||||
identities: state.identities,
|
||||
selectedAddress: props.selectedAddress,
|
||||
accounts: props.accounts,
|
||||
identities: props.identities,
|
||||
insufficientBalance: this.checkBalanceAgainstTx(txData),
|
||||
// State actions
|
||||
onTxChange: this.onTxChange.bind(this),
|
||||
// Actions
|
||||
buyEth: this.buyEth.bind(this, txParams.from || state.selectedAddress),
|
||||
buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress),
|
||||
sendTransaction: this.sendTransaction.bind(this, txData),
|
||||
cancelTransaction: this.cancelTransaction.bind(this, txData),
|
||||
signMessage: this.signMessage.bind(this, txData),
|
||||
signPersonalMessage: this.signPersonalMessage.bind(this, txData),
|
||||
cancelMessage: this.cancelMessage.bind(this, txData),
|
||||
cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData),
|
||||
}),
|
||||
|
||||
]),
|
||||
@ -119,25 +123,33 @@ ConfirmTxScreen.prototype.render = function () {
|
||||
}
|
||||
|
||||
function currentTxView (opts) {
|
||||
const { txData } = opts
|
||||
const { txParams, msgParams } = txData
|
||||
|
||||
log.info('rendering current tx view')
|
||||
const { txData } = opts
|
||||
const { txParams, msgParams, type } = txData
|
||||
|
||||
if (txParams) {
|
||||
// This is a pending transaction
|
||||
log.debug('txParams detected, rendering pending tx')
|
||||
return h(PendingTx, opts)
|
||||
|
||||
} else if (msgParams) {
|
||||
// This is a pending message to sign
|
||||
log.debug('msgParams detected, rendering pending msg')
|
||||
|
||||
if (type === 'eth_sign') {
|
||||
log.debug('rendering eth_sign message')
|
||||
return h(PendingMsg, opts)
|
||||
|
||||
} else if (type === 'personal_sign') {
|
||||
log.debug('rendering personal_sign message')
|
||||
return h(PendingPersonalMsg, opts)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) {
|
||||
if (!txData.txParams) return false
|
||||
var state = this.props
|
||||
var address = txData.txParams.from || state.selectedAddress
|
||||
var account = state.accounts[address]
|
||||
var props = this.props
|
||||
var address = txData.txParams.from || props.selectedAddress
|
||||
var account = props.accounts[address]
|
||||
var balance = account ? account.balance : '0x0'
|
||||
var maxCost = new BN(txData.maxCost, 16)
|
||||
|
||||
@ -150,9 +162,20 @@ ConfirmTxScreen.prototype.buyEth = function (address, event) {
|
||||
this.props.dispatch(actions.buyEthView(address))
|
||||
}
|
||||
|
||||
// Allows the detail view to update the gas calculations,
|
||||
// for manual gas controls.
|
||||
ConfirmTxScreen.prototype.onTxChange = function (txData) {
|
||||
log.debug(`conf-tx onTxChange triggered with ${JSON.stringify(txData)}`)
|
||||
this.setState({ txData })
|
||||
}
|
||||
|
||||
// Must default to any local state txData,
|
||||
// to allow manual override of gas calculations.
|
||||
ConfirmTxScreen.prototype.sendTransaction = function (txData, event) {
|
||||
event.stopPropagation()
|
||||
this.props.dispatch(actions.sendTx(txData))
|
||||
const state = this.state || {}
|
||||
const txMeta = state.txData
|
||||
this.props.dispatch(actions.updateAndApproveTx(txMeta || txData))
|
||||
}
|
||||
|
||||
ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) {
|
||||
@ -161,17 +184,33 @@ ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) {
|
||||
}
|
||||
|
||||
ConfirmTxScreen.prototype.signMessage = function (msgData, event) {
|
||||
log.info('conf-tx.js: signing message')
|
||||
var params = msgData.msgParams
|
||||
params.metamaskId = msgData.id
|
||||
event.stopPropagation()
|
||||
this.props.dispatch(actions.signMsg(params))
|
||||
}
|
||||
|
||||
ConfirmTxScreen.prototype.signPersonalMessage = function (msgData, event) {
|
||||
log.info('conf-tx.js: signing personal message')
|
||||
var params = msgData.msgParams
|
||||
params.metamaskId = msgData.id
|
||||
event.stopPropagation()
|
||||
this.props.dispatch(actions.signPersonalMsg(params))
|
||||
}
|
||||
|
||||
ConfirmTxScreen.prototype.cancelMessage = function (msgData, event) {
|
||||
log.info('canceling message')
|
||||
event.stopPropagation()
|
||||
this.props.dispatch(actions.cancelMsg(msgData))
|
||||
}
|
||||
|
||||
ConfirmTxScreen.prototype.cancelPersonalMessage = function (msgData, event) {
|
||||
log.info('canceling personal message')
|
||||
event.stopPropagation()
|
||||
this.props.dispatch(actions.cancelPersonalMsg(msgData))
|
||||
}
|
||||
|
||||
ConfirmTxScreen.prototype.goHome = function (event) {
|
||||
event.stopPropagation()
|
||||
this.props.dispatch(actions.goHome())
|
||||
|
||||
@ -410,11 +410,10 @@ input.large-input {
|
||||
}
|
||||
|
||||
.unapproved-tx-icon {
|
||||
height: 24px;
|
||||
background: #4dffff;
|
||||
border: solid;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
background: rgb(47, 174, 244);
|
||||
border-color: #AEAEAE;
|
||||
border-width: 0.5px;
|
||||
border-radius: 13px;
|
||||
}
|
||||
|
||||
|
||||
@ -6,14 +6,16 @@ const notification = require('../../../app/scripts/lib/notifications')
|
||||
module.exports = reduceApp
|
||||
|
||||
function reduceApp (state, action) {
|
||||
log.debug('App Reducer got ' + action.type)
|
||||
// clone and defaults
|
||||
const selectedAddress = state.metamask.selectedAddress
|
||||
const pendingTxs = hasPendingTxs(state)
|
||||
let pendingTxs = hasPendingTxs(state)
|
||||
let name = 'accounts'
|
||||
if (selectedAddress) {
|
||||
name = 'accountDetail'
|
||||
}
|
||||
if (pendingTxs) {
|
||||
log.debug('pending txs detected, defaulting to conf-tx view.')
|
||||
name = 'confTx'
|
||||
}
|
||||
|
||||
@ -294,27 +296,32 @@ function reduceApp (state, action) {
|
||||
},
|
||||
transForward: action.transForward,
|
||||
warning: null,
|
||||
isLoading: false,
|
||||
})
|
||||
|
||||
case actions.SHOW_CONF_MSG_PAGE:
|
||||
return extend(appState, {
|
||||
currentView: {
|
||||
name: 'confTx',
|
||||
name: pendingTxs ? 'confTx' : 'account-detail',
|
||||
context: 0,
|
||||
},
|
||||
transForward: true,
|
||||
warning: null,
|
||||
isLoading: false,
|
||||
})
|
||||
|
||||
case actions.COMPLETED_TX:
|
||||
var unapprovedTxs = state.metamask.unapprovedTxs
|
||||
var unapprovedMsgs = state.metamask.unapprovedMsgs
|
||||
var network = state.metamask.network
|
||||
log.debug('reducing COMPLETED_TX for tx ' + action.value)
|
||||
var { unapprovedTxs, unapprovedMsgs,
|
||||
unapprovedPersonalMsgs, network } = state.metamask
|
||||
|
||||
var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, network)
|
||||
.filter(tx => tx !== tx.id)
|
||||
var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network)
|
||||
.filter(tx => tx.id !== action.value )
|
||||
|
||||
if (unconfTxList && unconfTxList.length > 0) {
|
||||
pendingTxs = unconfTxList.length > 0
|
||||
|
||||
if (pendingTxs) {
|
||||
log.debug('reducer detected txs - rendering confTx view')
|
||||
return extend(appState, {
|
||||
transForward: false,
|
||||
currentView: {
|
||||
@ -324,6 +331,7 @@ function reduceApp (state, action) {
|
||||
warning: null,
|
||||
})
|
||||
} else {
|
||||
log.debug('attempting to close popup')
|
||||
notification.closePopup()
|
||||
|
||||
return extend(appState, {
|
||||
@ -572,11 +580,12 @@ function reduceApp (state, action) {
|
||||
}
|
||||
|
||||
function hasPendingTxs (state) {
|
||||
var unapprovedTxs = state.metamask.unapprovedTxs
|
||||
var unapprovedMsgs = state.metamask.unapprovedMsgs
|
||||
var network = state.metamask.network
|
||||
var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, network)
|
||||
return unconfTxList.length > 0
|
||||
var { unapprovedTxs, unapprovedMsgs,
|
||||
unapprovedPersonalMsgs, network } = state.metamask
|
||||
|
||||
var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network)
|
||||
var has = unconfTxList.length > 0
|
||||
return has
|
||||
}
|
||||
|
||||
function indexForPending (state, txId) {
|
||||
|
||||
@ -10,8 +10,6 @@ const addressSummary = require('./util').addressSummary
|
||||
const isHex = require('./util').isHex
|
||||
const EthBalance = require('./components/eth-balance')
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const RangeSlider = require('./components/range-slider')
|
||||
const Tooltip = require('./components/tooltip')
|
||||
module.exports = connect(mapStateToProps)(SendTransactionScreen)
|
||||
|
||||
function mapStateToProps (state) {
|
||||
@ -208,73 +206,6 @@ SendTransactionScreen.prototype.render = function () {
|
||||
},
|
||||
}),
|
||||
]),
|
||||
// custom gasPrice field
|
||||
h('h3.flex-center.text-transform-uppercase', {
|
||||
style: {
|
||||
background: '#EBEBEB',
|
||||
color: '#AEAEAE',
|
||||
marginBottom: '5px',
|
||||
},
|
||||
}, [
|
||||
'Transaction Fee (optional)',
|
||||
h(Tooltip, {
|
||||
title: `
|
||||
This is used to set the transaction's gas price.
|
||||
Setting it to 100% will use the full recommended value. `,
|
||||
}, [
|
||||
h('i.fa.fa-question-circle', {
|
||||
style: {
|
||||
marginLeft: '5px',
|
||||
},
|
||||
}),
|
||||
]),
|
||||
]),
|
||||
|
||||
h('section.flex-column.flex-center', [
|
||||
h('.flex-row', [
|
||||
h(RangeSlider, {
|
||||
name: 'gasInput',
|
||||
options: {
|
||||
mirrorInput: true,
|
||||
defaultValue: 100,
|
||||
min: 80,
|
||||
max: 220,
|
||||
},
|
||||
style: {
|
||||
container: {
|
||||
marginBottom: '16px',
|
||||
},
|
||||
range: {
|
||||
width: '68vw',
|
||||
},
|
||||
input: {
|
||||
width: '5em',
|
||||
marginLeft: '5px',
|
||||
},
|
||||
},
|
||||
}),
|
||||
|
||||
h('div', {
|
||||
style: {
|
||||
fontSize: '12px',
|
||||
paddingTop: '8px',
|
||||
paddingLeft: '5px',
|
||||
},
|
||||
}, '%'),
|
||||
]),
|
||||
h('.flex-row', {
|
||||
style: {
|
||||
justifyContent: 'space-between',
|
||||
width: '243px',
|
||||
position: 'relative',
|
||||
fontSize: '12px',
|
||||
right: '42px',
|
||||
bottom: '30px',
|
||||
},
|
||||
}, [
|
||||
h('span', 'Cheaper'), h('span', 'Faster'),
|
||||
]),
|
||||
]),
|
||||
])
|
||||
)
|
||||
}
|
||||
@ -289,12 +220,11 @@ SendTransactionScreen.prototype.back = function () {
|
||||
this.props.dispatch(actions.backToAccountDetail(address))
|
||||
}
|
||||
|
||||
SendTransactionScreen.prototype.onSubmit = function (gasPrice) {
|
||||
SendTransactionScreen.prototype.onSubmit = function () {
|
||||
const recipient = document.querySelector('input[name="address"]').value
|
||||
const input = document.querySelector('input[name="amount"]').value
|
||||
const value = util.normalizeEthStringToWei(input)
|
||||
const txData = document.querySelector('input[name="txData"]').value
|
||||
const gasMultiplier = document.querySelector('input[name="gasInput"]').value
|
||||
const balance = this.props.balance
|
||||
let message
|
||||
|
||||
@ -323,7 +253,6 @@ SendTransactionScreen.prototype.onSubmit = function (gasPrice) {
|
||||
var txParams = {
|
||||
from: this.props.address,
|
||||
value: '0x' + value.toString(16),
|
||||
gasMultiplier: gasMultiplier * 0.01,
|
||||
}
|
||||
|
||||
if (recipient) txParams.to = ethUtil.addHexPrefix(recipient)
|
||||
|
||||
@ -6,9 +6,10 @@ const configureStore = require('./app/store')
|
||||
const txHelper = require('./lib/tx-helper')
|
||||
module.exports = launchApp
|
||||
|
||||
let debugMode = window.METAMASK_DEBUG
|
||||
const log = require('loglevel')
|
||||
window.log = log
|
||||
log.setLevel('warn')
|
||||
log.setLevel(debugMode ? 'debug' : 'warn')
|
||||
|
||||
function launchApp (opts) {
|
||||
var accountManager = opts.accountManager
|
||||
@ -36,7 +37,7 @@ function startApp (metamaskState, accountManager, opts) {
|
||||
})
|
||||
|
||||
// if unconfirmed txs, start on txConf page
|
||||
var unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.network)
|
||||
var unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.network)
|
||||
if (unapprovedTxsAll.length > 0) {
|
||||
store.dispatch(actions.showConfTxPage())
|
||||
}
|
||||
|
||||
@ -1,13 +1,17 @@
|
||||
const valuesFor = require('../app/util').valuesFor
|
||||
|
||||
module.exports = function (unapprovedTxs, unapprovedMsgs, network) {
|
||||
module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network) {
|
||||
log.debug('tx-helper called with params:')
|
||||
log.debug({ unapprovedTxs, unapprovedMsgs, network })
|
||||
log.debug({ unapprovedTxs, unapprovedMsgs, personalMsgs, network })
|
||||
|
||||
var txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
|
||||
const txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
|
||||
log.debug(`tx helper found ${txValues.length} unapproved txs`)
|
||||
var msgValues = valuesFor(unapprovedMsgs)
|
||||
const msgValues = valuesFor(unapprovedMsgs)
|
||||
log.debug(`tx helper found ${msgValues.length} unsigned messages`)
|
||||
var allValues = txValues.concat(msgValues)
|
||||
let allValues = txValues.concat(msgValues)
|
||||
const personalValues = valuesFor(personalMsgs)
|
||||
log.debug(`tx helper found ${personalValues.length} unsigned personal messages`)
|
||||
allValues = allValues.concat(personalValues)
|
||||
|
||||
return allValues.sort(tx => tx.time)
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user