m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Add accounts back to metamask state

Browse Source
This commit is contained in:
Dan Finlay 2016-09-12 14:22:06 -07:00
parent 6fcbb43c50
commit 0d11eab8cb
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/lib/idStore.js
View File

@ -148,6 +148,10 @@ IdentityStore.prototype.revealAccount = function (cb) {
keyStore.setDefaultHdDerivationPath(this.hdPathString) keyStore.setDefaultHdDerivationPath(this.hdPathString)
keyStore.generateNewAddress(derivedKey, 1) keyStore.generateNewAddress(derivedKey, 1)
const addresses = ks.getAddresses();
const address = addresses[ addresses.length -1 ]
this._ethStore.addAccount(ethUtil.addHexPrefix(address))
configManager.setWallet(keyStore.serialize()) configManager.setWallet(keyStore.serialize())
@ -496,7 +500,7 @@ IdentityStore.prototype._createIdMgmt = function (derivedKey) {
IdentityStore.prototype.purgeCache = function () { IdentityStore.prototype.purgeCache = function () {
this._getAddresses().forEach((address) => { this._getAddresses().forEach((address) => {
this._ethStore.del(address) this._ethStore.del(ethUtil.addHexPrefix(address))
}) })
} }

2
development/states.js
View File

File diff suppressed because one or more lines are too long

6
development/states/account-detail.json
View File

@ -33,20 +33,20 @@
"accounts": { "accounts": {
"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": { "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
"code": "0x", "code": "0x",
"balance": "0x0", "balance": "0x100000000000",
"nonce": "0x0", "nonce": "0x0",
"address": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc" "address": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"
}, },
"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b": { "0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b": {
"code": "0x", "code": "0x",
"nonce": "0x0", "nonce": "0x0",
"balance": "0x0", "balance": "0x100000000000",
"address": "0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b" "address": "0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b"
}, },
"0xeb9e64b93097bc15f01f13eae97015c57ab64823": { "0xeb9e64b93097bc15f01f13eae97015c57ab64823": {
"code": "0x", "code": "0x",
"nonce": "0x0", "nonce": "0x0",
"balance": "0x0", "balance": "0x100000000000",
"address": "0xeb9e64b93097bc15f01f13eae97015c57ab64823" "address": "0xeb9e64b93097bc15f01f13eae97015c57ab64823"
}, },
"0x704107d04affddd9b66ab9de3dd7b095852e9b69": { "0x704107d04affddd9b66ab9de3dd7b095852e9b69": {

8
development/states/accounts.json
View File

@ -29,25 +29,25 @@
"unconfTxs": {}, "unconfTxs": {},
"accounts": { "accounts": {
"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": { "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
"balance": "0x0", "balance": "0x100000000000000",
"nonce": "0x0", "nonce": "0x0",
"code": "0x", "code": "0x",
"address": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc" "address": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"
}, },
"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b": { "0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b": {
"balance": "0x0", "balance": "0x100000000000000",
"nonce": "0x0", "nonce": "0x0",
"code": "0x", "code": "0x",
"address": "0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b" "address": "0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b"
}, },
"0xeb9e64b93097bc15f01f13eae97015c57ab64823": { "0xeb9e64b93097bc15f01f13eae97015c57ab64823": {
"balance": "0x0", "balance": "0x100000000000",
"nonce": "0x0", "nonce": "0x0",
"code": "0x", "code": "0x",
"address": "0xeb9e64b93097bc15f01f13eae97015c57ab64823" "address": "0xeb9e64b93097bc15f01f13eae97015c57ab64823"
}, },
"0x704107d04affddd9b66ab9de3dd7b095852e9b69": { "0x704107d04affddd9b66ab9de3dd7b095852e9b69": {
"balance": "0x0", "balance": "0x100000000000",
"code": "0x", "code": "0x",
"nonce": "0x0", "nonce": "0x0",
"address": "0x704107d04affddd9b66ab9de3dd7b095852e9b69" "address": "0x704107d04affddd9b66ab9de3dd7b095852e9b69"

10
ui/app/accounts/account-list-item.js
View File

@ -7,14 +7,14 @@ const EthBalance = require('../components/eth-balance')
const CopyButton = require('../components/copyButton') const CopyButton = require('../components/copyButton')
const Identicon = require('../components/identicon') const Identicon = require('../components/identicon')
module.exports = NewComponent module.exports = AccountListItem
inherits(NewComponent, Component) inherits(AccountListItem, Component)
function NewComponent () { function AccountListItem () {
Component.call(this) Component.call(this)
} }
NewComponent.prototype.render = function () { AccountListItem.prototype.render = function () {
const identity = this.props.identity const identity = this.props.identity
var isSelected = this.props.selectedAddress === identity.address var isSelected = this.props.selectedAddress === identity.address
var account = this.props.accounts[identity.address] var account = this.props.accounts[identity.address]
@ -73,7 +73,7 @@ NewComponent.prototype.render = function () {
) )
} }
NewComponent.prototype.pendingOrNot = function () { AccountListItem.prototype.pendingOrNot = function () {
const pending = this.props.pending const pending = this.props.pending
if (pending.length === 0) return null if (pending.length === 0) return null
return h('.pending-dot', pending.length) return h('.pending-dot', pending.length)