Merge pull request #683 from pqv199x/webpack

change config storage name

app/app.js

@@ -79,7 +79,7 @@ Vue.prototype.setupProvider = async function (provider, wjs) {
     Vue.prototype.NetworkProvider = provider
     if (wjs instanceof Web3) {
         const config = await getConfig()
-        localStorage.set('config', config)
+        localStorage.set('configMaster', config)
         Vue.prototype.web3 = wjs
         Vue.prototype.TomoValidator = new wjs.eth.Contract(
             TomoValidatorArtifacts.abi,
@@ -381,7 +381,7 @@ getConfig().then((config) => {
     // let provider = 'tomowallet'
     // var web3js = new Web3(new Web3.providers.HttpProvider(config.blockchain.rpc))
     // Vue.prototype.setupProvider(provider, web3js)
-    localStorage.set('config', config)
+    localStorage.set('configMaster', config)
     Vue.use(VueAnalytics, {
         id: config.GA,
         linkers: ['tomochain.com'],
@@ -405,7 +405,7 @@ const store = new Vuex.Store({
 Vue.prototype.detectNetwork = async function (provider) {
     try {
         let wjs = this.web3
-        const config = localStorage.get('config') || await getConfig()
+        const config = localStorage.get('configMaster') || await getConfig()
         const chainConfig = config.blockchain
         if (!wjs) {
             switch (provider) {
@@ -462,7 +462,7 @@ Vue.prototype.signTransaction = async function (txParams) {
     const provider = Vue.prototype.NetworkProvider
     let signature
     if (provider === 'ledger') {
-        const config = localStorage.get('config') || await getConfig()
+        const config = localStorage.get('configMaster') || await getConfig()
         const chainConfig = config.blockchain
         const rawTx = new Transaction(txParams)
         rawTx.v = Buffer.from([chainConfig.networkId])

app/components/Setting.vue

@@ -436,7 +436,7 @@ export default {
         this.provider = this.NetworkProvider || 'tomowallet'
         let self = this
         self.hdWallets = self.hdWallets || {}
-        self.config = store.get('config') || await self.appConfig()
+        self.config = store.get('configMaster') || await self.appConfig()
         self.chainConfig = self.config.blockchain || {}
         self.networks.rpc = self.chainConfig.rpc
 

app/components/candidates/Apply.vue

@@ -197,7 +197,7 @@ export default {
     created: async function () {
         const self = this
         let account
-        self.config = store.get('config') || await self.appConfig()
+        self.config = store.get('configMaster') || await self.appConfig()
         self.chainConfig = self.config.blockchain || {}
         try {
             self.isReady = !!self.web3

app/components/candidates/List.vue

@@ -221,7 +221,7 @@ export default {
         let self = this
         let account
         self.isReady = !!self.web3
-        const config = store.get('config') || await self.appConfig()
+        const config = store.get('configMaster') || await self.appConfig()
         self.chainConfig = config.blockchain
         self.currentBlock = self.chainConfig.blockNumber
 

app/components/candidates/Resign.vue

@@ -103,7 +103,7 @@ export default {
     created: async function () {
         let self = this
         let account
-        self.config = store.get('config') || await self.appConfig()
+        self.config = store.get('configMaster') || await self.appConfig()
         self.chainConfig = self.config.blockchain || {}
         self.isReady = !!self.web3
         self.gasPrice = await self.web3.eth.getGasPrice()

app/components/candidates/View.vue

@@ -630,7 +630,7 @@ export default {
     },
     created: async function () {
         let self = this
-        self.config = store.get('config') || await this.appConfig()
+        self.config = store.get('configMaster') || await this.appConfig()
         self.currentBlock = self.config.blockchain.blockNumber
         self.isReady = !!self.web3
         try {

app/components/candidates/Withdraw.vue

@@ -143,7 +143,7 @@ export default {
     },
     async mounted () {
         const self = this
-        self.config = store.get('config') || await self.appConfig()
+        self.config = store.get('configMaster') || await self.appConfig()
         self.chainConfig = self.config.blockchain || {}
         self.isReady = !!this.web3
         if (!self.coinbase) {

app/components/voters/Confirm.vue

@@ -62,7 +62,7 @@ export default {
     updated () {},
     created: async function () {
         let self = this
-        self.config = store.get('config') || await self.appConfig()
+        self.config = store.get('configMaster') || await self.appConfig()
 
         axios.get(`/api/transactions/${self.tx}`).then(function (response) {
             if (response.data == null) {

app/components/voters/Unvoting.vue

@@ -262,7 +262,7 @@ export default {
         let candidate = self.candidate
         let account
         self.loadingPage = true
-        self.config = store.get('config') || await self.appConfig()
+        self.config = store.get('configMaster') || await self.appConfig()
         self.chainConfig = self.config.blockchain || {}
         self.gasPrice = await self.web3.eth.getGasPrice()
         self.txFee = new BigNumber(this.chainConfig.gas * self.gasPrice).div(10 ** 18).toString(10)

app/components/voters/View.vue

@@ -418,7 +418,7 @@ export default {
     update () {},
     created: async function () {
         let self = this
-        self.config = store.get('config') || await self.appConfig()
+        self.config = store.get('configMaster') || await self.appConfig()
 
         self.getCandidates()
         self.getRewards()

app/components/voters/Voting.vue

@@ -220,7 +220,7 @@ export default {
     created: async function () {
         let self = this
         let account
-        self.config = store.get('config') || await self.appConfig()
+        self.config = store.get('configMaster') || await self.appConfig()
         self.chainConfig = self.config.blockchain || {}
         self.isReady = !!self.web3
         self.gasPrice = await self.web3.eth.getGasPrice()