502647092
/
tera
1
0
Fork 0
Code Releases Activity

Sat Jul 20 20:40:02 CST 2019 Source Update...

master
MiaoWoo 2019-07-20 20:40:02 +08:00
parent 59a5459080
commit 081044155c
12 changed files with 118 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/HTML/CSS/mobile-wallet.css
View File

@ -241,7 +241,7 @@ textarea {
/* background: var(--blue-grey); */
background: transparent;
border: none;
color: #fff;
color: #000;
padding: 5px;
width: 55px;
font-family: inherit;
@ -1858,7 +1858,7 @@ td.hash {
width: 60px;
border-radius: 3px;
background: transparent;
color: rgba(255, 255, 255, 0.6);
color: #000;
}
.white-select {
display: block;
@ -2773,7 +2773,7 @@ iframe
.btn--float
{
float: left;
width: 230px;
width: 200px;
margin: 10px;
}

8
Source/HTML/JS/client.js
View File

@ -64,6 +64,7 @@ window.IsLocalClient = function ()
{
return (window.location.protocol.substr(0, 4) !== "http");
};
var glSession;
var ServerHTTP;
var MainServer;
if(window.nw)
@ -1983,3 +1984,10 @@ function isMobile()
}
return false;
};
function DoNewSession()
{
var arr = new Uint8Array(6);
window.crypto.getRandomValues(arr);
glSession = GetHexFromArr(arr);
};

82
Source/HTML/JS/mobile-wallet.js
View File

