1
0
Fork 0
merge-requests/3/head
progr76@gmail.com 2019-04-25 21:18:40 +03:00
parent d784d500b0
commit 743c207710
6 changed files with 14 additions and 11 deletions

Binary file not shown.

Binary file not shown.

View File

@ -719,9 +719,7 @@ function Kmac(bits,padding,outputBits)
};
root.SHA3ARR = function (data,num)
{
if(!num)
num = GetCurrentBlockNumByTime();
if(num >= NEW_SIGN_TIME)
if(!NEW_SIGN_TIME || !num || num >= NEW_SIGN_TIME)
return sha3(data);
else
return meshhash(methods.sha3_array_256(data));

View File

@ -489,12 +489,13 @@
{
var arr = new Uint8Array(32);
window.crypto.getRandomValues(arr);
var PrivKey=GetHexFromArr(sha3(arr));
Storage.setItem("idPrivKey",PrivKey);
var PrivKey=sha3(arr);
Storage.setItem("idPrivKey",GetHexFromArr(PrivKey));
Storage.setItem("idPubKey",GetHexFromArr(SignLib.publicKeyCreate(PrivKey,1)));
CONFIG_DATA.PubKey=Storage.getItem("idPubKey");
console.log("CreateNewWebKeys: "+CONFIG_DATA.PubKey);
//console.log("CreateNewWebKeys: "+CONFIG_DATA.PubKey);
}
var CountCreateNewAccount=0;
@ -578,9 +579,7 @@
//glDebugPath="./dapp-smart/OnlineStore.html";
//glDebugPath="./dapp-smart/BTC-coin.html";
//glDebugPath="./dapp-smart/static/miner-list.html";
//glDebugPath="./dapp-smart/static/ReadAccountArr.html";
//glDebugPath="./dapp-smart/static/miner-list.html";
//glDebugPath="./dapp-smart/static/supply.html";
//glDebugPath="./dapp-smart/reward/AirDrop.html";
//{"HTMLBlock":24201380,"HTMLTr":0}
</script>

View File

@ -8,7 +8,7 @@
* Telegram: https://t.me/terafoundation
*/
global.UPDATE_CODE_VERSION_NUM = 1025;
global.UPDATE_CODE_VERSION_NUM = 1031;
global.MIN_CODE_VERSION_NUM = 1020;
global.MINING_VERSION_NUM = 3;
global.InitParamsArg = InitParamsArg;

View File

@ -156,6 +156,7 @@ require("../core/html-server");
require("../core/transaction-validator");
global.STAT_MODE = 1;
setInterval(PrepareStatEverySecond, 1000);
var IndexName = "index.html";
if(global.HTTPS_HOSTING_DOMAIN)
{
var file_sert = GetDataPath("sertif.lst");
@ -289,6 +290,11 @@ function RunListenServer()
bWasRun = 1;
});
};
var SiteFolder = GetNormalPathString("./SITE");
if(!fs.existsSync(SiteFolder))
{
IndexName = "web-wallet.html";
}
var LangPathMap = {};
LangPathMap["ru"] = 1;
LangPathMap["cn"] = 1;
@ -404,7 +410,7 @@ function DoCommandNew(response,Type,Path,Params)
if(Name.indexOf("..") >= 0 || Name.indexOf("\\") >= 0 || Name.indexOf("/") >= 0)
Name = "ErrorFilePath";
if(Name === "" || LangPathMap[Name])
Name = "index.html";
Name = IndexName;
if(Name.indexOf(".") < 0)
Name += ".html";
var PrefixPath;