update error code

diff --git a/src/assets/language/cn.js b/src/assets/language/cn.js
index abbf054..823589b 100644 (file)
--- a/src/assets/language/cn.js
+++ b/src/assets/language/cn.js
@@ -260,7 +260,18 @@ const cn = {
     BTM0011:'Keystore文件格式错误。',
     BTM0012:'Keystore已存在请勿重复导入。',
     BTM0013:'钱包名称的汉字最大长度为7。',
-    BTM0014:'钱包名称的最大长度为9。'
+    BTM0014:'钱包名称的最大长度为9。',
+    BTM3000:'密码错误。',
+    BTM3001:'无效密钥派生规则。' ,
+    BTM3002:'无法支持解析至PBKDF2。',
+    BTM3003:'请输入密码。',
+    BTM3004:'不支持多个keystore文件导入',
+    BTM3005:'助记词长度错误',
+    BTM3006:'助记词无效',
+
+    BTM3100:'输入不能为空',
+    BTM3101:'无效data类型。',
+    BTM3102:'无效Boolean类型。',
   },
   successMsg:{
     createWallet:{

diff --git a/src/assets/language/en.js b/src/assets/language/en.js
index e9a476f..c5e1969 100644 (file)
--- a/src/assets/language/en.js
+++ b/src/assets/language/en.js
@@ -64,8 +64,11 @@ const en = {
   },
   transfer: {
     address: 'Address',
-    quantity: 'Amount',
+    bytomAddress:'Bytom address (start with bm)',
+    vaporAddress:'Vapor address (start with vp)',
+    quantity: ' Amount',
     fee: 'Fee',
+    available:'Available:',
     feeType: 'Standard',
     send: 'Send transaction',
     confirmPassword: 'password',
@@ -255,7 +258,18 @@ const en = {
     BTM0011:'Keystore file format error.',
     BTM0012:'Keystore already exist.',
     BTM0013:'The max length of chinese char is 7.',
-    BTM0014:'The max length of wallet alias is 9.'
+    BTM0014:'The max length of wallet alias is 9.',
+    BTM3000:'Key derivation failed - possibly wrong password',
+    BTM3001:'Unsupported key derivation scheme' ,
+    BTM3002:'Unsupported parameters to PBKDF2',
+    BTM3003:'No password given.',
+    BTM3004:'do not support multiple keystore imported.',
+    BTM3005:'mnemonic length error',
+    BTM3006:'mnemonic is invalid',
+
+    BTM3100:'Input args are empty',
+    BTM3101:'Invalid data type.',
+    BTM3102:'Invalid Boolean argument'
   },
   successMsg:{
     createWallet:{

diff --git a/src/manifest.js b/src/manifest.js
index 73b2dd3..dc3fa0a 100644 (file)
--- a/src/manifest.js
+++ b/src/manifest.js
@@ -4,7 +4,7 @@ module.exports = {
   description: 'Bytom Wallet Chrome extension.',
   version: '3.0.1',
   author: 'Bytom frontend, zhitinglin',
-  web_accessible_resources: ['js/inject.js', 'wasm/main.wasm'],
+  web_accessible_resources: ['js/inject.js'],
   browser_action: {
     default_popup: 'pages/popup.html',
     default_icon: 'icons/logo.png'

diff --git a/src/models/bytom.js b/src/models/bytom.js
index ffde2d9..2ca82df 100644 (file)
--- a/src/models/bytom.js
+++ b/src/models/bytom.js
@@ -1,7 +1,7 @@
 import Bytom from 'bytom-js-sdk'
 import { networksJS as networks} from '../utils/constants'
 
-var bytom = new Bytom(networks, chrome.runtime.getURL('wasm/main.wasm'))
+var bytom = new Bytom(networks)
 
 bytom.sdk.networks = function() {
   return bytom.getNetType()

diff --git a/src/views/backup/backup.vue b/src/views/backup/backup.vue
index 20dd394..d5a3b9c 100644 (file)
--- a/src/views/backup/backup.vue
+++ b/src/views/backup/backup.vue
@@ -86,10 +86,14 @@ export default {
               this.$router.push({ name: RouteNames.BACKUP_MNEMONIC })
             })
           }
-          catch (e){
-            this.$toast.error(
-              e.message || e
-            );
+          catch (error){
+            let e = error
+            if (error.code){
+              e = this.$t(`error.${error.code}`)
+            }else if(error.message){
+              e = error.message
+            }
+            this.$toast.error(e);
           }
 
         },

diff --git a/src/views/home.vue b/src/views/home.vue
index 83fe134..fab16aa 100644 (file)
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -370,6 +370,7 @@ import * as Actions from '@/store/constants';
 import _ from 'lodash';
 import { Number as Num } from "@/utils/Number"
 import BigNumber from "bignumber.js"
+import getLang from "@/assets/language/sdk";
 
 
 const EnterActive = 'animated faster fadeInLeft';
@@ -539,10 +540,14 @@ export default {
               this[Actions.UPDATE_STORED_BYTOM](bytom).then(()=>{
                 this.setupRefreshTimer()
               })
-            }).catch(e =>{
-              this.$toast.error(
-                e.message ||e
-              );
+            }).catch(error =>{
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = getLang(error.message, this.language)
+              }
+              this.$toast.error(e);
             })
           }else{
             this[Actions.UPDATE_STORED_BYTOM](bytom).then(()=>{

diff --git a/src/views/prompts/bappPrompt.vue b/src/views/prompts/bappPrompt.vue
index d557385..40d16cb 100644 (file)
--- a/src/views/prompts/bappPrompt.vue
+++ b/src/views/prompts/bappPrompt.vue
@@ -398,9 +398,13 @@
           }).catch(error => {
             loader.hide();
 
-            this.$toast.error(
-              getLang(error.message) || error.message || error
-            );
+            let e = error
+            if (error.code){
+              e = this.$t(`error.${error.code}`)
+            }else if(error.message){
+              e = getLang(error.message)
+            }
+            this.$toast.error(e);
           });
         } else if(this.prompt.data.type ==='transfer'){
           transaction.transfer(this.transaction, this.password, this.address, this).then(result => {
@@ -413,9 +417,13 @@
 
           }).catch(error => {
             loader.hide();
-            this.$toast.error(
-              getLang(error.message) || error.message || error
-            );
+            let e = error
+            if (error.code){
+              e = this.$t(`error.${error.code}`)
+            }else if(error.message){
+              e = getLang(error.message)
+            }
+            this.$toast.error(e);
           });
         } else if(this.prompt.data.type ==='signTransaction'){
           const data = this.prompt.data.value
@@ -444,9 +452,13 @@
             }).catch(error => {
               loader.hide();
 
-              this.$toast.error(
-                getLang(error.message) || error.message || error
-              );
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = getLang(error.message)
+              }
+              this.$toast.error(e);
             });
           }
 
