Skip to content

Commit 0f52fa4

Browse files
committed
fix a bug:participateAssetIssue do not set ref block
1 parent 9bc1fcc commit 0f52fa4

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

src/main/java/org/tron/core/Wallet.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@
4343
import org.tron.core.capsule.WitnessCapsule;
4444
import org.tron.core.db.AccountStore;
4545
import org.tron.core.db.Manager;
46-
import org.tron.core.exception.*;
46+
import org.tron.core.exception.ContractExeException;
47+
import org.tron.core.exception.ContractValidateException;
48+
import org.tron.core.exception.DupTransactionException;
49+
import org.tron.core.exception.StoreException;
50+
import org.tron.core.exception.TaposException;
51+
import org.tron.core.exception.TooBigTransactionException;
52+
import org.tron.core.exception.ValidateBandwidthException;
53+
import org.tron.core.exception.ValidateSignatureException;
4754
import org.tron.core.net.message.TransactionMessage;
4855
import org.tron.core.net.node.NodeImpl;
4956
import org.tron.protos.Contract.AccountCreateContract;
@@ -191,6 +198,7 @@ public Account getBalance(Account account) {
191198
/**
192199
* Create a transaction by contract.
193200
*/
201+
@Deprecated
194202
public Transaction createTransaction(TransferContract contract) {
195203
AccountStore accountStore = dbManager.getAccountStore();
196204
return new TransactionCapsule(contract, accountStore).getInstance();
@@ -244,7 +252,7 @@ public Transaction createTransaction(VoteWitnessContract voteWitnessContract) {
244252
public Transaction createTransaction(AssetIssueContract assetIssueContract) {
245253
return new TransactionCapsule(assetIssueContract).getInstance();
246254
}
247-
255+
@Deprecated
248256
public Transaction createTransaction(WitnessCreateContract witnessCreateContract) {
249257
return new TransactionCapsule(witnessCreateContract).getInstance();
250258
}
@@ -287,11 +295,11 @@ public WitnessList getWitnessList() {
287295
.forEach(witnessCapsule -> builder.addWitnesses(witnessCapsule.getInstance()));
288296
return builder.build();
289297
}
290-
298+
@Deprecated
291299
public Transaction createTransaction(TransferAssetContract transferAssetContract) {
292300
return new TransactionCapsule(transferAssetContract).getInstance();
293301
}
294-
302+
@Deprecated
295303
public Transaction createTransaction(
296304
ParticipateAssetIssueContract participateAssetIssueContract) {
297305
return new TransactionCapsule(participateAssetIssueContract).getInstance();

src/main/java/org/tron/core/services/RpcApiService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -575,13 +575,13 @@ public void transferAsset(TransferAssetContract request,
575575
@Override
576576
public void participateAssetIssue(ParticipateAssetIssueContract request,
577577
StreamObserver<Transaction> responseObserver) {
578-
ByteString fromBs = request.getOwnerAddress();
579-
580-
if (fromBs != null) {
581-
Transaction trx = wallet.createTransaction(request);
582-
responseObserver.onNext(trx);
583-
} else {
584-
responseObserver.onNext(null);
578+
try {
579+
responseObserver
580+
.onNext(createTransactionCapsule(request, ContractType.ParticipateAssetIssueContract).getInstance());
581+
} catch (ContractValidateException e) {
582+
responseObserver
583+
.onNext(null);
584+
logger.debug("ContractValidateException", e.getMessage());
585585
}
586586
responseObserver.onCompleted();
587587
}

0 commit comments

Comments
 (0)