update version to 2.2.0

diff --git a/package.json b/package.json
index b55b77f..79fc027 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
     "name": "Byone",
     "description": "Bytom Chrome Extension Wallet",
-    "version": "2.1.4",
+    "version": "2.2.0",
     "author": "zhiting.fly@8btc.com",
     "license": "MIT",
     "private": true,
     "scripts": {
         "dev": "webpack --config ./build/webpack.dev.conf.js --watch --hot",
-        "build": "node build/build.js --env.minor",
+        "build": "npm run clear && node build/build.js --env.minor",
         "zip": "zip -q -r extension.zip dist",
         "clear": "rm -rf chrome-ext.crx extension.zip dist"
     },

diff --git a/src/background.js b/src/background.js
index 447cfba..1d9329e 100644 (file)
--- a/src/background.js
+++ b/src/background.js
@@ -193,37 +193,12 @@ export default class Background {
         const currentAccount =  bytom.currentAccount
         let account
         if(bytom.settings.netType === 'vapor'){
-          let vote
-          const votes = currentAccount.votes
-          if(votes && votes.length >0 ){
-            vote = _.sumBy(votes,'total')
-          }
-
-          let balances = currentAccount.vpBalances ||[]
-          balances = balances.map(({ inBtc, inCny, inUsd, name, ...keepAttrs}) => {
-            if(keepAttrs.asset === BTM)
-              return {availableBalance: (keepAttrs.balance-vote),...keepAttrs}
-              else
-                return keepAttrs
-          })
-
           account = {
             address: currentAccount.vpAddress,
-            alias:currentAccount.alias,
-            balances: balances|| [],
-            accountId: currentAccount.guid,
-            rootXPub: currentAccount.rootXPub
           };
         }else{
-          let balances = currentAccount.balances ||[]
-          balances = balances.map(({ inBtc, inCny, inUsd, name, ...keepAttrs}) => keepAttrs)
-
           account ={
             address: currentAccount.address,
-            alias:currentAccount.alias,
-            balances: balances|| [],
-            accountId: currentAccount.guid,
-            rootXPub: currentAccount.rootXPub
           };
         }
 

diff --git a/src/manifest.js b/src/manifest.js
index aff6a95..0f17cbf 100644 (file)
--- a/src/manifest.js
+++ b/src/manifest.js
@@ -2,7 +2,7 @@ module.exports = {
   manifest_version: 2,
   name: 'Byone',
   description: 'Bytom Wallet Chrome extension.',
-  version: '2.1.4',
+  version: '2.2.0',
   author: 'Bytom frontend, zhitinglin',
   web_accessible_resources: ['js/inject.js', 'wasm/main.wasm'],
   browser_action: {

diff --git a/src/models/transaction.js b/src/models/transaction.js
index ef897c5..c112acd 100644 (file)
--- a/src/models/transaction.js
+++ b/src/models/transaction.js
@@ -88,10 +88,10 @@ transaction.buildVeto = function(address, vote, amount, confirmations, memo) {
   return retPromise;
 };
 
-transaction.buildTransaction = function(guid, inputs, outputs, gas, confirmations) {
+transaction.buildTransaction = function(address, inputs, outputs, gas, confirmations) {
   let retPromise = new Promise((resolve, reject) => {
     bytom.transaction
-      .buildTransaction(guid, inputs, outputs, gas, confirmations)
+      .buildTransaction(address, inputs, outputs, gas, confirmations)
       .then(res => {
         resolve(res);
       })
@@ -124,7 +124,10 @@ transaction.transfer = function(guid, transaction, password, address) {
         bytom.transaction
           .submitPayment(address, ret.raw_transaction, ret.signatures)
           .then(res3 => {
-            resolve(res3);
+            const object ={
+              transactionHash: res3.txHash
+            }
+            resolve(object);
           })
           .catch(error => {
             reject(error);
@@ -143,19 +146,22 @@ transaction.signMessage = function(message, password, address) {
   return bytom.keys.signMessage(message, password,address);
 };
 
-transaction.advancedTransfer = function(guid, transaction, password, arrayData) {
+transaction.advancedTransfer = function(guid, transaction, password, arrayData, address) {
   let retPromise = new Promise((resolve, reject) => {
     bytom.transaction
-      .signTransaction(guid, JSON.stringify(transaction), password)
+      .signTransaction(guid, JSON.stringify(snakeize(transaction)), password)
       .then(ret => {
         let signatures = ret.signatures
         if(arrayData){
           signatures[0] = arrayData
         }
         bytom.transaction
-          .submitPayment(guid, ret.raw_transaction, signatures)
+          .submitPayment(address, ret.raw_transaction, signatures)
           .then(res3 => {
-            resolve(res3);
+            const object ={
+              transactionHash: res3.txHash
+            }
+            resolve(object);
           })
           .catch(error => {
             reject(error);

diff --git a/src/utils/constants.js b/src/utils/constants.js
index f13592f..1433b2c 100644 (file)
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -21,11 +21,11 @@ export const camelize = (object) => {
 }
 
 export const networks = {
-  mainnet:'https://bcapi.bystack.com',
+  mainnet:'https://bcapi.movapi.com',
 }
 
 export const networksJS = {
-  mainnet: `${networks['mainnet']}/api/v2/btm/`,
-  mainnetvapor: `${networks['mainnet']}/api/v2/vapor/`
+  mainnet: `${networks['mainnet']}/bytom/v3/`,
+  mainnetvapor: `${networks['mainnet']}/vapor/v3/` ,
 }
 

diff --git a/src/views/assetList.vue b/src/views/assetList.vue
index 3167943..2cc3d9e 100644 (file)
--- a/src/views/assetList.vue
+++ b/src/views/assetList.vue
@@ -339,7 +339,7 @@ export default {
                 formattedTransactions.push(transaction);
               }else{
                 transaction.val =  0
-                transaction.address = address.short(this.currentAccount.address)
+                transaction.address = address.short(this.address)
 
                 formattedTransactions.push(transaction);
               }

diff --git a/src/views/sendTransaction/advancedTransfer.vue b/src/views/sendTransaction/advancedTransfer.vue
index b02018c..e3d75b4 100644 (file)
--- a/src/views/sendTransaction/advancedTransfer.vue
+++ b/src/views/sendTransaction/advancedTransfer.vue
@@ -169,6 +169,13 @@ export default {
         };
     },
     computed: {
+      address: function(){
+        if(this.netType === 'vapor'){
+          return this.currentAccount.vpAddress
+        }else{
+          return this.currentAccount.address
+        }
+      },
       ...mapGetters([
         'currentAccount',
         'net',
@@ -189,14 +196,14 @@ export default {
                 onCancel: this.onCancel
             });
 
-            transaction.buildTransaction(this.currentAccount.guid,  this.transaction.input, this.transaction.output, this.transaction.fee , this.transaction.confirmations).then(async (result) => {
+            transaction.buildTransaction(this.address,  this.transaction.input, this.transaction.output, this.transaction.fee , this.transaction.confirmations).then(async (result) => {
 
               let arrayData
               if(this.transaction.args){
                 arrayData =  await transaction.convertArgument(this.transaction.args)
               }
 
-              return transaction.advancedTransfer(this.currentAccount.guid, result, this.password, arrayData)
+              return transaction.advancedTransfer(this.currentAccount.guid, result[0], this.password, arrayData, this.address)
                   .then((resp) => {
                       loader.hide();
                       this.prompt.responder(resp);
@@ -252,8 +259,8 @@ export default {
                     return this.queryAsset(key).then(resp =>{
                       return {
                         'asset': key,
-                        'alias':resp.alias,
-                        'amount':Num.formatNue( _.sumBy(objs, 'amount'), resp.decimals)
+                        'alias':resp.symbol,
+                        'amount': _.sumBy(objs, 'amount')
                       }
                     })
                   })

diff --git a/src/views/sendTransaction/signMessage.vue b/src/views/sendTransaction/signMessage.vue
index 54819fc..97481c4 100644 (file)
--- a/src/views/sendTransaction/signMessage.vue
+++ b/src/views/sendTransaction/signMessage.vue
@@ -159,6 +159,8 @@ import getLang from "@/assets/language/sdk";
 import { BTM } from "@/utils/constants";
 import {apis} from '@/utils/BrowserApis';
 import NotificationService from '../../services/NotificationService'
+import { mapGetters } from 'vuex'
+
 
 export default {
     data() {
@@ -174,6 +176,11 @@ export default {
         };
     },
     computed: {
+      ...mapGetters([
+        'net',
+        'netType',
+        'accountList'
+      ])
     },
     watch: {
     },
@@ -215,20 +222,17 @@ export default {
             this.message = object.message
         }
 
-        account.setupNet(localStorage.bytomNet);
-        account.list().then(accounts => {
-          const account = accounts.filter(a => a.address === this.address)[0]
+        const account = this.accountList.filter(a => (a.address === this.address || a.vpAddress === this.address) )[0]
+        this.account = account
 
-          const balances = account.balances
-          let balance = 0
-          if(balances.length > 0){
-            const balanceObject = balances.filter(b => b.asset === BTM)[0]
-            balance = balanceObject.balance/Math.pow(10,balanceObject.decimals)
-          }
-          this.accountBalance = balance
+        const balances = this.netType ==='vapor'? account.vpBalances : account.balances
+        let balance = 0
+        if(balances.length > 0){
+          const balanceObject = balances.filter(b => b.asset.assetId === BTM)[0]
+          balance = balanceObject.availableBalance
+        }
 
-          this.account = account
-        });
+        this.accountBalance = balance
       }
 };
 </script>

diff --git a/src/views/sendTransaction/transfer.vue b/src/views/sendTransaction/transfer.vue
index d0583ae..cf1936c 100644 (file)
--- a/src/views/sendTransaction/transfer.vue
+++ b/src/views/sendTransaction/transfer.vue
@@ -331,8 +331,9 @@ export default {
         //detect injection
         if(this.$route.query.type === 'popup'){
           if (this.$route.query.from != undefined) {
-              this.guid = this.$route.query.from
-              this.account = this.accountList.filter(e => e.guid === this.guid)[0]
+              this.address = this.$route.query.from
+              this.guid = this.currentAccount.guid
+              this.account = this.currentAccount
           }
 
           if (this.$route.query.asset != undefined) {
@@ -341,9 +342,7 @@ export default {
             this.transaction.asset= currentAssetId
 
             const assets = this.assets
-            this.selectAsset = assets.filter(b => b.asset === currentAssetId.toLowerCase())[0]
-
-
+            this.selectAsset = assets.filter(b => b.assetId === currentAssetId.toLowerCase())[0]
           }
           if (this.$route.query.to != undefined) {
               this.transaction.to = this.$route.query.to