Add txId to ProofOfBurnDto

HenrikJannsen · Jun 30, 2024 · 444aa0d · 444aa0d
1 parent 7b85bc5
commit 444aa0d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/restapi/src/main/java/bisq/restapi/dto/ProofOfBurnDto.java b/restapi/src/main/java/bisq/restapi/dto/ProofOfBurnDto.java
@@ -33,14 +33,16 @@
 @Schema(title = "ProofOfBurn")
 public class ProofOfBurnDto {
     private final long amount;
-    private final long time;
+    private final long blockTime;
     private final String hash;
     private final int blockHeight;
+    private final String txId;
 
-    public ProofOfBurnDto(long amount, long time, String hash, int blockHeight) {
+    public ProofOfBurnDto(long amount, long blockTime, String hash, int blockHeight, String txId) {
         this.amount = amount;
-        this.time = time;
+        this.blockTime = blockTime;
         this.hash = hash;
         this.blockHeight = blockHeight;
+        this.txId = txId;
     }
 }
diff --git a/restapi/src/main/java/bisq/restapi/endpoints/ProofOfBurnApi.java b/restapi/src/main/java/bisq/restapi/endpoints/ProofOfBurnApi.java
@@ -77,11 +77,18 @@ public List<ProofOfBurnDto> getProofOfBurn(@Parameter(description = DESC_BLOCK_H
                                                @PathParam("block-height")
                                                int fromBlockHeight) {
         List<ProofOfBurnDto> result = daoStateService.getProofOfBurnTxs().stream()
-                .filter(tx -> tx.getBlockHeight() >= fromBlockHeight)
-                .map(tx -> new ProofOfBurnDto(tx.getBurntBsq(),
-                        tx.getTime(),
-                        Hex.encode(ProofOfBurnService.getHashFromOpReturnData(tx)),
-                        tx.getBlockHeight()))
+                .filter(tx -> {
+                    int blockHeight = tx.getBlockHeight();
+                    return blockHeight >= fromBlockHeight;
+                })
+                .map(tx -> {
+                    ProofOfBurnDto proofOfBurnDto = new ProofOfBurnDto(tx.getBurntBsq(),
+                            tx.getTime(),
+                            Hex.encode(ProofOfBurnService.getHashFromOpReturnData(tx)),
+                            tx.getBlockHeight(),
+                            tx.getId());
+                    return proofOfBurnDto;
+                })
                 .collect(Collectors.toList());
         log.info("ProofOfBurn result list from block height {}: {}", fromBlockHeight, result);
         return result;