Merge pull request #60 from Staketab/dev

update parse response for txSend and checkBlocksFromZkCloudWorker

Author: MrFoxogen

src/main/java/com/staketab/minanames/dto/ZkCloudWorkerArgs.java

@@ -14,4 +14,5 @@
 public class ZkCloudWorkerArgs {
     private String contractAddress;
     private String domain;
+    private String startBlock;
 }

src/main/java/com/staketab/minanames/dto/ZkCloudWorkerSendTxResponse.java

@@ -0,0 +1,17 @@
+package com.staketab.minanames.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ZkCloudWorkerSendTxResponse {
+    private String txId;
+    private String transaction;
+    private long timeReceived;
+    private String received;
+}

src/main/java/com/staketab/minanames/service/ZkCloudWorkerService.java

@@ -10,7 +10,7 @@ public interface ZkCloudWorkerService {
 
     void sendTxs(List<PayableTransactionEntity> appliedTxs);
 
-    ZkCloudWorkerContractDataResponse getBlockInfo();
+    ZkCloudWorkerContractDataResponse getBlockInfo(String startBlock);
 
     void sendCreateTask();
 

src/main/java/com/staketab/minanames/service/impl/ZkCloudWorkerServiceImpl.java

@@ -18,6 +18,7 @@
 import com.staketab.minanames.dto.ZkCloudWorkerDataDTO;
 import com.staketab.minanames.dto.ZkCloudWorkerGetBlockInfoResponse;
 import com.staketab.minanames.dto.ZkCloudWorkerRequestDTO;
+import com.staketab.minanames.dto.ZkCloudWorkerSendTxResponse;
 import com.staketab.minanames.dto.ZkCloudWorkerTransaction;
 import com.staketab.minanames.entity.DomainEntity;
 import com.staketab.minanames.entity.IpfsMetadataCloudWorkerProperty;
@@ -37,6 +38,7 @@
 import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -102,8 +104,8 @@ public void sendTxs(List<PayableTransactionEntity> appliedTxs) {
     }
 
     @Override
-    public ZkCloudWorkerContractDataResponse getBlockInfo() {
-        ZkCloudWorkerDataDTO zkCloudWorkerDataDTO = mapToZkCloudWorkerDataDTO(List.of(), GET_BLOCK_INFO);
+    public ZkCloudWorkerContractDataResponse getBlockInfo(String startBlock) {
+        ZkCloudWorkerDataDTO zkCloudWorkerDataDTO = mapToZkCloudWorkerDataDTO(GET_BLOCK_INFO, null, startBlock);
         ZkCloudWorkerRequestDTO zkCloudWorkerRequestDTO = mapToZkCloudWorkerRequestDTO(zkCloudWorkerDataDTO, GET_BLOCK_INFO);
         ResponseEntity<String> stringResponseEntity = zkCloudWorkerClient.sendToZkCloudWorker(zkCloudWorkerRequestDTO);
         String body = stringResponseEntity.getBody();
@@ -122,29 +124,22 @@ public void sendCreateTask() {
     @Override
     public void checkBlocksFromZkCloudWorker() {
         long topBlockNumber = domainRepository.findTopBlockNumber() != null ? domainRepository.findTopBlockNumber() : 0L;
-        ZkCloudWorkerContractDataResponse blockInfo = getBlockInfo();
-        List<ZkCloudWorkerBlocksResponse> finalBlocks = blockInfo.getBlocks()
+        ZkCloudWorkerContractDataResponse blockInfo = getBlockInfo(null);
+        List<ZkCloudWorkerBlocksResponse> blocks = blockInfo.getBlocks();
+        List<ZkCloudWorkerBlocksResponse> finalBlocks = blocks
                 .stream()
                 .filter(ZkCloudWorkerBlocksResponse::isFinal)
-                .toList()
-                .reversed();
-
-        for (ZkCloudWorkerBlocksResponse finalBlock : finalBlocks) {
-            if (finalBlock.getBlockNumber() <= topBlockNumber) {
-                continue;
-            }
-            String ipfs = finalBlock.getIpfs();
-            IpfsZkCloudWorkerResponse blockByIpfs = ipfsZkCloudWorkerClient.getBlockByIpfs(ipfs);
-            List<IpfsZkCloudWorkerTransactionWrapperResponse> transactions = blockByIpfs.getTransactions();
+                .filter(value -> value.getBlockNumber() > topBlockNumber)
+                .collect(Collectors.toList());
+        getMoreBlocksIfNeed(finalBlocks, blocks, topBlockNumber);
+        List<ZkCloudWorkerBlocksResponse> cloudWorkerBlocksResponses = finalBlocks.reversed();
 
-            activateNewDomains(finalBlock, transactions, ipfs);
-            updateOldDomains(finalBlock, transactions);
-        }
+        addNewDomainsOrUpdateOld(cloudWorkerBlocksResponses, topBlockNumber);
     }
 
     @Override
     public IpfsDomainMetadataZkDataDTO getDomainMetadata(String domainMetadata) {
-        ZkCloudWorkerDataDTO zkCloudWorkerDataDTO = mapToZkCloudWorkerDataDTO(GET_DOMAIN_METADATA, domainMetadata);
+        ZkCloudWorkerDataDTO zkCloudWorkerDataDTO = mapToZkCloudWorkerDataDTO(GET_DOMAIN_METADATA, domainMetadata, null);
         ZkCloudWorkerRequestDTO zkCloudWorkerRequestDTO = mapToZkCloudWorkerRequestDTO(zkCloudWorkerDataDTO, GET_DOMAIN_METADATA);
         ResponseEntity<String> stringResponseEntity = zkCloudWorkerClient.sendToZkCloudWorker(zkCloudWorkerRequestDTO);
         String body = stringResponseEntity.getBody();
@@ -153,6 +148,39 @@ public IpfsDomainMetadataZkDataDTO getDomainMetadata(String domainMetadata) {
         return gson.fromJson(result, IpfsDomainMetadataZkDataDTO.class);
     }
 
+    private void getMoreBlocksIfNeed(List<ZkCloudWorkerBlocksResponse> finalBlocks, List<ZkCloudWorkerBlocksResponse> blocks, long topBlockNumber) {
+        List<ZkCloudWorkerBlocksResponse> allBlocks = new ArrayList<>();
+        int blockNumber = finalBlocks.getLast().getBlockNumber();
+        if (!finalBlocks.isEmpty() && blocks.size() == finalBlocks.size()) {
+            String startBlock = finalBlocks.getLast().getPreviousBlockAddress();
+            while (blockNumber != topBlockNumber + 1) {
+                List<ZkCloudWorkerBlocksResponse> cloudWorkerBlocksResponses = getBlockInfo(startBlock).getBlocks()
+                        .stream()
+                        .filter(ZkCloudWorkerBlocksResponse::isFinal)
+                        .filter(value -> value.getBlockNumber() > topBlockNumber)
+                        .toList();
+                allBlocks.addAll(cloudWorkerBlocksResponses);
+                blockNumber = cloudWorkerBlocksResponses.getLast().getBlockNumber();
+                startBlock = cloudWorkerBlocksResponses.getLast().getPreviousBlockAddress();
+            }
+        }
+        finalBlocks.addAll(allBlocks);
+    }
+
+    private void addNewDomainsOrUpdateOld(List<ZkCloudWorkerBlocksResponse> cloudWorkerBlocksResponses, long topBlockNumber) {
+        for (ZkCloudWorkerBlocksResponse finalBlock : cloudWorkerBlocksResponses) {
+            if (finalBlock.getBlockNumber() <= topBlockNumber) {
+                continue;
+            }
+            String ipfs = finalBlock.getIpfs();
+            IpfsZkCloudWorkerResponse blockByIpfs = ipfsZkCloudWorkerClient.getBlockByIpfs(ipfs);
+            List<IpfsZkCloudWorkerTransactionWrapperResponse> transactions = blockByIpfs.getTransactions();
+
+            activateNewDomains(finalBlock, transactions, ipfs);
+            updateOldDomains(finalBlock, transactions);
+        }
+    }
+
     private void activateNewDomains(ZkCloudWorkerBlocksResponse finalBlock, List<IpfsZkCloudWorkerTransactionWrapperResponse> transactions, String ipfs) {
         Map<String, IpfsZkCloudWorkerTransactionResponse> cloudWorkerTransactionResponseMap = transactions
                 .stream()
@@ -251,14 +279,14 @@ private void setMetadata(String newMetadata, DomainEntity domainEntity, String b
     }
 
     private void setTxIds(ResponseEntity<String> stringResponseEntity, List<DomainEntity> domainEntities) {
-        List<String> txIds = gson.fromJson(stringResponseEntity.getBody(), new TypeToken<List<String>>() {
+        List<ZkCloudWorkerSendTxResponse> txIds = gson.fromJson(stringResponseEntity.getBody(), new TypeToken<List<ZkCloudWorkerSendTxResponse>>() {
         }.getType());
 
         for (int i = 0; i < domainEntities.size(); i++) {
             DomainEntity domainEntity = domainEntities.get(i);
             if (txIds != null) {
-                String txId = txIds.get(i);
-                domainEntity.setZkTxId(txId);
+                ZkCloudWorkerSendTxResponse zkCloudWorkerSendTxResponse = txIds.get(i);
+                domainEntity.setZkTxId(zkCloudWorkerSendTxResponse.getTxId());
             }
         }
     }
@@ -278,13 +306,14 @@ private ZkCloudWorkerDataDTO mapToZkCloudWorkerDataDTO(List<String> tx, ZkCloudW
                 .build();
     }
 
-    private ZkCloudWorkerDataDTO mapToZkCloudWorkerDataDTO(ZkCloudWorkerTask zkCloudWorkerTask, String domainMetadata) {
+    private ZkCloudWorkerDataDTO mapToZkCloudWorkerDataDTO(ZkCloudWorkerTask zkCloudWorkerTask, String domainMetadata, String startBlock) {
         return ZkCloudWorkerDataDTO.builder()
                 .task(zkCloudWorkerTask.getName())
                 .metadata(zkCloudWorkerTask.getMetadata())
                 .args(mapArgsToString(ZkCloudWorkerArgs.builder()
                         .contractAddress(mnsContract)
                         .domain(domainMetadata)
+                        .startBlock(startBlock)
                         .build()))
                 .build();
     }