502647092/tera
1
0
Fork 0
Code Releases Activity

0.905

Browse Source
This commit is contained in:
progr76@gmail.com
2019-02-26 04:55:33 +03:00
parent 5782e4c1ca
commit d436ca1710
34 changed files with 961 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/HTML/CSS/wallet.css
View File

@@ -464,7 +464,7 @@ table.keys
{
z-index:100;
position:absolute;
height:150px;
height:170px;
width:380px;
top:20%;
left:0;
@@ -480,6 +480,14 @@ table.keys
border-radius: 8px;
}
#idCheckOnSend
{
font-size: smaller;
position:absolute;
bottom: 10px;
}
.radius
{
border-radius: 4px;

4
Source/HTML/JS/terahashlib.js
View File

@@ -26,8 +26,8 @@ if(typeof global === "object")
BLOCKNUM_ALGO2 = 0;
if(global.TEST_NETWORK)
{
BLOCKNUM_HASH_NEW = 1000;
global.BLOCKNUM_TICKET_ALGO = 1296300;
BLOCKNUM_HASH_NEW = 100;
BLOCKNUM_TICKET_ALGO = 0;
}
else
{

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

@@ -300,9 +300,12 @@ function SendMoneyBefore()
}
else
{
var SumSend = $("idSumSend").value;
var StrTo = " to " + GetAccountText(Item, ToID);
$("idWhiteOnSend").checked = 0;
$("idOnSendText").innerText = "" + $("idSumSend").value + " " + $("idCoinName").innerText + StrTo;
$("idOnSendText").innerHTML = "<B style='color:#ff4534'>" + SumSend + "</B> " + $("idCoinName").innerText + StrTo;
if(SumSend >= 100000)
$("idOnSendText").innerHTML += "<BR><DIV style='color: yellow;'>WARNING: You are about to send a very large amount!</DIV>";
SetVisibleBlock("idBlockOnSend", 1);
SetImg(this, 'idBlockOnSend');
}

10
Source/HTML/JS/wallet-web.js
View File

@@ -8,7 +8,7 @@
* Telegram: https://web.telegram.org/#/im?p=@terafoundation
*/
var MIN_VERSION = 868;
var MIN_VERSION = 903;
var COUNT_BLOCK_PROOF = 300;
var MIN_SUM_POWER = COUNT_BLOCK_PROOF * 35;
var MainServer = undefined;
@@ -26,7 +26,7 @@ var ServerTestMap = {"127.0.0.1":{"ip":"127.0.0.1", "port":80, "Name":"LOCAL"},
function StartWebWallet()
{
if(NETWORK === "TERA-TEST")
if(NETWORK === "TERA-TEST2")
{
MIN_SUM_POWER = 0;
ServerMap = ServerTestMap;
@@ -113,18 +113,21 @@ 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;
GetData(GetProtocolServerPath(Item) + "/GetNodeList", {}, function (Data)
{
if(Data && Data.result && Data.BlockChain && Data.VersionNum >= MIN_VERSION)
if(Data && Data.result && Data.NETWORK === NETWORK && Data.VersionNum >= MIN_VERSION)
{
ConnectedCount++;
Item.GetHandShake = 1;
Item.BlockChain = Data.BlockChain;
SetStatus("Get: " + Item.ip + ":" + Item.port);
var bWas = 0;
for(var i = 0; i < Data.arr.length; i++)
{
@@ -132,6 +135,7 @@ function DoNodeList(Item)
if(!ServerMap[Node.ip] && Node.port)
{
ServerMap[Node.ip] = Node;
console.log("New: " + Node.ip + ":" + Node.port);
bWas = 1;
}
}

6
Source/HTML/monitor.html
View File

@@ -246,9 +246,9 @@
{isLine:true,text:"Ноды"},
{name:"MAX:CLUSTER_NODE",text:"=RUNING=",value:0,red:"#83a3d6"},
{name:"MAX:CLUSTER_NODE_HASH",text:"=RUNING OK HASH=",value:0,red:"#658a61"},
// {name:"MAX:CLUSTER_NODE_ACC_HASH",text:"=RUNING ACCOUNT HASH=",value:0,red:"#658a61"},
{name:"MAX:CLUSTER_NODE",text:"=RUNNING=",value:0,red:"#83a3d6"},
{name:"MAX:CLUSTER_NODE_HASH",text:"=RUNNING OK HASH=",value:0,red:"#658a61"},
// {name:"MAX:CLUSTER_NODE_ACC_HASH",text:"=RUNNING ACCOUNT HASH=",value:0,red:"#658a61"},

10
Source/HTML/wallet.html
View File

@@ -1482,7 +1482,7 @@
<tr>
<td>Amount</td>
<td>
<INPUT type="number" id="idSumSend" value="" step=0 min=0 max=1000000000 onkeyup="OnEditTransactionFields()" onchange="OnEditTransactionFields()">&nbsp;
<INPUT type="number" id="idSumSend" style="color:#1e21cb" value="" step=0 min=0 max=1000000000 onkeyup="OnEditTransactionFields()" onchange="OnEditTransactionFields()">&nbsp;
<button style="font-family: monospace;" onclick="SetAllSum()"><-</button>
<B id="idCoinName"></B>
</td>
@@ -1804,13 +1804,13 @@
<DIV id="idBlockOnSend" style="display: none">
<DIV align="center">
Send <B id="idOnSendText"></B> ?
<BR>
Send <B id="idOnSendText"></B>
<button onclick="SendMoney2()" id="idBtOnSend" class="radius">Send</button>
<button onclick='SetVisibleBlock("idBlockOnSend",0);' class="radius">Cancel</button>
<DIV align="left">
<DIV style="font-size: smaller"><input type="checkbox" id="idWhiteOnSend"/> Add this account to white list</DIV>
<!--<DIV style="font-size: smaller"><input type="checkbox" id="idOnSendNoShow" oninput="SaveValues()"/> Do not show this warning again</DIV>-->
<DIV id="idCheckOnSend"><input type="checkbox" id="idWhiteOnSend"/> Add this account to white list</DIV>
</DIV>
</DIV>
</DIV>

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

@@ -97,13 +97,13 @@
function ChangeNetwork()
{
if(NETWORK==="TERA-TEST")
if(NETWORK==="TERA-TEST2")
{
NETWORK="TERA-MAIN";
}
else
{
NETWORK="TERA-TEST";
NETWORK="TERA-TEST2";
}
localStorage["NETWORK"]=NETWORK;
StartWebWallet();
@@ -924,7 +924,7 @@
<tr>
<td>Amount</td>
<td>
<INPUT type="number" id="idSumSend" value="" step=0 min=0 max=1000000000 oninput="OnEditTransactionFields()">&nbsp;
<INPUT type="number" id="idSumSend" style="color:#1e21cb" value="" step=0 min=0 max=1000000000 oninput="OnEditTransactionFields()">&nbsp;
<button style="font-family: monospace;" onclick="SetAllSum()"><-</button>
<B id="idCoinName"></B>
</td>
@@ -1084,13 +1084,13 @@
<DIV id="idBlockOnSend" style="display: none">
<DIV align="center">
Send <B id="idOnSendText"></B> ?
Send <B id="idOnSendText"></B>
<BR>
<button onclick="SendMoney2()" id="idBtOnSend" class="radius">Send</button>
<button onclick='SetVisibleBlock("idBlockOnSend",0);' class="radius">Cancel</button>
<BR>
<DIV align="left">
<DIV style="font-size: smaller"><input type="checkbox" id="idWhiteOnSend"/> Add this account to white list</DIV>
<DIV id="idCheckOnSend"><input type="checkbox" id="idWhiteOnSend"/> Add this account to white list</DIV>
</DIV>
</DIV>
</DIV>