Merge pull request #1149 from MetaMask/i1114-AddPersonalSign
Add personal_signfeature/default_network_editable
Dan Finlay
8 years ago
committed by
GitHub
commit
ab01fef1c0
@ -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 |
||||
@ -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 |
||||
} |
||||
@ -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": {} |
||||
} |
||||
@ -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() |
||||
}) |
||||
}) |
||||
}) |
||||
}) |
||||
@ -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') |
||||
}) |
||||
}) |
||||
}) |
||||
@ -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, |
||||
}), |
||||
]), |
||||
|
||||
]) |
||||
) |
||||
} |
||||
|
||||
@ -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,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