Merge branch 'main' into operator-config

LF-Decentralized-Trust-labs · Nov 14, 2024 · 9abf11d · 9abf11d
2 parents 49a407c + a7a7a9d
commit 9abf11d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/core/go/internal/privatetxnmgr/sequencer_dispatch.go b/core/go/internal/privatetxnmgr/sequencer_dispatch.go
@@ -161,7 +161,7 @@ func (s *Sequencer) DispatchTransactions(ctx context.Context, dispatchableTransa
 				PublicTxInput: pldapi.PublicTxInput{
 					From:            resolvedAddrs[i],
 					To:              &s.contractAddress,
-					PublicTxOptions: pldapi.PublicTxOptions{}, // TODO: Consider propagation from paladin transaction input
+					PublicTxOptions: pt.PublicTxOptions,
 				},
 			}
 

diff --git a/domains/pente/src/main/java/io/kaleido/paladin/pente/domain/PenteDomain.java b/domains/pente/src/main/java/io/kaleido/paladin/pente/domain/PenteDomain.java
@@ -452,6 +452,7 @@ protected CompletableFuture<ToDomain.PrepareTransactionResponse> prepareTransact
     protected CompletableFuture<ToDomain.HandleEventBatchResponse> handleEventBatch(ToDomain.HandleEventBatchRequest request) {
         try {
             var mapper = new ObjectMapper();
+            var result = ToDomain.HandleEventBatchResponse.newBuilder();
             for (var event : request.getEventsList()) {
                 if (PenteConfiguration.transferSignature.equals(event.getSoliditySignature())) {
                     var transfer = mapper.readValue(event.getDataJson(), PenteTransitionJSON.class);
@@ -471,29 +472,26 @@ protected CompletableFuture<ToDomain.HandleEventBatchResponse> handleEventBatch(
                             .setId(id.to0xHex())
                             .setTransactionId(transfer.txId.to0xHex())
                             .build()).toList();
-                    var result = ToDomain.HandleEventBatchResponse.newBuilder()
-                            .addTransactionsComplete(ToDomain.CompletedTransaction.newBuilder()
+                    result.addTransactionsComplete(ToDomain.CompletedTransaction.newBuilder()
                                     .setTransactionId(transfer.txId.to0xHex())
                                     .setLocation(event.getLocation())
                                     .build())
                             .addAllSpentStates(inputs)
                             .addAllReadStates(reads)
                             .addAllConfirmedStates(outputs)
                             .addAllInfoStates(info);
-                    return CompletableFuture.completedFuture(result.build());
                 } else if (PenteConfiguration.approvalSignature.equals(event.getSoliditySignature())) {
                     var approval = mapper.readValue(event.getDataJson(), PenteApprovedJSON.class);
-                    var result = ToDomain.HandleEventBatchResponse.newBuilder()
-                            .addTransactionsComplete(ToDomain.CompletedTransaction.newBuilder()
+                    result.addTransactionsComplete(ToDomain.CompletedTransaction.newBuilder()
                                     .setTransactionId(approval.txId.to0xHex())
                                     .setLocation(event.getLocation())
                                     .build());
-                    return CompletableFuture.completedFuture(result.build());
+
                 } else {
                     throw new Exception("Unknown signature: " + event.getSoliditySignature());
                 }
             }
-            return CompletableFuture.completedFuture(null);
+            return CompletableFuture.completedFuture(result.build());
         } catch (Exception e) {
             return CompletableFuture.failedFuture(e);
         }