@@ -461,7 +473,13 @@
           }).catch(error => {
             loader.hide();
 
-            this.$toast.error( getLang(error.message));
+            let e = error
+            if (error.code){
+              e = this.$t(`error.${error.code}`)
+            }else if(error.message){
+              e = getLang(error.message)
+            }
+            this.$toast.error(e);
           });
         }
         else{

diff --git a/src/views/sendTransaction/transfer.vue b/src/views/sendTransaction/transfer.vue
index 7d30d52..b88a8ae 100644 (file)
--- a/src/views/sendTransaction/transfer.vue
+++ b/src/views/sendTransaction/transfer.vue
@@ -432,9 +432,14 @@ export default {
 
             }).catch(error => {
                 loader.hide();
-                this.$toast.error(
-                   getLang(error.message, this.language)
-                );
+
+                let e = error
+                if (error.code){
+                  e = this.$t(`error.${error.code}`)
+                }else if(error.message){
+                  e = getLang(error.message, this.language)
+                }
+                this.$toast.error(e);
             });
       },
       ...mapActions([

diff --git a/src/views/welcome/creation.vue b/src/views/welcome/creation.vue
index f97faed..b932382 100644 (file)
--- a/src/views/welcome/creation.vue
+++ b/src/views/welcome/creation.vue
@@ -240,10 +240,14 @@ export default {
 
             try{
               account.isAliasValid(this.formItem.accAlias, this)
-            }catch (e){
-              this.$toast.error(
-                e.message || e
-              );
+            }catch (error){
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = error.message
+              }
+              this.$toast.error(e);
               this.$refs['accAlias'].focus();
               return;
             }
@@ -258,11 +262,15 @@ export default {
                 loader.hide();
                 this.formItem = {};
                 this.$router.push('/mnemonic');
-            }).catch(err => {
+            }).catch(error => {
               loader.hide();
-              this.$toast.error(
-                err.message || err
-              )
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = error.message
+              }
+              this.$toast.error(e)
             });
           }
         },

