diff --git a/js/ui-block.js b/js/ui-block.js
index ff66fc1..9bd4a33 100644
--- a/js/ui-block.js
+++ b/js/ui-block.js
@@ -4,14 +4,14 @@
var uiBlock = function () {
- var MAIN_NET_ATP_CONTRACT_ADDR = "n1zUNqeBPvsyrw5zxp9mKcDdLTjuaEL7s39";
- var TEST_NET_ATP_CONTRACT_ADDR = "n1nkoSJVLQnaKnDKH56mtKtdjbgLKoHZhtD";
+ var MAIN_NET_ATP_CONTRACT_ADDR = "c1zUNqeBPvsyrw5zxp9mKcDdLTjuaEL7s39";
+ var TEST_NET_ATP_CONTRACT_ADDR = "c1nkoSJVLQnaKnDKH56mtKtdjbgLKoHZhtD";
- var MAIN_NET_NAT_CONTRACT_ADDR = "n1mpgNi6KKdSzr7i5Ma7JsG5yPY9knf9He7";
- var TEST_NET_NAT_CONTRACT_ADDR = "n22PdtQepev7rcQgy3zqfdAkNPN2pSpywZ8";
+ var MAIN_NET_NAT_CONTRACT_ADDR = "c1mpgNi6KKdSzr7i5Ma7JsG5yPY9knf9He7";
+ var TEST_NET_NAT_CONTRACT_ADDR = "c22PdtQepev7rcQgy3zqfdAkNPN2pSpywZ8";
- var MAIN_NET_NAX_CONTRACT_ADDR = 'n1etmdwczuAUCnMMvpGasfi8kwUbb2ddvRJ';
- var TEST_NET_NAX_CONTRACT_ADDR = 'n1osWtAu3V4Ho1ztq6BcMmCuoWDoLTFnPbw';
+ var MAIN_NET_NAX_CONTRACT_ADDR = 'c1etmdwczuAUCnMMvpGasfi8kwUbb2ddvRJ';
+ var TEST_NET_NAX_CONTRACT_ADDR = 'c1osWtAu3V4Ho1ztq6BcMmCuoWDoLTFnPbw';
var old$fnModal = $.fn.modal;
@@ -22,7 +22,7 @@ var uiBlock = function () {
numberAddComma: numberAddComma,
toSi: toSi,
validate: validate,
- currency: "NAS",
+ currency: "CNTA",
_currencyChangedListeners: [],
addCurrencyChangedListener: addCurrencyChangedListener,
getContractAddr: getContractAddr,
@@ -79,7 +79,7 @@ var uiBlock = function () {
function isNRC20ContractAddr(addr) {
var currencies = getCurrencies();
for (var c in currencies) {
- if (c != "NAS" && currencies[c] == addr) {
+ if (c != "CNTA" && currencies[c] == addr) {
return true;
}
}
@@ -89,7 +89,7 @@ var uiBlock = function () {
function getCurrencies() {
currencies = localSave.getItem("currencies");
if (!currencies) {
- currencies = { "NAS": "", "NAX": MAIN_NET_NAX_CONTRACT_ADDR, "ATP": MAIN_NET_ATP_CONTRACT_ADDR, "NAT": MAIN_NET_NAT_CONTRACT_ADDR };
+ currencies = { "CNTA": "", "NAX": MAIN_NET_NAX_CONTRACT_ADDR, "ATP": MAIN_NET_ATP_CONTRACT_ADDR, "NAT": MAIN_NET_NAT_CONTRACT_ADDR };
} else {
currencies = JSON.parse(currencies);
}
@@ -201,9 +201,9 @@ var uiBlock = function () {
// apiPrefix
apiList = [
- { chainId: 1, name: "Mainnet", url: "https://mainnet.nebulas.io", currencies: { "NAS": "", "NAX": MAIN_NET_NAX_CONTRACT_ADDR, "ATP": MAIN_NET_ATP_CONTRACT_ADDR, "NAT": MAIN_NET_NAT_CONTRACT_ADDR } },
+ { chainId: 1, name: "Mainnet", url: "https://mainnet.nebulas.io", currencies: { "CNTA": "", "NAX": MAIN_NET_NAX_CONTRACT_ADDR, "ATP": MAIN_NET_ATP_CONTRACT_ADDR, "NAT": MAIN_NET_NAT_CONTRACT_ADDR } },
{ chainId: 1001, name: "Testnet", url: "https://testnet.nebulas.io", currencies: { "NAS": "", "NAX": TEST_NET_NAX_CONTRACT_ADDR, "ATP": TEST_NET_ATP_CONTRACT_ADDR, "NAT": TEST_NET_NAT_CONTRACT_ADDR } },
- { chainId: 100, name: "Local Nodes", url: "http://127.0.0.1:8685", currencies: { "NAS": "" } }
+ { chainId: 100, name: "Local Nodes", url: "http://127.0.0.1:8685", currencies: { "CNTA": "" } }
];
apiPrefix = (localSave.getItem("apiPrefix") || "").toLowerCase();
sApiButtons = "";
@@ -480,7 +480,7 @@ var uiBlock = function () {
for (i = 0; i < len && n >= 1000; ++i, n /= 1000);
if (i == len && unit == "Wei")
- for (i = 0, len = si.length - 1, unit = "NAS"; i < len && n >= 1000; ++i, n /= 1000);
+ for (i = 0, len = si.length - 1, unit = "CNTA"; i < len && n >= 1000; ++i, n /= 1000);
n = n.toFixed();
return (i == len ? numberAddComma(n) : n) + " " + si[i] + unit;
diff --git a/sendNas.html b/sendNas.html
index ca9aeb0..5de4a42 100644
--- a/sendNas.html
+++ b/sendNas.html
@@ -234,7 +234,7 @@
trans
var currency = uiBlock.currency;
var contractAddr = uiBlock.getContractAddr(uiBlock.currency);
$("#balance").val("").trigger("input");
- if (currency == "NAS") {
+ if (currency == "CNTA") {
neb.api.getAccountState(addr)
.then(function (resp) {
if (currency != uiBlock.currency) {
@@ -243,7 +243,7 @@ trans
if (resp.error) {
throw new Error(resp.error);
}
- var nas = Unit.fromBasic(resp.balance, "nas").toString(10);
+ var nas = Unit.fromBasic(resp.balance, "cnta").toString(10);
$("#balance").val(nas).trigger("input"); // add comma & unit from value, needs trigger 'input' event if via set o.value
$("#nonce").val(parseInt(resp.nonce || 0) + 1);
})
@@ -277,7 +277,7 @@ trans
if(uiBlock.currency === "NAX") {
balance = Unit.fromBasic(b, "gwei").toString();
} else {
- balance = Unit.fromBasic(b, "nas").toString(10);
+ balance = Unit.fromBasic(b, ).toString(10);
}
$("#balance").val(balance).trigger("input"); // add comma & unit from value, needs trigger 'input' event if via set o.value
@@ -327,7 +327,7 @@ trans
gLastGenerateInfo.gasprice != gasprice ||
gLastGenerateInfo.nonce != nonce) try { //TODO: 加括号
var tmp = Unit.fromBasic(Utils.toBigNumber(gaslimit)
- .times(Utils.toBigNumber(gasprice)), "nas");
+ .times(Utils.toBigNumber(gasprice)), "cnta");
if (Utils.toBigNumber(balance).lt(Utils.toBigNumber(amount).plus(tmp))) //TODO: 加括号; tmp-->max gas used
if (Utils.toBigNumber(balance).lt(tmp))
@@ -337,7 +337,7 @@ trans
var a = amount.split(".");
var amountValid = a.length == 1 || a[1].length <= 18;
- if (uiBlock.currency == "NAS") {
+ if (uiBlock.currency == "CNTA") {
if (!amountValid) throw new Error("Invalid value! The minimum unit is wei (1^-18nas) ");
gTx = new Transaction(parseInt(localSave.getItem("chainId")), gAccount, toAddress, Unit.nasToBasic(Utils.toBigNumber(amount)), parseInt(nonce), gasprice, gaslimit);
} else {
@@ -407,7 +407,7 @@ trans
neb.api.getAccountState($(".icon-address.from input").val())
.then(function (resp) {
// console.log("getAccountState resp: " + JSON.stringify(resp));
- var balanceNas = Unit.fromBasic(resp.balance, "nas").toString(10);
+ var balanceNas = Unit.fromBasic(resp.balance, "cnta").toString(10);
$("#balance").val(balanceNas);
$("#nonce").val(resp.nonce);
}).catch(function (err) {
diff --git a/sendOffline.html b/sendOffline.html
index 520aa82..34f145b 100644
--- a/sendOffline.html
+++ b/sendOffline.html
@@ -261,7 +261,7 @@ info
tx = Transaction.prototype.fromProto(val);
var to = tx.to.getAddressString();
var value = tx.value;
- var currency = "NAS"
+ var currency = "CNTA"
if (tx.data.payload) {
var data = eval("var d = " + nebulas.CryptoUtils.toBuffer(tx.data.payload).toString() + "; d");
var args = eval("var args = " + data["Args"]+"; args");
@@ -277,7 +277,7 @@ info
if(uiBlock.currency === "NAX") {
balance = unit.fromBasic(value, "gwei").toString();
} else {
- balance = unit.fromBasic(value, "nas").toString(10);
+ balance = unit.fromBasic(value, "cnta").toString(10);
}
$("#value").val(balance).trigger("input");
@@ -305,7 +305,7 @@ info
var contract = null;
toaccount = Account.fromAddress(toaddress);
- if (uiBlock.currency != "NAS") {
+ if (uiBlock.currency != "CNTA") {
var transfer_amount;
if(uiBlock.currency === "NAX") {
@@ -325,7 +325,7 @@ info
gLastGenerateInfo.contract != contract) try {
var a = amount.split(".");
var amountValid = a.length == 1 || a[1].length <= 18;
- if (uiBlock.currency == "NAS") {
+ if (uiBlock.currency == "CNTA") {
if (!amountValid) throw new Error("Invalid value! The minimum unit is wei (1^-18nas) ");
tx = new Transaction(parseInt(localSave.getItem("chainId")), gAccount, toaccount.getAddressString(), unit.nasToBasic(amount), parseInt(nonce), gasprice, gaslimit);
} else {
diff --git a/viewWalletInfo.html b/viewWalletInfo.html
index 16f75bb..e75a28c 100644
--- a/viewWalletInfo.html
+++ b/viewWalletInfo.html
@@ -145,7 +145,7 @@
var currency = uiBlock.currency;
var contractAddr = uiBlock.getContractAddr(uiBlock.currency);
$("#amount").val("").trigger("input");
- if (currency == "NAS") {
+ if (currency == "CNTA") {
neb.api.getAccountState(addr)
.then(function (resp) {
if (currency != uiBlock.currency) {