From 2fb19c1a956329937210e23bc6ebdaba5cdc8f5b Mon Sep 17 00:00:00 2001 From: Charlie <29900478@qq.com> Date: Fri, 20 Nov 2020 16:17:10 +0800 Subject: [PATCH] update package --- .../java/io/nuls/transaction/service/impl/TxServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java b/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java index 070e0fbd50..ff30b7e52a 100644 --- a/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java +++ b/module/nuls-transaction/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java @@ -604,7 +604,7 @@ public TxPackage getPackableTxs(Chain chain, long endtimestamp, long maxTxDataSi long batchValidReserve = TxConstant.PACKAGE_MODULE_VALIDATOR_RESERVE_TIME; if (packableTime <= batchValidReserve) { //直接打空块 - return new TxPackage(new ArrayList<>(), preStateRoot, chain.getBestBlockHeight() + 1); + return new TxPackage(new ArrayList<>(), null, chain.getBestBlockHeight() + 1); } //重置标志 chain.setContractTxFail(false); @@ -955,7 +955,7 @@ public TxPackage getPackableTxs(Chain chain, long endtimestamp, long maxTxDataSi baseValidateTx(chain, tx, txRegister); chain.getUnverifiedQueue().addLast(new TransactionNetPO(txPackageWrapper.getTx())); } - return new TxPackage(new ArrayList<>(), preStateRoot, chain.getBestBlockHeight() + 1); + return new TxPackage(new ArrayList<>(), null, chain.getBestBlockHeight() + 1); } //检测预留传输时间 long current = NulsDateUtils.getCurrentTimeMillis();