diff --git a/Source/HTML/CSS/mobile-wallet.css b/Source/HTML/CSS/mobile-wallet.css
index 4e1f7e5..c1ec8dc 100644
--- a/Source/HTML/CSS/mobile-wallet.css
+++ b/Source/HTML/CSS/mobile-wallet.css
@@ -20,6 +20,7 @@ body {
main {
max-width: 1200px;
margin: 0 auto;
+ padding-top: 100px;
}
*,
@@ -207,9 +208,14 @@ textarea {
}
.header {
+ position: fixed;
+ z-index: 100;
+ width: 100%;
background: linear-gradient(270deg, #3D4C61 0%, #445368 100%);
color: #fff;
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15);
+
+ /*position: fixed; top: 0;*/
}
.header__wrapper {
display: flex;
@@ -1738,6 +1744,9 @@ td.hash {
@media (min-width: 768px) {
+ .main {
+ padding-top: 60px;
+ }
.main-logo {
width: 125px;
height: 30px;
@@ -1845,12 +1854,11 @@ td.hash {
position: absolute;
font-size: 14px;
line-height: 16px;
- bottom: -38px;
- right: 7px;
+ right: 165px;
width: 60px;
border-radius: 3px;
background: transparent;
- color: var(--blue-grey);
+ color: rgba(255, 255, 255, 0.6);
}
.white-select {
display: block;
@@ -2107,6 +2115,13 @@ td.hash {
}
+@media (min-width: 768px) and (max-width: 800px) {
+ .header__nav {
+ margin-right: 35px;
+ }
+}
+
+
@media (max-width: 960px) {
/* .prod-card--line:hover {
@@ -2211,7 +2226,7 @@ td.hash {
margin-left: 0;
}
.header__right select {
- right: 37px;
+ right: 207px;
}
.send-page__send-btn-wrp {
max-width: 100%;
@@ -2438,7 +2453,7 @@ td.hash {
margin-right: 18px;
}
.header__right select {
- right: 10px;
+ right: 190px;
}
.accounts-info__add .key-field {
min-width: 920px;
diff --git a/Source/HTML/JS/client.js b/Source/HTML/JS/client.js
index e9848d3..d5bdd69 100644
--- a/Source/HTML/JS/client.js
+++ b/Source/HTML/JS/client.js
@@ -1035,7 +1035,7 @@ function RetHistoryAccount(Item,Name)
if(Num < 1)
return "" + Num;
var Str;
- if(IsLocalClient())
+ if(UseInnerPage())
Str = "" + Num + "";
else
Str = "" + Num + "";
@@ -1052,7 +1052,7 @@ function RetBaseAccount(Item)
function ViewTransaction(BlockNum)
{
- if(IsLocalClient())
+ if(UseInnerPage())
OpenBlockViewerPage(BlockNum);
else
window.Open('./blockviewer.html#' + BlockNum, 'viewer', 800, 800);
@@ -1966,3 +1966,20 @@ function Right(Str,count)
else
return Str.substr(0, Str.length);
};
+
+function UseInnerPage()
+{
+ if(isMobile() && !IsLocalClient())
+ return 1;
+ else
+ return 0;
+};
+
+function isMobile()
+{
+ if(/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent))
+ {
+ return true;
+ }
+ return false;
+};
diff --git a/Source/HTML/JS/mobile-wallet.js b/Source/HTML/JS/mobile-wallet.js
index c79c3b9..cb41015 100644
--- a/Source/HTML/JS/mobile-wallet.js
+++ b/Source/HTML/JS/mobile-wallet.js
@@ -71,6 +71,11 @@ window.onload = function ()
{
window.attachEvent("onmessage", OnMessage);
}
+ if(UseInnerPage())
+ {
+ AddFrame("HistoryPage", "./history.html");
+ AddFrame("BlockViewerPage", "./blockviewer.html");
+ }
};
function OnLoad()
@@ -110,11 +115,13 @@ function OnLoad()
}
};
-function ChangeNetwork()
+function ChangeNetwork(bStart)
{
CONNECT_STATUS = 0;
NETWORK = $("idCurNetwork").value;
Storage.setItem("NETWORK", NETWORK);
+ if(bStart)
+ StartWebWallet();
ConnectWebWallet();
};
@@ -1047,7 +1054,7 @@ function MyToggleList(e)
function OpenHistoryPage(Num)
{
- if(!IsLocalClient())
+ if(!UseInnerPage())
{
window.open("./history.html#" + Num);
return ;
@@ -1058,7 +1065,7 @@ function OpenHistoryPage(Num)
function OpenBlockViewerPage(Num)
{
- if(!IsLocalClient())
+ if(!UseInnerPage())
{
window.open("./blockviewer.html#" + Num);
return ;
@@ -1067,6 +1074,17 @@ function OpenBlockViewerPage(Num)
SendMessage("BlockViewerPage", {BlockNum:Num, FrameName:"idBlockViewerPage"});
};
+function AddFrame(name,filename)
+{
+ var iframe = document.createElement('iframe');
+ iframe.name = name;
+ iframe.src = filename;
+ iframe.sandbox = "allow-scripts allow-same-origin allow-popups";
+ iframe.id = "id" + name;
+ iframe.style = "display: none";
+ document.getElementsByTagName('body')[0].appendChild(iframe);
+};
+
function SetVisibleFrame(name,bVisible)
{
SetVisibleBlock("idMainHeader", !bVisible);
@@ -1175,7 +1193,7 @@ function ChangeLang()
function GetNewLangItem()
{
- ToLog(JSON.stringify(LangMap["ENG"]));
+ console.log(JSON.stringify(LangMap["ENG"]));
};
var LangMap = {};
LangMap["ENG"] = {};
@@ -1189,17 +1207,18 @@ LangMap["RUS"] = {"TERA WALLET":"TERA КОШЕЛЕК", "Generate key":"Сген
"Current create:":"Текущий блок:", "Protocol ver:":"Версия протокола:", "ID: {Item.Num}":"ИД: {Item.Num}", "Token generate":"Генерация токенов",
"ACCOUNTS":"СЧЕТА", "SEND":"ПОСЛАТЬ", "DAPPS":"ДАППС", "EXPLORER":"ПРОСМ", "ATTENTION: Before using the wallet, save the private key.":"ВНИМАНИЕ: Перед использованием кошелька сохраните приватный ключ",
"Web-site":"Веб-сайт", "Bitcointalk":"Bitcointalk", "Twitter":"Твиттер", "Telegram":"Телеграм", "Discord":"Дискорд", "QQchat":"QQchat",
- "Buy/sell/mine TERA":"Купить/Продать", "+ CREATE NEW":"+ СОЗДАТЬ НОВЫЙ", "Confirm Transaction":"Подтверждение транзакции",
- "CREATE DAPPS":"СОЗДАТЬ", "Set pass":"Установить пароль", "Unlock":"Разблокировать", "Entrance to sub-wallet":"Войти в под-кошелек",
- "Public name":"Публичное имя", "Currency":"Валюта", "Pay to:":"Получатель:", "Amount:":"Сумма:", "Description:":"Описание:",
- "Welcome to TERA Wallet":"Добропожаловать в кошелек TERA", "Edit your wallet":"Редактирование вашего кошелька", "Key settings":"Задание ключей",
- "KEY SETTINGS":"ЗАДАНИЕ КЛЮЧЕЙ", "Create an account":"Создание счета", "Sending coins":"Отправка монет", "Decentralized applications (dApps)":"Децентрализованные приложения (Даппс)",
- "Secure your wallet":"Безопасность вашего кошелька", "Wallet is secured":"Установлен пароль", "Total":"Всего", "Item.Name":"Item.Name",
- "You have no accounts yet":"У вас нет ни одного счета", "Wait 10-15 sec":"Ждите 10-15 сек", "Creating your account":"Идет создание вашего счета",
- "From:":"Отправитель:", "Set a password for protect entry":"Установите пароль для безопасности", "Enter password to unlock wallet":"Введите пароль для разблокировки кошелька",
- "From ID:":"Отправитель:", "Pay to ID:":"Получатель:", "Account":"Счет", "Owner":"Владелец", "Block num":"Ном блока", "Private key (secret)":"Приватный ключ (секретно)",
- "Load key":"Загруз.", "Create your first account and start using TERA":"Создайте свой первый счет и начните использовать TERA",
- "0 Accounts":"0 Счетов", "OWNER: {Item.Owner}":"Владелец: {Item.Owner}", "More info":"Информация", "Public key":"Публичный ключ"};
+ "Buy/sell/mine TERA":"Купить/Продать", "+ CREATE NEW":"+ СОЗДАТЬ", "Confirm Transaction":"Подтверждение транзакции", "CREATE DAPPS":"СОЗДАТЬ",
+ "Set pass":"Установить пароль", "Unlock":"Разблокировать", "Entrance to sub-wallet":"Войти в под-кошелек", "Public name":"Публичное имя",
+ "Currency":"Валюта", "Pay to:":"Получатель:", "Amount:":"Сумма:", "Description:":"Описание:", "Welcome to TERA Wallet":"Добропожаловать в кошелек TERA",
+ "Edit your wallet":"Редактирование вашего кошелька", "Key settings":"Задание ключей", "KEY SETTINGS":"ЗАДАНИЕ КЛЮЧЕЙ", "Create an account":"Создание счета",
+ "Sending coins":"Отправка монет", "Decentralized applications (dApps)":"Децентрализованные приложения (Даппс)", "Secure your wallet":"Безопасность вашего кошелька",
+ "Wallet is secured":"Установлен пароль", "Total":"Всего", "Item.Name":"Item.Name", "You have no accounts yet":"У вас нет ни одного счета",
+ "Wait 10-15 sec":"Ждите 10-15 сек", "Creating your account":"Идет создание вашего счета", "From:":"Отправитель:", "Set a password for protect entry":"Установите пароль для безопасности",
+ "Enter password to unlock wallet":"Введите пароль для разблокировки кошелька", "From ID:":"Отправитель:", "Pay to ID:":"Получатель:",
+ "Account":"Счет", "Owner":"Владелец", "Block num":"Ном блока", "Private key (secret)":"Приватный ключ (секретно)", "Load key":"Загруз.",
+ "Create your first account and start using TERA":"Создайте свой первый счет и начните использовать TERA", "0 Accounts":"0 Счетов",
+ "OWNER: {Item.Owner}":"Владелец: {Item.Owner}", "More info":"Информация", "Public key":"Публичный ключ", "Enter number of dapp":"Введите номер Даппа",
+ "Enter the dapps number that will be added to your account. Attention make sure that you trust this dapp, otherwise you may lose all funds in this account.":"Введите номер Даппа, который будет добавлен в ваш аккаунт. Внимание убедитесь, что Вы доверяете ему, в противном случае вы можете потерять все средства на этом счете."};
LangMap["简体中文"] = {"TERA WALLET":"TERA 钱包", "Generate key":"生成私钥", "OK":"OK", "Cancel":"取消", "Edit":"编辑", "Save key":"保存私钥",
"+ CREATE A NEW ACCOUNT":"+ 新建账号", "Create account":"创建账号", "Send":"发送", "SEND":"转账", "CONFIRM":"确认", "Accounts":"账号", "Account(s)":"账号",
"Blocks and Tx":"区块和交易", "Counters":"状态统计", "Open DApp":"打开DApp", "Back":"返回", "Delete":"删除", "Save to book":"保存到地址本", "Choose":"选择",
diff --git a/Source/HTML/JS/wallet-web.js b/Source/HTML/JS/wallet-web.js
index 066a094..d580b68 100644
--- a/Source/HTML/JS/wallet-web.js
+++ b/Source/HTML/JS/wallet-web.js
@@ -8,12 +8,13 @@
* Telegram: https://t.me/terafoundation
*/
-var MIN_VERSION = 1020;
+var MIN_VERSION = 1114;
var COUNT_BLOCK_PROOF = 300;
-var MIN_SUM_POWER = COUNT_BLOCK_PROOF * 35;
+var MIN_SUM_POWER = 0;
var MainServer = undefined;
var MaxConnectedCount = 10;
-var MaxTimeConnecting = 3 * 1000;
+var TIME_LENGTH_CONNECT_ALL = 2 * 1000;
+var MAX_TIME_FOR_CONNECT = 1000;
var StartTimeConnecting = 0;
var ConnectedCount = 0;
var NETWORK = "TERA-MAIN";
@@ -26,7 +27,8 @@ var ServerMainMap = {"127.0.0.1":{"ip":"127.0.0.1", "port":80, "Name":"LOCAL"},
"port":80, "Name":"SUPPORT2", "System":1}, "t1.teraexplorer.com":{"ip":"t1.teraexplorer.com", "port":80, "Name":"t1.teraexplorer.com",
"System":1}, };
var ServerTestMap = {"127.0.0.1":{"ip":"127.0.0.1", "port":80, "Name":"LOCAL"}, "dappsgate.com":{"ip":"dappsgate.com", "port":88,
- "Name":"SUPPORT2", "System":1}, };
+ "Name":"SUPPORT1", "System":1}, "terablockchain.org":{"ip":"terablockchain.org", "port":88, "Name":"SUPPORT2", "System":1},
+};
function StartWebWallet()
{
@@ -111,9 +113,11 @@ function ConnectWebWallet()
setTimeout(LoopWalletInfo, 1500);
};
var Stage = 0;
+var PreparingStartLoopHandShake = 0;
function LoopHandShake()
{
+ PreparingStartLoopHandShake = 0;
Stage++;
SetStatus("Connecting: " + Stage + "...");
for(var key in ServerMap)
@@ -130,13 +134,12 @@ function LoopHandShake()
function DoNodeList(Item)
{
- console.log(GetProtocolServerPath(Item) + "/GetNodeList");
if(window.location.protocol === "https:" && Item.port !== 443)
return ;
if(Item.port === 443 && IsIPAddres(Item.ip))
return ;
- SetStatus("Try: " + Item.ip + ":" + Item.port);
Item.SendHandShake = 1;
+ Item.StartTime = Date.now();
GetData(GetProtocolServerPath(Item) + "/GetNodeList", {}, function (Data)
{
if(Data && Data.result && Data.NETWORK === NETWORK && Data.VersionNum >= MIN_VERSION)
@@ -144,7 +147,7 @@ function DoNodeList(Item)
ConnectedCount++;
Item.GetHandShake = 1;
Item.BlockChain = Data.BlockChain;
- SetStatus("Get: " + Item.ip + ":" + Item.port);
+ Item.DeltaTime = Date.now() - Item.StartTime;
var bWas = 0;
for(var i = 0; i < Data.arr.length; i++)
{
@@ -152,33 +155,47 @@ function DoNodeList(Item)
if(!ServerMap[Node.ip] && Node.port)
{
ServerMap[Node.ip] = Node;
- console.log("New: " + Node.ip + ":" + Node.port);
bWas = 1;
}
}
- if(bWas && ConnectedCount < MaxConnectedCount && new Date() - StartTimeConnecting < MaxTimeConnecting)
+ var DeltaAll = Date.now() - StartTimeConnecting;
+ if(!PreparingStartLoopHandShake && bWas && ConnectedCount < MaxConnectedCount && DeltaAll < TIME_LENGTH_CONNECT_ALL)
{
+ PreparingStartLoopHandShake = 1;
setTimeout(LoopHandShake, 100);
}
}
});
};
+var idTimeFindLider = 0;
+var CountDoWalletInfoAll = 0;
+var CountDoWalletInfoGet = 0;
function LoopWalletInfo()
{
- SetStatus("Get wallets info...");
+ CountDoWalletInfoAll = 0;
+ CountDoWalletInfoGet = 0;
+ var Arr = [];
for(var key in ServerMap)
{
var Item = ServerMap[key];
- if(Item.port)
+ if(Item.port && Item.DeltaTime < MAX_TIME_FOR_CONNECT)
{
- CountWallet++;
- if(window.BrowserIE && CountWallet > 4)
- break;
- DoWalletInfo(Item);
+ Arr.push(Item);
}
}
- setTimeout(FindLider, 500);
+ Arr.sort(function (a,b)
+ {
+ a.DeltaTime - b.DeltaTime;
+ });
+ CountWallet = Math.min(Arr.length, 8);
+ if(window.BrowserIE && CountWallet > 4)
+ CountWallet = 4;
+ for(var i = 0; i < CountWallet; i++)
+ {
+ DoWalletInfo(Arr[i]);
+ }
+ idTimeFindLider = setTimeout(FindLider, 2500);
};
function DoWalletInfo(Item)
@@ -187,18 +204,28 @@ function DoWalletInfo(Item)
return ;
if(Item.port === 443 && IsIPAddres(Item.ip))
return ;
+ CountDoWalletInfoAll++;
Item.StartTime = Date.now();
Item.SendWalletInfo = 1;
GetData(GetProtocolServerPath(Item) + "/GetCurrentInfo", {BlockChain:1}, function (Data)
{
+ if(!idTimeFindLider)
+ return ;
if(Data && Data.result && Data.BlockChain && Data.NETWORK === NETWORK)
{
Item.Name = Data.NODES_NAME;
Item.GetWalletInfo = 1;
- Item.DeltaTime = new Date() - Item.StartTime;
+ Item.DeltaTime = Date.now() - Item.StartTime;
Item.BlockChain = Data.BlockChain;
Item.MaxNumBlockDB = Data.MaxNumBlockDB;
- console.log("Get: " + Item.ip + ":" + Item.port + " delta=" + Item.DeltaTime);
+ SetStatus("Get: " + Item.ip + ":" + Item.port + " t:" + Item.DeltaTime);
+ CountDoWalletInfoGet++;
+ if(idTimeFindLider && CountDoWalletInfoAll && CountDoWalletInfoGet >= 2 && CountDoWalletInfoGet / CountDoWalletInfoAll > 0.7)
+ {
+ clearTimeout(idTimeFindLider);
+ idTimeFindLider = 0;
+ FindLider();
+ }
}
});
};
@@ -219,7 +246,6 @@ function FindLider()
Item.SumPower = CalcPowFromBlockChain(arr);
if(Item.SumPower < MIN_SUM_POWER)
{
- console.log("Skip: " + Item.ip + ":" + Item.port + " SumPower(" + Item.SumPower + ") < MIN_SUM_POWER(" + MIN_SUM_POWER + ")");
continue;
}
if(!MapSumPower[Item.SumPower])
@@ -246,7 +272,7 @@ function FindLider()
var Item = Arr[i];
if(Item.SumPower === MaxKey)
{
- SetStatus("Find " + Item.ip + ":" + Item.port + " with pow=" + Item.SumPower + "/" + MaxKey + " ping=" + Item.DeltaTime);
+ SetStatus("Find " + Item.ip + ":" + Item.port + " pow=" + Item.SumPower + " t:" + Item.DeltaTime + " ms");
MainServer = Item;
SaveServerMap();
break;
diff --git a/Source/HTML/dapp-frame.html b/Source/HTML/dapp-frame.html
index 0b7a562..c6134ec 100644
--- a/Source/HTML/dapp-frame.html
+++ b/Source/HTML/dapp-frame.html
@@ -359,6 +359,9 @@
SendMessage({cmd:"History",OPEN_PATH:OPEN_PATH});
}, false);
+
+ if(isMobile())
+ SetMobileMode();
}
function CreateFrame(SetData)
@@ -409,8 +412,6 @@
newchild.name = "viewport"
newchild.content = "width=device-width, initial-scale=1.0";//, maximum-scale=1.0, user-scalable=0;
window.parent.document.getElementsByTagName("head")[0].appendChild(newchild);
-
- //ToLog("SetMobileMode 2");
}
diff --git a/Source/HTML/wallet.html b/Source/HTML/wallet.html
index f9b6439..05896c3 100644
--- a/Source/HTML/wallet.html
+++ b/Source/HTML/wallet.html
@@ -1105,10 +1105,10 @@
ArrInfo=
[
{Name:"Hashrate from the beginning of the chain", Delta:1000000000, DX:310},
- {Name:"month", Delta:30.5*24*3600, DX:200},
- {Name:"day", Delta:24*3600, DX:140},
- {Name:"hour", Delta:3600, DX:90},
- {Name:"minute", Delta:60, DX:60}
+ {Name:"month", Delta:30.5*24*3600, DX:200, Mult:10000},
+ {Name:"day", Delta:24*3600, DX:140, Mult:1000},
+ {Name:"hour", Delta:3600, DX:90, Mult:100},
+ {Name:"minute", Delta:60, DX:60, Mult:2},
];
for(var i=0;i
-
Enter number of dapp
+
Enter number of dapp
Enter the dapps number that will be added to your account. Attention make sure that you trust this dapp, otherwise you may lose all funds in this account.