Update RPC endpoint

24 files changed, 29 insertions, 151 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 171f1710..f0fdc544 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1205,6 +1205,8 @@ Made seed word restoring BIP44 compatible.
 Added the ability to restore accounts from seed words.
 ## Current Master
 
+## 1.0.9 Mon Nov 12 2018
+
 ## 1.0.8 Mon Nov 12 2018
 
 ## 1.0.7 Mon Nov 12 2018
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
index e63deaaf..ddf4c090 100644
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@@ -308,7 +308,7 @@
     "message": "Hesla nejsou stejná"
   },
   "dexscanView": {
-    "message": "Prohlédněte si účet na DexScan"
+    "message": "Prohlédněte si účet na DEXSCAN"
   },
   "exchangeRate": {
     "message": "Směnný kurz"
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 1fafb70a..e90a23f7 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -308,7 +308,7 @@
     "message": "Passwörter stimmen nicht überein"
   },
   "dexscanView": {
-    "message": "Account auf DexScan anschauen"
+    "message": "Account auf DEXSCAN anschauen"
   },
   "exchangeRate": {
     "message": "Wechselrate"
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 86d75f8d..eb551c93 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -278,7 +278,7 @@
     "message": "Passwords Don't Match"
   },
   "dexscanView": {
-    "message": "View account on DexScan"
+    "message": "View account on DEXSCAN"
   },
   "exchangeRate": {
     "message": "Exchange Rate"
@@ -1367,7 +1367,7 @@
     "message": "Updated $1"
   },
   "viewOnDexScan": {
-    "message": "View on DexScan"
+    "message": "View on DEXSCAN"
   },
   "welcomeBack": {
     "message": "Welcome Back!"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 910c273d..1d9c600d 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -308,7 +308,7 @@
     "message": "Las contraseñas no coinciden"
   },
   "dexscanView": {
-    "message": "Ver la cuenta en DexScan"
+    "message": "Ver la cuenta en DEXSCAN"
   },
   "exchangeRate": {
     "message": "Tipo de cambio"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 42dc59d8..b0580433 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -302,7 +302,7 @@
     "message": "Les mots de passe ne correspondent pas"
   },
   "dexscanView": {
-    "message": "Afficher le compte sur DexScan"
+    "message": "Afficher le compte sur DEXSCAN"
   },
   "exchangeRate": {
     "message": "Taux de change"
diff --git a/app/_locales/ht_HT/messages.json b/app/_locales/ht_HT/messages.json
index 76fd19f3..2d4ac4d7 100644
--- a/app/_locales/ht_HT/messages.json
+++ b/app/_locales/ht_HT/messages.json
@@ -302,7 +302,7 @@
     "message": "Modpas Pa Koresponn ak"
   },
   "dexscanView": {
-    "message": "Gade kont sou DexScan"
+    "message": "Gade kont sou DEXSCAN"
   },
   "exchangeRate": {
     "message": "Chanje to"
@@ -1343,7 +1343,7 @@
     "message": ""
   },
   "viewOnDexScan": {
-    "message": "Wè sou DexScan"
+    "message": "Wè sou DEXSCAN"
   },
   "welcomeBack": {
     "message": "Bon retou!"
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 3e5b2744..36dcdf39 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -305,7 +305,7 @@
     "message": "Le Password Non Corrispondonos"
   },
   "dexscanView": {
-    "message": "Vedi account su DexScan"
+    "message": "Vedi account su DEXSCAN"
   },
   "exchangeRate": {
     "message": "Tasso di cambio"
diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
index 53ec41a8..1fdb95bd 100644
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@@ -308,7 +308,7 @@
     "message": ""
   },
   "dexscanView": {
-    "message": "Bekijk account op DexScan"
+    "message": "Bekijk account op DEXSCAN"
   },
   "exchangeRate": {
     "message": "Wisselkoers"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 08f4089c..b922f141 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -308,7 +308,7 @@
     "message": ""
   },
   "dexscanView": {
-    "message": "Ver conta no DexScan"
+    "message": "Ver conta no DEXSCAN"
   },
   "exchangeRate": {
     "message": "Taxa de Câmbio"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index e8136032..602b49c0 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -308,7 +308,7 @@
     "message": ""
   },
   "dexscanView": {
-    "message": "Просмотреть счет на DexScan"
+    "message": "Просмотреть счет на DEXSCAN"
   },
   "exchangeRate": {
     "message": "Обменный курс"
diff --git a/app/_locales/sl_SI/messages.json b/app/_locales/sl_SI/messages.json
index e9e74ceb..22cced60 100644
--- a/app/_locales/sl_SI/messages.json
+++ b/app/_locales/sl_SI/messages.json
@@ -94,16 +94,11 @@
     "message": "DekuSan",
     "description": "The name of the application"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
   "approve": {
     "message": "Potrdi"
   },
   "approved": {
     "message": "Potrjeno"
-=======
-  "approved": {
-    "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "attemptingConnect": {
     "message": "Povezovanje z verigo blokov ..."
@@ -200,11 +195,7 @@
     "message": "Potrdi"
   },
   "confirmed": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
     "message": "Potrjeno"
-=======
-    "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "confirmContract": {
     "message": "Potrdi pogodbo"
@@ -313,11 +304,7 @@
     "message": "Prilagodi gas"
   },
   "customToken": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
     "message": "Žeton po meri"
-=======
-    "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "customize": {
     "message": "Prilagodi"
@@ -368,13 +355,8 @@
   "directDeposit": {
     "message": "Neposredno vplačilo"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
-  "directDepositEther": {
-    "message": "Neposredno vplačilo ehera"
-=======
   "directDepositDex": {
     "message": "Direktno vplačilo ehera"
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "directDepositDexExplainer": {
     "message": "Če že imate dexon, ga lahko najhitreje dobite v DekuSan z direktnim vplačilom."
@@ -421,7 +403,6 @@
   "enterPasswordConfirm": {
     "message": "Potrdite geslo"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
   "enterPasswordContinue": {
     "message": "Za nadaljevanje vnesite geslo"
   },
@@ -430,7 +411,7 @@
   },
   "etherscanView": {
     "message": "Poglejte račun na DEXscan"
-=======
+  },
   "passwordNotLongEnough": {
     "message": ""
   },
@@ -438,8 +419,7 @@
     "message": ""
   },
   "dexscanView": {
-    "message": "Poglejte račun na DexScan"
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
+    "message": "Poglejte račun na DEXSCAN"
   },
   "exchangeRate": {
     "message": "Menjalni tečaj"
@@ -516,16 +496,8 @@
   "gasPriceRequired": {
     "message": "Gas price je zahtevan"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
-  "generatingTransaction": {
-    "message": "Ustvarjanje transakcije"
-  },
-  "getEther": {
-    "message": "Pridobi Ether"
-=======
   "getDex": {
     "message": "Pridobite dexon"
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "getDexFromFaucet": {
     "message": "Pridobite dexon iz fauceta za $1",
@@ -576,17 +548,10 @@
     "message": "Zgodovina"
   },
   "howToDeposit": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
-    "message": "Kako želite vplačati Ether?"
-  },
-  "holdEther": {
-    "message": "Omogoča vam shranjevanje ethra in žetonov ter povezovanje decentraliziranih aplikacij."
-=======
     "message": "Kako želite vplačati dexon?"
   },
   "holdDex": {
     "message": "Omogoča vam, da imate eter in žetone in služi kot most za decentralizirane aplikacije."
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "import": {
     "message": "Uvoz",
@@ -655,11 +620,7 @@
     "description": "format for importing an account"
   },
   "keepTrackTokens": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
-    "message": "Sledite žetonom, ki ste jih pridobili z MetaMask."
-=======
     "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "kovan": {
     "message": "Testno omrežje Kovan"
@@ -668,20 +629,10 @@
     "message": "Obiščite našo pomoč"
   },
   "max": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
-    "message": "Max"
-  },
-  "learnMore": {
-    "message": "Preberite več"
-  },
-  "ledgerAccountRestriction": {
-    "message": "Za dodajanje novega računa morate uporabiti zadnji račun."
-=======
     "message": ""
   },
   "learnMore": {
     "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "lessThanMax": {
     "message": "mora biti manjši ali enak $1.",
@@ -691,11 +642,7 @@
     "message": "Želite dodati te žetone?"
   },
   "links": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
     "message": "Povezave"
-=======
-    "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "limit": {
     "message": "Meja"
@@ -762,13 +709,8 @@
     "message": "Za izbrano datoteko morate vnesti geslo.",
     "description": "Password and file needed to import an account"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
-  "negativeETH": {
-    "message": "Negativnih zneskov ETH ni mogoče poslati."
-=======
   "negativeDex": {
     "message": "Ni mogoče poslati negativne vsote DEX."
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "networks": {
     "message": "Omrežja"
@@ -1050,10 +992,6 @@
   "ropsten": {
     "message": "Testno omrežje Ropsten"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
-  "rpc": {
-    "message": "RPC po meri"
-=======
   "currentRpc": {
     "message": ""
   },
@@ -1071,7 +1009,6 @@
   },
   "connectingToUnknown": {
     "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "sampleAccountName": {
     "message": "npr. Moj račun",
@@ -1080,16 +1017,11 @@
   "save": {
     "message": "Shrani"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
-  "saveAsCsvFile": {
-    "message": "Shrani kot CSV datoteko"
-=======
   "reprice_title": {
     "message": ""
   },
   "reprice_subtitle": {
     "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "saveAsFile": {
     "message": "Shrani kot datoteko",
@@ -1143,40 +1075,11 @@
   "sendTokens": {
     "message": "Pošlji žetone"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
-  "sentEther": {
-    "message": "poslani ether"
-  },
-  "sentTokens": {
-    "message": "poslani žetoni"
-  },
-  "separateEachWord": {
-    "message": "Vsako besedo ločite z enim presledkom"
-  },
-  "searchTokens": {
-    "message": "Iskanje žetonov"
-  },
-  "selectAnAddress": {
-    "message": "Izberi naslov"
-  },
-  "selectAnAccount": {
-    "message": "Izberi račun"
-  },
-  "selectAnAccountHelp": {
-    "message": "Izberi račun za prikaz v MetaMask"
-  },
-  "selectHdPath": {
-    "message": "Izberi HD Path"
-  },
-  "selectPathHelp": {
-    "message": "Če obstoječih Ledger ne vidite, poskusite izbrati \"Legacy (MEW / MyCrypto)\""
-=======
   "onlySendToDexonAddress": {
     "message": ""
   },
   "searchTokens": {
     "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "sendTokensAnywhere": {
     "message": "Pošljite žetone vsem, ki imajo DEXON račun"
@@ -1205,16 +1108,8 @@
   "sign": {
     "message": "Podpiši"
   },
-<<<<<<< HEAD:app/_locales/sl/messages.json
-  "signatureRequest": {
-    "message": "Zahteva za podpis"
-  },
-  "signed": {
-    "message": "Podpisano"
-=======
   "signed": {
     "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "signMessage": {
     "message": "Podpiši sporočilo"
@@ -1277,11 +1172,7 @@
     "message": "Potrdi"
   },
   "submitted": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
-    "message": "Potrjeno"
-=======
     "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "supportCenter": {
     "message": "Obiščite naše središče za podporo"
@@ -1363,11 +1254,7 @@
     "message": "transakcije"
   },
   "transactionError": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
     "message": "Napaka pri transakciji. Izjema sprožena v kodi pogodbe."
-=======
-    "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "transactionMemo": {
     "message": "Opomba transakcije (nezahtevano)"
@@ -1446,11 +1333,7 @@
     "message": "Posodobljeno $1"
   },
   "uriErrorMsg": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
-    "message": "URI zahtevajo ustrezno HTTP/HTTPS predpono."
-=======
     "message": "URI-ji zahtevajo ustrezno HTTP\/HTTPS predpono."
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   },
   "usaOnly": {
     "message": "Samo za ZDA",
@@ -1499,12 +1382,6 @@
     "message": "Zahtevan je bil vaš podpis"
   },
   "youSign": {
-<<<<<<< HEAD:app/_locales/sl/messages.json
-    "message": "Podpisali boste"
-  },
-  "yourPrivateSeedPhrase": {
-    "message": "Vaš zasebni seed phrase"
-=======
     "message": "Podpisani ste"
   },
   "aboutDekuSan": {
@@ -1918,6 +1795,5 @@
   },
   "connectingToRinkeby": {
     "message": ""
->>>>>>> Update translations:app/_locales/sl_SI/messages.json
   }
 }
\ No newline at end of file
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index 89217bb7..12f5f625 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -308,7 +308,7 @@
     "message": ""
   },
   "dexscanView": {
-    "message": "ดูบัญชีบน DexScan"
+    "message": "ดูบัญชีบน DEXSCAN"
   },
   "exchangeRate": {
     "message": "อัตราแลกเปลี่ยน"
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index d2c94594..dad2f97a 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -263,7 +263,7 @@
     "message": "Parolalar eşleşmiyor"
   },
   "dexscanView": {
-    "message": "Hesabı DexScan üzerinde izle"
+    "message": "Hesabı DEXSCAN üzerinde izle"
   },
   "exchangeRate": {
     "message": "Döviz kuru"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index fef5f6b0..8e3b05f2 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -308,7 +308,7 @@
     "message": ""
   },
   "dexscanView": {
-    "message": "Xem tài khoản trên DexScan"
+    "message": "Xem tài khoản trên DEXSCAN"
   },
   "exchangeRate": {
     "message": "Tỷ giá"
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 10de9e17..0e42883b 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -308,7 +308,7 @@
     "message": "密码不匹配"
   },
   "dexscanView": {
-    "message": "在 DexScan 上查看账户"
+    "message": "在 DEXSCAN 上查看账户"
   },
   "exchangeRate": {
     "message": "兑换比率"
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 4958b018..3af0cbea 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -305,7 +305,7 @@
     "message": "您所輸入的密碼不一致"
   },
   "dexscanView": {
-    "message": "在 DexScan 上查看帳戶"
+    "message": "在 DEXSCAN 上查看帳戶"
   },
   "exchangeRate": {
     "message": "匯率"
diff --git a/app/manifest.json b/app/manifest.json
index 913f6612..0d6be883 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "manifest_version": 2,
   "author": "https://dexon.org",
   "description": "__MSG_appDescription__",
diff --git a/app/scripts/controllers/network/enums.js b/app/scripts/controllers/network/enums.js
index fd00a60e..7ac40ca7 100644
--- a/app/scripts/controllers/network/enums.js
+++ b/app/scripts/controllers/network/enums.js
@@ -6,7 +6,7 @@ const TESTNET = 'testnet'
 const LOCALHOST = 'localhost'
 
 const MAINNET_CODE = 1
-const TESTNET_CODE = 237
+const TESTNET_CODE = 238
 const ROPSTEN_CODE = 3
 const RINKEYBY_CODE = 4
 const KOVAN_CODE = 42
@@ -17,7 +17,7 @@ const KOVAN_DISPLAY_NAME = 'Kovan'
 const MAINNET_DISPLAY_NAME = 'Main DEXON Network'
 const TESTNET_DISPLAY_NAME = 'DEXON Test Network'
 
-const TESTNET_RPC_URL = 'http://testnet.dexon.org:8545'
+const TESTNET_RPC_URL = 'https://api-testnet.dexscan.org/v1/network/rpc'
 
 module.exports = {
   ROPSTEN,
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index e8ef5595..27d1ef86 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -112,7 +112,7 @@ class TransactionController extends EventEmitter {
     const getChainId = parseInt(networkState)
     if (Number.isNaN(getChainId)) {
        // default to DEXON testnet
-      return 237
+      return 238
     } else {
       return getChainId
     }
diff --git a/app/scripts/lib/resolver.js b/app/scripts/lib/resolver.js
index 6719a6fc..05399e72 100644
--- a/app/scripts/lib/resolver.js
+++ b/app/scripts/lib/resolver.js
@@ -41,7 +41,7 @@ function getProvider (type) {
     case 'mainnet':
       return 'https://mainnet.infura.io/'
     case 'testnet':
-      return 'http://testnet.dexon.org:8545/'
+      return 'https://api-testnet.dexscan.org/v1/network/rpc'
     default:
       return 'http://localhost:8545/'
   }
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index e15f5d5b..cd756412 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -77,7 +77,7 @@ class ExtensionPlatform {
     const nonce = parseInt(txMeta.txParams.nonce, 16)
 
     const title = 'Confirmed transaction'
-    const message = `Transaction ${nonce} confirmed! View on DexScan`
+    const message = `Transaction ${nonce} confirmed! View on DEXSCAN`
     this._showNotification(title, message, url)
   }
 
diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js
index ce8ef254..be9fd429 100644
--- a/ui/lib/account-link.js
+++ b/ui/lib/account-link.js
@@ -6,7 +6,7 @@ module.exports = function (address, network) {
       link = `https://dexscan.org/address/${address}`
       break
     case 2: // test net
-    case 237: // test net
+    case 238: // test net
     default:
       link = `https://testnet.dexscan.org/address/${address}`
       break
diff --git a/ui/lib/tx-link.js b/ui/lib/tx-link.js
index aa457d38..f4d2ede3 100644
--- a/ui/lib/tx-link.js
+++ b/ui/lib/tx-link.js
@@ -6,7 +6,7 @@ module.exports = function (txHash, network) {
       link = `https://dexscan.org/transaction/${txHash}`
       break
     case 2: // test net
-    case 237: // test net
+    case 238: // test net
     default:
       link = `https://testnet.dexscan.org/transaction/${txHash}`
       break