mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-10-23 20:05:27 +02:00
Get mascara to send a transaction in the ui
This commit is contained in:
parent
45ab81fb45
commit
412cc2394a
@ -11,7 +11,6 @@ module.exports = initializePopup
|
||||
|
||||
function initializePopup (connectionStream) {
|
||||
// setup app
|
||||
debugger
|
||||
connectToAccountManager(connectionStream, setupApp)
|
||||
}
|
||||
|
||||
|
@ -58,21 +58,17 @@ module.exports = class IndexDbController extends EventEmitter {
|
||||
})
|
||||
}
|
||||
|
||||
put (key, store) {
|
||||
return this.requestObjectStore(key, 'readwrite')
|
||||
put (state) {
|
||||
return this.requestObjectStore('dataStore', 'readwrite')
|
||||
.then((dataObject)=> {
|
||||
const putRequest = dataObject.put(store)
|
||||
const putRequest = dataObject.put(state, 'dataStore')
|
||||
putRequest.onsuccess = (event) => Promise.resolve(event.currentTarget.result)
|
||||
putRequest.onerror = (event) => Promise.reject(event)
|
||||
})
|
||||
}
|
||||
|
||||
update (key, value) {
|
||||
|
||||
}
|
||||
|
||||
migrate () {
|
||||
this.db.createObjectStore(this.name)
|
||||
this.db.createObjectStore('dataStore')
|
||||
}
|
||||
|
||||
_add (key, objStore, cb = logger) {
|
||||
|
@ -5,7 +5,6 @@ module.exports = setupIframe
|
||||
|
||||
|
||||
function setupIframe(opts) {
|
||||
debugger
|
||||
opts = opts || {}
|
||||
var frame = Iframe({
|
||||
src: opts.zeroClientProvider || 'https://zero.metamask.io/',
|
||||
|
@ -87,7 +87,7 @@ function loadStateFromPersistence() {
|
||||
const initialState = migrator.generateInitialState(firstTimeState)
|
||||
dbController.initialState = initialState
|
||||
return dbController.open()
|
||||
.then((stuff) => {
|
||||
.then((openRequest) => {
|
||||
return dbController.get('dataStore')
|
||||
})
|
||||
.then((data) => {
|
||||
@ -141,14 +141,14 @@ function setupController (initState, client) {
|
||||
// storeTransform(versionifyData),
|
||||
// diskStore
|
||||
// )
|
||||
controller.store.subscribe((store) => {
|
||||
dbController.put('dataStore', store)
|
||||
// .then((event) => {debugger})
|
||||
// .catch((err) => {debugger})
|
||||
controller.store.subscribe((state) => {
|
||||
dbController.put(versionifyData(controller.store))
|
||||
.catch((err) => {console.error(err)})
|
||||
})
|
||||
function versionifyData(state) {
|
||||
let versionedData = diskStore.getState()
|
||||
versionedData.data = state
|
||||
// let versionedData = diskStore.getState()
|
||||
// versionedData.data = state
|
||||
let versionedData = {data: state}
|
||||
return versionedData
|
||||
}
|
||||
|
||||
|
@ -14,7 +14,6 @@ log.setLevel(debugMode ? 'debug' : 'warn')
|
||||
function launchApp (opts) {
|
||||
var accountManager = opts.accountManager
|
||||
actions._setBackgroundConnection(accountManager)
|
||||
debugger
|
||||
// check if we are unlocked first
|
||||
accountManager.getState(function (err, metamaskState) {
|
||||
if (err) throw err
|
||||
|
Loading…
Reference in New Issue
Block a user