@ -24,6 +24,7 @@ var CONNECT_STATUS = 0;
var NotModalClose = 0;
window.onload = function ()
{
DoNewSession();
InitAccountsCard();
DoLangScript();
InitWalletKeyName();
@ -38,7 +39,6 @@ window.onload = function ()
if(Data && Data.result)
{
Storage.setItem("NETWORK", Data.NETWORK);
console.log("Default network: " + Data.NETWORK);
OnLoad();
}
});
@ -98,8 +98,8 @@ function OnLoad()
LoadValues();
InitDappsCard();
StartWebWallet();
setInterval(UpdatesExplorerData, 1000);
setInterval(UpdatesAccountsData, 1000);
setInterval(UpdatesExplorerData, 2000);
setInterval(UpdatesAccountsData, 2000);
DoStableScroll();
window.onmousemove = function (event)
{
@ -117,12 +117,14 @@ function OnLoad()
function ChangeNetwork(bStart)
{
FirstAccountsData = 1;
CONNECT_STATUS = 0;
NETWORK = $("idCurNetwork").value;
Storage.setItem("NETWORK", NETWORK);
if(bStart)
StartWebWallet();
ConnectWebWallet();
else
ConnectWebWallet();
};
function UpdateTabs()
@ -144,6 +146,7 @@ function OnFindServer()
CONNECT_STATUS = 2;
Storage.setItem("MainServer", JSON.stringify({ip:MainServer.ip, port:MainServer.port}));
FillCurrencyAsync("idAccountCur");
SetDataUpdateTime(10);
UpdateTabs();
};
@ -188,10 +191,20 @@ function OnSelectTab(name)
SetPrivKey($("idPrivKeyEdit").value.trim());
InitPrivKey();
}
if(name === "TabDapps")
if(name === "TabAccounts" || name === "TabSend")
{
ViewDapps();
UpdatesAccountsData(1);
}
else
if(name === "TabExplorer")
{
UpdatesExplorerData(1);
}
else
if(name === "TabDapps")
{
ViewDapps();
}
};
function SetVisibleTab()
@ -292,8 +305,14 @@ function OnPrivKeyCancel()
};
var FirstAccountsData = 1;
var AccountsCount = - 1;
var DataUpdateTime = 0;
function UpdatesAccountsData()
function SetDataUpdateTime(PeriodSec)
{
DataUpdateTime = Date.now() + 1000 * PeriodSec;
};
function UpdatesAccountsData(bGetData)
{
if(IsVisibleClass(".accounts-info__add"))
return ;
@ -304,7 +323,16 @@ function UpdatesAccountsData()
{
return ;
}
GetData("/GetAccountListByKey", {Key:Str, AllData:FirstAccountsData}, function (Data,responseText)
if(!bGetData)
{
if(IsVisibleBlock("TabAccounts") || DataUpdateTime >= Date.now())
{
bGetData = 1;
}
}
if(!bGetData)
return ;
GetData("/GetAccountListByKey", {Key:Str, Session:glSession, AllData:FirstAccountsData}, function (Data,responseText)
{
if(!Data || !Data.result || !Data.arr)
return ;
@ -549,8 +577,20 @@ function RestoreAllAccounts()
DelAccount(0);
};
function UpdatesExplorerData()
function UpdatesExplorerData(bGetData)
{
var bDiagram = 0;
if(IsVisibleBlock("TabExplorer") && IsVisibleBlock("idStatBlock"))
bDiagram = 1;
if(!bGetData)
{
if(bDiagram || DataUpdateTime >= Date.now())
{
bGetData = 1;
}
}
if(!bGetData)
return ;
var WasSendTr = 0;
for(var key in MapSendTransaction)
{
@ -561,7 +601,7 @@ function UpdatesExplorerData()
break;
}
}
GetData("GetCurrentInfo", {Diagram:IsVisibleBlock("idStatBlock") ? 1 : 0, ArrLog:WasSendTr}, function (Data)
GetData("GetCurrentInfo", {Diagram:bDiagram, ArrLog:WasSendTr}, function (Data)
{
if(!Data || !Data.result)
return ;
@ -697,9 +737,11 @@ function downloadKey(fieldID)
anchor.click();
document.body.removeChild(anchor);
};
var glWasModal = 0;
function openModal(id)
{
glWasModal = 1;
var modal = document.querySelector("#" + id);
var overlay = document.querySelector("#overlay");
modal.style.display = "block";
@ -710,6 +752,7 @@ function closeModal()
{
if(NotModalClose)
return ;
glWasModal = 0;
var modals = document.querySelectorAll(".modal");
var overlay = document.querySelector("#overlay");
modals.forEach(function (item)
@ -802,14 +845,24 @@ function SendMobileBefore()
SetVisibleClass(".send-page__setting", 0);
SetVisibleClass(".send-page__confirm", 1);
SetStatus("");
UpdatesAccountsData(1);
UpdatesExplorerData(1);
};
function OKSend()
{
SendMoney();
ClearSend();
SaveValues();
SendMoney(function ()
{
if(glWasModal)
{
ClearSend();
SaveValues();
}
closeModal();
});
SetDataUpdateTime(20);
CancelSend();
openModal('idSending');
};
function CancelSend()
@ -920,6 +973,7 @@ function SetUsePassword(bUse)
function DoExitWallet()
{
ClearSend();
SaveValues();
NotModalClose = 1;
$("Password").value = "";
SetWalletPassword("");
@ -1210,7 +1264,7 @@ LangMap["RUS"] = {"TERA WALLET":"TERA КОШЕЛЕК", "Generate 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":"Создание счета",
"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":"Установите пароль для безопасности",

6
Source/HTML/JS/wallet-lib.js
View File

@ -347,7 +347,7 @@ function SendMoney2()
SendMoney();
};
function SendMoney()
function SendMoney(F)
{
if(!CanSendTransaction)
{
@ -358,7 +358,9 @@ function SendMoney()
if($("idSendButton").disabled)
return ;
SetVisibleBlock("idBlockOnSend", 0);
CreateTransaction(SendMoneyTR, true, ClearAttach);
if(!F)
F = ClearAttach;
CreateTransaction(SendMoneyTR, true, F);
};
function GetJSONFromTransaction(TR)

8
Source/HTML/dapp-frame.html
View File

@ -26,9 +26,9 @@
var NumDappGet=0;
var NumDappInfo=0;
var arr = new Uint8Array(6);
window.crypto.getRandomValues(arr);
var glSession=GetHexFromArr(arr);
// var arr = new Uint8Array(6);
// window.crypto.getRandomValues(arr);
// var glSession=GetHexFromArr(arr);
//DAPP TRANSFER
@ -295,6 +295,8 @@
var SMART={},BASE_ACCOUNT={},OPEN_PATH="";
window.onload=function()
{
DoNewSession();
if(window.location.hash)
OPEN_PATH=window.location.hash.substr(1);
if(IsLocalClient())

7
Source/HTML/wallet.html
View File

@ -490,6 +490,13 @@
{
CanSendTransaction=1;
}
if(Data.NET_WORK_MODE && Data.NET_WORK_MODE.NOT_RUN)
{
CanSendTransaction=0;
WalletStatus="OK";
SetMainStatus("<DIV align='center' style='color:#565571'><big><B>NODE NOT RUNING</B></big></DIV>",1);
}
MaxAccID=Data.MaxAccID;
MaxDappsID=Data.MaxDappsID;

6
Source/HTML/web-wallet.html
View File

@ -632,9 +632,13 @@
</form>
</section>
<section class="modal dapp-modal" id="idSending" onclick="closeModal()" style="display: none;">
<h2 class="password-modal__title">Sending Tx</h2><BR>
<p class="password-modal__subtitle">Wait 5-8 sec, pls</p>
</section>
<section class="modal password-modal" id="idSmartEnter">
<section class="modal dapp-modal" id="idSmartEnter" style="display: none;">
<h2 class="password-modal__title"><span>Enter number of dapp</span></h2>
<p class="password-modal__subtitle">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.</p>

6
Source/core/connect.js
View File

@ -1443,12 +1443,12 @@ module.exports = class CConnect extends require("./transfer-msg")
if(!this.LastNotZeroNodesTime)
this.LastNotZeroNodesTime = CurTime
var DeltaTime = CurTime - this.LastNotZeroNodesTime;
if(DeltaTime > 10 * 1000)
if(DeltaTime > 60 * 1000)
{
ToLog("DETECT GRAY MODE")
if(!global.NET_WORK_MODE)
{
global.NET_WORK_MODE = {ip:"", port:""}
global.NET_WORK_MODE = {ip:"", port:"30000"}
}
global.NET_WORK_MODE.UseDirectIP = 0
SAVE_CONST()
@ -1459,7 +1459,7 @@ module.exports = class CConnect extends require("./transfer-msg")
var CountNodes = this.ActualNodes.size;
if(CountNodes && !global.NET_WORK_MODE)
{
global.NET_WORK_MODE = {ip:"", port:"30000"}
global.NET_WORK_MODE = {ip:"", port:"30000", NOT_RUN:0}
global.NET_WORK_MODE.UseDirectIP = 1
SAVE_CONST()
}

2
Source/core/constant.js
View File

@ -8,7 +8,7 @@
* Telegram: https://t.me/terafoundation
*/
global.UPDATE_CODE_VERSION_NUM = 1159;
global.UPDATE_CODE_VERSION_NUM = 1163;
global.MIN_CODE_VERSION_NUM = 1114;
global.MINING_VERSION_NUM = 0;
global.InitParamsArg = InitParamsArg;

4
Source/core/server.js
View File

@ -973,6 +973,10 @@ module.exports = class CTransport extends require("./connect")
this.CanSend++
return ;
}
if(global.NET_WORK_MODE && NET_WORK_MODE.NOT_RUN)
{
return ;
}
let SELF = this;
this.Server = net.createServer(function (sock)
{

8
Source/process/main-process.js
View File

@ -36,9 +36,9 @@ setTimeout(function ()
global.glCurNumFindArr = 0;
global.ArrReconnect = [];
global.ArrConnect = [];
var FindList = [{"ip":"91.235.136.81", "port":30005}, {"ip":"149.154.70.158", "port":30000}, {"ip":"185.240.243.182", "port":30000},
{"ip":"212.109.197.205", "port":30000}, {"ip":"212.109.197.209", "port":30000}, {"ip":"80.87.192.24", "port":30000}, {"ip":"teraexplorer.org",
"port":30000}, ];
var FindList = [{"ip":"91.235.136.81", "port":30000}, {"ip":"dappsgate.com", "port":30000}, {"ip":"185.240.243.182", "port":30000},
{"ip":"t1.teraexplorer.com", "port":30000}, {"ip":"t2.teraexplorer.com", "port":30000}, {"ip":"t4.teraexplorer.com", "port":30000},
{"ip":"teraexplorer.org", "port":30000}, ];
if(global.LOCAL_RUN)
{
FindList = [{"ip":"127.0.0.1", "port":50001}, {"ip":"127.0.0.1", "port":50002}];
@ -332,7 +332,7 @@ function StartChildProcess(Item)
}
if(ITEM.Worker)
{
ITEM.Worker.send({cmd:"Alive"});
ITEM.Worker.send({cmd:"Alive", DELTA_CURRENT_TIME:DELTA_CURRENT_TIME});
}
}, 500);
ITEM.RunRPC = function (Name,Params,F)

8
Source/process/web-process.js
View File

@ -591,7 +591,7 @@ HostingCaller.GetNodeList = function (Params)
};
var AccountKeyMap = {};
var LastMaxNum = 0;
HostingCaller.GetAccountListByKey = function (Params,ppp,bRet)
HostingCaller.GetAccountListByKey = function (Params,aaa,bbb,bRet)
{
if(typeof Params !== "object" || !Params.Key)
return {result:0, arr:[]};
@ -642,9 +642,13 @@ HostingCaller.GetAccountListByKey = function (Params,ppp,bRet)
}
var Ret = {result:1, arr:arr};
if(bRet)
{
return Ret;
}
var Context = GetUserContext(Params);
var StrInfo = JSON.stringify(Ret);
if(Params.AllData === "0")
Params.AllData = 0;
if(!Params.AllData && Context.PrevAccountList === StrInfo)
{
return {result:0, cache:1};
@ -743,7 +747,7 @@ HostingCaller.DappWalletList = function (Params)
{
if(typeof Params !== "object")
return {result:0};
var Ret = HostingCaller.GetAccountListByKey(Params, undefined, 1);
var Ret = HostingCaller.GetAccountListByKey(Params, undefined, undefined, 1);
var Smart = ParseNum(Params.Smart);
var arr = [];
for(var i = 0; i < Ret.arr.length; i++)