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

tx controller - tx state history various small fixes

Browse Source
This commit is contained in:
kumavis 2017-08-14 19:15:36 -07:00
parent fec0f2ca5e
commit 1af797b1b3
5 changed files with 13637 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/controllers/transactions.js
View File

@ -1,6 +1,5 @@
const EventEmitter = require('events') const EventEmitter = require('events')
const extend = require('xtend') const extend = require('xtend')
const clone = require('clone')
const ObservableStore = require('obs-store') const ObservableStore = require('obs-store')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
const EthQuery = require('ethjs-query') const EthQuery = require('ethjs-query')

2
app/scripts/lib/tx-state-history-helper.js
View File

@ -15,7 +15,7 @@ function migrateFromSnapshotsToDiffs(longHistory) {
// convert non-initial history entries into diffs // convert non-initial history entries into diffs
.map((entry, index) => { .map((entry, index) => {
if (index === 0) return entry if (index === 0) return entry
return generateHistoryEntry(longHistory[index-1], entry) return generateHistoryEntry(longHistory[index - 1], entry)
}) })
) )
} }

2
app/scripts/migrations/018.js
View File

@ -32,7 +32,7 @@ function transformState (state) {
const transactions = newState.TransactionController.transactions const transactions = newState.TransactionController.transactions
newState.TransactionController.transactions = transactions.map((txMeta) => { newState.TransactionController.transactions = transactions.map((txMeta) => {
// no history: initialize // no history: initialize
if (!txMeta.history || tx.history.length === 0) { if (!txMeta.history || txMeta.history.length === 0) {
const snapshot = txStateHistoryHelper.snapshotFromTxMeta(txMeta) const snapshot = txStateHistoryHelper.snapshotFromTxMeta(txMeta)
txMeta.history = [snapshot] txMeta.history = [snapshot]
return txMeta return txMeta

2
test/unit/tx-state-history-helper.js
View File

@ -3,7 +3,7 @@ const txStateHistoryHelper = require('../../app/scripts/lib/tx-state-history-hel
const testVault = require('../data/v17-long-history.json') const testVault = require('../data/v17-long-history.json')
describe('history-differ', function () { describe('tx-state-history-helper', function () {
it('migrates history to diffs and can recover original values', function () { it('migrates history to diffs and can recover original values', function () {
testVault.data.TransactionController.transactions.forEach((tx, index) => { testVault.data.TransactionController.transactions.forEach((tx, index) => {
const newHistory = txStateHistoryHelper.migrateFromSnapshotsToDiffs(tx.history) const newHistory = txStateHistoryHelper.migrateFromSnapshotsToDiffs(tx.history)

13634
xyz.json Normal file
View File

File diff suppressed because it is too large Load Diff