@haloplatform/vuex-web3-sync
Advanced tools
Comparing version 0.2.8 to 0.2.9
@@ -196,3 +196,3 @@ 'use strict'; | ||
} else { | ||
if (state.coinbase !== coinbase) commit('setCoinbase', coinbase || state.web3.address); | ||
if (state.web3.coinbase !== coinbase) commit('setCoinbase', coinbase || state.web3.address); | ||
resolve(coinbase); | ||
@@ -216,3 +216,3 @@ } | ||
var balance = state.web3.instance().fromWei(result.toString(10), 'ether'); | ||
if (state.balance !== balance) commit('setBalance', balance); | ||
if (state.web3.balance !== balance) commit('setBalance', balance); | ||
resolve(balance); | ||
@@ -257,2 +257,3 @@ } | ||
commit = _ref7.commit; | ||
var address, isUnlocked, isConnected; | ||
return regeneratorRuntime.wrap(function _callee2$(_context2) { | ||
@@ -269,47 +270,49 @@ while (1) { | ||
_context2.prev = 3; | ||
_context2.t0 = commit; | ||
_context2.next = 7; | ||
_context2.next = 6; | ||
return dispatch('getCoinbase'); | ||
case 7: | ||
_context2.t1 = _context2.sent; | ||
(0, _context2.t0)('setAddress', _context2.t1); | ||
_context2.next = 14; | ||
case 6: | ||
address = _context2.sent; | ||
if (address !== state.web3.address) commit('setAddress', address); | ||
_context2.next = 13; | ||
break; | ||
case 11: | ||
_context2.prev = 11; | ||
_context2.t2 = _context2['catch'](3); | ||
case 10: | ||
_context2.prev = 10; | ||
_context2.t0 = _context2['catch'](3); | ||
console.log('get coinbase error:', _context2.t2); | ||
console.log('get coinbase error:', _context2.t0); | ||
case 14: | ||
_context2.prev = 14; | ||
_context2.next = 17; | ||
case 13: | ||
_context2.prev = 13; | ||
_context2.next = 16; | ||
return dispatch('getBalance'); | ||
case 17: | ||
_context2.next = 22; | ||
case 16: | ||
_context2.next = 21; | ||
break; | ||
case 19: | ||
_context2.prev = 19; | ||
_context2.t3 = _context2['catch'](14); | ||
case 18: | ||
_context2.prev = 18; | ||
_context2.t1 = _context2['catch'](13); | ||
console.log('get balance error:', _context2.t3); | ||
console.log('get balance error:', _context2.t1); | ||
case 22: | ||
_context2.t4 = commit; | ||
_context2.next = 25; | ||
case 21: | ||
_context2.next = 23; | ||
return dispatch('checkUnlock'); | ||
case 25: | ||
_context2.t5 = _context2.sent; | ||
(0, _context2.t4)('setUnlock', _context2.t5); | ||
case 23: | ||
isUnlocked = _context2.sent; | ||
commit('setConnected', state.web3.instance().isConnected()); | ||
if (isUnlocked !== state.web3.isUnlocked) commit('setUnlock', isUnlocked); | ||
isConnected = state.web3.instance().isConnected(); | ||
if (isConnected !== state.web3.isConnected) commit('setConnected', isConnected); | ||
_context2.next = 0; | ||
break; | ||
case 30: | ||
case 29: | ||
case 'end': | ||
@@ -319,3 +322,3 @@ return _context2.stop(); | ||
} | ||
}, _callee2, this, [[3, 11], [14, 19]]); | ||
}, _callee2, this, [[3, 10], [13, 18]]); | ||
})); | ||
@@ -322,0 +325,0 @@ |
{ | ||
"name": "@haloplatform/vuex-web3-sync", | ||
"version": "0.2.8", | ||
"version": "0.2.9", | ||
"description": "Web3 Vuex synchronization module", | ||
@@ -5,0 +5,0 @@ "main": "dist/module.js", |
@@ -37,3 +37,3 @@ import Web3 from 'web3' | ||
} else { | ||
if (state.coinbase !== coinbase) commit('setCoinbase', coinbase || state.web3.address) | ||
if (state.web3.coinbase !== coinbase) commit('setCoinbase', coinbase || state.web3.address) | ||
resolve(coinbase) | ||
@@ -54,3 +54,3 @@ } | ||
const balance = state.web3.instance().fromWei(result.toString(10), 'ether') | ||
if (state.balance !== balance) commit('setBalance', balance) | ||
if (state.web3.balance !== balance) commit('setBalance', balance) | ||
resolve(balance) | ||
@@ -73,3 +73,4 @@ } | ||
try { | ||
commit('setAddress', await dispatch('getCoinbase')) | ||
const address = await dispatch('getCoinbase') | ||
if (address !== state.web3.address) commit('setAddress', address) | ||
} catch (err) { | ||
@@ -83,4 +84,8 @@ console.log('get coinbase error:', err) | ||
} | ||
commit('setUnlock', await dispatch('checkUnlock')) | ||
commit('setConnected', state.web3.instance().isConnected()) | ||
const isUnlocked = await dispatch('checkUnlock') | ||
if (isUnlocked !== state.web3.isUnlocked) commit('setUnlock', isUnlocked) | ||
const isConnected = state.web3.instance().isConnected() | ||
if (isConnected !== state.web3.isConnected) commit('setConnected', isConnected) | ||
} | ||
@@ -87,0 +92,0 @@ }, |
20629
576