Skip to content

feat(mechanism): optimize address parsing of stake interfaces #5419

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 15 commits into from
Sep 4, 2023
Merged

feat(mechanism): optimize address parsing of stake interfaces #5419

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
87f9cea
feat(mechanism): optimize new transaction address parsing
Aug 14, 2023
e406639
feat(mechanism): optimize new transaction address parsing
Aug 14, 2023
5b1490b
feat(mechanism): optimize new transaction address parsing
Aug 23, 2023
9d61a7a
Merge branch 'develop' of https://github.com/CarlChaoCarl/java-tron i…
Aug 23, 2023
1f9da68
feat(mechanism): optimize new transaction address parsing
Aug 23, 2023
26e852a
feat(mechanism): optimize new transaction address parsing
Aug 23, 2023
7a5c58b
feat(mechanism): optimize new transaction address parsing
Aug 24, 2023
ab5bb17
Merge branch 'tronprotocol:develop' into feature/optimize_transaction…
CarlChaoCarl Aug 25, 2023
4d1fd04
Merge branch 'tronprotocol:develop' into feature/optimize_transaction…
CarlChaoCarl Aug 28, 2023
3e3ebe9
feat(mechanism): add unit test for optimize of new transaction addres…
Aug 28, 2023
737c36e
feat(mechanism): add fields for optimize of new transaction address p…
Aug 29, 2023
082abc7
feat(mechanism): add fields for optimize of new transaction address p…
Aug 31, 2023
52ecd18
Merge branch 'tronprotocol:develop' into feature/optimize_transaction…
CarlChaoCarl Aug 31, 2023
cd65c89
feat(mechanism): add fields for optimize of new transaction address p…
Sep 1, 2023
eaaa323
feat(mechanism): add fields for optimize of new transaction address p…
Sep 1, 2023
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
101 changes: 101 additions & 0 deletions framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@
import org.tron.protos.Protocol.Transaction.Contract.ContractType;
import org.tron.protos.Protocol.TransactionInfo;
import org.tron.protos.contract.AssetIssueContractOuterClass.TransferAssetContract;
import org.tron.protos.contract.BalanceContract.CancelAllUnfreezeV2Contract;
import org.tron.protos.contract.BalanceContract.DelegateResourceContract;
import org.tron.protos.contract.BalanceContract.FreezeBalanceV2Contract;
import org.tron.protos.contract.BalanceContract.TransferContract;
import org.tron.protos.contract.BalanceContract.UnDelegateResourceContract;
import org.tron.protos.contract.BalanceContract.UnfreezeBalanceContract;
import org.tron.protos.contract.BalanceContract.UnfreezeBalanceV2Contract;
import org.tron.protos.contract.BalanceContract.WithdrawExpireUnfreezeContract;
import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;

Expand Down Expand Up @@ -156,6 +163,100 @@ public TransactionLogTriggerCapsule(TransactionCapsule trxCapsule, BlockCapsule
StringUtil.encode58Check(createSmartContract.getOwnerAddress().toByteArray()));
}
break;
case UnfreezeBalanceContract:
UnfreezeBalanceContract unfreezeBalanceContract = contractParameter
.unpack(UnfreezeBalanceContract.class);

if (Objects.nonNull(unfreezeBalanceContract)) {
Copy link
Contributor

@halibobo1205 halibobo1205 Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contract cannot be null.

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I get it

if (Objects.nonNull(unfreezeBalanceContract.getOwnerAddress())) {
transactionLogTrigger.setFromAddress(StringUtil
.encode58Check(unfreezeBalanceContract.getOwnerAddress().toByteArray()));
}
if (Objects.nonNull(unfreezeBalanceContract.getReceiverAddress())) {
Copy link
Contributor

@xxo1shine xxo1shine Aug 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The frequency of these if statements is too high, you can encapsulate a function.

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, Ok, I encapsulate the code

transactionLogTrigger.setToAddress(StringUtil
.encode58Check(unfreezeBalanceContract.getReceiverAddress().toByteArray()));
}
}
Copy link
Contributor

@halibobo1205 halibobo1205 Aug 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be added?

 transactionLogTrigger.setAssetName("trx");
           transactionLogTrigger.setAssetAmount(transactionInfo.getUnfreezeAmount());

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I get it

break;
case FreezeBalanceV2Contract:
FreezeBalanceV2Contract freezeBalanceV2Contract = contractParameter
.unpack(FreezeBalanceV2Contract.class);