diff --git a/src/views/welcome/import.vue b/src/views/welcome/import.vue
index 915922b..ebcd6cb 100644 (file)
--- a/src/views/welcome/import.vue
+++ b/src/views/welcome/import.vue
@@ -324,10 +324,14 @@
 
             try{
               account.isValidMnemonic(mnemonic)
-            }catch (e){
-              this.$toast.error(
-               e.message || e
-              );
+            }catch (error){
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = error.message
+              }
+              this.$toast.error(e)
               return
             }
 
@@ -354,10 +358,14 @@
               }).then(() => {
                 this.$router.push('/restore-password');
               });
-            }catch (e){
-              this.$toast.error(
-                e.message || e
-              );
+            }catch (error){
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = error.message
+              }
+              this.$toast.error(e)
               return
             }
 
@@ -379,10 +387,14 @@
               }).then(() => {
                 this.$router.push('/restore-password');
               });
-            }catch (e){
-              this.$toast.error(
-                e.message || e
-              );
+            }catch (error){
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = error.message
+              }
+              this.$toast.error(e)
               return
             }
 

diff --git a/src/views/welcome/mnemonic.vue b/src/views/welcome/mnemonic.vue
index e6bdcac..30d93cc 100644 (file)
--- a/src/views/welcome/mnemonic.vue
+++ b/src/views/welcome/mnemonic.vue
@@ -167,10 +167,14 @@ export default {
             const mnemonic = account.decryptMnemonic(vault, this.passwd, this)
             this[Actions.SET_MNEMONIC](mnemonic)
           }
-          catch (e){
-            this.$toast.error(
-              e.message || e
-            );
+          catch (error){
+            let e = error
+            if (error.code){
+              e = this.$t(`error.${error.code}`)
+            }else if(error.message){
+              e = error.message
+            }
+            this.$toast.error(e)
           }
       },
       ...mapActions([

diff --git a/src/views/welcome/password/setting.vue b/src/views/welcome/password/setting.vue
index 807be17..fa64f29 100644 (file)
--- a/src/views/welcome/password/setting.vue
+++ b/src/views/welcome/password/setting.vue
@@ -221,10 +221,14 @@
 
           try{
             account.isAliasValid(accountAlias, this)
-          }catch (e){
-            this.$toast.error(
-              e.message || e
-            );
+          }catch (error){
+            let e = error
+            if (error.code){
+              e = this.$t(`error.${error.code}`)
+            }else if(error.message){
+              e = error.message
+            }
+            this.$toast.error( e );
             this.$refs['accAlias'].focus();
             return;
           }
@@ -242,11 +246,15 @@
               this.formItem = {};
               this[Actions.CLEAR_DATA]()
               this[Actions.PUSH_ALERT](this.$t("successMsg.restoreWallet"))
-            }).catch(err => {
+            }).catch(error => {
               loader.hide();
-              this.$toast.error(
-                err.message || err
-              )
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = error.message
+              }
+              this.$toast.error(e)
             });
           }else if(keystore){
             //restore by keystore
@@ -255,11 +263,15 @@
               this.formItem = {};
               this[Actions.CLEAR_DATA]()
               this[Actions.PUSH_ALERT](this.$t("successMsg.restoreWallet"))
-            }).catch(err => {
+            }).catch(error => {
               loader.hide();
-              this.$toast.error(
-                err.message || err
-              )
+              let e = error
+              if (error.code){
+                e = this.$t(`error.${error.code}`)
+              }else if(error.message){
+                e = error.message
+              }
+              this.$toast.error(e)
             });
 
           }

diff --git a/src/views/welcome/verifyMnemonic.vue b/src/views/welcome/verifyMnemonic.vue
index c10ea09..1cdea08 100644 (file)
--- a/src/views/welcome/verifyMnemonic.vue
+++ b/src/views/welcome/verifyMnemonic.vue
@@ -192,11 +192,14 @@ export default {
           account.createAccount(this).then(() => {
             loader.hide();
             this[Actions.PUSH_ALERT](this.$t("successMsg.createWallet"))
-          }).catch(err => {
-            loader.hide();
-            this.$toast.error(
-              err.message || err
-            )
+          }).catch(error => {
+            let e = error
+            if (error.code){
+              e = this.$t(`error.${error.code}`)
+            }else if(error.message){
+              e = error.message
+            }
+            this.$toast.error(e)
           });
         },
         updateMnemonicList(index){

diff --git a/static/wasm/main.wasm b/static/wasm/main.wasm
deleted file mode 100644 (file)
index b1f54fa..0000000
Binary files a/static/wasm/main.wasm and /dev/null differ

diff --git a/wasm/main.wasm b/wasm/main.wasm
deleted file mode 100644 (file)
index 59e9bb3..0000000
Binary files a/wasm/main.wasm and /dev/null differ