feat(ApiWrapper):fix getTransactionFromPending bug

tronprotocol · May 17, 2023 · 2a45ffe · 2a45ffe
1 parent 7dccfc7
commit 2a45ffe
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/trident-java/core/src/main/java/org/tron/trident/core/ApiWrapper.java b/trident-java/core/src/main/java/org/tron/trident/core/ApiWrapper.java
@@ -15,6 +15,7 @@
 import org.tron.trident.core.key.KeyPair;
 import org.tron.trident.core.transaction.BlockId;
 import org.tron.trident.core.transaction.TransactionBuilder;
+import org.tron.trident.core.utils.ByteArray;
 import org.tron.trident.core.utils.Sha256Hash;
 import org.tron.trident.core.transaction.TransactionCapsule;
 import org.tron.trident.core.utils.Utils;
@@ -1914,15 +1915,12 @@ public long getPendingSize() {
      * @throws IllegalException if fail to get transaction from pending
      */
     public Transaction getTransactionFromPending(String txId) throws IllegalException {
-        ByteString bsTxid = parseAddress(txId);
+        ByteString bsTxid = ByteString.copyFrom(ByteArray.fromHexString(txId));
         BytesMessage request = BytesMessage.newBuilder()
             .setValue(bsTxid)
             .build();
 
-        Transaction transaction = blockingStubSolidity.getTransactionById(request);
-        if(transaction.getRetCount() == 0){
-            throw new IllegalException();
-        }
+        Transaction transaction = blockingStub.getTransactionFromPending(request);
         return transaction;
     }