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

web3-provider - add nonce tracker

Browse Source
This commit is contained in:
kumavis 2016-02-20 12:13:18 -08:00
parent bdf262fb18
commit 4b8be94f51
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/background.js
View File

@ -4,7 +4,6 @@ const extend = require('xtend')
const EthStore = require('eth-store') const EthStore = require('eth-store')
const PortStream = require('./lib/port-stream.js') const PortStream = require('./lib/port-stream.js')
const MetaMaskProvider = require('./lib/metamask-provider') const MetaMaskProvider = require('./lib/metamask-provider')
// const IdentityManager = require('./lib/idmgmt')
const IdentityStore = require('./lib/idStore') const IdentityStore = require('./lib/idStore')
console.log('ready to roll') console.log('ready to roll')
@ -41,7 +40,8 @@ var zeroClient = MetaMaskProvider({
var result = selectedAddress ? [selectedAddress] : [] var result = selectedAddress ? [selectedAddress] : []
cb(null, result) cb(null, result)
}, },
signTransaction: idStore.addUnconfirmedTransaction.bind(idStore), approveTx: idStore.addUnconfirmedTransaction.bind(idStore),
signTransaction: idStore.signTransaction.bind(idStore),
}) })
var ethStore = new EthStore(zeroClient) var ethStore = new EthStore(zeroClient)
idStore.setStore(ethStore) idStore.setStore(ethStore)

5
app/scripts/lib/metamask-provider.js
View File

@ -1,4 +1,5 @@
const ProviderEngine = require('web3-provider-engine') const ProviderEngine = require('web3-provider-engine')
const NonceTrackerSubprovider = require('web3-provider-engine/subproviders/nonce-tracker.js')
const CacheSubprovider = require('web3-provider-engine/subproviders/cache.js') const CacheSubprovider = require('web3-provider-engine/subproviders/cache.js')
const FixtureSubprovider = require('web3-provider-engine/subproviders/fixture.js') const FixtureSubprovider = require('web3-provider-engine/subproviders/fixture.js')
const FilterSubprovider = require('web3-provider-engine/subproviders/filters.js') const FilterSubprovider = require('web3-provider-engine/subproviders/filters.js')
@ -12,6 +13,9 @@ function metamaskProvider(opts){
var engine = new ProviderEngine() var engine = new ProviderEngine()
// nonce tracker
engine.addProvider(new NonceTrackerSubprovider())
// cache layer // cache layer
engine.addProvider(new CacheSubprovider()) engine.addProvider(new CacheSubprovider())
@ -33,6 +37,7 @@ function metamaskProvider(opts){
// id mgmt // id mgmt
engine.addProvider(new HookedWalletSubprovider({ engine.addProvider(new HookedWalletSubprovider({
getAccounts: opts.getAccounts, getAccounts: opts.getAccounts,
approveTx: opts.approveTx,
signTransaction: opts.signTransaction, signTransaction: opts.signTransaction,
})) }))