0.1043

Source/HTML/console.html

@@ -62,8 +62,19 @@
         var Name = $("idConsoleIndex").value;
         $("idName").value=Name;
         CurRowName=Name;
-        var Code=CodeList[Name];
-        $("idConsoleText").value=Code;
+        var Data=CodeList[Name];
+        if(Data && Data.Code)
+        {
+            $("idConsoleText").value=Data.Code;
+            $("idConsoleSend").value=Data.Type;
+            $("idProcessTX").checked=Data.ProcessTX;
+        }
+        else
+        {
+            $("idConsoleText").value=Data;
+            $("idProcessTX").checked=0;
+            $("idConsoleSend").value="ServerCode";
+        }
         if(bRun)
             SendToServer();
     }
@@ -87,7 +98,10 @@
         }
 
         if(Name)
-            CodeList[Name]=$("idConsoleText").value;
+        {
+            var Data={Code:$("idConsoleText").value,Type:$("idConsoleSend").value,ProcessTX:$("idProcessTX").checked};
+            CodeList[Name]=Data;
+        }
 
         if(bUpdate)
         {
@@ -397,7 +411,7 @@
     {
         if(!localStorage["WasSaveConsole"])
             return;
-        //$("idConsoleText").value=localStorage["idConsoleText"];
+
         $("idConsoleSend").value=localStorage["idConsoleSend"];
         $("idConsoleDeltaBlockNum").value=localStorage["idConsoleDeltaBlockNum"];
         $("idNode").value=localStorage["idConsoleNode"];
@@ -405,7 +419,7 @@
             CodeList=JSON.parse(localStorage["ConsoleCodeList2"]);
         if(localStorage["idConsolePow"])
             $("idPow").value=localStorage["idConsolePow"];
-        //$("idSendAll").checked=(localStorage["idConsoleSendAll"]==="true");
+
 
         $("idProcessTX").checked=(localStorage["idConsoleProcessTX"]==="true");
         if(localStorage["idConsolePeriodRun"])
@@ -414,7 +428,7 @@
     function SaveValues()
     {
         localStorage["WasSaveConsole"]=1;
-        //localStorage["idConsoleText"]=$("idConsoleText").value;
+
         localStorage["idConsoleSend"]=$("idConsoleSend").value;
         localStorage["idConsoleDeltaBlockNum"]=$("idConsoleDeltaBlockNum").value;
         localStorage["idConsoleNode"]=$("idNode").value;

Source/core/constant.js

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

Source/core/db/block-db.js

@@ -41,6 +41,9 @@ module.exports = class CDB extends require("../code")
         var FileItem2 = BlockDB.OpenDBFile(FILE_NAME_HEADER2, bWriteMode);
         if(FileItem2.size)
             global.DB_VERSION = 2
+        else
+            if(FileItem1.size)
+                global.DB_VERSION = 1
         BlockDB.OpenDBFile(FILE_NAME_BODY, bWriteMode)
         this.BlockNumDB = 0
         this.BlockNumDBMin = 0

Source/dapp/accounts.js

@@ -1537,3 +1537,27 @@ DAppByType[TYPE_DEPRECATED_TRANSFER1] = App;
 DAppByType[TYPE_DEPRECATED_TRANSFER2] = App;
 DAppByType[TYPE_TRANSACTION_TRANSFER] = App;
 DAppByType[TYPE_TRANSACTION_ACC_HASH] = App;
+
+function TestStateFiles(Size,Format)
+{
+    return ;
+    if(global.PROCESS_NAME !== "MAIN")
+        return ;
+    var DBState1 = new DBRow("state-ok", Size, Format, 0);
+    var DBState2 = new DBRow("state-no", Size, Format, 0);
+    for(var Num = 0; 1; Num++)
+    {
+        var Item1 = DBState1.Read(Num);
+        var Item2 = DBState2.Read(Num);
+        if(!Item1 && !Item2)
+            break;
+        var Str1 = JSON.stringify(Item1);
+        var Str2 = JSON.stringify(Item2);
+        if(Str1 !== Str2)
+        {
+            ToLog("Err item: " + Num);
+            ToLog("1: " + Str1);
+            ToLog("2: " + Str2);
+        }
+    }
+};

Source/process/main-process.js

@@ -321,7 +321,6 @@ function StartChildProcess(Item)
                 });
                 ITEM.Worker.on('error', function (err)
                 {
-                    ToError("ERROR IN " + ITEM.Name + " Err : " + err);
                 });
                 ITEM.Worker.on('close', function (code)
                 {

Source/process/tx-process.js

@@ -156,8 +156,6 @@ function DoTXProcess()
         }
         if(!IsValidSumHash(Block))
         {
-            if(bShowDetail)
-                ToLog("Stop calc: " + Block.BlockNum + " - ZERO");
             break;
         }
         var Item = BlockTree.LoadValue(Block.BlockNum, 1);
@@ -167,6 +165,19 @@ function DoTXProcess()
                 ToLog("WAS CALC: " + Num + " SumHash: " + GetHexFromArr(Block.SumHash).substr(0, 12));
             continue;
         }
+        if(Num > 0)
+        {
+            var Block0 = SERVER.ReadBlockDB(Num - 1);
+            if(Block0)
+            {
+                var Item0 = BlockTree.LoadValue(Block0.BlockNum, 1);
+                if(Item0 && CompareArr(Item0.SumHash, Block0.SumHash) !== 0)
+                {
+                    ToLog("WAS_CHANGED_PREV_BLOCK = " + Block0.BlockNum);
+                    break;
+                }
+            }
+        }
         SERVER.BlockProcessTX(Block);
         if(Num % 100000 === 0)
             ToLog("CALC: " + Num);