if (Objects.nonNull(freezeBalanceV2Contract)) {
Copy link
Contributor

@halibobo1205 halibobo1205 Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contract cannot be null.

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I get it

if (Objects.nonNull(freezeBalanceV2Contract.getOwnerAddress())) {
transactionLogTrigger.setFromAddress(StringUtil
.encode58Check(freezeBalanceV2Contract.getOwnerAddress().toByteArray()));
}
transactionLogTrigger.setAssetAmount(freezeBalanceV2Contract.getFrozenBalance());
Copy link
Contributor

@halibobo1205 halibobo1205 Aug 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

transactionLogTrigger.setAssetName("trx"); ?

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK，I get it.

}
break;
case UnfreezeBalanceV2Contract:
UnfreezeBalanceV2Contract unfreezeBalanceV2Contract = contractParameter
.unpack(UnfreezeBalanceV2Contract.class);

if (Objects.nonNull(unfreezeBalanceV2Contract)) {
Copy link
Contributor

@halibobo1205 halibobo1205 Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contract cannot be null.

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I get it

if (Objects.nonNull(unfreezeBalanceV2Contract.getOwnerAddress())) {
transactionLogTrigger.setFromAddress(StringUtil
.encode58Check(unfreezeBalanceV2Contract.getOwnerAddress().toByteArray()));
}
transactionLogTrigger.setAssetAmount(
unfreezeBalanceV2Contract.getUnfreezeBalance());
}
break;
case WithdrawExpireUnfreezeContract:
WithdrawExpireUnfreezeContract withdrawExpireUnfreezeContract = contractParameter
.unpack(WithdrawExpireUnfreezeContract.class);

if (Objects.nonNull(withdrawExpireUnfreezeContract)
&& Objects.nonNull(withdrawExpireUnfreezeContract.getOwnerAddress())) {
transactionLogTrigger.setFromAddress(StringUtil.encode58Check(
withdrawExpireUnfreezeContract.getOwnerAddress().toByteArray()));
}
break;
case DelegateResourceContract:
DelegateResourceContract delegateResourceContract = contractParameter
.unpack(DelegateResourceContract.class);

if (Objects.nonNull(delegateResourceContract)) {
Copy link
Contributor

@halibobo1205 halibobo1205 Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contract cannot be null.

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I get it

if (Objects.nonNull(delegateResourceContract.getOwnerAddress())) {
transactionLogTrigger.setFromAddress(StringUtil
.encode58Check(delegateResourceContract.getOwnerAddress().toByteArray()));
}
if (Objects.nonNull(delegateResourceContract.getReceiverAddress())) {
transactionLogTrigger.setToAddress(StringUtil
.encode58Check(delegateResourceContract.getReceiverAddress().toByteArray()));
}
transactionLogTrigger.setAssetAmount(
Copy link
Contributor

@halibobo1205 halibobo1205 Aug 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

transactionLogTrigger.setAssetName("trx");?

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK，I get it.

delegateResourceContract.getBalance());
}
break;
case UnDelegateResourceContract:
UnDelegateResourceContract unDelegateResourceContract = contractParameter
.unpack(UnDelegateResourceContract.class);

if (Objects.nonNull(unDelegateResourceContract)) {
Copy link
Contributor

@halibobo1205 halibobo1205 Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contract cannot be null.

Copy link
Contributor Author

@CarlChaoCarl CarlChaoCarl Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I get it

if (Objects.nonNull(unDelegateResourceContract.getOwnerAddress())) {
transactionLogTrigger.setFromAddress(StringUtil
.encode58Check(unDelegateResourceContract.getOwnerAddress().toByteArray()));
}
if (Objects.nonNull(unDelegateResourceContract.getReceiverAddress())) {
transactionLogTrigger.setToAddress(StringUtil.encode58Check(
unDelegateResourceContract.getReceiverAddress().toByteArray()));
}
transactionLogTrigger.setAssetAmount(
unDelegateResourceContract.getBalance());
}
break;
case CancelAllUnfreezeV2Contract:
CancelAllUnfreezeV2Contract cancelAllUnfreezeV2Contract = contractParameter
.unpack(CancelAllUnfreezeV2Contract.class);

if (Objects.nonNull(cancelAllUnfreezeV2Contract)
&& Objects.nonNull(cancelAllUnfreezeV2Contract.getOwnerAddress())) {
transactionLogTrigger.setFromAddress(StringUtil
.encode58Check(cancelAllUnfreezeV2Contract.getOwnerAddress().toByteArray()));
}
break;
default:
break;
}
Expand Down