Skip to content

Commit 22b1265

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into feature/optimize_stake2_code
2 parents 699c044 + a4100b6 commit 22b1265

File tree

50 files changed

+1423
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1423
-303
lines changed

actuator/src/main/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ private long getTotalWithdrawUnfreeze(List<UnFreezeV2> unfrozenV2List, long now)
125125
}
126126

127127
private List<UnFreezeV2> getTotalWithdrawList(List<UnFreezeV2> unfrozenV2List, long now) {
128-
return unfrozenV2List.stream().filter(unfrozenV2 -> (unfrozenV2.getUnfreezeAmount() > 0
129-
&& unfrozenV2.getUnfreezeExpireTime() <= now)).collect(Collectors.toList());
128+
return unfrozenV2List.stream().filter(unfrozenV2 -> unfrozenV2.getUnfreezeExpireTime() <= now)
129+
.collect(Collectors.toList());
130130
}
131131

132132
private List<UnFreezeV2> getRemainWithdrawList(List<UnFreezeV2> unfrozenV2List, long now) {

actuator/src/main/java/org/tron/core/vm/nativecontract/WithdrawExpireUnfreezeProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ private long getTotalWithdrawUnfreeze(List<Protocol.Account.UnFreezeV2> unfrozen
6060
}
6161

6262
private List<Protocol.Account.UnFreezeV2> getTotalWithdrawList(List<Protocol.Account.UnFreezeV2> unfrozenV2List, long now) {
63-
return unfrozenV2List.stream().filter(unfrozenV2 -> (unfrozenV2.getUnfreezeAmount() > 0
64-
&& unfrozenV2.getUnfreezeExpireTime() <= now)).collect(Collectors.toList());
63+
return unfrozenV2List.stream().filter(unfrozenV2 -> unfrozenV2.getUnfreezeExpireTime() <= now)
64+
.collect(Collectors.toList());
6565
}
6666

6767
public long execute(WithdrawExpireUnfreezeParam param, Repository repo) throws ContractExeException {

actuator/src/main/java/org/tron/core/vm/utils/FreezeV2Util.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ private static long getTotalWithdrawUnfreeze(List<Protocol.Account.UnFreezeV2> u
234234
}
235235

236236
private static List<Protocol.Account.UnFreezeV2> getTotalWithdrawList(List<Protocol.Account.UnFreezeV2> unfrozenV2List, long now) {
237-
return unfrozenV2List.stream().filter(unfrozenV2 -> (unfrozenV2.getUnfreezeAmount() > 0
238-
&& unfrozenV2.getUnfreezeExpireTime() <= now)).collect(Collectors.toList());
237+
return unfrozenV2List.stream().filter(unfrozenV2 -> unfrozenV2.getUnfreezeExpireTime() <= now)
238+
.collect(Collectors.toList());
239239
}
240240

241241
public static long getV2NetUsage(AccountCapsule ownerCapsule, long netUsage) {

chainbase/src/main/java/org/tron/core/ChainBaseManager.java

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.tron.core.db.RecentBlockStore;
3030
import org.tron.core.db.RecentTransactionStore;
3131
import org.tron.core.db.TransactionStore;
32-
import org.tron.core.db2.core.ITronChainBase;
3332
import org.tron.core.exception.BadItemException;
3433
import org.tron.core.exception.HeaderNotFound;
3534
import org.tron.core.exception.ItemNotFoundException;
@@ -245,54 +244,6 @@ public class ChainBaseManager {
245244
@Setter
246245
private long lowestBlockNum = -1; // except num = 0.
247246

248-
public void closeOneStore(ITronChainBase database) {
249-
logger.info("******** Begin to close {}. ********", database.getName());
250-
try {
251-
database.close();
252-
} catch (Exception e) {
253-
logger.info("Failed to close {}.", database.getName(), e);
254-
} finally {
255-
logger.info("******** End to close {}. ********", database.getName());
256-
}
257-
}
258-
259-
public void closeAllStore() {
260-
dbStatService.shutdown();
261-
closeOneStore(transactionRetStore);
262-
closeOneStore(recentBlockStore);
263-
closeOneStore(transactionHistoryStore);
264-
closeOneStore(transactionStore);
265-
closeOneStore(accountStore);
266-
closeOneStore(blockStore);
267-
closeOneStore(blockIndexStore);
268-
closeOneStore(accountIdIndexStore);
269-
closeOneStore(accountIndexStore);
270-
closeOneStore(witnessScheduleStore);
271-
closeOneStore(assetIssueStore);
272-
closeOneStore(dynamicPropertiesStore);
273-
closeOneStore(abiStore);
274-
closeOneStore(codeStore);
275-
closeOneStore(contractStore);
276-
closeOneStore(contractStateStore);
277-
closeOneStore(storageRowStore);
278-
closeOneStore(exchangeStore);
279-
closeOneStore(proposalStore);
280-
closeOneStore(votesStore);
281-
closeOneStore(delegatedResourceStore);
282-
closeOneStore(delegatedResourceAccountIndexStore);
283-
closeOneStore(assetIssueV2Store);
284-
closeOneStore(exchangeV2Store);
285-
closeOneStore(nullifierStore);
286-
closeOneStore(merkleTreeStore);
287-
closeOneStore(delegationStore);
288-
closeOneStore(proofStore);
289-
closeOneStore(commonStore);
290-
closeOneStore(commonDataBase);
291-
closeOneStore(pbftSignDataStore);
292-
closeOneStore(sectionBloomStore);
293-
closeOneStore(accountAssetStore);
294-
}
295-
296247
// for test only
297248
public List<ByteString> getWitnesses() {
298249
return witnessScheduleStore.getActiveWitnesses();
@@ -316,9 +267,7 @@ public BlockCapsule getHead() throws HeaderNotFound {
316267
}
317268

318269
public synchronized BlockId getHeadBlockId() {
319-
return new BlockId(
320-
dynamicPropertiesStore.getLatestBlockHeaderHash(),
321-
dynamicPropertiesStore.getLatestBlockHeaderNumber());
270+
return new BlockId(dynamicPropertiesStore.getLatestBlockHeaderHash());
322271
}
323272

324273
public long getHeadBlockNum() {
@@ -434,6 +383,10 @@ private void init() {
434383
this.nodeType = getLowestBlockNum() > 1 ? NodeType.LITE : NodeType.FULL;
435384
}
436385

386+
public void shutdown() {
387+
dbStatService.shutdown();
388+
}
389+
437390
public boolean isLiteNode() {
438391
return getNodeType() == NodeType.LITE;
439392
}

chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,10 @@ public static byte[] getOwner(Transaction.Contract contract) {
346346
}
347347
}
348348
return owner.toByteArray();
349+
} catch (InvalidProtocolBufferException invalidProtocolBufferException) {
350+
logger.warn("InvalidProtocolBufferException occurred because {}, please verify the interface "
351+
+ "input parameters", invalidProtocolBufferException.getMessage());
352+
return new byte[0];
349353
} catch (Exception ex) {
350354
logger.error(ex.getMessage());
351355
return new byte[0];

chainbase/src/main/java/org/tron/core/db/TronDatabase.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,14 @@ public void reset() {
9494
*/
9595
@Override
9696
public void close() {
97-
dbSource.closeDB();
97+
logger.info("******** Begin to close {}. ********", getName());
98+
try {
99+
dbSource.closeDB();
100+
} catch (Exception e) {
101+
logger.warn("Failed to close {}.", getName(), e);
102+
} finally {
103+
logger.info("******** End to close {}. ********", getName());
104+
}
98105
}
99106

100107
public abstract void put(byte[] key, T item);

chainbase/src/main/java/org/tron/core/db/TronStoreWithRevoking.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,14 @@ public String getName() {
182182

183183
@Override
184184
public void close() {
185-
revokingDB.close();
185+
logger.info("******** Begin to close {}. ********", getName());
186+
try {
187+
revokingDB.close();
188+
} catch (Exception e) {
189+
logger.warn("Failed to close {}.", getName(), e);
190+
} finally {
191+
logger.info("******** End to close {}. ********", getName());
192+
}
186193
}
187194

188195
@Override

0 commit comments

Comments
 (0)