fix: DUPLICATE_TRANSACTION error for Queries (#2190)

Signed-off-by: Ivan Ivanov <[email protected]>
hiero-ledger · Feb 4, 2025 · 49eb915 · 49eb915
1 parent 6eef60a
commit 49eb915
Show file tree

Hide file tree

Showing 8 changed files with 314 additions and 286 deletions.
diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts
@@ -58,7 +58,10 @@ tasks.withType<Test>().configureEach {
     systemProperty("OPERATOR_KEY", providers.gradleProperty("OPERATOR_KEY").getOrElse(""))
 }
 
-tasks.testIntegration { failFast = true }
+tasks.testIntegration {
+    maxParallelForks = (Runtime.getRuntime().availableProcessors()).coerceAtLeast(1)
+    failFast = true
+}
 
 tasks.withType<JavaCompile>().configureEach { options.compilerArgs.add("-Xlint:-exports,-dep-ann") }
 

diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/Query.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/Query.java
@@ -364,22 +364,15 @@ private void initWithNodeIds(Client client) {
      * @return                          the transaction
      */
     Transaction getPaymentTransaction(int index) {
-        var paymentTx = Objects.requireNonNull(paymentTransactions).get(index);
-        if (paymentTx != null) {
-            return paymentTx;
-        } else {
-            if (paymentTransactionId == null) {
-                paymentTransactionId = TransactionId.generate(Objects.requireNonNull(paymentOperator).accountId);
-            }
-
-            var newPaymentTx = makePaymentTransaction(
-                    paymentTransactionId,
-                    nodeAccountIds.get(index),
-                    paymentOperator,
-                    Objects.requireNonNull(chosenQueryPayment));
-            paymentTransactions.set(index, newPaymentTx);
-            return newPaymentTx;
-        }
+        paymentTransactionId = TransactionId.generate(Objects.requireNonNull(paymentOperator).accountId);
+
+        var newPaymentTx = makePaymentTransaction(
+                paymentTransactionId,
+                nodeAccountIds.get(index),
+                paymentOperator,
+                Objects.requireNonNull(chosenQueryPayment));
+        paymentTransactions.set(index, newPaymentTx);
+        return newPaymentTx;
     }
 
     @Override

diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/Transaction.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/Transaction.java
@@ -1313,8 +1313,9 @@ TransactionResponse mapResponse(
             com.hedera.hashgraph.sdk.proto.Transaction request) {
         var transactionId = Objects.requireNonNull(getTransactionIdInternal());
         var hash = hash(request.getSignedTransactionBytes().toByteArray());
+        // advance is needed for chunked transactions
         transactionIds.advance();
-        return new TransactionResponse(nodeId, transactionId, hash, null);
+        return new TransactionResponse(nodeId, transactionId, hash, null, this);
     }
 
     @Override
@@ -1375,6 +1376,15 @@ ExecutionState getExecutionState(Status status, com.hedera.hashgraph.sdk.proto.T
         return super.getExecutionState(status, response);
     }
 
+    Transaction regenerateTransactionId(Client client) {
+        Objects.requireNonNull(client.getOperatorAccountId());
+        transactionIds.setLocked(false);
+        var newTransactionID = TransactionId.generate(client.getOperatorAccountId());
+        transactionIds.set(transactionIds.getIndex(), newTransactionID);
+        transactionIds.setLocked(true);
+        return this;
+    }
+
     @Override
     @SuppressWarnings("LiteProtoToString")
     public String toString() {

diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/TransactionResponse.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/TransactionResponse.java
diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ExecutableTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ExecutableTest.java
@@ -258,6 +258,7 @@ TransactionResponse mapResponse(
                                 new AccountId(3),
                                 TransactionId.withValidStart(new AccountId(3), now),
                                 new byte[] {1, 2, 3},
+                                null,
                                 null)
                         .setValidateStatus(true);
             }
@@ -299,6 +300,7 @@ TransactionResponse mapResponse(
                         new AccountId(4),
                         TransactionId.withValidStart(new AccountId(4), now),
                         new byte[] {1, 2, 3},
+                        null,
                         null);
             }
         };
@@ -352,6 +354,7 @@ TransactionResponse mapResponse(
                         new AccountId(3),
                         TransactionId.withValidStart(new AccountId(3), now),
                         new byte[] {1, 2, 3},
+                        null,
                         null);
             }
         };
@@ -423,6 +426,7 @@ void testChannelFailedToConnectTimeout() {
                 new AccountId(3),
                 TransactionId.withValidStart(new AccountId(3), java.time.Instant.now()),
                 new byte[] {1, 2, 3},
+                null,
                 null);
         var tx = new DummyTransaction();