sync: sync upstream code

Signed-off-by: MiaoWoo <admin@yumc.pw>

src/core/block-loader.ts

@@ -1030,7 +1030,6 @@ export default class CBlock extends CRest {
                 var TR = arrContent[0];
                 if (TR[0] === TYPE_TRANSACTION.TYPE_TRANSACTION_ACC_HASH) {
                     if (!global.DApps.Accounts.TRCheckAccountHash(TR, Data.BlockNum)) {
-                        global.ToLog(`global.DApps.Accounts.TRCheckAccountHash(TR, Data.BlockNum) ${JSON.stringify(TR)}, ${Data.BlockNum}`)
                         if (!this.BADHashCount)
                             this.BADHashCount = 0
                         this.BADHashCount++
@@ -1043,8 +1042,6 @@ export default class CBlock extends CRest {
                             this.FREE_ALL_MEM_CHAINS()
                             this.SetTruncateBlockDB(Block.BlockNum - 5 * global.DELTA_BLOCK_ACCOUNT_HASH)
                         }
-                        else {
-                        }
                         return;
                     }
                 }

src/core/constant.ts

@@ -134,7 +134,7 @@ global.TRUST_PROCESS_COUNT = 80000;
 global.MAX_NODES_RETURN = 100;
 global.MAX_WAIT_PERIOD_FOR_STATUS = 10 * 1000;
 global.MAX_GRAY_CONNECTIONS_TO_SERVER = 10;
-global.MAX_PACKET_LENGTH = 450 * 1024;
+global.MAX_PACKET_LENGTH = 550 * 1024;
 global.COUNT_BLOCKS_FOR_LOAD = 600;
 global.TR_LEN = 100;
 global.BLOCK_PROCESSING_LENGTH = 8;
@@ -235,10 +235,12 @@ else
         global.NEW_FORMULA_TARGET1 = 0;
         global.NEW_FORMULA_TARGET2 = 1;
         global.COUNT_NODE_PROOF = 8;
-        global.REST_START_COUNT = 10000;
         global.NEW_SIGN_TIME = 4859000;
         global.MAX_LENGTH_SENDER_MAP = 100;
         global.DELTA_START_SENDER_MAP = 12;
+        global.REST_START_COUNT = 0;
+        global.LOAD_TO_BEGIN = 0;
+
     }
 if (global.LOCAL_RUN) {
     global.BLOCKNUM_TICKET_ALGO = 0;

src/core/rest-loader.ts

@@ -12,6 +12,10 @@
 import CDB from './db/block-db'
 import { TYPE_TRANSACTION } from '../constant/account';
 import { DB_FORMAT } from '../constant/db-format';
+var MIN_POW_CHAINS = 2;
+if (global.TEST_NETWORK) {
+    MIN_POW_CHAINS = 1;
+}
 export default class CRest extends CDB {
     LoadRestContext
     BlockNumDB

src/core/server.ts

@@ -12,10 +12,9 @@
 import * as net from 'net'
 // import dgram = require("dgram");
 import * as crypto from 'crypto';
-import "./library"
+import { secp256k1, RBTree } from "./library"
 import "./crypto-library"
 import CConnect from './connect'
-import { secp256k1, RBTree } from '../core/library'
 import { STreeBuffer } from './base';
 const HARD_PACKET_PERIOD = 20;
 global.BUF_TYPE = 1;