BUGFIX

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wayki-max",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Wicc web wallet for chrome and firefox.",
   "author": "coredev@waykichainhk.com",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "vue-slider-component": "^2.8.16",
     "vue2-toast": "^2.0.2",
     "vuex": "^3.1.1",
-    "wicc-wallet-lib": "^2.0.0"
+    "wicc-wallet-lib": "^2.1.0"
   },
   "scripts": {
     "lint": "eslint --ext .js,.vue src",
@@ -86,4 +86,4 @@
     "webpack-merge": "^4.1.0",
     "ws": "3.3.2"
   }
-}
+}

src/backend/wallet/baas-api.js

@@ -19,12 +19,12 @@ const handleError = (error) => {
 export default class {
   constructor(network) {
     this.network = network || 'testnet'
-    if (localStorage.getItem('myselfNetWork')){
+    if (localStorage.getItem('myselfNetWork')) {
       this.host = JSON.parse(localStorage.getItem('myselfNetWork')).url
-    }else{
+    } else {
       if (this.network === 'mainnet') {
         this.host = BAAS_MAINNET
-      }else if (this.network === 'testnet') {
+      } else if (this.network === 'testnet') {
         this.host = BAAS_TESTNET
       }
     }
@@ -39,7 +39,7 @@ export default class {
   }
 
   getAccountInfo(address) {
-    return axios.post(this.host + '/account/getaccountinfo',{'address':address}).then(handleResponse, handleError)
+    return axios.post(this.host + '/account/getaccountinfo', { 'address': address }).then(handleResponse, handleError)
   }
 
   getTxDetail(tx) {
@@ -52,7 +52,7 @@ export default class {
   ///查询ERC20代币详情
   getTokenInfo(regId, address) {
     // alert(this.host + '/contract/getcontractaccountinfo'+address+regId)
-    return axios.post(this.host + '/contract/getcontractaccountinfo',{
+    return axios.post(this.host + '/contract/getcontractaccountinfo', {
       'address': address,
       'contractregid': regId.trim()
     })
@@ -71,23 +71,23 @@ export default class {
   ///获取wicc，wusd，wgrt交易记录
   getTransHistory(info) {
     if (!info.address) throw new Error('address is required.')
-    return axios.post(this.host + '/transaction/gettranscationsbyaddressplus', {
-        "address": info.address,
-        "currentpage": info.currentpage,
-        "pagesize": info.pagesize,
-        "startheight": 1,
-        "trandirection": 0,
-        "txtype": "",
-        "coinsymbol":info.coinsymbol,
+    return axios.post(this.host + '/transaction/getwallettranscationsbyaddressplus', {
+      "address": info.address,
+      "currentpage": info.currentpage,
+      "pagesize": info.pagesize,
+      "startheight": 1,
+      "trandirection": 0,
+      "txtype": "",
+      "coinsymbol": info.coinsymbol,
     }).then(handleResponse, handleError)
   }
   ///获取
-  getDetailInfo(info){
+  getDetailInfo(info) {
     return axios.post(this.host + '/transaction/gettxdetailplus', info).then(handleResponse, handleError)
   }
 
   ///根据代号查询发型资产详情
-  getAssetInfo(info){
+  getAssetInfo(info) {
     return axios.post(this.host + '/asset/getasset', info).then(handleResponse, handleError)
   }
   //获取插件钱包最新版本号

src/backend/wallet/index.js

@@ -29,7 +29,7 @@ const getSignInfo = (network, address) => {
   let srcRegId = ""
   const localRegid = localStorage.getItem('srcRegID')
   srcRegId = localRegid ? localRegid : ""
-  if (srcRegId!="") {
+  if (srcRegId != "") {
     return baasApi.getblockcount().then((data) => {
       const height = data
       const privateKey = vaultStorage.getPrivateKey(address)
@@ -42,7 +42,7 @@ const getSignInfo = (network, address) => {
   }
   return baasApi.getAccountInfo(address).then((data) => {
     srcRegId = data.regid ? data.regid : ""
-    localStorage.setItem('srcRegID',srcRegId)
+    localStorage.setItem('srcRegID', srcRegId)
     return baasApi.getblockcount()
   }).then((data) => {
     const height = data
@@ -341,7 +341,7 @@ export default {
     return {
       network,
       address: activeAddress,
-      regid:localRegid?localRegid:"", 
+      regid: localRegid ? localRegid : "",
     }
   },
   getTransHistory({
@@ -762,7 +762,9 @@ export default {
         coinType: info.coinType,
         assetType: info.assetType
       };
+      console.log('will get dexPriceBuy hex');
       let hex = wiccApi.dexPriceBuy(dexBuyLimitTxinfo)
+      console.log('hex', hex);
       return new BaasAPI(localNetWork).submitOfflineTrans(hex)
     })
   },
@@ -862,7 +864,7 @@ export default {
         throw new Error('INVALID_VALUE')
       }
       let hex = wiccApi.createVariousCoinsTx(privateKey, height, srcRegId, info.destAddr, info.value, info.fees, info.coinType, info.feeSymbol, localNetWork, info.memo)
-      return {rawtx:hex}
+      return { rawtx: hex }
     })
   },
 
@@ -914,13 +916,13 @@ export default {
         feesName: info.feesName,
 
       };
-      
-      if (srcRegId){
+
+      if (srcRegId) {
         let hex = wiccApi.assetsPub(assestInfo)
         return new BaasAPI(localNetWork).submitOfflineTrans(hex)
-      }else{
+      } else {
         return new Promise((resolve, reject) => {
-            reject("qianbaoweijihuo")
+          reject("qianbaoweijihuo")
         })
       }
     })
@@ -952,12 +954,12 @@ export default {
         feesName: info.feesName,
 
       };
-      if (srcRegId){
+      if (srcRegId) {
         let hex = wiccApi.assetsUpdate(assestInfo)
         return new BaasAPI(localNetWork).submitOfflineTrans(hex)
-      }else{
+      } else {
         return new Promise((resolve, reject) => {
-            reject("qianbaoweijihuo")
+          reject("qianbaoweijihuo")
         })
       }
     })
@@ -991,14 +993,14 @@ export default {
       if (isNaN(parseFloat(info.amount))) {
         throw new Error('INVALID_VALUE')
       }
-      let hex = wiccApi.uContractInvoke(privateKey, height, srcRegId, info.regId, info.amount, info.coinSymbol,info.fees, info.feesName, info.contract, localNetWork, info.memo)
+      let hex = wiccApi.uContractInvoke(privateKey, height, srcRegId, info.regId, info.amount, info.coinSymbol, info.fees, info.feesName, info.contract, localNetWork, info.memo)
       return new BaasAPI(localNetWork).submitOfflineTrans(hex)
     })
   },
 
-    /**
-   * 多币种合约调用(仅仅签名)
-   */
+  /**
+ * 多币种合约调用(仅仅签名)
+ */
   variousCoinsContractRaw({ info }) {
     const localNetWork = localStorage.getItem('network')
     const wiccApi = getWiccApi(localNetWork)
@@ -1010,8 +1012,8 @@ export default {
       if (isNaN(parseFloat(info.amount))) {
         throw new Error('INVALID_VALUE')
       }
-      let hex = wiccApi.uContractInvoke(privateKey, height, srcRegId, info.regId, info.amount, info.coinSymbol,info.fees, info.feesName, info.contract, localNetWork, info.memo)
-      return {rawtx:hex}
+      let hex = wiccApi.uContractInvoke(privateKey, height, srcRegId, info.regId, info.amount, info.coinSymbol, info.fees, info.feesName, info.contract, localNetWork, info.memo)
+      return { rawtx: hex }
     })
   },