Skip to content

Release v4.2.2.1 #3875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 25, 2021
Merged

Release v4.2.2.1 #3875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a537578
modify version
forfreeday Jun 25, 2021
422548e
Merge pull request #3874 from forfreeday/feature/optimization_process…
forfreeday Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/src/main/java/org/tron/core/db/Manager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,7 @@ public boolean pushTransaction(final TransactionCapsule trx)

try (ISession tmpSession = revokingStore.buildSession()) {
processTransaction(trx, null);
trx.setTrxTrace(null);
pendingTransactions.add(trx);
tmpSession.merge();
}
Expand Down Expand Up @@ -1207,7 +1208,6 @@ public TransactionInfo processTransaction(final TransactionCapsule trxCap, Block
}
//set the sort order
trxCap.setOrder(transactionInfo.getFee());
trxCap.setTrxTrace(null);
return transactionInfo.getInstance();
}

Expand Down
2 changes: 1 addition & 1 deletion framework/src/main/java/org/tron/program/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public class Version {

public static final String VERSION_NAME = "GreatVoyage-v4.2.1-62-g0ba5c5c77";
public static final String VERSION_CODE = "15584";
private static final String VERSION = "4.2.2";
private static final String VERSION = "4.2.2.1";

public static String getVersion() {
return VERSION;
Expand Down