From 8dafeb2cf0eeb59c60c845f603140dc99bc7bd7d Mon Sep 17 00:00:00 2001 From: MiaoWoo Date: Thu, 18 Jul 2019 19:22:32 +0800 Subject: [PATCH] sync: sync upstream code Signed-off-by: MiaoWoo --- src/HTML/JS/coinlib.js | 10 +++ src/HTML/JS/crypto-client.js | 10 +++ src/HTML/wallet.html | 3 +- src/core/block-exchange.ts | 19 +++-- src/core/constant.ts | 5 +- src/core/library.ts | 12 ++- src/core/rest-loader.ts | 7 +- src/core/transaction-validator.ts | 3 +- src/core/update.ts | 6 ++ src/core/wallet.ts | 2 +- src/global.d.ts | 1 + src/process/child-process.ts | 120 ++++++++++++++++++++++++++++++ src/process/main-process.ts | 4 +- src/process/static-process.ts | 49 +----------- src/process/tx-process.ts | 76 +------------------ src/process/web-process.ts | 75 ++----------------- src/system/accounts.ts | 3 - src/system/smart.ts | 2 + 18 files changed, 196 insertions(+), 211 deletions(-) create mode 100644 src/process/child-process.ts diff --git a/src/HTML/JS/coinlib.js b/src/HTML/JS/coinlib.js index 2479f46..f83dce3 100644 --- a/src/HTML/JS/coinlib.js +++ b/src/HTML/JS/coinlib.js @@ -11,6 +11,15 @@ var MAX_SUM_TER = 1e9; var MAX_SUM_CENT = 1e9; +function CHECKSUM(Coin) +{ + if(typeof Coin.SumCOIN !== "number") + Coin.SumCOIN = 0; + if(typeof Coin.SumCENT !== "number") + Coin.SumCENT = 0; +}; + + function ADD(Coin,Value2) { Coin.SumCOIN += Value2.SumCOIN; @@ -102,6 +111,7 @@ function COIN_FROM_STRING(Str) }; if(typeof global === "object") { + global.CHECKSUM = CHECKSUM; global.ADD = ADD; global.SUB = SUB; global.DIV = DIV; diff --git a/src/HTML/JS/crypto-client.js b/src/HTML/JS/crypto-client.js index 7a467cb..9ac1000 100644 --- a/src/HTML/JS/crypto-client.js +++ b/src/HTML/JS/crypto-client.js @@ -135,6 +135,15 @@ window.GetCurrentBlockNumByTime = function () return 0; }; +function SetMinPow() +{ + var item = $("idDeltaPow"); + if(item) + { + window.DELTA_POWER_POW_TR = ParseNum(item.value); + } +}; + function GetBlockNumTr(arr) { var BlockNum = window.DELTA_FOR_TIME_TX + GetCurrentBlockNumByTime(); @@ -153,6 +162,7 @@ var LastCreatePOWHash = [255, 255, 255, 255]; function CreateHashBodyPOWInnerMinPower(arr,MinPow,startnonce) { + SetMinPow(); var TrType = arr[0]; var BlockNum = GetBlockNumTr(arr); if(MinPow === undefined) diff --git a/src/HTML/wallet.html b/src/HTML/wallet.html index 8e8ba13..84d6879 100644 --- a/src/HTML/wallet.html +++ b/src/HTML/wallet.html @@ -63,7 +63,7 @@ var SaveIdArr=["idAccount","idTo","idSumSend","idDescription","idSelStyle", "idViewAccountNum","idViewBlockNum","idViewActNum","idViewHashNum","idViewDappNum", "idRunText","idViewAccountFilter", - "idBlockCount","idPeriodAutoCheckPoint"]; + "idBlockCount","idPeriodAutoCheckPoint","idDeltaPow"]; var MaxAccID=0; @@ -1730,6 +1730,7 @@
+ Pow: