feat(mechanism): optimize address parsing of stake interfaces#5419
Merged
halibobo1205 merged 15 commits intotronprotocol:developfrom Sep 4, 2023
Merged
Conversation
xxo1shine
reviewed
Aug 15, 2023
| transactionLogTrigger.setFromAddress(StringUtil | ||
| .encode58Check(unfreezeBalanceContract.getOwnerAddress().toByteArray())); | ||
| } | ||
| if (Objects.nonNull(unfreezeBalanceContract.getReceiverAddress())) { |
Contributor
There was a problem hiding this comment.
The frequency of these if statements is too high, you can encapsulate a function.
Contributor
Author
There was a problem hiding this comment.
OK, Ok, I encapsulate the code
framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java
Outdated
Show resolved
Hide resolved
| transactionLogTrigger.setFromAddress(StringUtil | ||
| .encode58Check(freezeBalanceV2Contract.getOwnerAddress().toByteArray())); | ||
| } | ||
| transactionLogTrigger.setAssetAmount(freezeBalanceV2Contract.getFrozenBalance()); |
Contributor
There was a problem hiding this comment.
transactionLogTrigger.setAssetName("trx"); ?
| transactionLogTrigger.setToAddress(StringUtil | ||
| .encode58Check(delegateResourceContract.getReceiverAddress().toByteArray())); | ||
| } | ||
| transactionLogTrigger.setAssetAmount( |
Contributor
There was a problem hiding this comment.
transactionLogTrigger.setAssetName("trx");?
added 2 commits
August 23, 2023 15:31
…nto feature/optimize_transaction_address_parsing_v2
| if (Objects.nonNull(withdrawExpireUnfreezeContract)) { | ||
| transactionLogTrigger.setFromAddress(StringUtil.encode58Check( | ||
| withdrawExpireUnfreezeContract.getOwnerAddress().toByteArray())); | ||
| transactionLogTrigger.setAssetAmount(transactionInfo.getWithdrawExpireAmount()); |
Contributor
There was a problem hiding this comment.
transactionLogTrigger.setAssetName("trx");
| WithdrawExpireUnfreezeContract withdrawExpireUnfreezeContract = contractParameter | ||
| .unpack(WithdrawExpireUnfreezeContract.class); | ||
|
|
||
| if (Objects.nonNull(withdrawExpireUnfreezeContract)) { |
Contributor
There was a problem hiding this comment.
contract cannot be null.
| UnfreezeBalanceContract unfreezeBalanceContract = contractParameter | ||
| .unpack(UnfreezeBalanceContract.class); | ||
|
|
||
| if (Objects.nonNull(unfreezeBalanceContract)) { |
Contributor
There was a problem hiding this comment.
contract cannot be null.
| FreezeBalanceV2Contract freezeBalanceV2Contract = contractParameter | ||
| .unpack(FreezeBalanceV2Contract.class); | ||
|
|
||
| if (Objects.nonNull(freezeBalanceV2Contract)) { |
Contributor
There was a problem hiding this comment.
contract cannot be null.
| UnfreezeBalanceV2Contract unfreezeBalanceV2Contract = contractParameter | ||
| .unpack(UnfreezeBalanceV2Contract.class); | ||
|
|
||
| if (Objects.nonNull(unfreezeBalanceV2Contract)) { |
Contributor
There was a problem hiding this comment.
contract cannot be null.
| DelegateResourceContract delegateResourceContract = contractParameter | ||
| .unpack(DelegateResourceContract.class); | ||
|
|
||
| if (Objects.nonNull(delegateResourceContract)) { |
Contributor
There was a problem hiding this comment.
contract cannot be null.
| UnDelegateResourceContract unDelegateResourceContract = contractParameter | ||
| .unpack(UnDelegateResourceContract.class); | ||
|
|
||
| if (Objects.nonNull(unDelegateResourceContract)) { |
Contributor
There was a problem hiding this comment.
contract cannot be null.
| CancelAllUnfreezeV2Contract cancelAllUnfreezeV2Contract = contractParameter | ||
| .unpack(CancelAllUnfreezeV2Contract.class); | ||
|
|
||
| if (Objects.nonNull(cancelAllUnfreezeV2Contract)) { |
Contributor
There was a problem hiding this comment.
contract cannot be null.
…_address_parsing_v2
…_address_parsing_v2
| if (!ByteString.EMPTY.equals(unfreezeBalanceContract.getReceiverAddress())) { | ||
| transactionLogTrigger.setToAddress(StringUtil | ||
| .encode58Check(unfreezeBalanceContract.getReceiverAddress().toByteArray())); | ||
| } |
Contributor
There was a problem hiding this comment.
Does this need to be added?
transactionLogTrigger.setAssetName("trx");
transactionLogTrigger.setAssetAmount(transactionInfo.getUnfreezeAmount());|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #5419 +/- ##
=============================================
+ Coverage 61.35% 61.41% +0.05%
- Complexity 9348 9351 +3
=============================================
Files 846 846
Lines 50211 50273 +62
Branches 5583 5584 +1
=============================================
+ Hits 30805 30873 +68
+ Misses 17002 16981 -21
- Partials 2404 2419 +15 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
tomatoishealthy
approved these changes
Aug 30, 2023
kuny0707
approved these changes
Aug 30, 2023
kuny0707
approved these changes
Aug 31, 2023
…_address_parsing_v2
xxo1shine
approved these changes
Sep 1, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
optimize address parsing of stake interfaces, close #5411
Why are these changes required?
This PR has been tested by:
Follow up
Extra details