diff --git a/README.md b/README.md index 2242cf04..3f6bfe7c 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Build docker image ```shell -docker build -t cardanofoundation/ledger-sync: . +docker build --target ledger-sync -t cardanofoundation/ledger-sync: . ``` ### Docker Run diff --git a/application/build.gradle b/application/build.gradle index 74f565b1..e7e27035 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.4' - id 'nu.studer.jooq' version '8.2' + id 'org.springframework.boot' version '3.2.2' + id 'nu.studer.jooq' version '8.2.3' } dependencies { @@ -8,6 +8,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-webflux' + implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-configuration-processor' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-jooq' @@ -57,6 +58,7 @@ ext { } jooq { + version = '3.18.9' configurations { main { generateSchemaSourceOnCompilation = false diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/ExplorerConsumerApplication.java b/application/src/main/java/org/cardanofoundation/ledgersync/LedgerSyncApplication.java similarity index 70% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/ExplorerConsumerApplication.java rename to application/src/main/java/org/cardanofoundation/ledgersync/LedgerSyncApplication.java index b4063ec1..d80a9db7 100755 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/ExplorerConsumerApplication.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/LedgerSyncApplication.java @@ -1,5 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer; +package org.cardanofoundation.ledgersync; +import jakarta.annotation.PostConstruct; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; @@ -17,7 +18,7 @@ @ComponentScan(basePackages = "org.cardanofoundation.*") @EntityScan("org.cardanofoundation.*") @EnableJpaRepositories("org.cardanofoundation.*") -public class ExplorerConsumerApplication { +public class LedgerSyncApplication { static { System.setProperty("org.jooq.no-logo", "true"); @@ -25,7 +26,13 @@ public class ExplorerConsumerApplication { } public static void main(String[] args) { - SpringApplication.run(ExplorerConsumerApplication.class, args); + SpringApplication.run(LedgerSyncApplication.class, args); + } + + @PostConstruct + public void postConstruct() { + long maxMemory = Runtime.getRuntime().maxMemory(); + log.info("<< Max JVM heap memory: {} MB", maxMemory / (1024 * 1024) + " >>"); } } diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedAddress.java b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedAddress.java similarity index 91% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedAddress.java rename to application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedAddress.java index 4ad3541b..5ddc0c44 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedAddress.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedAddress.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.aggregate; +package org.cardanofoundation.ledgersync.aggregate; import com.bloxbean.cardano.client.crypto.Base58; import lombok.AccessLevel; @@ -8,7 +8,7 @@ import lombok.experimental.FieldDefaults; import org.cardanofoundation.ledgersync.common.common.address.ShelleyAddress; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; import java.util.Arrays; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedAddressBalance.java b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedAddressBalance.java similarity index 98% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedAddressBalance.java rename to application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedAddressBalance.java index a8d166ad..760a9d3a 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedAddressBalance.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedAddressBalance.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.aggregate; +package org.cardanofoundation.ledgersync.aggregate; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedBatchBlockData.java b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedBatchBlockData.java similarity index 96% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedBatchBlockData.java rename to application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedBatchBlockData.java index b25cff79..016eaec9 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedBatchBlockData.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedBatchBlockData.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.aggregate; +package org.cardanofoundation.ledgersync.aggregate; import lombok.AccessLevel; import lombok.Getter; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedBlock.java b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedBlock.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedBlock.java rename to application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedBlock.java index 9782f623..3f5a5dcc 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedBlock.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedBlock.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.aggregate; +package org.cardanofoundation.ledgersync.aggregate; //import org.cardanofoundation.ledgersync.common.common.AuxData; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedSlotLeader.java b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedSlotLeader.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedSlotLeader.java rename to application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedSlotLeader.java index 0f4e1c3a..ce81b85c 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedSlotLeader.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedSlotLeader.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.aggregate; +package org.cardanofoundation.ledgersync.aggregate; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTx.java b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTx.java similarity index 95% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTx.java rename to application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTx.java index 4fcec776..cb3845c0 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTx.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTx.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.aggregate; +package org.cardanofoundation.ledgersync.aggregate; import com.bloxbean.cardano.yaci.core.model.Amount; import com.bloxbean.cardano.yaci.core.model.Update; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTxIn.java b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTxIn.java similarity index 94% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTxIn.java rename to application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTxIn.java index 2086c12f..062718fe 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTxIn.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTxIn.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.aggregate; +package org.cardanofoundation.ledgersync.aggregate; import com.bloxbean.cardano.yaci.core.model.TransactionInput; import com.bloxbean.cardano.yaci.core.model.byron.ByronTxIn; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTxOut.java b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTxOut.java similarity index 98% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTxOut.java rename to application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTxOut.java index ded17368..e66a1a95 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/aggregate/AggregatedTxOut.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/aggregate/AggregatedTxOut.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.aggregate; +package org.cardanofoundation.ledgersync.aggregate; //import org.cardanofoundation.ledgersync.common.common.Amount; //import org.cardanofoundation.ledgersync.common.common.Datum; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/ExceptionHandlerConfiguration.java b/application/src/main/java/org/cardanofoundation/ledgersync/configuration/ExceptionHandlerConfiguration.java similarity index 88% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/ExceptionHandlerConfiguration.java rename to application/src/main/java/org/cardanofoundation/ledgersync/configuration/ExceptionHandlerConfiguration.java index 12a9c05c..3ab9a476 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/ExceptionHandlerConfiguration.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/configuration/ExceptionHandlerConfiguration.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.configuration; +package org.cardanofoundation.ledgersync.configuration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/JooqConfigurationCustomizer.java b/application/src/main/java/org/cardanofoundation/ledgersync/configuration/JooqConfigurationCustomizer.java similarity index 92% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/JooqConfigurationCustomizer.java rename to application/src/main/java/org/cardanofoundation/ledgersync/configuration/JooqConfigurationCustomizer.java index 4cd1afb3..104c61fd 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/JooqConfigurationCustomizer.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/configuration/JooqConfigurationCustomizer.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.configuration; +package org.cardanofoundation.ledgersync.configuration; import org.jooq.conf.MappedSchema; import org.jooq.conf.RenderMapping; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/MicrometerConfig.java b/application/src/main/java/org/cardanofoundation/ledgersync/configuration/MicrometerConfig.java similarity index 83% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/MicrometerConfig.java rename to application/src/main/java/org/cardanofoundation/ledgersync/configuration/MicrometerConfig.java index ab1ea943..2a2673ff 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/configuration/MicrometerConfig.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/configuration/MicrometerConfig.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.configuration; +package org.cardanofoundation.ledgersync.configuration; import io.micrometer.core.aop.TimedAspect; import io.micrometer.core.instrument.MeterRegistry; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/constant/ConsumerConstant.java b/application/src/main/java/org/cardanofoundation/ledgersync/constant/ConsumerConstant.java similarity index 94% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/constant/ConsumerConstant.java rename to application/src/main/java/org/cardanofoundation/ledgersync/constant/ConsumerConstant.java index a53c3391..1439448e 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/constant/ConsumerConstant.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/constant/ConsumerConstant.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.constant; +package org.cardanofoundation.ledgersync.constant; import org.cardanofoundation.ledgersync.common.common.constant.Constant; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/converter/AvvmAddressConverter.java b/application/src/main/java/org/cardanofoundation/ledgersync/converter/AvvmAddressConverter.java similarity index 97% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/converter/AvvmAddressConverter.java rename to application/src/main/java/org/cardanofoundation/ledgersync/converter/AvvmAddressConverter.java index 30701e38..aa60e7b5 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/converter/AvvmAddressConverter.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/converter/AvvmAddressConverter.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.converter; +package org.cardanofoundation.ledgersync.converter; import co.nstant.in.cbor.model.Array; import co.nstant.in.cbor.model.ByteString; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/converter/CostModelConverter.java b/application/src/main/java/org/cardanofoundation/ledgersync/converter/CostModelConverter.java similarity index 90% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/converter/CostModelConverter.java rename to application/src/main/java/org/cardanofoundation/ledgersync/converter/CostModelConverter.java index 1b48a277..09bd63ff 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/converter/CostModelConverter.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/converter/CostModelConverter.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.converter; +package org.cardanofoundation.ledgersync.converter; import co.nstant.in.cbor.model.Array; import co.nstant.in.cbor.model.Map; @@ -14,7 +14,7 @@ import java.util.List; import java.util.stream.IntStream; -import static org.cardanofoundation.ledgersync.explorerconsumer.service.impl.genesis.GenesisDataServiceImpl.convertObjecToBigInteger; +import static org.cardanofoundation.ledgersync.service.impl.genesis.GenesisDataServiceImpl.convertObjecToBigInteger; @UtilityClass public class CostModelConverter { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/BlockMessage.java b/application/src/main/java/org/cardanofoundation/ledgersync/dto/BlockMessage.java similarity index 82% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/BlockMessage.java rename to application/src/main/java/org/cardanofoundation/ledgersync/dto/BlockMessage.java index 21c352c1..49f47a3c 100755 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/BlockMessage.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/dto/BlockMessage.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.dto; +package org.cardanofoundation.ledgersync.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/EUTXOWrapper.java b/application/src/main/java/org/cardanofoundation/ledgersync/dto/EUTXOWrapper.java similarity index 77% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/EUTXOWrapper.java rename to application/src/main/java/org/cardanofoundation/ledgersync/dto/EUTXOWrapper.java index d9ef37ac..329ac132 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/EUTXOWrapper.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/dto/EUTXOWrapper.java @@ -1,11 +1,11 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.dto; +package org.cardanofoundation.ledgersync.dto; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.experimental.FieldDefaults; -import org.cardanofoundation.explorer.consumercommon.entity.MaTxOut; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.MaTxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; import org.springframework.util.CollectionUtils; import java.util.Collection; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/GenesisData.java b/application/src/main/java/org/cardanofoundation/ledgersync/dto/GenesisData.java similarity index 78% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/GenesisData.java rename to application/src/main/java/org/cardanofoundation/ledgersync/dto/GenesisData.java index 2b8a1566..fb437df3 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/GenesisData.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/dto/GenesisData.java @@ -1,11 +1,11 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.dto; +package org.cardanofoundation.ledgersync.dto; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.cardanofoundation.explorer.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; import java.sql.Timestamp; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/TransactionOutMultiAssets.java b/application/src/main/java/org/cardanofoundation/ledgersync/dto/TransactionOutMultiAssets.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/TransactionOutMultiAssets.java rename to application/src/main/java/org/cardanofoundation/ledgersync/dto/TransactionOutMultiAssets.java index f96b9bb6..95b153f3 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/TransactionOutMultiAssets.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/dto/TransactionOutMultiAssets.java @@ -1,12 +1,12 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.dto; +package org.cardanofoundation.ledgersync.dto; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.experimental.FieldDefaults; -import org.cardanofoundation.explorer.consumercommon.entity.MaTxOut; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.MaTxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; import org.springframework.util.MultiValueMap; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/cache/CurrentEpochObject.java b/application/src/main/java/org/cardanofoundation/ledgersync/dto/cache/CurrentEpochObject.java similarity index 80% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/cache/CurrentEpochObject.java rename to application/src/main/java/org/cardanofoundation/ledgersync/dto/cache/CurrentEpochObject.java index 62889f74..0559215a 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/cache/CurrentEpochObject.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/dto/cache/CurrentEpochObject.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.dto.cache; +package org.cardanofoundation.ledgersync.dto.cache; import lombok.*; import lombok.experimental.FieldDefaults; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/cache/LatestTxObject.java b/application/src/main/java/org/cardanofoundation/ledgersync/dto/cache/LatestTxObject.java similarity index 84% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/cache/LatestTxObject.java rename to application/src/main/java/org/cardanofoundation/ledgersync/dto/cache/LatestTxObject.java index c6b768b2..557075d6 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/dto/cache/LatestTxObject.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/dto/cache/LatestTxObject.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.dto.cache; +package org.cardanofoundation.ledgersync.dto.cache; import lombok.*; import lombok.experimental.FieldDefaults; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/dto/healthcheck/HealthStatus.java b/application/src/main/java/org/cardanofoundation/ledgersync/dto/healthcheck/HealthStatus.java new file mode 100644 index 00000000..152db0ce --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/dto/healthcheck/HealthStatus.java @@ -0,0 +1,18 @@ +package org.cardanofoundation.ledgersync.dto.healthcheck; + +import lombok.*; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class HealthStatus { + Boolean isHealthy; + String messageCode; + String messageDesc; + LocalDateTime latestBlockInsertTime; + Boolean hasStopSlot; +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/dto/healthcheck/Message.java b/application/src/main/java/org/cardanofoundation/ledgersync/dto/healthcheck/Message.java new file mode 100644 index 00000000..5496227c --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/dto/healthcheck/Message.java @@ -0,0 +1,22 @@ +package org.cardanofoundation.ledgersync.dto.healthcheck; + +import lombok.Getter; + +@Getter +public enum Message { + READY_TO_SERVE("READY_TO_SERVE", "Data is ready to serve"), + IS_NOT_SYNCING("IS_NOT_SYNCING", "Connection to node is not healthy, data is not being synchronized"), + SYNCING_BUT_NOT_READY("SYNCING_BUT_NOT_READY", "Data is being synchronized, but it isn't ready to serve yet"), + CONNECTION_HEALTHY_BUT_BLOCK_CONSUMING_NOT_HEALTHY("CONNECTION_HEALTHY_BUT_BLOCK_CONSUMING_NOT_HEALTHY", + "Connection to node is healthy, but the latest block insertion time has exceeded the threshold"), + SYNCING_HAS_FINISHED("SYNCING_HAS_FINISHED", + "Connection to node is healthy, but the latest block insertion time has exceeded the threshold"); + + private final String code; + private final String desc; + + Message(String code, String desc) { + this.code = code; + this.desc = desc; + } +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/exception/HashScriptException.java b/application/src/main/java/org/cardanofoundation/ledgersync/exception/HashScriptException.java similarity index 74% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/exception/HashScriptException.java rename to application/src/main/java/org/cardanofoundation/ledgersync/exception/HashScriptException.java index eca795ea..aca4eb1c 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/exception/HashScriptException.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/exception/HashScriptException.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.exception; +package org.cardanofoundation.ledgersync.exception; public class HashScriptException extends RuntimeException { public HashScriptException(Exception e) { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTokenBalanceRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTokenBalanceRepository.java deleted file mode 100644 index 39ac2c76..00000000 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTokenBalanceRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; - -import org.cardanofoundation.explorer.consumercommon.entity.AddressTokenBalance; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface AddressTokenBalanceRepository - extends JpaRepository { - -} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/custom/CustomAddressTokenBalanceRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/custom/CustomAddressTokenBalanceRepository.java deleted file mode 100644 index a2fa15e8..00000000 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/custom/CustomAddressTokenBalanceRepository.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository.custom; - -import lombok.AccessLevel; -import lombok.RequiredArgsConstructor; -import lombok.experimental.FieldDefaults; -import org.cardanofoundation.explorer.consumercommon.entity.Address; -import org.cardanofoundation.explorer.consumercommon.entity.AddressTokenBalance; -import org.cardanofoundation.explorer.consumercommon.entity.MultiAsset; -import org.jooq.Condition; -import org.jooq.DSLContext; -import org.jooq.Record; -import org.springframework.data.util.Pair; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.sql.Timestamp; -import java.util.Collection; -import java.util.List; - -import static org.cardanofoundation.ledgersync.jooq.Tables.*; - -@Repository -@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true) -@RequiredArgsConstructor -// TODO: add integration tests -public class CustomAddressTokenBalanceRepository { - private final DSLContext dsl; - - @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) - public List findAllByAddressFingerprintPairIn(Collection> addressFingerprintPairs) { - - Condition condition = null; - for (Pair addressFingerprintPair : addressFingerprintPairs) { - String address = addressFingerprintPair.getFirst(); - String fingerprint = addressFingerprintPair.getSecond(); - Condition pairCondition = (ADDRESS.ADDRESS_.eq(address)) - .and(MULTI_ASSET.FINGERPRINT.eq(fingerprint)); - condition = condition == null ? pairCondition : condition.or(pairCondition); - } - - var query = dsl.select() - .from(ADDRESS_TOKEN_BALANCE) - .join(ADDRESS).on(ADDRESS_TOKEN_BALANCE.ADDRESS_ID.eq(ADDRESS.ID)) - .join(MULTI_ASSET).on(ADDRESS_TOKEN_BALANCE.IDENT.eq(MULTI_ASSET.ID)) - .where(condition); - - return query.fetch().map(this::mapToAddressTokenBalance); - } - - @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) - public List findAllByAddressMultiAssetIdPairIn(Collection> addressMultiAssetIdPairs) { - Condition condition = null; - for (Pair addressMultiAssetIdPair : addressMultiAssetIdPairs) { - Long addressId = addressMultiAssetIdPair.getFirst(); - Long multiAssetId = addressMultiAssetIdPair.getSecond(); - Condition pairCondition = ADDRESS_TOKEN_BALANCE.ADDRESS_ID.eq(addressId) - .and(ADDRESS_TOKEN_BALANCE.IDENT.eq(multiAssetId)); - condition = condition == null ? pairCondition : condition.or(pairCondition); - } - - var query = dsl.select() - .from(ADDRESS_TOKEN_BALANCE) - .join(MULTI_ASSET).on(ADDRESS_TOKEN_BALANCE.IDENT.eq(MULTI_ASSET.ID)) - .join(ADDRESS).on(ADDRESS_TOKEN_BALANCE.ADDRESS_ID.eq(ADDRESS.ID)) - .where(condition); - - return query.fetch().map(this::mapToAddressTokenBalance); - } - - private AddressTokenBalance mapToAddressTokenBalance(Record record) { - AddressTokenBalance addressTokenBalance = new AddressTokenBalance(); - - addressTokenBalance.setAddress( - Address.builder().id(record.get(ADDRESS.ID)) - .stakeAddressId(record.get(ADDRESS.STAKE_ADDRESS_ID)) - .balance(record.get(ADDRESS.BALANCE)) - .address(record.get(ADDRESS.ADDRESS_)) - .addressHasScript(record.get(ADDRESS.ADDRESS_HAS_SCRIPT)) - .txCount(record.get(ADDRESS.TX_COUNT)) - .verifiedContract(record.get(ADDRESS.VERIFIED_CONTRACT)) - .build()); - - addressTokenBalance.setMultiAsset(MultiAsset.builder() - .id(record.get(MULTI_ASSET.ID)) - .policy(record.get(MULTI_ASSET.POLICY)) - .name(record.get(MULTI_ASSET.NAME_VIEW)) - .nameView(record.get(MULTI_ASSET.NAME_VIEW)) - .fingerprint(record.get(MULTI_ASSET.FINGERPRINT)) - .txCount(record.get(MULTI_ASSET.TX_COUNT)) - .supply(record.get(MULTI_ASSET.SUPPLY)) - .totalVolume(record.get(MULTI_ASSET.TOTAL_VOLUME)) - .time(Timestamp.valueOf(record.get(MULTI_ASSET.TIME))) - .build()); - - addressTokenBalance.setStakeAddressId(record.get(ADDRESS_TOKEN_BALANCE.STAKE_ADDRESS_ID)); - addressTokenBalance.setAddressId(record.get(ADDRESS_TOKEN_BALANCE.ADDRESS_ID)); - addressTokenBalance.setBalance(record.get(ADDRESS_TOKEN_BALANCE.BALANCE)); - addressTokenBalance.setMultiAssetId(record.get(ADDRESS_TOKEN_BALANCE.IDENT)); - addressTokenBalance.setId(record.get(ADDRESS_TOKEN_BALANCE.ID)); - - return addressTokenBalance; - } -} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxBootstrapWitnessService.java b/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxBootstrapWitnessService.java deleted file mode 100644 index a0cd2a0a..00000000 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxBootstrapWitnessService.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; - -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; - -import java.util.Collection; -import java.util.Map; - -public interface TxBootstrapWitnessService { - - void handleBootstrapWitnesses(Collection txs, Map txMap); -} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/AbstractServiceFactory.java b/application/src/main/java/org/cardanofoundation/ledgersync/factory/AbstractServiceFactory.java similarity index 72% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/AbstractServiceFactory.java rename to application/src/main/java/org/cardanofoundation/ledgersync/factory/AbstractServiceFactory.java index 39073ddf..f735748d 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/AbstractServiceFactory.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/factory/AbstractServiceFactory.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.factory; +package org.cardanofoundation.ledgersync.factory; import jakarta.annotation.PostConstruct; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SyncServiceInstance; +import org.cardanofoundation.ledgersync.service.SyncServiceInstance; import java.util.List; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/BlockAggregatorServiceFactory.java b/application/src/main/java/org/cardanofoundation/ledgersync/factory/BlockAggregatorServiceFactory.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/BlockAggregatorServiceFactory.java rename to application/src/main/java/org/cardanofoundation/ledgersync/factory/BlockAggregatorServiceFactory.java index 931d6252..a47238bd 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/BlockAggregatorServiceFactory.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/factory/BlockAggregatorServiceFactory.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.factory; +package org.cardanofoundation.ledgersync.factory; import org.cardanofoundation.ledgersync.common.common.kafka.CommonBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockAggregatorService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BlockAggregatorService; import org.springframework.stereotype.Component; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/CertificateSyncServiceFactory.java b/application/src/main/java/org/cardanofoundation/ledgersync/factory/CertificateSyncServiceFactory.java similarity index 72% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/CertificateSyncServiceFactory.java rename to application/src/main/java/org/cardanofoundation/ledgersync/factory/CertificateSyncServiceFactory.java index 17de360c..e5b0ca48 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/CertificateSyncServiceFactory.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/factory/CertificateSyncServiceFactory.java @@ -1,16 +1,14 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.factory; +package org.cardanofoundation.ledgersync.factory; import com.bloxbean.cardano.yaci.core.model.certs.*; import jakarta.annotation.PostConstruct; -import org.cardanofoundation.explorer.consumercommon.entity.Delegation; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.function.Function; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/NativeScriptFactory.java b/application/src/main/java/org/cardanofoundation/ledgersync/factory/NativeScriptFactory.java similarity index 75% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/NativeScriptFactory.java rename to application/src/main/java/org/cardanofoundation/ledgersync/factory/NativeScriptFactory.java index 1cca79c9..448d4fc1 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/NativeScriptFactory.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/factory/NativeScriptFactory.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.factory; +package org.cardanofoundation.ledgersync.factory; import jakarta.annotation.PostConstruct; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.cardanofoundation.ledgersync.common.common.nativescript.NativeScript; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.nativescript.NativeScriptService; +import org.cardanofoundation.ledgersync.service.impl.nativescript.NativeScriptService; import org.springframework.stereotype.Component; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/PlutusScriptFactory.java b/application/src/main/java/org/cardanofoundation/ledgersync/factory/PlutusScriptFactory.java similarity index 75% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/PlutusScriptFactory.java rename to application/src/main/java/org/cardanofoundation/ledgersync/factory/PlutusScriptFactory.java index 5ac7732b..15f205b7 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/factory/PlutusScriptFactory.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/factory/PlutusScriptFactory.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.factory; +package org.cardanofoundation.ledgersync.factory; import com.bloxbean.cardano.client.plutus.spec.PlutusScript; import jakarta.annotation.PostConstruct; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.plutus.PlutusScriptService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.service.impl.plutus.PlutusScriptService; import org.springframework.stereotype.Component; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/healthcheck/LedgerSyncHealthEndpoint.java b/application/src/main/java/org/cardanofoundation/ledgersync/healthcheck/LedgerSyncHealthEndpoint.java new file mode 100644 index 00000000..9fc7580b --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/healthcheck/LedgerSyncHealthEndpoint.java @@ -0,0 +1,32 @@ +package org.cardanofoundation.ledgersync.healthcheck; + +import lombok.RequiredArgsConstructor; +import org.cardanofoundation.ledgersync.dto.healthcheck.HealthStatus; +import org.cardanofoundation.ledgersync.service.HealthStatusService; +import org.springframework.boot.actuate.endpoint.annotation.Endpoint; +import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; +import org.springframework.context.annotation.Bean; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; + +@Endpoint(id = "health-status") +@RequiredArgsConstructor +@Component +public class LedgerSyncHealthEndpoint { + + private final HealthStatusService healthStatusService; + + @ReadOperation + @Bean + public ResponseEntity checkHealthStatus() { + var healthStatus = healthStatusService.getHealthStatus(); + + if (Boolean.FALSE.equals(healthStatus.getIsHealthy())) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(healthStatus); + } + + return ResponseEntity.ok().body(healthStatus); + } +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/listeners/BlockEventListener.java b/application/src/main/java/org/cardanofoundation/ledgersync/listeners/BlockEventListener.java similarity index 77% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/listeners/BlockEventListener.java rename to application/src/main/java/org/cardanofoundation/ledgersync/listeners/BlockEventListener.java index 9ad4a3b3..058c3cdb 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/listeners/BlockEventListener.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/listeners/BlockEventListener.java @@ -1,20 +1,24 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.listeners; +package org.cardanofoundation.ledgersync.listeners; import com.bloxbean.cardano.yaci.store.events.*; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.BlockRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.*; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block.BlockAggregatorServiceImpl; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block.ByronEbbAggregatorServiceImpl; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block.ByronMainAggregatorServiceImpl; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.repository.BlockRepository; +import org.cardanofoundation.ledgersync.service.*; +import org.cardanofoundation.ledgersync.service.impl.block.BlockAggregatorServiceImpl; +import org.cardanofoundation.ledgersync.service.impl.block.ByronEbbAggregatorServiceImpl; +import org.cardanofoundation.ledgersync.service.impl.block.ByronMainAggregatorServiceImpl; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -34,6 +38,7 @@ public class BlockEventListener { private final BlockRepository blockRepository; private final MetricCollectorService metricCollectorService; + private final HealthCheckCachingService healthCheckCachingService; private final AtomicInteger blockCount = new AtomicInteger(0); @Value("${blocks.batch-size}") @@ -90,14 +95,21 @@ public void handleGenesisBlock(GenesisBlockEvent genesisBlockEvent) { } genesisDataService.setupData(genesisHash); + healthCheckCachingService.saveLatestBlockSlot(genesisBlockEvent.getSlot()); + healthCheckCachingService.saveLatestBlockInsertTime(LocalDateTime.now(ZoneOffset.UTC)); + healthCheckCachingService.saveLatestBlockTime( + LocalDateTime.ofInstant(Instant.ofEpochSecond(genesisBlockEvent.getBlockTime()), ZoneId.of("UTC"))); } @EventListener @Transactional public void handleRollback(RollbackEvent rollbackEvent) { - Long rollbackBlockNo = blockRepository.findBySlotNo(rollbackEvent.getRollbackTo().getSlot()) - .map(block -> block.getBlockNo()) - .orElse(0L); + long rollbackBlockNo = 0; + var rollBackBlock = blockRepository.findBySlotNo(rollbackEvent.getRollbackTo().getSlot()); + + if (rollBackBlock.isPresent()) { + rollbackBlockNo = rollBackBlock.get().getBlockNo(); + } if (rollbackBlockNo == 0) { log.warn("Rollback block no {}, hash {} not found", rollbackEvent.getRollbackTo().getSlot(), @@ -109,6 +121,10 @@ public void handleRollback(RollbackEvent rollbackEvent) { rollbackService.rollBackFrom(rollbackBlockNo); metricCollectorService.collectRollbackMetric(); blockCount.set(0); + + healthCheckCachingService.saveLatestBlockSlot(rollbackEvent.getRollbackTo().getSlot()); + healthCheckCachingService.saveLatestBlockInsertTime(LocalDateTime.now(ZoneOffset.UTC)); + healthCheckCachingService.saveLatestBlockTime(rollBackBlock.get().getTime().toLocalDateTime()); } private boolean checkIfBlockExists(EventMetadata metadata) { @@ -166,6 +182,13 @@ private void handleAggregateBlock(EventMetadata eventMetadata, AggregatedBlock a int currentBlockCount = blockCount.incrementAndGet(); if (currentBlockCount % batchSize == 0 || lastReceivedTimeElapsed >= commitThreshold || eventMetadata.isSyncMode()) { blockSyncService.startBlockSyncing(); + + healthCheckCachingService.saveLatestBlockInsertTime(LocalDateTime.now(ZoneOffset.UTC)); + healthCheckCachingService.saveLatestBlockTime(LocalDateTime.ofEpochSecond( + eventMetadata.getBlockTime(), 0, ZoneOffset.ofHours(0))); + healthCheckCachingService.saveIsSyncMode(eventMetadata.isSyncMode()); + healthCheckCachingService.saveLatestBlockSlot(eventMetadata.getSlot()); + blockCount.set(0); } diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/listeners/LedgerSyncEventListener.java b/application/src/main/java/org/cardanofoundation/ledgersync/listeners/LedgerSyncEventListener.java similarity index 86% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/listeners/LedgerSyncEventListener.java rename to application/src/main/java/org/cardanofoundation/ledgersync/listeners/LedgerSyncEventListener.java index 2f13ce85..e5a6d901 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/listeners/LedgerSyncEventListener.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/listeners/LedgerSyncEventListener.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.listeners; +package org.cardanofoundation.ledgersync.listeners; import com.bloxbean.cardano.yaci.store.core.domain.Cursor; import com.bloxbean.cardano.yaci.store.core.service.CursorService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.BlockRepository; +import org.cardanofoundation.ledgersync.repository.BlockRepository; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/mapper/EpochParamMapper.java b/application/src/main/java/org/cardanofoundation/ledgersync/mapper/EpochParamMapper.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/mapper/EpochParamMapper.java rename to application/src/main/java/org/cardanofoundation/ledgersync/mapper/EpochParamMapper.java index ee5e6d3d..15d68adb 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/mapper/EpochParamMapper.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/mapper/EpochParamMapper.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.mapper; +package org.cardanofoundation.ledgersync.mapper; -import org.cardanofoundation.explorer.consumercommon.entity.EpochParam; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.entity.EpochParam; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/AddressTxBalanceProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/AddressTxBalanceProjection.java similarity index 72% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/AddressTxBalanceProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/AddressTxBalanceProjection.java index a910a9d7..e8f67817 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/AddressTxBalanceProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/AddressTxBalanceProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; import java.math.BigInteger; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/DatumProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/DatumProjection.java similarity index 53% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/DatumProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/DatumProjection.java index ea9b3fa8..483a05c3 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/DatumProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/DatumProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; public interface DatumProjection { Long getId(); diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/LatestTxInProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/LatestTxInProjection.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/LatestTxInProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/LatestTxInProjection.java index ef43f407..1984261f 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/LatestTxInProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/LatestTxInProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/LatestTxOutProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/LatestTxOutProjection.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/LatestTxOutProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/LatestTxOutProjection.java index 46f5f72d..08cf734a 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/LatestTxOutProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/LatestTxOutProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MaTxMintProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/MaTxMintProjection.java similarity index 64% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MaTxMintProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/MaTxMintProjection.java index 40ce48f5..d294dfdb 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MaTxMintProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/MaTxMintProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; import java.math.BigInteger; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MaTxOutProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/MaTxOutProjection.java similarity index 82% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MaTxOutProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/MaTxOutProjection.java index 2115529c..2bdba373 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MaTxOutProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/MaTxOutProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MultiAssetTotalVolumeProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/MultiAssetTotalVolumeProjection.java similarity index 66% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MultiAssetTotalVolumeProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/MultiAssetTotalVolumeProjection.java index c355a257..d9cf4e22 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MultiAssetTotalVolumeProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/MultiAssetTotalVolumeProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; import java.math.BigInteger; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MultiAssetTxCountProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/MultiAssetTxCountProjection.java similarity index 58% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MultiAssetTxCountProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/MultiAssetTxCountProjection.java index a4ebc4da..254bf0bb 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/MultiAssetTxCountProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/MultiAssetTxCountProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; public interface MultiAssetTxCountProjection { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/ScriptProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/ScriptProjection.java similarity index 53% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/ScriptProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/ScriptProjection.java index e63362fd..d4f02375 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/ScriptProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/ScriptProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; public interface ScriptProjection { Long getId(); diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/TxOutProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/TxOutProjection.java similarity index 86% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/TxOutProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/TxOutProjection.java index 552e2821..848f4fc2 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/TxOutProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/TxOutProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/TxTimeProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/TxTimeProjection.java similarity index 75% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/TxTimeProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/TxTimeProjection.java index cfad1271..5e52e40d 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/TxTimeProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/TxTimeProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; import java.sql.Timestamp; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/UniqueAccountTxCountProjection.java b/application/src/main/java/org/cardanofoundation/ledgersync/projection/UniqueAccountTxCountProjection.java similarity index 60% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/UniqueAccountTxCountProjection.java rename to application/src/main/java/org/cardanofoundation/ledgersync/projection/UniqueAccountTxCountProjection.java index 3d2cfecc..bce108cd 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/projection/UniqueAccountTxCountProjection.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/projection/UniqueAccountTxCountProjection.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.projection; +package org.cardanofoundation.ledgersync.projection; public interface UniqueAccountTxCountProjection { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressRepository.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressRepository.java index 87d249e9..9764d649 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressRepository.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Address; -import org.cardanofoundation.explorer.consumercommon.entity.Address_; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Address; +import org.cardanofoundation.ledgersync.consumercommon.entity.Address_; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTokenBalanceRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTokenBalanceRepository.java new file mode 100644 index 00000000..1b145073 --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTokenBalanceRepository.java @@ -0,0 +1,11 @@ +package org.cardanofoundation.ledgersync.repository; + +import org.cardanofoundation.ledgersync.consumercommon.entity.AddressTokenBalance; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AddressTokenBalanceRepository + extends JpaRepository, CustomAddressTokenBalanceRepository { + +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTokenRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTokenRepository.java similarity index 68% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTokenRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTokenRepository.java index 2b937ffe..465ff813 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTokenRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTokenRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.AddressToken; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.AddressToken; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTxBalanceRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTxBalanceRepository.java similarity index 73% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTxBalanceRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTxBalanceRepository.java index 7040f7ef..23f8ae27 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/AddressTxBalanceRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/AddressTxBalanceRepository.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.AddressTxBalance; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.AddressTxBalanceProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.AddressTxBalance; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.projection.AddressTxBalanceProjection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/BlockRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/BlockRepository.java similarity index 86% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/BlockRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/BlockRepository.java index 349ed9fe..176be7fa 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/BlockRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/BlockRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/CostModelRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/CostModelRepository.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/CostModelRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/CostModelRepository.java index 37510dae..bf4b70de 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/CostModelRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/CostModelRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.CostModel; +import org.cardanofoundation.ledgersync.consumercommon.entity.CostModel; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/repository/CustomAddressTokenBalanceRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/CustomAddressTokenBalanceRepository.java new file mode 100644 index 00000000..9112bfc4 --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/CustomAddressTokenBalanceRepository.java @@ -0,0 +1,15 @@ +package org.cardanofoundation.ledgersync.repository; + +import org.cardanofoundation.ledgersync.consumercommon.entity.AddressTokenBalance; +import org.springframework.data.util.Pair; + +import java.util.Collection; + +public interface CustomAddressTokenBalanceRepository { + + Collection findAllByAddressFingerprintPairIn( + Collection> addressFingerprintPairs); + + Collection findAllByAddressMultiAssetIdPairIn( + Collection> addressMultiAssetIdPairs); +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/CustomTxOutRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/CustomTxOutRepository.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/CustomTxOutRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/CustomTxOutRepository.java index e5bf3d1c..971fcd12 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/CustomTxOutRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/CustomTxOutRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.TxOutProjection; +import org.cardanofoundation.ledgersync.projection.TxOutProjection; import org.springframework.data.util.Pair; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/DatumRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/DatumRepository.java similarity index 80% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/DatumRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/DatumRepository.java index bb55ca54..82f7bdf7 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/DatumRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/DatumRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Datum; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Datum; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/DelegationRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/DelegationRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/DelegationRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/DelegationRepository.java index 3b7dfd6b..225c750f 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/DelegationRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/DelegationRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Delegation; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Delegation; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/EpochParamRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/EpochParamRepository.java similarity index 75% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/EpochParamRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/EpochParamRepository.java index 7d1141b6..0e45f0b9 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/EpochParamRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/EpochParamRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.EpochParam; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.EpochParam; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/EpochRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/EpochRepository.java similarity index 86% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/EpochRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/EpochRepository.java index baf67378..16ab167a 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/EpochRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/EpochRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Epoch; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.UniqueAccountTxCountProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.Epoch; +import org.cardanofoundation.ledgersync.projection.UniqueAccountTxCountProjection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ExtraKeyWitnessRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ExtraKeyWitnessRepository.java similarity index 74% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ExtraKeyWitnessRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/ExtraKeyWitnessRepository.java index a0eacb67..f1795269 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ExtraKeyWitnessRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ExtraKeyWitnessRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.ExtraKeyWitness; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.ExtraKeyWitness; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/FailedTxOutRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/FailedTxOutRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/FailedTxOutRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/FailedTxOutRepository.java index ea45cec1..68f1d742 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/FailedTxOutRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/FailedTxOutRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.FailedTxOut; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.FailedTxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MaTxMintRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/MaTxMintRepository.java similarity index 70% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MaTxMintRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/MaTxMintRepository.java index f07e96bc..cc03092b 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MaTxMintRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/MaTxMintRepository.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.MaTxMint; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MaTxMintProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.MaTxMint; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.projection.MaTxMintProjection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MultiAssetRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/MultiAssetRepository.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MultiAssetRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/MultiAssetRepository.java index 0549461a..921b9b58 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MultiAssetRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/MultiAssetRepository.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.MultiAsset; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MultiAssetTotalVolumeProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MultiAssetTxCountProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.MultiAsset; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.projection.MultiAssetTotalVolumeProjection; +import org.cardanofoundation.ledgersync.projection.MultiAssetTxCountProjection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MultiAssetTxOutRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/MultiAssetTxOutRepository.java similarity index 72% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MultiAssetTxOutRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/MultiAssetTxOutRepository.java index 7596b1cf..7ed4e843 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/MultiAssetTxOutRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/MultiAssetTxOutRepository.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.MaTxOut; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MaTxOutProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.MaTxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.projection.MaTxOutProjection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -18,7 +18,7 @@ public interface MultiAssetTxOutRepository extends JpaRepository { @Query( - "SELECT new org.cardanofoundation.ledgersync.explorerconsumer.projection.MaTxOutProjection(" + "SELECT new org.cardanofoundation.ledgersync.projection.MaTxOutProjection(" + "mto.ident.fingerprint, " + "mto.txOutId, " + "mto.quantity) " diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ParamProposalRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ParamProposalRepository.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ParamProposalRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/ParamProposalRepository.java index 31c72ca9..3780b5c5 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ParamProposalRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ParamProposalRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolHashRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolHashRepository.java similarity index 78% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolHashRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolHashRepository.java index 2ad1538b..2a1a7556 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolHashRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolHashRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Propagation; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolMetadataRefRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolMetadataRefRepository.java similarity index 70% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolMetadataRefRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolMetadataRefRepository.java index d9ed1e45..f223ac02 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolMetadataRefRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolMetadataRefRepository.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; -import org.cardanofoundation.explorer.consumercommon.entity.PoolMetadataRef; -import org.cardanofoundation.explorer.consumercommon.entity.PoolMetadataRef_; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolMetadataRef; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolMetadataRef_; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolOwnerRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolOwnerRepository.java similarity index 65% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolOwnerRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolOwnerRepository.java index 916fa524..2fe1a338 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolOwnerRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolOwnerRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.PoolOwner; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolOwner; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolRelayRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolRelayRepository.java similarity index 65% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolRelayRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolRelayRepository.java index 8fc49e5a..f2a6a19c 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolRelayRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolRelayRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.PoolRelay; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolRelay; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolRetireRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolRetireRepository.java similarity index 64% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolRetireRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolRetireRepository.java index d91cbba2..f847cc99 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolRetireRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolRetireRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.PoolRetire; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolRetire; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolUpdateRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolUpdateRepository.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolUpdateRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolUpdateRepository.java index 59d45452..fa7e0c08 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PoolUpdateRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PoolUpdateRepository.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; -import org.cardanofoundation.explorer.consumercommon.entity.PoolUpdate; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolUpdate; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PotTransferRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PotTransferRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PotTransferRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/PotTransferRepository.java index 894695b6..a73f5207 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/PotTransferRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/PotTransferRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.PotTransfer; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.PotTransfer; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RedeemerDataRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/RedeemerDataRepository.java similarity index 72% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RedeemerDataRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/RedeemerDataRepository.java index 8373927e..089f3f5a 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RedeemerDataRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/RedeemerDataRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.RedeemerData; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.RedeemerData; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RedeemerRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/RedeemerRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RedeemerRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/RedeemerRepository.java index 01db7269..9741ecdd 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RedeemerRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/RedeemerRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ReferenceInputRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ReferenceInputRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ReferenceInputRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/ReferenceInputRepository.java index ee4d2b1c..d55e8da1 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ReferenceInputRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ReferenceInputRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.ReferenceTxIn; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.ReferenceTxIn; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ReserveRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ReserveRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ReserveRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/ReserveRepository.java index 2a097610..c4820a6e 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ReserveRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ReserveRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Reserve; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Reserve; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RollbackHistoryRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/RollbackHistoryRepository.java similarity index 59% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RollbackHistoryRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/RollbackHistoryRepository.java index 57854d03..77730e6c 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/RollbackHistoryRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/RollbackHistoryRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.RollbackHistory; +import org.cardanofoundation.ledgersync.consumercommon.entity.RollbackHistory; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ScriptRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ScriptRepository.java similarity index 74% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ScriptRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/ScriptRepository.java index baed6db5..49635a63 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/ScriptRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/ScriptRepository.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.ScriptProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.projection.ScriptProjection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/SlotLeaderRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/SlotLeaderRepository.java similarity index 73% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/SlotLeaderRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/SlotLeaderRepository.java index 1f4009ee..da4c6f15 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/SlotLeaderRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/SlotLeaderRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.SlotLeader; +import org.cardanofoundation.ledgersync.consumercommon.entity.SlotLeader; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeAddressRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeAddressRepository.java similarity index 75% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeAddressRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeAddressRepository.java index c98922dc..5a04fbac 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeAddressRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeAddressRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeDeregistrationRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeDeregistrationRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeDeregistrationRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeDeregistrationRepository.java index 6ae003dc..c4b11503 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeDeregistrationRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeDeregistrationRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.StakeDeregistration; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeDeregistration; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeRegistrationRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeRegistrationRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeRegistrationRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeRegistrationRepository.java index 3ce3bc24..b485fe46 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/StakeRegistrationRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/StakeRegistrationRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.StakeRegistration; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeRegistration; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TreasuryRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TreasuryRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TreasuryRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TreasuryRepository.java index 358b4ca6..1b90533a 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TreasuryRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TreasuryRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Treasury; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Treasury; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxBootstrapWitnessRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxBootstrapWitnessRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxBootstrapWitnessRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TxBootstrapWitnessRepository.java index e0f5c8c3..6858d322 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxBootstrapWitnessRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxBootstrapWitnessRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxBootstrapWitnesses; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxBootstrapWitnesses; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxChartRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxChartRepository.java similarity index 71% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxChartRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TxChartRepository.java index 787ebba2..d3564c0b 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxChartRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxChartRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.TxChart; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxChart; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxInRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxInRepository.java similarity index 68% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxInRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TxInRepository.java index 402eb9b7..9518ebb1 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxInRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxInRepository.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.LatestTxInProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxIn; +import org.cardanofoundation.ledgersync.projection.LatestTxInProjection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -16,7 +16,7 @@ public interface TxInRepository extends JpaRepository { @Query("SELECT " - + "new org.cardanofoundation.ledgersync.explorerconsumer.projection.LatestTxInProjection(" + + "new org.cardanofoundation.ledgersync.projection.LatestTxInProjection(" + "txIn.txInput.id, " + "txOut.address" + ") FROM TxIn txIn " diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxMetaDataHashRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxMetaDataHashRepository.java similarity index 67% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxMetaDataHashRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TxMetaDataHashRepository.java index 44376dbf..e8b8bd7b 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxMetaDataHashRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxMetaDataHashRepository.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.TxMetadataHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxMetadataHash; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxMetadataRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxMetadataRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxMetadataRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TxMetadataRepository.java index 50678526..82b45fdd 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxMetadataRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxMetadataRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxMetadata; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxMetadata; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxOutRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxOutRepository.java similarity index 64% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxOutRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TxOutRepository.java index 914add7c..8a68acda 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxOutRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxOutRepository.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.LatestTxOutProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.projection.LatestTxOutProjection; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -16,7 +16,7 @@ public interface TxOutRepository extends JpaRepository, CustomTxOutRepository { @Query("SELECT " - + "new org.cardanofoundation.ledgersync.explorerconsumer.projection.LatestTxOutProjection(" + + "new org.cardanofoundation.ledgersync.projection.LatestTxOutProjection(" + "txOut.txId, txOut.address) FROM TxOut txOut " + "WHERE txOut.tx IN (:txs)") List findAllByTxIn(@Param("txs") Collection txs); diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxRepository.java similarity index 85% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TxRepository.java index 869a1243..76562547 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxRepository.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.Tx_; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.TxTimeProjection; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx_; +import org.cardanofoundation.ledgersync.projection.TxTimeProjection; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxWitnessRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxWitnessRepository.java similarity index 58% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxWitnessRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/TxWitnessRepository.java index 6e309ce8..a8cde3a5 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/TxWitnessRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/TxWitnessRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxWitness; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxWitness; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/UnconsumeTxInRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/UnconsumeTxInRepository.java similarity index 59% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/UnconsumeTxInRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/UnconsumeTxInRepository.java index adcce15c..ac1b3772 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/UnconsumeTxInRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/UnconsumeTxInRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.UnconsumeTxIn; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.UnconsumeTxIn; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/WithdrawalRepository.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/WithdrawalRepository.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/WithdrawalRepository.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/WithdrawalRepository.java index ff41f118..b5794491 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/WithdrawalRepository.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/WithdrawalRepository.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository; +package org.cardanofoundation.ledgersync.repository; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.Withdrawal; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Withdrawal; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/repository/impl/CustomAddressTokenBalanceRepositoryImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/impl/CustomAddressTokenBalanceRepositoryImpl.java new file mode 100644 index 00000000..ad82d80e --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/impl/CustomAddressTokenBalanceRepositoryImpl.java @@ -0,0 +1,99 @@ +package org.cardanofoundation.ledgersync.repository.impl; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; +import lombok.experimental.FieldDefaults; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.repository.CustomAddressTokenBalanceRepository; +import org.springframework.data.util.Pair; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; + +@Repository +@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true) +@RequiredArgsConstructor +public class CustomAddressTokenBalanceRepositoryImpl implements + CustomAddressTokenBalanceRepository { + + @PersistenceContext + EntityManager entityManager; + + @Override + @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) + public Collection findAllByAddressFingerprintPairIn( + Collection> addressFingerprintPairs) { + var criteriaBuilder = entityManager.getCriteriaBuilder(); + var query = criteriaBuilder.createQuery(AddressTokenBalance.class); + Root addressTokenBalanceRoot = query.from(AddressTokenBalance.class); + Join addressJoin = + addressTokenBalanceRoot.join(AddressTokenBalance_.address); + Join multiAssetJoin = + addressTokenBalanceRoot.join(AddressTokenBalance_.multiAsset); + + Predicate[] predicates = addressFingerprintPairs.stream() + .map(addressFingerprintPair -> + buildAddressTokenBalancePredicate( + criteriaBuilder, addressJoin, multiAssetJoin, addressFingerprintPair)) + .toArray(Predicate[]::new); + + query.select(addressTokenBalanceRoot).where(criteriaBuilder.or(predicates)); + return entityManager.createQuery(query).getResultList(); + } + + @Override + @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) + public Collection findAllByAddressMultiAssetIdPairIn( + Collection> addressMultiAssetIdPairs) { + var criteriaBuilder = entityManager.getCriteriaBuilder(); + var query = criteriaBuilder.createQuery(AddressTokenBalance.class); + Root addressTokenBalanceRoot = query.from(AddressTokenBalance.class); + Join addressJoin = + addressTokenBalanceRoot.join(AddressTokenBalance_.address); + Join multiAssetJoin = + addressTokenBalanceRoot.join(AddressTokenBalance_.multiAsset); + + Predicate[] predicates = addressMultiAssetIdPairs.stream() + .map(addressMultiAssetIdPair -> + buildAddressTokenBalancePredicateWithIdPair( + criteriaBuilder, addressJoin, multiAssetJoin, addressMultiAssetIdPair)) + .toArray(Predicate[]::new); + + query.select(addressTokenBalanceRoot).where(criteriaBuilder.or(predicates)); + return entityManager.createQuery(query).getResultList(); + } + + private static Predicate buildAddressTokenBalancePredicate( + CriteriaBuilder criteriaBuilder, Join addressJoin, + Join multiAssetJoin, + Pair addressFingerprintPair) { + String address = addressFingerprintPair.getFirst(); + String fingerprint = addressFingerprintPair.getSecond(); + Predicate addressEquals = criteriaBuilder.equal(addressJoin.get(Address_.address), address); + Predicate fingerprintEquals = criteriaBuilder + .equal(multiAssetJoin.get(MultiAsset_.fingerprint), fingerprint); + + return criteriaBuilder.and(addressEquals, fingerprintEquals); + } + + private static Predicate buildAddressTokenBalancePredicateWithIdPair( + CriteriaBuilder criteriaBuilder, Join addressJoin, + Join multiAssetJoin, + Pair addressMultiAssetIdPair) { + Long addressId = addressMultiAssetIdPair.getFirst(); + Long multiAssetId = addressMultiAssetIdPair.getSecond(); + Predicate addressEquals = criteriaBuilder.equal(addressJoin.get(BaseEntity_.id), addressId); + Predicate fingerprintEquals = criteriaBuilder + .equal(multiAssetJoin.get(BaseEntity_.id), multiAssetId); + + return criteriaBuilder.and(addressEquals, fingerprintEquals); + } +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/impl/CustomTxOutRepositoryImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/repository/impl/CustomTxOutRepositoryImpl.java similarity index 91% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/impl/CustomTxOutRepositoryImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/repository/impl/CustomTxOutRepositoryImpl.java index 2d7a2488..383219e1 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/repository/impl/CustomTxOutRepositoryImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/repository/impl/CustomTxOutRepositoryImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.repository.impl; +package org.cardanofoundation.ledgersync.repository.impl; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; @@ -6,9 +6,9 @@ import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.TxOutProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.CustomTxOutRepository; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.projection.TxOutProjection; +import org.cardanofoundation.ledgersync.repository.CustomTxOutRepository; import org.springframework.data.util.Pair; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Propagation; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/AddressBalanceService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/AddressBalanceService.java similarity index 77% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/AddressBalanceService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/AddressBalanceService.java index 2c35c6e7..e210d272 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/AddressBalanceService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/AddressBalanceService.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; import java.util.Collection; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/AggregatedDataCachingService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/AggregatedDataCachingService.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/AggregatedDataCachingService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/AggregatedDataCachingService.java index 5b203095..e7d1dace 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/AggregatedDataCachingService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/AggregatedDataCachingService.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.Epoch; +import org.cardanofoundation.ledgersync.consumercommon.entity.Epoch; public interface AggregatedDataCachingService { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BatchCertificateDataService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/BatchCertificateDataService.java similarity index 97% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BatchCertificateDataService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/BatchCertificateDataService.java index 7d5e921e..65312abd 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BatchCertificateDataService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/BatchCertificateDataService.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; import java.util.Collection; import java.util.Optional; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockAggregatorService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/BlockAggregatorService.java similarity index 85% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockAggregatorService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/BlockAggregatorService.java index 3519e03c..7fecff98 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockAggregatorService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/BlockAggregatorService.java @@ -1,14 +1,14 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; import com.bloxbean.cardano.client.api.util.AssetUtil; import com.bloxbean.cardano.yaci.core.util.HexUtil; import lombok.RequiredArgsConstructor; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddress; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.util.LedgerSyncAssetUtil; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddress; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.util.LedgerSyncAssetUtil; import java.math.BigInteger; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockDataService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/BlockDataService.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockDataService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/BlockDataService.java index eeeca66b..405cb563 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockDataService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/BlockDataService.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; import org.springframework.data.util.Pair; import java.util.Collection; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockSyncService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/BlockSyncService.java similarity index 65% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockSyncService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/BlockSyncService.java index 9d263d0b..19080bd4 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/BlockSyncService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/BlockSyncService.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; public interface BlockSyncService { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/CertificateSyncService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/CertificateSyncService.java similarity index 73% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/CertificateSyncService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/CertificateSyncService.java index e092717e..f1da15b8 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/CertificateSyncService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/CertificateSyncService.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; import com.bloxbean.cardano.yaci.core.model.certs.Certificate; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/CostModelService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/CostModelService.java similarity index 63% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/CostModelService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/CostModelService.java index a91351d8..e6c8d312 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/CostModelService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/CostModelService.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.CostModel; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.consumercommon.entity.CostModel; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; import org.springframework.transaction.annotation.Transactional; public interface CostModelService { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/DatumService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/DatumService.java similarity index 70% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/DatumService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/DatumService.java index b39ecf18..95d28e83 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/DatumService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/DatumService.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.Datum; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Datum; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; import java.util.Collection; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/EpochParamService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/EpochParamService.java similarity index 74% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/EpochParamService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/EpochParamService.java index 63683c5f..4b83e030 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/EpochParamService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/EpochParamService.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.EpochParam; +import org.cardanofoundation.ledgersync.consumercommon.entity.EpochParam; import org.springframework.transaction.annotation.Transactional; public interface EpochParamService { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/EpochService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/EpochService.java similarity index 71% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/EpochService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/EpochService.java index 3749975f..e1225d0c 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/EpochService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/EpochService.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; import java.util.Collection; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/GenesisDataService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/GenesisDataService.java similarity index 83% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/GenesisDataService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/GenesisDataService.java index 05ba74ae..88614fd8 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/GenesisDataService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/GenesisDataService.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; import org.springframework.transaction.annotation.Transactional; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/GenesisFetching.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/GenesisFetching.java similarity index 70% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/GenesisFetching.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/GenesisFetching.java index 7efd855e..74e397cc 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/GenesisFetching.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/GenesisFetching.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; public interface GenesisFetching { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/service/HealthCheckCachingService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/HealthCheckCachingService.java new file mode 100644 index 00000000..72848671 --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/HealthCheckCachingService.java @@ -0,0 +1,44 @@ +package org.cardanofoundation.ledgersync.service; + +import java.time.LocalDateTime; + +public interface HealthCheckCachingService { + + /** + * Cache latest block time + */ + void saveLatestBlockTime(LocalDateTime blockTime); + + /** + * Get the latest block + */ + LocalDateTime getLatestBlockTime(); + + /** + * Cache the time when the most recent block was inserted + */ + void saveLatestBlockInsertTime(LocalDateTime insertTime); + + LocalDateTime getLatestBlockInsertTime(); + + /** + * Cache latest slot no + */ + void saveLatestBlockSlot(Long slot); + + /** + * Get latest slot no + */ + Long getLatestBlockSlot(); + + /** + * Cache the value indicates whether the yaci is crawling with sync mode or not (use Chain-Sync protocol) + */ + void saveIsSyncMode(Boolean isSyncMode); + + /** + * Get the value indicates whether the yaci is crawling with sync mode or not (use Chain-Sync protocol) + */ + Boolean getIsSyncMode(); +} + diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/service/HealthStatusService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/HealthStatusService.java new file mode 100644 index 00000000..f9a4496d --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/HealthStatusService.java @@ -0,0 +1,9 @@ +package org.cardanofoundation.ledgersync.service; + + +import org.cardanofoundation.ledgersync.dto.healthcheck.HealthStatus; + +public interface HealthStatusService { + + HealthStatus getHealthStatus(); +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/MetricCollectorService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/MetricCollectorService.java similarity index 77% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/MetricCollectorService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/MetricCollectorService.java index 008e06af..bd845ece 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/MetricCollectorService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/MetricCollectorService.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; public interface MetricCollectorService { public void collectRollbackMetric(); diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/MultiAssetService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/MultiAssetService.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/MultiAssetService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/MultiAssetService.java index abd61c66..8d5239b7 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/MultiAssetService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/MultiAssetService.java @@ -1,11 +1,11 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.MaTxOut; -import org.cardanofoundation.explorer.consumercommon.entity.MultiAsset; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.MaTxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.MultiAsset; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; import org.springframework.util.MultiValueMap; import java.util.Collection; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ParamProposalService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/ParamProposalService.java similarity index 64% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ParamProposalService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/ParamProposalService.java index 22897105..c8d52eb5 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ParamProposalService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/ParamProposalService.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; import java.util.Collection; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/RedeemerService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/RedeemerService.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/RedeemerService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/RedeemerService.java index e5bfaf19..0c582c08 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/RedeemerService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/RedeemerService.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; import org.springframework.data.util.Pair; import java.util.Collection; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ReferenceInputService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/ReferenceInputService.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ReferenceInputService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/ReferenceInputService.java index bcfa801f..7d34b739 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ReferenceInputService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/ReferenceInputService.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.ReferenceTxIn; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.consumercommon.entity.ReferenceTxIn; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; import org.springframework.data.util.Pair; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/RollbackService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/RollbackService.java similarity index 75% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/RollbackService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/RollbackService.java index 36df8b68..0c7882ab 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/RollbackService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/RollbackService.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; public interface RollbackService { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ScriptService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/ScriptService.java similarity index 84% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ScriptService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/ScriptService.java index f9034ff7..dcabfd40 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/ScriptService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/ScriptService.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; import com.bloxbean.cardano.yaci.core.model.Witnesses; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; import java.util.Collection; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/SlotLeaderService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/SlotLeaderService.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/SlotLeaderService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/SlotLeaderService.java index 0939e20d..57120fd0 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/SlotLeaderService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/SlotLeaderService.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; import com.bloxbean.cardano.yaci.core.model.Block; import com.bloxbean.cardano.yaci.core.model.byron.ByronMainBlock; -import org.cardanofoundation.explorer.consumercommon.entity.SlotLeader; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedSlotLeader; +import org.cardanofoundation.ledgersync.consumercommon.entity.SlotLeader; +import org.cardanofoundation.ledgersync.aggregate.AggregatedSlotLeader; //import org.cardanofoundation.ledgersync.common.common.Block; //import org.cardanofoundation.ledgersync.common.common.byron.ByronMainBlock; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/StakeAddressService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/StakeAddressService.java similarity index 82% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/StakeAddressService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/StakeAddressService.java index 20cb745f..cd8394e4 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/StakeAddressService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/StakeAddressService.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import java.util.Collection; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/SyncServiceInstance.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/SyncServiceInstance.java similarity index 83% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/SyncServiceInstance.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/SyncServiceInstance.java index 71bbdd4b..ef98cf79 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/SyncServiceInstance.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/SyncServiceInstance.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; import java.lang.reflect.ParameterizedType; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TransactionService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/TransactionService.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TransactionService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/TransactionService.java index 89d37a0a..c25e5d85 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TransactionService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/TransactionService.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; import java.util.Collection; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/service/TxBootstrapWitnessService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxBootstrapWitnessService.java new file mode 100644 index 00000000..a5529916 --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxBootstrapWitnessService.java @@ -0,0 +1,12 @@ +package org.cardanofoundation.ledgersync.service; + +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; + +import java.util.Collection; +import java.util.Map; + +public interface TxBootstrapWitnessService { + + void handleBootstrapWitnesses(Collection txs, Map txMap); +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxChartService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxChartService.java similarity index 76% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxChartService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/TxChartService.java index 4cc53014..56b2d0b0 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxChartService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxChartService.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import java.util.Collection; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxInService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxInService.java similarity index 86% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxInService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/TxInService.java index 6f09e704..11e8b7ca 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxInService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxInService.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; import org.springframework.data.util.Pair; import java.util.Collection; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxMetaDataHashService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxMetaDataHashService.java similarity index 68% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxMetaDataHashService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/TxMetaDataHashService.java index e8f10514..c23fd1b4 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxMetaDataHashService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxMetaDataHashService.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.TxMetadataHash; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxMetadataHash; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; import java.util.Collection; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxMetaDataService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxMetaDataService.java similarity index 66% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxMetaDataService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/TxMetaDataService.java index 78316004..b9addbc9 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxMetaDataService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxMetaDataService.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxMetadata; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxMetadata; import java.util.List; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxOutService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxOutService.java similarity index 75% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxOutService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/TxOutService.java index 2ef93497..d39a3ee6 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxOutService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxOutService.java @@ -1,13 +1,13 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.Datum; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.dto.EUTXOWrapper; +import org.cardanofoundation.ledgersync.consumercommon.entity.Datum; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.dto.EUTXOWrapper; import java.util.Collection; import java.util.List; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxWitnessService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxWitnessService.java similarity index 62% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxWitnessService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/TxWitnessService.java index 7c6a449c..9b4a83ba 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/TxWitnessService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/TxWitnessService.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; import java.util.Collection; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/WithdrawalsService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/WithdrawalsService.java similarity index 71% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/WithdrawalsService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/WithdrawalsService.java index e832ebca..63b8e803 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/WithdrawalsService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/WithdrawalsService.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service; +package org.cardanofoundation.ledgersync.service; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; import org.springframework.data.util.Pair; import java.util.Collection; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/AddressBalanceServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/AddressBalanceServiceImpl.java similarity index 91% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/AddressBalanceServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/AddressBalanceServiceImpl.java index 1811b1dc..93462efc 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/AddressBalanceServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/AddressBalanceServiceImpl.java @@ -1,19 +1,18 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.google.common.collect.Lists; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.AddressTxBalanceProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.*; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.custom.CustomAddressTokenBalanceRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AddressBalanceService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AggregatedDataCachingService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MultiAssetService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.projection.AddressTxBalanceProjection; +import org.cardanofoundation.ledgersync.repository.*; +import org.cardanofoundation.ledgersync.service.AddressBalanceService; +import org.cardanofoundation.ledgersync.service.AggregatedDataCachingService; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.MultiAssetService; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -29,8 +28,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant.ADDRESS_TOKEN_BALANCE_BATCH_QUERY_SIZE; -import static org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant.BATCH_QUERY_SIZE; +import static org.cardanofoundation.ledgersync.constant.ConsumerConstant.ADDRESS_TOKEN_BALANCE_BATCH_QUERY_SIZE; +import static org.cardanofoundation.ledgersync.constant.ConsumerConstant.BATCH_QUERY_SIZE; @Slf4j @Service @@ -43,7 +42,6 @@ public class AddressBalanceServiceImpl implements AddressBalanceService { AddressTokenRepository addressTokenRepository; AddressTxBalanceRepository addressTxBalanceRepository; AddressTokenBalanceRepository addressTokenBalanceRepository; - CustomAddressTokenBalanceRepository customAddressTokenBalanceRepository; StakeAddressRepository stakeAddressRepository; MultiAssetService multiAssetService; @@ -150,9 +148,27 @@ public void rollbackAddressBalances(Collection txs) { * to subtract an address's total token balance record */ var addressTokens = addressTokenRepository.findAllByTxIn(txs); - var addressMultiAssetIdPairs = addressTokens.stream() - .map(addressToken -> Pair.of(addressToken.getAddressId(), addressToken.getMultiAssetId())) - .collect(Collectors.toSet()); + + if (!addressTokens.isEmpty()) { + var addressMultiAssetIdPairs = addressTokens.stream() + .map(addressToken -> Pair.of(addressToken.getAddressId(), addressToken.getMultiAssetId())) + .collect(Collectors.toSet()); + + // Find all address token balance records + var addressTokenBalanceMap = addressTokenBalanceRepository + .findAllByAddressMultiAssetIdPairIn(addressMultiAssetIdPairs) + .stream() + .collect(Collectors.toMap( + addressTokenBalance -> + Pair.of(addressTokenBalance.getAddressId(), + addressTokenBalance.getMultiAssetId()), + Function.identity() + )); + + // Rollback address token balances + rollbackAddressTokenBalances(addressTokens, addressTokenBalanceMap); + addressTokenBalanceRepository.saveAll(addressTokenBalanceMap.values()); + } // Find all address records var addressMap = addressRepository.findAllByAddressIn(addressSet) @@ -164,25 +180,10 @@ public void rollbackAddressBalances(Collection txs) { .stream() .collect(Collectors.toMap(BaseEntity::getId, Function.identity())); - // Find all address token balance records - var addressTokenBalanceMap = customAddressTokenBalanceRepository - .findAllByAddressMultiAssetIdPairIn(addressMultiAssetIdPairs) - .stream() - .collect(Collectors.toMap( - addressTokenBalance -> - Pair.of(addressTokenBalance.getAddressId(), - addressTokenBalance.getMultiAssetId()), - Function.identity() - )); - // Rollback address native balances rollbackAddressNativeBalances(addressTxBalances, addressMap, stakeAddressMap); - // Rollback address token balances - rollbackAddressTokenBalances(addressTokens, addressTokenBalanceMap); - addressRepository.saveAll(addressMap.values()); - addressTokenBalanceRepository.saveAll(addressTokenBalanceMap.values()); stakeAddressRepository.saveAll(stakeAddressMap.values()); log.info("Address balances rollback finished"); } @@ -333,7 +334,7 @@ private void handleAddressToken(Map txMap, Map addr Map, AddressTokenBalance> newAddressTokenBalanceMap = new HashMap<>(); /* - * Create a map of ass-et fingerprint with its associated tx hashes + * Create a map of asset fingerprint with its associated tx hashes * It helps keeping track of how many txs an asset associates with */ Map> fingerprintTxHashesMap = new HashMap<>(); @@ -372,7 +373,7 @@ private Map, AddressTokenBalance> getAddressTokenBalanceMap( var queryBatches = Lists.partition( new ArrayList<>(addressFingerprintPairs), ADDRESS_TOKEN_BALANCE_BATCH_QUERY_SIZE); - queryBatches.parallelStream().forEach(batch -> customAddressTokenBalanceRepository + queryBatches.parallelStream().forEach(batch -> addressTokenBalanceRepository .findAllByAddressFingerprintPairIn(batch) .parallelStream() .forEach(addressTokenBalance -> { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/BlockDataServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/BlockDataServiceImpl.java similarity index 90% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/BlockDataServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/BlockDataServiceImpl.java index aeb62b5e..bf11ec38 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/BlockDataServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/BlockDataServiceImpl.java @@ -1,13 +1,13 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBatchBlockData; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBatchBlockData; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BlockDataService; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/CostModelServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/CostModelServiceImpl.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/CostModelServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/CostModelServiceImpl.java index 4824c5a5..df268a0d 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/CostModelServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/CostModelServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import co.nstant.in.cbor.model.Array; import co.nstant.in.cbor.model.SimpleValue; @@ -11,13 +11,13 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.CostModel; +import org.cardanofoundation.ledgersync.consumercommon.entity.CostModel; import org.cardanofoundation.ledgersync.common.common.cost.mdl.PlutusV1Keys; import org.cardanofoundation.ledgersync.common.common.cost.mdl.PlutusV2Keys; import org.cardanofoundation.ledgersync.common.util.JsonUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.CostModelRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CostModelService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.CostModelRepository; +import org.cardanofoundation.ledgersync.service.CostModelService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/DatumServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/DatumServiceImpl.java similarity index 90% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/DatumServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/DatumServiceImpl.java index bbfc8179..42dcfb32 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/DatumServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/DatumServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; /** * ; Valid blocks must also satisfy the following two constraints: ; 1) the length of @@ -6,17 +6,16 @@ * transaction_index must be strictly smaller than the ; length of transaction_bodies */ -import com.bloxbean.cardano.client.plutus.spec.PlutusData; import com.bloxbean.cardano.client.util.HexUtil; import com.bloxbean.cardano.yaci.core.model.Witnesses; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; -import org.cardanofoundation.explorer.consumercommon.entity.Datum; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Datum; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.cardanofoundation.ledgersync.common.util.JsonUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.DatumRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.DatumService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.DatumRepository; +import org.cardanofoundation.ledgersync.service.DatumService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -24,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import static org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant.BATCH_QUERY_SIZE; +import static org.cardanofoundation.ledgersync.constant.ConsumerConstant.BATCH_QUERY_SIZE; @Service @RequiredArgsConstructor diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochParamServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/EpochParamServiceImpl.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochParamServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/EpochParamServiceImpl.java index 9705ccb9..2598e5ec 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochParamServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/EpochParamServiceImpl.java @@ -1,22 +1,22 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import lombok.AccessLevel; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.Epoch; -import org.cardanofoundation.explorer.consumercommon.entity.EpochParam; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; -import org.cardanofoundation.explorer.consumercommon.enumeration.EraType; -import org.cardanofoundation.ledgersync.explorerconsumer.mapper.EpochParamMapper; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.BlockRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.EpochParamRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.EpochRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ParamProposalRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CostModelService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.EpochParamService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.GenesisDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.EpochParamUtil; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.Epoch; +import org.cardanofoundation.ledgersync.consumercommon.entity.EpochParam; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.EraType; +import org.cardanofoundation.ledgersync.mapper.EpochParamMapper; +import org.cardanofoundation.ledgersync.repository.BlockRepository; +import org.cardanofoundation.ledgersync.repository.EpochParamRepository; +import org.cardanofoundation.ledgersync.repository.EpochRepository; +import org.cardanofoundation.ledgersync.repository.ParamProposalRepository; +import org.cardanofoundation.ledgersync.service.CostModelService; +import org.cardanofoundation.ledgersync.service.EpochParamService; +import org.cardanofoundation.ledgersync.service.GenesisDataService; +import org.cardanofoundation.ledgersync.util.EpochParamUtil; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/EpochServiceImpl.java similarity index 86% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/EpochServiceImpl.java index 4468a941..89c20c2e 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/EpochServiceImpl.java @@ -1,19 +1,19 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.Epoch; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.EraType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.Epoch; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.EraType; import org.cardanofoundation.ledgersync.common.common.Era; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.EpochRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AggregatedDataCachingService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.EpochService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.GenesisDataService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.repository.EpochRepository; +import org.cardanofoundation.ledgersync.repository.TxRepository; +import org.cardanofoundation.ledgersync.service.AggregatedDataCachingService; +import org.cardanofoundation.ledgersync.service.EpochService; +import org.cardanofoundation.ledgersync.service.GenesisDataService; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -94,7 +94,7 @@ private void handleEpoch(AggregatedBlock aggregatedBlock, Map ep public void rollbackEpochStats(List rollbackBlocks) { var epochNoBlocksMap = rollbackBlocks.stream() .collect(Collectors.groupingBy( - org.cardanofoundation.explorer.consumercommon.entity.Block::getEpochNo, + Block::getEpochNo, Collectors.toSet())); var epochBlocksMap = epochRepository.findAllByNoIn(epochNoBlocksMap.keySet()) .stream() diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/HealthStatusCachingServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/HealthStatusCachingServiceImpl.java new file mode 100644 index 00000000..ed865e00 --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/HealthStatusCachingServiceImpl.java @@ -0,0 +1,65 @@ +package org.cardanofoundation.ledgersync.service.impl; + +import jakarta.annotation.PostConstruct; +import org.cardanofoundation.ledgersync.service.HealthCheckCachingService; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; + +@Service +public class HealthStatusCachingServiceImpl implements HealthCheckCachingService { + private LocalDateTime latestBlockTime; + private LocalDateTime latestBlockInsertTime; + private final AtomicLong latestBlockSlot = new AtomicLong(); + private final AtomicBoolean isSyncMode = new AtomicBoolean(); + + @PostConstruct + void init() { + latestBlockInsertTime = LocalDateTime.now(ZoneOffset.UTC); + latestBlockSlot.set(-10L); // dummy value + isSyncMode.set(Boolean.FALSE); + } + + @Override + public void saveLatestBlockTime(LocalDateTime blockTime) { + latestBlockTime = blockTime; + } + + @Override + public LocalDateTime getLatestBlockTime() { + return latestBlockTime; + } + + @Override + public void saveLatestBlockInsertTime(LocalDateTime insertTime) { + latestBlockInsertTime = insertTime; + } + + @Override + public LocalDateTime getLatestBlockInsertTime() { + return latestBlockInsertTime; + } + + @Override + public void saveLatestBlockSlot(Long slot) { + latestBlockSlot.set(slot); + } + + @Override + public Long getLatestBlockSlot() { + return latestBlockSlot.get(); + } + + @Override + public void saveIsSyncMode(Boolean value) { + isSyncMode.set(value); + } + + @Override + public Boolean getIsSyncMode() { + return isSyncMode.get(); + } +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/HealthStatusServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/HealthStatusServiceImpl.java new file mode 100644 index 00000000..24c4bc3c --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/HealthStatusServiceImpl.java @@ -0,0 +1,158 @@ +package org.cardanofoundation.ledgersync.service.impl; + +import com.bloxbean.cardano.yaci.store.common.config.StoreProperties; +import com.bloxbean.cardano.yaci.store.core.service.CursorService; +import com.bloxbean.cardano.yaci.store.core.service.HealthService; +import lombok.RequiredArgsConstructor; +import org.cardanofoundation.ledgersync.dto.healthcheck.HealthStatus; +import org.cardanofoundation.ledgersync.dto.healthcheck.Message; +import org.cardanofoundation.ledgersync.service.HealthCheckCachingService; +import org.cardanofoundation.ledgersync.service.HealthStatusService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.temporal.ChronoUnit; +import java.util.Objects; + +@Service +@RequiredArgsConstructor +public class HealthStatusServiceImpl implements HealthStatusService { + + private final HealthCheckCachingService healthCheckCachingService; + private final HealthService healthService; + private final CursorService cursorService; + private final StoreProperties storeProperties; + + @Value("${ledger-sync.healthcheck.block-time-threshold}") + private Long blockTimeThresholdInSecond; + + @Value("${ledger-sync.healthcheck.non-batching-inserted-time-threshold}") + private Long nonBatchingInsertedTimeThresholdInSecond; + + @Value("${ledger-sync.healthcheck.batching-inserted-time-threshold}") + private Long batchingInsertedTimeThresholdInSecond; + + @Value("${ledger-sync.healthcheck.keepalive-time-threshold}") + private Long keepAliveResponseTimeThresholdInSecond; + + @Value("${blocks.batch-size}") + private Integer batchSize; + + @Override + public HealthStatus getHealthStatus() { + final LocalDateTime latestBlockInsertTime = healthCheckCachingService.getLatestBlockInsertTime(); + final LocalDateTime latestBlockTime = healthCheckCachingService.getLatestBlockTime(); + final long stopSlot = storeProperties.getSyncStopSlot(); + final Long insertedTimeThresholdInSecond = batchSize == 1 || healthCheckCachingService.getIsSyncMode().equals(Boolean.TRUE) ? + nonBatchingInsertedTimeThresholdInSecond : batchingInsertedTimeThresholdInSecond; + + boolean isHealthy = true; + Message message = Message.SYNCING_BUT_NOT_READY; + + if (stopSlot > 0) { + return getHealthStatusWhenStopSlotIsSet(stopSlot); + } + + if (Objects.isNull(latestBlockTime)) { // this latestBlockTime is only != null after a block is successfully inserted into the database + if (isOutOfThreshold(insertedTimeThresholdInSecond, latestBlockInsertTime)) { + if (isConnectionToNodeHealthy()) { + message = Message.CONNECTION_HEALTHY_BUT_BLOCK_CONSUMING_NOT_HEALTHY; + } else { + message = Message.IS_NOT_SYNCING; + } + + return HealthStatus.builder() + .isHealthy(false) + .messageDesc(message.getDesc()) + .messageCode(message.getCode()) + .latestBlockInsertTime(latestBlockInsertTime) + .hasStopSlot(true) + .build(); + } + } else { + if (!isConnectionToNodeHealthy()) { + isHealthy = false; + message = Message.IS_NOT_SYNCING; + } else if (isOutOfThreshold(insertedTimeThresholdInSecond, latestBlockInsertTime)) { + isHealthy = false; + message = Message.CONNECTION_HEALTHY_BUT_BLOCK_CONSUMING_NOT_HEALTHY; + } + } + + if (isHealthy && latestBlockTime != null && !isOutOfThreshold(blockTimeThresholdInSecond, latestBlockTime)) { + message = Message.READY_TO_SERVE; + } + + return HealthStatus.builder() + .isHealthy(isHealthy) + .messageCode(message.getCode()) + .messageDesc(message.getDesc()) + .latestBlockInsertTime(latestBlockInsertTime) + .hasStopSlot(false) + .build(); + } + + private HealthStatus getHealthStatusWhenStopSlotIsSet(Long stopSlot) { + final LocalDateTime latestBlockInsertTime = healthCheckCachingService.getLatestBlockInsertTime(); + final Long latestSlotNo = healthCheckCachingService.getLatestBlockSlot(); + final LocalDateTime latestBlockTime = healthCheckCachingService.getLatestBlockTime(); + final Long insertedTimeThresholdInSecond = batchSize == 1 || healthCheckCachingService.getIsSyncMode().equals(Boolean.TRUE) ? + nonBatchingInsertedTimeThresholdInSecond : batchingInsertedTimeThresholdInSecond; + + boolean isHealthy = true; + Message message = Message.SYNCING_BUT_NOT_READY; + + if (Objects.isNull(latestBlockTime)) { + var recentCursor = cursorService.getCursor(); + if (recentCursor.isPresent() && recentCursor.get().getSlot() >= stopSlot) { + message = Message.SYNCING_HAS_FINISHED; + } + + if (isOutOfThreshold(insertedTimeThresholdInSecond, latestBlockInsertTime)) { + isHealthy = false; + if (!isConnectionToNodeHealthy()) { + message = Message.IS_NOT_SYNCING; + } else { + message = Message.CONNECTION_HEALTHY_BUT_BLOCK_CONSUMING_NOT_HEALTHY; + } + } + } else { + if (!isConnectionToNodeHealthy()) { + isHealthy = false; + message = Message.IS_NOT_SYNCING; + } else if (isOutOfThreshold(insertedTimeThresholdInSecond, latestBlockInsertTime)) { + isHealthy = false; + message = Message.CONNECTION_HEALTHY_BUT_BLOCK_CONSUMING_NOT_HEALTHY; + } + } + + if (isHealthy && latestSlotNo >= stopSlot) { + message = Message.SYNCING_HAS_FINISHED; + } + + return HealthStatus.builder() + .isHealthy(isHealthy) + .messageCode(message.getCode()) + .messageDesc(message.getDesc()) + .latestBlockInsertTime(latestBlockInsertTime) + .hasStopSlot(true) + .build(); + } + + private boolean isOutOfThreshold(Long threshold, LocalDateTime time) { + long value = ChronoUnit.SECONDS.between(time, LocalDateTime.now(ZoneOffset.UTC)); + return threshold <= value; + } + + private LocalDateTime getLastKeepAliveResponseTime() { + return Instant.ofEpochMilli(healthService.getHealthStatus().getLastKeepAliveResponseTime()).atZone(ZoneId.of("UTC")).toLocalDateTime(); + } + + private boolean isConnectionToNodeHealthy() { + return healthService.getHealthStatus().isConnectionAlive() && !isOutOfThreshold(keepAliveResponseTimeThresholdInSecond, getLastKeepAliveResponseTime()); + } +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MetricCollectorServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/MetricCollectorServiceImpl.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MetricCollectorServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/MetricCollectorServiceImpl.java index 7a30373d..5cdbcbec 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MetricCollectorServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/MetricCollectorServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import io.micrometer.core.instrument.Counter; @@ -8,9 +8,9 @@ import jakarta.annotation.PostConstruct; import lombok.experimental.FieldDefaults; import org.cardanofoundation.ledgersync.common.common.Era; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.GenesisDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MetricCollectorService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.GenesisDataService; +import org.cardanofoundation.ledgersync.service.MetricCollectorService; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MultiAssetServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/MultiAssetServiceImpl.java similarity index 91% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MultiAssetServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/MultiAssetServiceImpl.java index ccf5f247..ce29193e 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MultiAssetServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/MultiAssetServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.client.util.HexUtil; import com.bloxbean.cardano.yaci.core.model.Amount; @@ -7,21 +7,21 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; import org.cardanofoundation.ledgersync.common.util.StringUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MaTxMintProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MultiAssetTotalVolumeProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MultiAssetTxCountProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MaTxMintRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MultiAssetRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MultiAssetTxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AggregatedDataCachingService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MultiAssetService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.LedgerSyncAssetUtil; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.projection.MaTxMintProjection; +import org.cardanofoundation.ledgersync.projection.MultiAssetTotalVolumeProjection; +import org.cardanofoundation.ledgersync.projection.MultiAssetTxCountProjection; +import org.cardanofoundation.ledgersync.repository.MaTxMintRepository; +import org.cardanofoundation.ledgersync.repository.MultiAssetRepository; +import org.cardanofoundation.ledgersync.repository.MultiAssetTxOutRepository; +import org.cardanofoundation.ledgersync.service.AggregatedDataCachingService; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.MultiAssetService; +import org.cardanofoundation.ledgersync.util.LedgerSyncAssetUtil; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +37,7 @@ import java.util.stream.Collectors; import static com.bloxbean.cardano.yaci.core.util.Constants.LOVELACE; -import static org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant.BATCH_QUERY_SIZE; +import static org.cardanofoundation.ledgersync.constant.ConsumerConstant.BATCH_QUERY_SIZE; @Slf4j @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true) diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/NoDataCachingServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/NoDataCachingServiceImpl.java similarity index 83% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/NoDataCachingServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/NoDataCachingServiceImpl.java index f545b6e3..5fa0ad44 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/NoDataCachingServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/NoDataCachingServiceImpl.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; -import org.cardanofoundation.explorer.consumercommon.entity.Epoch; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AggregatedDataCachingService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Epoch; +import org.cardanofoundation.ledgersync.service.AggregatedDataCachingService; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ParamProposalServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ParamProposalServiceImpl.java similarity index 92% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ParamProposalServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ParamProposalServiceImpl.java index 0bf0c423..557726f8 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ParamProposalServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ParamProposalServiceImpl.java @@ -1,16 +1,16 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.yaci.core.model.ProtocolParamUpdate; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; -import org.cardanofoundation.explorer.consumercommon.entity.CostModel; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ParamProposalRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CostModelService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.ParamProposalService; +import org.cardanofoundation.ledgersync.consumercommon.entity.CostModel; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.ParamProposalRepository; +import org.cardanofoundation.ledgersync.service.CostModelService; +import org.cardanofoundation.ledgersync.service.ParamProposalService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/RedeemerServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/RedeemerServiceImpl.java similarity index 90% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/RedeemerServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/RedeemerServiceImpl.java index b1481e2c..99518400 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/RedeemerServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/RedeemerServiceImpl.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; -import com.bloxbean.cardano.client.plutus.spec.ExUnits; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; import com.bloxbean.cardano.yaci.core.model.Amount; import com.bloxbean.cardano.yaci.core.model.Datum; +import com.bloxbean.cardano.yaci.core.model.ExUnits; +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; import com.bloxbean.cardano.yaci.core.model.certs.Certificate; import com.bloxbean.cardano.yaci.core.model.certs.CertificateType; import com.bloxbean.cardano.yaci.core.model.certs.StakeDelegation; @@ -12,22 +12,22 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer.RedeemerBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.RedeemerData; -import org.cardanofoundation.explorer.consumercommon.entity.RedeemerData.RedeemerDataBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptPurposeType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer.RedeemerBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.RedeemerData; +import org.cardanofoundation.ledgersync.consumercommon.entity.RedeemerData.RedeemerDataBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptPurposeType; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.TxOutProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.RedeemerDataRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.RedeemerRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.RedeemerService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.projection.TxOutProjection; +import org.cardanofoundation.ledgersync.repository.RedeemerDataRepository; +import org.cardanofoundation.ledgersync.repository.RedeemerRepository; +import org.cardanofoundation.ledgersync.repository.TxOutRepository; +import org.cardanofoundation.ledgersync.service.RedeemerService; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ReferenceInputServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ReferenceInputServiceImpl.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ReferenceInputServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ReferenceInputServiceImpl.java index e22421bc..d14ce1d0 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ReferenceInputServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ReferenceInputServiceImpl.java @@ -1,17 +1,17 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.ReferenceTxIn; -import org.cardanofoundation.explorer.consumercommon.entity.ReferenceTxIn.ReferenceTxInBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ReferenceInputRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.ReferenceInputService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxOutService; +import org.cardanofoundation.ledgersync.consumercommon.entity.ReferenceTxIn; +import org.cardanofoundation.ledgersync.consumercommon.entity.ReferenceTxIn.ReferenceTxInBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.repository.ReferenceInputRepository; +import org.cardanofoundation.ledgersync.service.ReferenceInputService; +import org.cardanofoundation.ledgersync.service.TxOutService; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ScriptServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ScriptServiceImpl.java similarity index 84% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ScriptServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ScriptServiceImpl.java index ca2375e4..75a3b384 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ScriptServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/ScriptServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import co.nstant.in.cbor.model.Array; import co.nstant.in.cbor.model.ByteString; @@ -6,24 +6,26 @@ import com.bloxbean.cardano.client.plutus.spec.PlutusScript; import com.bloxbean.cardano.client.plutus.spec.PlutusV1Script; import com.bloxbean.cardano.client.plutus.spec.PlutusV2Script; +import com.bloxbean.cardano.yaci.core.model.PlutusScriptType; import com.bloxbean.cardano.yaci.core.model.Witnesses; +import com.bloxbean.cardano.yaci.store.common.util.PlutusV3Script; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.cardanofoundation.ledgersync.common.common.nativescript.NativeScript; import org.cardanofoundation.ledgersync.common.util.CborSerializationUtil; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.exception.HashScriptException; -import org.cardanofoundation.ledgersync.explorerconsumer.factory.NativeScriptFactory; -import org.cardanofoundation.ledgersync.explorerconsumer.factory.PlutusScriptFactory; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.ScriptProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ScriptRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.ScriptService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.exception.HashScriptException; +import org.cardanofoundation.ledgersync.factory.NativeScriptFactory; +import org.cardanofoundation.ledgersync.factory.PlutusScriptFactory; +import org.cardanofoundation.ledgersync.projection.ScriptProjection; +import org.cardanofoundation.ledgersync.repository.ScriptRepository; +import org.cardanofoundation.ledgersync.service.ScriptService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -104,18 +106,27 @@ public Map getAllScript(Witnesses txWitnesses, Tx tx) { .collect(Collectors.toMap(Script::getHash, Function.identity(), (a, b) -> a))); + mScripts.putAll(txWitnesses.getPlutusV3Scripts().stream() + .map(plutusScript -> plutusScriptFactory.handle(convertToPlutusScript(plutusScript), tx)) + .collect(Collectors.toMap(Script::getHash, + Function.identity(), (a, b) -> a))); + return mScripts; } private PlutusScript convertToPlutusScript(com.bloxbean.cardano.yaci.core.model.PlutusScript plutusScript) { - if (plutusScript.getType().equals("1")) + if (plutusScript.getType() == PlutusScriptType.PlutusScriptV1) return PlutusV1Script.builder() .cborHex(plutusScript.getContent()) .build(); - else if (plutusScript.getType().equals("2")) + else if (plutusScript.getType() == PlutusScriptType.PlutusScriptV2) return PlutusV2Script.builder() .cborHex(plutusScript.getContent()) .build(); + else if (plutusScript.getType() == PlutusScriptType.PlutusScriptV3) + return PlutusV3Script.builder() + .cborHex(plutusScript.getContent()) + .build(); else throw new IllegalStateException("Invalid plutus script type : " + plutusScript.getType()); } @@ -168,6 +179,10 @@ public String getHashOfReferenceScript(String hexReferScript) throws HashScriptE PlutusV2Script plutusV2Script = PlutusV2Script.deserialize( (ByteString) scriptArray.getDataItems().get(1)); return plutusV2Script.getPolicyId(); + case 3: + PlutusV3Script plutusV3Script = PlutusV3Script.deserialize( + (ByteString) scriptArray.getDataItems().get(1)); + return plutusV3Script.getPolicyId(); default: log.error("Invalid script type {}, hex {}", type, hexReferScript); throw new HashScriptException("Script type invalid " + type); @@ -236,6 +251,10 @@ public Script getScriptFromScriptRef(String hexReferScript, Tx tx) { var plutusScriptV2 = PlutusV2Script.deserialize( (ByteString) scriptArray.getDataItems().get(1)); return plutusScriptFactory.handle(plutusScriptV2, tx); + case 3: + var plutusScriptV3 = PlutusV3Script.deserialize( + (ByteString) scriptArray.getDataItems().get(1)); + return plutusScriptFactory.handle(plutusScriptV3, tx); default: log.error("Invalid script type {}, hex {}", type, hexReferScript); throw new HashScriptException("Script type invalid " + type); diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/SlotLeaderServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/SlotLeaderServiceImpl.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/SlotLeaderServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/SlotLeaderServiceImpl.java index f29c867b..6108501a 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/SlotLeaderServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/SlotLeaderServiceImpl.java @@ -1,18 +1,18 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.yaci.core.model.Block; import com.bloxbean.cardano.yaci.core.model.byron.ByronMainBlock; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; -import org.cardanofoundation.explorer.consumercommon.entity.SlotLeader; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.SlotLeader; import org.cardanofoundation.ledgersync.common.util.SlotLeaderUtils; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedSlotLeader; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolHashRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.SlotLeaderRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SlotLeaderService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedSlotLeader; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.repository.PoolHashRepository; +import org.cardanofoundation.ledgersync.repository.SlotLeaderRepository; +import org.cardanofoundation.ledgersync.service.SlotLeaderService; import org.springframework.stereotype.Service; import java.math.BigInteger; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/StakeAddressServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/StakeAddressServiceImpl.java similarity index 85% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/StakeAddressServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/StakeAddressServiceImpl.java index 9b86171b..67c8a2be 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/StakeAddressServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/StakeAddressServiceImpl.java @@ -1,17 +1,17 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.google.common.collect.Lists; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress.StakeAddressBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress.StakeAddressBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.cardanofoundation.ledgersync.common.common.address.ShelleyAddress; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.StakeAddressRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.StakeAddressService; +import org.cardanofoundation.ledgersync.repository.StakeAddressRepository; +import org.cardanofoundation.ledgersync.service.StakeAddressService; import org.springframework.stereotype.Service; import java.math.BigInteger; @@ -20,7 +20,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant.BATCH_QUERY_SIZE; +import static org.cardanofoundation.ledgersync.constant.ConsumerConstant.BATCH_QUERY_SIZE; @Service @RequiredArgsConstructor diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TransactionServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TransactionServiceImpl.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TransactionServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TransactionServiceImpl.java index 9b649477..2c90c014 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TransactionServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TransactionServiceImpl.java @@ -1,21 +1,21 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; import com.bloxbean.cardano.yaci.core.model.certs.Certificate; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.dto.EUTXOWrapper; -import org.cardanofoundation.ledgersync.explorerconsumer.factory.CertificateSyncServiceFactory; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ExtraKeyWitnessRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.*; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.dto.EUTXOWrapper; +import org.cardanofoundation.ledgersync.factory.CertificateSyncServiceFactory; +import org.cardanofoundation.ledgersync.repository.ExtraKeyWitnessRepository; +import org.cardanofoundation.ledgersync.repository.TxRepository; +import org.cardanofoundation.ledgersync.service.*; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxBootstrapWitnessServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxBootstrapWitnessServiceImpl.java similarity index 78% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxBootstrapWitnessServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxBootstrapWitnessServiceImpl.java index 3ac0a92b..2e50e3d2 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxBootstrapWitnessServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxBootstrapWitnessServiceImpl.java @@ -1,14 +1,14 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxBootstrapWitnesses; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxBootstrapWitnessRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxBootstrapWitnessService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxBootstrapWitnesses; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.TxBootstrapWitnessRepository; +import org.cardanofoundation.ledgersync.service.TxBootstrapWitnessService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxChartServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxChartServiceImpl.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxChartServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxChartServiceImpl.java index a3ff9f84..25342121 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxChartServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxChartServiceImpl.java @@ -1,15 +1,15 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxChart; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.TxTimeProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxChartRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxChartService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxChart; +import org.cardanofoundation.ledgersync.projection.TxTimeProjection; +import org.cardanofoundation.ledgersync.repository.TxChartRepository; +import org.cardanofoundation.ledgersync.repository.TxRepository; +import org.cardanofoundation.ledgersync.service.TxChartService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxInServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxInServiceImpl.java similarity index 91% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxInServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxInServiceImpl.java index 6cc3bde9..43493087 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxInServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxInServiceImpl.java @@ -1,23 +1,23 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.explorer.consumercommon.entity.TxIn.TxInBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxIn.TxInBuilder; import org.cardanofoundation.ledgersync.common.common.Era; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxInRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.UnconsumeTxInRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MultiAssetService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxInService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxOutService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.repository.TxInRepository; +import org.cardanofoundation.ledgersync.repository.UnconsumeTxInRepository; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.MultiAssetService; +import org.cardanofoundation.ledgersync.service.TxInService; +import org.cardanofoundation.ledgersync.service.TxOutService; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataHashServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataHashServiceImpl.java similarity index 82% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataHashServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataHashServiceImpl.java index 635e93b3..be4b03fe 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataHashServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataHashServiceImpl.java @@ -1,14 +1,14 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.google.common.collect.Lists; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; -import org.cardanofoundation.explorer.consumercommon.entity.TxMetadataHash; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxMetaDataHashRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxMetaDataHashService; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxMetadataHash; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.repository.TxMetaDataHashRepository; +import org.cardanofoundation.ledgersync.service.TxMetaDataHashService; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataServiceImpl.java similarity index 88% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataServiceImpl.java index f91b506f..ca898809 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import co.nstant.in.cbor.CborException; @@ -11,14 +11,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxMetadata; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxMetadata; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxMetadataRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxMetaDataService; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.repository.TxMetadataRepository; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.TxMetaDataService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxOutServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxOutServiceImpl.java similarity index 89% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxOutServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxOutServiceImpl.java index fb4a7f48..eb46ba0f 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxOutServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxOutServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.google.common.collect.Lists; import lombok.AccessLevel; @@ -6,23 +6,23 @@ import lombok.SneakyThrows; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.explorer.consumercommon.entity.FailedTxOut.FailedTxOutBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut.TxOutBuilder; -import org.cardanofoundation.explorer.consumercommon.enumeration.TokenType; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.FailedTxOut.FailedTxOutBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut.TxOutBuilder; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.TokenType; import org.cardanofoundation.ledgersync.common.util.JsonUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddress; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.dto.EUTXOWrapper; -import org.cardanofoundation.ledgersync.explorerconsumer.dto.TransactionOutMultiAssets; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.FailedTxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MultiAssetTxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MultiAssetService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.ScriptService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxOutService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddress; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.dto.EUTXOWrapper; +import org.cardanofoundation.ledgersync.dto.TransactionOutMultiAssets; +import org.cardanofoundation.ledgersync.repository.FailedTxOutRepository; +import org.cardanofoundation.ledgersync.repository.MultiAssetTxOutRepository; +import org.cardanofoundation.ledgersync.repository.TxOutRepository; +import org.cardanofoundation.ledgersync.service.MultiAssetService; +import org.cardanofoundation.ledgersync.service.ScriptService; +import org.cardanofoundation.ledgersync.service.TxOutService; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import static com.bloxbean.cardano.yaci.core.util.Constants.LOVELACE; -import static org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant.TX_OUT_BATCH_QUERY_SIZE; +import static org.cardanofoundation.ledgersync.constant.ConsumerConstant.TX_OUT_BATCH_QUERY_SIZE; @Slf4j @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true) diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxWitnessServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxWitnessServiceImpl.java similarity index 64% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxWitnessServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxWitnessServiceImpl.java index eaceb189..536dce17 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxWitnessServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/TxWitnessServiceImpl.java @@ -1,15 +1,15 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.yaci.core.model.byron.*; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxWitness; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxWitnessRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxWitnessService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxWitness; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.TxWitnessRepository; +import org.cardanofoundation.ledgersync.service.TxWitnessService; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; @@ -25,38 +25,44 @@ public class TxWitnessServiceImpl implements TxWitnessService { @Override public void handleTxWitness(Collection aggregatedTxs, Map txMap) { - List txWitnesses = new ArrayList<>(); + List txWitnessesToSave = new ArrayList<>(); aggregatedTxs.forEach(aggregatedTx -> { + List txWitnesses = new ArrayList<>(); + var tx = txMap.get(aggregatedTx.getHash()); processAggregatedTxWitnesses(aggregatedTx, tx, txWitnesses); processByronTxWitnesses(aggregatedTx, tx, txWitnesses); - }); - - Map, TxWitness> txWitnessMap = new HashMap<>(); - txWitnesses.forEach(txWitness -> txWitnessMap.put(Pair.of(txWitness.getKey(), txWitness.getSignature()), txWitness)); - - Map, List> txWitnessIndexMap = new HashMap<>(); - for (int i = 0; i < txWitnesses.size(); i++) { - TxWitness txWitness = txWitnesses.get(i); - Pair txWitnessesPair = Pair.of(txWitness.getKey(), txWitness.getSignature()); - if (txWitnessIndexMap.containsKey(txWitnessesPair)) { - List indexList = txWitnessIndexMap.get(txWitnessesPair); - indexList.add(i); - txWitnessIndexMap.put(txWitnessesPair, indexList); - } else { - txWitnessIndexMap.put(txWitnessesPair, new ArrayList<>(List.of(i))); + Map, TxWitness> txWitnessMap = new HashMap<>(); + txWitnesses.forEach(txWitness -> txWitnessMap.put(Pair.of(txWitness.getKey(), txWitness.getSignature()), txWitness)); + + Map, List> txWitnessIndexMap = new HashMap<>(); + for (int i = 0; i < txWitnesses.size(); i++) { + TxWitness txWitness = txWitnesses.get(i); + Pair txWitnessesPair = Pair.of(txWitness.getKey(), txWitness.getSignature()); + + if (txWitnessIndexMap.containsKey(txWitnessesPair)) { + List indexList = txWitnessIndexMap.get(txWitnessesPair); + indexList.add(i); + txWitnessIndexMap.put(txWitnessesPair, indexList); + } else { + txWitnessIndexMap.put(txWitnessesPair, new ArrayList<>(List.of(i))); + } } - } - txWitnessIndexMap.forEach((key, value) -> { - TxWitness txWitness = txWitnessMap.get(Pair.of(key.getFirst(), key.getSecond())); - txWitness.setIndexArrSize(value.size()); - txWitness.setIndexArr(value.toArray(Integer[]::new)); + txWitnessIndexMap.forEach((key, value) -> { + TxWitness txWitness = txWitnessMap.get(Pair.of(key.getFirst(), key.getSecond())); + txWitness.setIndexArrSize(value.size()); + txWitness.setIndexArr(value.toArray(Integer[]::new)); + }); + + txWitnessesToSave.addAll(txWitnessMap.values()); }); - txWitnessRepository.saveAll(txWitnesses); + if (!txWitnessesToSave.isEmpty()) { + txWitnessRepository.saveAll(txWitnessesToSave); + } } private void processAggregatedTxWitnesses(AggregatedTx aggregatedTx, Tx tx, List txWitnesses) { diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/WithdrawalsServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/WithdrawalsServiceImpl.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/WithdrawalsServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/WithdrawalsServiceImpl.java index 3509eaa5..105852ad 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/WithdrawalsServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/WithdrawalsServiceImpl.java @@ -1,18 +1,18 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.Withdrawal; -import org.cardanofoundation.explorer.consumercommon.entity.Withdrawal.WithdrawalBuilder; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.WithdrawalRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.WithdrawalsService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Withdrawal; +import org.cardanofoundation.ledgersync.consumercommon.entity.Withdrawal.WithdrawalBuilder; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.WithdrawalRepository; +import org.cardanofoundation.ledgersync.service.WithdrawalsService; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockAggregatorServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/BlockAggregatorServiceImpl.java similarity index 97% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockAggregatorServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/BlockAggregatorServiceImpl.java index 6f19eeeb..863c5f1d 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockAggregatorServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/BlockAggregatorServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import com.bloxbean.cardano.client.crypto.Bech32; import com.bloxbean.cardano.yaci.core.model.*; @@ -11,12 +11,12 @@ import org.cardanofoundation.ledgersync.common.common.Era; import org.cardanofoundation.ledgersync.common.common.constant.Constant; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.*; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockAggregatorService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SlotLeaderService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.AddressUtil; +import org.cardanofoundation.ledgersync.aggregate.*; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.service.BlockAggregatorService; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.SlotLeaderService; +import org.cardanofoundation.ledgersync.util.AddressUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockSyncServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/BlockSyncServiceImpl.java similarity index 87% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockSyncServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/BlockSyncServiceImpl.java index 558fe0f0..ed91f2ac 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockSyncServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/BlockSyncServiceImpl.java @@ -1,25 +1,25 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import io.micrometer.core.annotation.Timed; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.SlotLeader; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedSlotLeader; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.BlockRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.*; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedSlotLeader; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.SlotLeader; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.repository.BlockRepository; +import org.cardanofoundation.ledgersync.repository.TxRepository; +import org.cardanofoundation.ledgersync.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigInteger; import java.util.*; -import static org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant.getNetworkNotStartWithByron; +import static org.cardanofoundation.ledgersync.constant.ConsumerConstant.getNetworkNotStartWithByron; @Slf4j @Service @@ -39,7 +39,6 @@ public class BlockSyncServiceImpl implements BlockSyncService { MetricCollectorService metricCollectorService; AggregatedDataCachingService aggregatedDataCachingService; - @Override @Transactional @Timed(value = "consumer.block.processing.timer", description = "Time spent syncing blocks") @@ -72,7 +71,6 @@ public void handleBlockSync() { allAggregatedBlocks.forEach(aggregatedBlock -> handleBlock(aggregatedBlock, blockMap)); blockRepository.saveAll(blockMap.values()); aggregatedDataCachingService.addBlockCount(allAggregatedBlocks.size()); - // Prepare and handle transaction contents Tx latestSavedTx = txRepository.findFirstByOrderByIdDesc(); transactionService.prepareAndHandleTxs(blockMap, allAggregatedBlocks); diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronEbbAggregatorServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/ByronEbbAggregatorServiceImpl.java similarity index 85% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronEbbAggregatorServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/ByronEbbAggregatorServiceImpl.java index 808473f7..a7f71cad 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronEbbAggregatorServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/ByronEbbAggregatorServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import com.bloxbean.cardano.yaci.core.model.byron.ByronEbBlock; import com.bloxbean.cardano.yaci.store.events.ByronEbBlockEvent; @@ -7,10 +7,10 @@ import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; import org.cardanofoundation.ledgersync.common.common.Era; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockAggregatorService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SlotLeaderService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BlockAggregatorService; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.SlotLeaderService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronMainAggregatorServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/ByronMainAggregatorServiceImpl.java similarity index 91% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronMainAggregatorServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/ByronMainAggregatorServiceImpl.java index 628181dc..3e45051c 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronMainAggregatorServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/ByronMainAggregatorServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import com.bloxbean.cardano.yaci.core.model.byron.ByronMainBlock; import com.bloxbean.cardano.yaci.core.model.byron.ByronTx; @@ -11,13 +11,13 @@ import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; import org.cardanofoundation.ledgersync.common.common.Era; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockAggregatorService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SlotLeaderService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.service.BlockAggregatorService; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.SlotLeaderService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/RollbackServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/RollbackServiceImpl.java similarity index 94% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/RollbackServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/RollbackServiceImpl.java index fdb0a236..86644c81 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/RollbackServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/block/RollbackServiceImpl.java @@ -1,14 +1,14 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.RollbackHistory; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.*; -import org.cardanofoundation.ledgersync.explorerconsumer.service.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.RollbackHistory; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.repository.*; +import org.cardanofoundation.ledgersync.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/GenesisKeyDelegationServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/GenesisKeyDelegationServiceImpl.java similarity index 61% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/GenesisKeyDelegationServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/GenesisKeyDelegationServiceImpl.java index 7a2ee774..66fb9310 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/GenesisKeyDelegationServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/GenesisKeyDelegationServiceImpl.java @@ -1,15 +1,15 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.GenesisKeyDelegation; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/MoveInstantaneousServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/MoveInstantaneousServiceImpl.java similarity index 86% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/MoveInstantaneousServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/MoveInstantaneousServiceImpl.java index 527b85c6..0dc00b79 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/MoveInstantaneousServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/MoveInstantaneousServiceImpl.java @@ -1,16 +1,16 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.MoveInstataneous; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.explorer.consumercommon.entity.PotTransfer.PotTransferBuilder; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.AddressUtil; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.PotTransfer.PotTransferBuilder; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.util.AddressUtil; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRegistrationServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRegistrationServiceImpl.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRegistrationServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRegistrationServiceImpl.java index 4d65c45b..96d686d7 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRegistrationServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRegistrationServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.client.crypto.Bech32; import com.bloxbean.cardano.yaci.core.model.PoolParams; @@ -10,15 +10,15 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.explorer.consumercommon.entity.PoolRelay.PoolRelayBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolRelay.PoolRelayBuilder; import org.cardanofoundation.ledgersync.common.common.constant.Constant; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.AddressUtil; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.util.AddressUtil; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRetirementServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRetirementServiceImpl.java similarity index 72% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRetirementServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRetirementServiceImpl.java index abd0f29a..e3b89804 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRetirementServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRetirementServiceImpl.java @@ -1,18 +1,18 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.PoolRetirement; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.PoolRetire; -import org.cardanofoundation.explorer.consumercommon.entity.PoolRetire.PoolRetireBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolRetire; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolRetire.PoolRetireBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/RegCertServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/RegCertServiceImpl.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/RegCertServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/RegCertServiceImpl.java index 93d7f212..c81ba200 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/RegCertServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/RegCertServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.RegCert; import com.bloxbean.cardano.yaci.core.model.certs.StakeRegistration; @@ -6,11 +6,11 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDelegationServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDelegationServiceImpl.java similarity index 77% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDelegationServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDelegationServiceImpl.java index ef33e51c..4f81c4b9 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDelegationServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDelegationServiceImpl.java @@ -1,19 +1,19 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeDelegation; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Delegation; -import org.cardanofoundation.explorer.consumercommon.entity.Delegation.DelegationBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.AddressUtil; +import org.cardanofoundation.ledgersync.consumercommon.entity.Delegation; +import org.cardanofoundation.ledgersync.consumercommon.entity.Delegation.DelegationBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.util.AddressUtil; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDeregistrationServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDeregistrationServiceImpl.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDeregistrationServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDeregistrationServiceImpl.java index 63a1b27d..c16a5a9b 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDeregistrationServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDeregistrationServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeDeregistration; @@ -6,14 +6,14 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.StakeDeregistration.StakeDeregistrationBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.AddressUtil; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeDeregistration.StakeDeregistrationBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.util.AddressUtil; import org.springframework.stereotype.Service; import java.util.Map; @@ -32,7 +32,7 @@ public void handle(AggregatedBlock aggregatedBlock, StakeDeregistration certificate, int certificateIdx, Tx tx, Redeemer redeemer, Map stakeAddressMap) { StakeDeregistrationBuilder stakeDeregistrationBuilder = - org.cardanofoundation.explorer.consumercommon.entity.StakeDeregistration.builder(); + org.cardanofoundation.ledgersync.consumercommon.entity.StakeDeregistration.builder(); String stakeAddressHex = AddressUtil.getRewardAddressString( certificate.getStakeCredential(), aggregatedBlock.getNetwork()); diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegDelegCertServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegDelegCertServiceImpl.java similarity index 75% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegDelegCertServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegDelegCertServiceImpl.java index f6b28417..11070e09 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegDelegCertServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegDelegCertServiceImpl.java @@ -1,15 +1,15 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.*; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegistrationServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegistrationServiceImpl.java similarity index 62% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegistrationServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegistrationServiceImpl.java index 8fbbd576..1dcd62be 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegistrationServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegistrationServiceImpl.java @@ -1,18 +1,18 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeRegistration; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.StakeRegistration.StakeRegistrationBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.AddressUtil; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeRegistration.StakeRegistrationBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.util.AddressUtil; import org.springframework.stereotype.Service; import java.util.Map; @@ -30,7 +30,7 @@ public void handle(AggregatedBlock aggregatedBlock, StakeRegistration certificate, int certificateIdx, Tx tx, Redeemer redeemer, Map stakeAddressMap) { StakeRegistrationBuilder stakeRegistrationBuilder = - org.cardanofoundation.explorer.consumercommon.entity.StakeRegistration.builder(); + org.cardanofoundation.ledgersync.consumercommon.entity.StakeRegistration.builder(); String stakeAddressHex = AddressUtil.getRewardAddressString( certificate.getStakeCredential(), aggregatedBlock.getNetwork()); diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeVoteDelegCertServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeVoteDelegCertServiceImpl.java similarity index 74% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeVoteDelegCertServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeVoteDelegCertServiceImpl.java index 736bc2be..a5ed9e08 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeVoteDelegCertServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeVoteDelegCertServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeDelegation; import com.bloxbean.cardano.yaci.core.model.certs.StakePoolId; @@ -7,11 +7,11 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeVoteRegDelegCertServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeVoteRegDelegCertServiceImpl.java similarity index 78% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeVoteRegDelegCertServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeVoteRegDelegCertServiceImpl.java index 372f4bdd..b46b5e01 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeVoteRegDelegCertServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeVoteRegDelegCertServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeDelegation; import com.bloxbean.cardano.yaci.core.model.certs.StakePoolId; @@ -8,11 +8,11 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/UnregCertServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/UnregCertServiceImpl.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/UnregCertServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/UnregCertServiceImpl.java index c267e297..b58365e2 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/UnregCertServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/UnregCertServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeDeregistration; import com.bloxbean.cardano.yaci.core.model.certs.UnregCert; @@ -6,11 +6,11 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/VoteRegDelegCertServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/VoteRegDelegCertServiceImpl.java similarity index 69% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/VoteRegDelegCertServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/VoteRegDelegCertServiceImpl.java index c0c76924..6b3b1512 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/VoteRegDelegCertServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/VoteRegDelegCertServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeRegistration; import com.bloxbean.cardano.yaci.core.model.certs.VoteRegDelegCert; @@ -6,11 +6,11 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CertificateSyncService; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.CertificateSyncService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateData.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateData.java similarity index 93% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateData.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateData.java index 0ed0ee3c..ad017cc7 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateData.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateData.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.batch; +package org.cardanofoundation.ledgersync.service.impl.certificate.batch; import lombok.AccessLevel; import lombok.Getter; import lombok.experimental.FieldDefaults; -import org.cardanofoundation.explorer.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; import java.util.*; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateDataServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateDataServiceImpl.java similarity index 95% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateDataServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateDataServiceImpl.java index 29939f7f..cc4ebebf 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateDataServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateDataServiceImpl.java @@ -1,12 +1,12 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.batch; +package org.cardanofoundation.ledgersync.service.impl.certificate.batch; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.*; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.repository.*; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisDataServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisDataServiceImpl.java similarity index 96% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisDataServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisDataServiceImpl.java index b93b6abb..aa7273f7 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisDataServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisDataServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.genesis; +package org.cardanofoundation.ledgersync.service.impl.genesis; import com.bloxbean.cardano.client.crypto.Base58; import com.bloxbean.cardano.client.crypto.Blake2bUtil; @@ -9,19 +9,19 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.explorer.consumercommon.enumeration.TokenType; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.TokenType; import org.cardanofoundation.ledgersync.common.common.Era; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.*; -import org.cardanofoundation.ledgersync.explorerconsumer.converter.AvvmAddressConverter; -import org.cardanofoundation.ledgersync.explorerconsumer.converter.CostModelConverter; -import org.cardanofoundation.ledgersync.explorerconsumer.dto.GenesisData; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.BlockRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.SlotLeaderRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.*; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.BlockDataServiceImpl; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block.ByronMainAggregatorServiceImpl; +import org.cardanofoundation.ledgersync.aggregate.*; +import org.cardanofoundation.ledgersync.converter.AvvmAddressConverter; +import org.cardanofoundation.ledgersync.converter.CostModelConverter; +import org.cardanofoundation.ledgersync.dto.GenesisData; +import org.cardanofoundation.ledgersync.repository.BlockRepository; +import org.cardanofoundation.ledgersync.repository.SlotLeaderRepository; +import org.cardanofoundation.ledgersync.service.*; +import org.cardanofoundation.ledgersync.service.impl.BlockDataServiceImpl; +import org.cardanofoundation.ledgersync.service.impl.block.ByronMainAggregatorServiceImpl; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisLocalFetching.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisLocalFetching.java similarity index 80% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisLocalFetching.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisLocalFetching.java index b28e7814..4189f251 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisLocalFetching.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisLocalFetching.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.genesis; +package org.cardanofoundation.ledgersync.service.impl.genesis; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.ledgersync.explorerconsumer.service.GenesisFetching; -import org.cardanofoundation.ledgersync.explorerconsumer.util.FileUtil; +import org.cardanofoundation.ledgersync.service.GenesisFetching; +import org.cardanofoundation.ledgersync.util.FileUtil; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; import org.springframework.util.ResourceUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisWebClientFetching.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisWebClientFetching.java similarity index 87% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisWebClientFetching.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisWebClientFetching.java index 7e6fca08..82783acf 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/genesis/GenesisWebClientFetching.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/genesis/GenesisWebClientFetching.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.genesis; +package org.cardanofoundation.ledgersync.service.impl.genesis; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.ledgersync.explorerconsumer.service.GenesisFetching; +import org.cardanofoundation.ledgersync.service.GenesisFetching; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.client.WebClient; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/NativeScriptService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/NativeScriptService.java similarity index 54% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/NativeScriptService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/NativeScriptService.java index f0e28fa6..a3ac28cc 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/NativeScriptService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/NativeScriptService.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.nativescript; +package org.cardanofoundation.ledgersync.service.impl.nativescript; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.cardanofoundation.ledgersync.common.common.nativescript.NativeScript; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SyncServiceInstance; +import org.cardanofoundation.ledgersync.service.SyncServiceInstance; public abstract class NativeScriptService implements diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAllServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAllServiceImpl.java similarity index 78% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAllServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAllServiceImpl.java index 4cbf4ac5..2e2670d4 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAllServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAllServiceImpl.java @@ -1,13 +1,13 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.nativescript; +package org.cardanofoundation.ledgersync.service.impl.nativescript; import com.bloxbean.cardano.client.exception.CborSerializationException; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.cardanofoundation.ledgersync.common.common.nativescript.ScriptAll; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAnyServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAnyServiceImpl.java similarity index 78% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAnyServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAnyServiceImpl.java index bcf31296..a191cf04 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAnyServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAnyServiceImpl.java @@ -1,13 +1,13 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.nativescript; +package org.cardanofoundation.ledgersync.service.impl.nativescript; import com.bloxbean.cardano.client.exception.CborSerializationException; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.cardanofoundation.ledgersync.common.common.nativescript.ScriptAny; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAtLeastServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAtLeastServiceImpl.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAtLeastServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAtLeastServiceImpl.java index b80ebcab..81021e00 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptAtLeastServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptAtLeastServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.nativescript; +package org.cardanofoundation.ledgersync.service.impl.nativescript; import com.bloxbean.cardano.client.exception.CborSerializationException; @@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.cardanofoundation.ledgersync.common.common.nativescript.ScriptAtLeast; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptInvalidBeforeServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptInvalidBeforeServiceImpl.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptInvalidBeforeServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptInvalidBeforeServiceImpl.java index a0462fd9..f6cf2f86 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptInvalidBeforeServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptInvalidBeforeServiceImpl.java @@ -1,13 +1,13 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.nativescript; +package org.cardanofoundation.ledgersync.service.impl.nativescript; import com.bloxbean.cardano.client.exception.CborSerializationException; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.cardanofoundation.ledgersync.common.common.nativescript.RequireTimeBefore; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptInvalidHereAfterServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptInvalidHereAfterServiceImpl.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptInvalidHereAfterServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptInvalidHereAfterServiceImpl.java index d4e37828..4b1cd0cd 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptInvalidHereAfterServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptInvalidHereAfterServiceImpl.java @@ -1,13 +1,13 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.nativescript; +package org.cardanofoundation.ledgersync.service.impl.nativescript; import com.bloxbean.cardano.client.exception.CborSerializationException; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.cardanofoundation.ledgersync.common.common.nativescript.RequireTimeAfter; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptPubKeyServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptPubKeyServiceImpl.java similarity index 79% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptPubKeyServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptPubKeyServiceImpl.java index 13889286..f779177f 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/nativescript/ScriptPubKeyServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/nativescript/ScriptPubKeyServiceImpl.java @@ -1,13 +1,13 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.nativescript; +package org.cardanofoundation.ledgersync.service.impl.nativescript; import com.bloxbean.cardano.client.exception.CborSerializationException; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.cardanofoundation.ledgersync.common.common.nativescript.ScriptPubkey; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptService.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptService.java similarity index 60% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptService.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptService.java index aeab63f7..24175d6e 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptService.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptService.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.plutus; +package org.cardanofoundation.ledgersync.service.impl.plutus; import com.bloxbean.cardano.client.plutus.spec.PlutusScript; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SyncServiceInstance; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.service.SyncServiceInstance; public abstract class PlutusScriptService implements diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptV1ServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV1ServiceImpl.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptV1ServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV1ServiceImpl.java index 46e96ddd..ea396d10 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptV1ServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV1ServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.plutus; +package org.cardanofoundation.ledgersync.service.impl.plutus; import com.bloxbean.cardano.client.exception.CborSerializationException; import com.bloxbean.cardano.client.plutus.spec.PlutusV1Script; @@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.springframework.stereotype.Service; @Service diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptV2ServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV2ServiceImpl.java similarity index 81% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptV2ServiceImpl.java rename to application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV2ServiceImpl.java index 07abed21..9bd9e0f8 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/plutus/PlutusScriptV2ServiceImpl.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV2ServiceImpl.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.plutus; +package org.cardanofoundation.ledgersync.service.impl.plutus; import com.bloxbean.cardano.client.exception.CborSerializationException; import com.bloxbean.cardano.client.plutus.spec.PlutusV2Script; @@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import lombok.extern.slf4j.Slf4j; -import org.cardanofoundation.explorer.consumercommon.entity.Script; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import org.springframework.stereotype.Service; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV3ServiceImpl.java b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV3ServiceImpl.java new file mode 100644 index 00000000..4a297e18 --- /dev/null +++ b/application/src/main/java/org/cardanofoundation/ledgersync/service/impl/plutus/PlutusScriptV3ServiceImpl.java @@ -0,0 +1,41 @@ +package org.cardanofoundation.ledgersync.service.impl.plutus; + +import com.bloxbean.cardano.client.exception.CborSerializationException; +import com.bloxbean.cardano.yaci.store.common.util.PlutusV3Script; +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; +import lombok.experimental.FieldDefaults; +import lombok.extern.slf4j.Slf4j; +import org.cardanofoundation.ledgersync.consumercommon.entity.Script; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true) +@Slf4j +public class PlutusScriptV3ServiceImpl extends PlutusScriptService { + + @Override + public Script handle(PlutusV3Script plutusScript, Tx tx) { + try { + return buildScript(getTxScriptBytes(plutusScript, tx), ScriptType.PLUTUSV3, tx, + plutusScript.getPolicyId()); + } catch (CborSerializationException e) { + log.error("Get Policy Id of plutusV2, tx {}", tx.getHash()); + } + return null; + } + + @Override + protected byte[] getTxScriptBytes(PlutusV3Script plutusScript, Tx tx) { + byte[] data = new byte[]{}; + try { + data = plutusScript.serializeScriptBody(); + } catch (Exception e) { + log.warn("Exception serialize plutusV2 script tx_hash: {}, ", tx.getHash()); + } + return data; + } +} diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/AddressUtil.java b/application/src/main/java/org/cardanofoundation/ledgersync/util/AddressUtil.java similarity index 95% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/AddressUtil.java rename to application/src/main/java/org/cardanofoundation/ledgersync/util/AddressUtil.java index 43c4479c..f8c9436b 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/AddressUtil.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/util/AddressUtil.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; import com.bloxbean.cardano.client.address.AddressProvider; import com.bloxbean.cardano.client.address.Credential; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/DatumFormatUtil.java b/application/src/main/java/org/cardanofoundation/ledgersync/util/DatumFormatUtil.java similarity index 82% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/DatumFormatUtil.java rename to application/src/main/java/org/cardanofoundation/ledgersync/util/DatumFormatUtil.java index c8543e17..bfe650dd 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/DatumFormatUtil.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/util/DatumFormatUtil.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; import org.springframework.util.ObjectUtils; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/EpochParamUtil.java b/application/src/main/java/org/cardanofoundation/ledgersync/util/EpochParamUtil.java similarity index 95% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/EpochParamUtil.java rename to application/src/main/java/org/cardanofoundation/ledgersync/util/EpochParamUtil.java index 0b955df7..993cb2e9 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/EpochParamUtil.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/util/EpochParamUtil.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; import java.util.Collection; import java.util.HashMap; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/FileUtil.java b/application/src/main/java/org/cardanofoundation/ledgersync/util/FileUtil.java similarity index 94% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/FileUtil.java rename to application/src/main/java/org/cardanofoundation/ledgersync/util/FileUtil.java index bb8a4702..33892599 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/FileUtil.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/util/FileUtil.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; import java.io.BufferedInputStream; import java.io.FileInputStream; diff --git a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/LedgerSyncAssetUtil.java b/application/src/main/java/org/cardanofoundation/ledgersync/util/LedgerSyncAssetUtil.java similarity index 78% rename from application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/LedgerSyncAssetUtil.java rename to application/src/main/java/org/cardanofoundation/ledgersync/util/LedgerSyncAssetUtil.java index 6638d7ca..3f821521 100644 --- a/application/src/main/java/org/cardanofoundation/ledgersync/explorerconsumer/util/LedgerSyncAssetUtil.java +++ b/application/src/main/java/org/cardanofoundation/ledgersync/util/LedgerSyncAssetUtil.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; public class LedgerSyncAssetUtil { public static String getFingerPrint(byte[] assetName, String policyId) { diff --git a/application/src/main/resources/config/application.yaml b/application/src/main/resources/config/application.yaml index b8fbf702..ee47de94 100755 --- a/application/src/main/resources/config/application.yaml +++ b/application/src/main/resources/config/application.yaml @@ -85,4 +85,23 @@ ledger-sync: pool-offline-data: fixed-delay: ${POOL_OFFLINE_DATA_FIXED_DELAY:172800} initial-delay: ${POOL_OFFLINE_DATA_INIT_DELAY:20000} - enabled: ${SCHEDULER_ENABLED:true} \ No newline at end of file + enabled: ${SCHEDULER_ENABLED:true} + healthcheck: + block-time-threshold: ${BLOCK_TIME_THRESHOLD_IN_SECOND:240} + non-batching-inserted-time-threshold: ${NON_BATCHING_INSERTED_TIME_THRESHOLD_IN_SECOND:240} + batching-inserted-time-threshold: ${BATCHING_INSERTED_TIME_THRESHOLD_IN_SECOND:900} + keepalive-time-threshold: ${KEEPALIVE_TIME_THRESHOLD_IN_SECOND:1200} + +management: + endpoints: + enabled-by-default: false + web: + exposure: + include: "health,prometheus,health-status" + endpoint: + health: + enabled: true + prometheus: + enabled: true + health-status: + enabled: true \ No newline at end of file diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/ExplorerConsumerApplicationTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/LedgerSyncApplicationTest.java similarity index 54% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/ExplorerConsumerApplicationTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/LedgerSyncApplicationTest.java index 3239fe71..99e7a39d 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/ExplorerConsumerApplicationTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/LedgerSyncApplicationTest.java @@ -1,11 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer; +package org.cardanofoundation.ledgersync; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Profile; import org.springframework.test.context.TestPropertySource; @SpringBootTest @TestPropertySource("classpath:application.yaml") -public class ExplorerConsumerApplicationTest { +public class LedgerSyncApplicationTest { } diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/hash/DatumTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/hash/DatumTest.java similarity index 96% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/hash/DatumTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/hash/DatumTest.java index 3c29a780..62df35d4 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/hash/DatumTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/hash/DatumTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.hash; +package org.cardanofoundation.ledgersync.hash; import com.bloxbean.cardano.client.crypto.Blake2bUtil; import com.bloxbean.cardano.client.util.HexUtil; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/hash/ScriptTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/hash/ScriptTest.java similarity index 82% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/hash/ScriptTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/hash/ScriptTest.java index cbebb4d5..3c30a263 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/hash/ScriptTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/hash/ScriptTest.java @@ -1,14 +1,14 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.hash; +package org.cardanofoundation.ledgersync.hash; import co.nstant.in.cbor.model.ByteString; import com.bloxbean.cardano.client.exception.CborDeserializationException; import com.bloxbean.cardano.client.exception.CborSerializationException; import com.bloxbean.cardano.client.plutus.spec.PlutusV1Script; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.factory.NativeScriptFactory; -import org.cardanofoundation.ledgersync.explorerconsumer.factory.PlutusScriptFactory; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ScriptRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.ScriptServiceImpl; +import org.cardanofoundation.ledgersync.factory.NativeScriptFactory; +import org.cardanofoundation.ledgersync.factory.PlutusScriptFactory; +import org.cardanofoundation.ledgersync.repository.ScriptRepository; +import org.cardanofoundation.ledgersync.service.impl.ScriptServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/pool/PoolTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/pool/PoolTest.java similarity index 93% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/pool/PoolTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/pool/PoolTest.java index b8a3f989..8cb1381e 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/pool/PoolTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/pool/PoolTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.pool; +package org.cardanofoundation.ledgersync.pool; import com.bloxbean.cardano.client.crypto.Bech32; import com.bloxbean.cardano.client.util.HexUtil; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/AddressBalanceServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/AddressBalanceServiceImplTest.java similarity index 94% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/AddressBalanceServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/AddressBalanceServiceImplTest.java index c25a95f7..de9eac6f 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/AddressBalanceServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/AddressBalanceServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.math.BigInteger; import java.sql.Timestamp; @@ -15,38 +15,37 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.custom.CustomAddressTokenBalanceRepository; +import org.junit.jupiter.api.BeforeEach; import org.mockito.*; import org.springframework.data.util.Pair; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import org.cardanofoundation.explorer.consumercommon.entity.Address; -import org.cardanofoundation.explorer.consumercommon.entity.Address.AddressBuilder; -import org.cardanofoundation.explorer.consumercommon.entity.AddressToken; -import org.cardanofoundation.explorer.consumercommon.entity.AddressTokenBalance; -import org.cardanofoundation.explorer.consumercommon.entity.AddressTxBalance; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.MultiAsset; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Address; +import org.cardanofoundation.ledgersync.consumercommon.entity.Address.AddressBuilder; +import org.cardanofoundation.ledgersync.consumercommon.entity.AddressToken; +import org.cardanofoundation.ledgersync.consumercommon.entity.AddressTokenBalance; +import org.cardanofoundation.ledgersync.consumercommon.entity.AddressTxBalance; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.MultiAsset; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.cardanofoundation.ledgersync.common.common.address.ShelleyAddress; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.AddressTxBalanceProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.AddressRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.AddressTokenBalanceRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.AddressTokenRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.AddressTxBalanceRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MultiAssetRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.StakeAddressRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AggregatedDataCachingService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MultiAssetService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.projection.AddressTxBalanceProjection; +import org.cardanofoundation.ledgersync.repository.AddressRepository; +import org.cardanofoundation.ledgersync.repository.AddressTokenBalanceRepository; +import org.cardanofoundation.ledgersync.repository.AddressTokenRepository; +import org.cardanofoundation.ledgersync.repository.AddressTxBalanceRepository; +import org.cardanofoundation.ledgersync.repository.MultiAssetRepository; +import org.cardanofoundation.ledgersync.repository.StakeAddressRepository; +import org.cardanofoundation.ledgersync.service.AggregatedDataCachingService; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.MultiAssetService; import org.mockito.junit.jupiter.MockitoExtension; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -81,9 +80,6 @@ class AddressBalanceServiceImplTest { @Mock AggregatedDataCachingService aggregatedDataCachingService; - @Mock - CustomAddressTokenBalanceRepository customAddressTokenBalanceRepository; - @Captor ArgumentCaptor> addressesCaptor; @@ -102,9 +98,17 @@ class AddressBalanceServiceImplTest { @Captor ArgumentCaptor> multiAssetsCaptor; - @InjectMocks AddressBalanceServiceImpl victim; + @BeforeEach + void setUp() { + victim = new AddressBalanceServiceImpl( + multiAssetRepository, addressRepository, addressTokenRepository, + addressTxBalanceRepository, addressTokenBalanceRepository, stakeAddressRepository, + multiAssetService, blockDataService, aggregatedDataCachingService + ); + } + @Test @DisplayName("Should skip processing on no address balance records in batch") void shouldSkipAddressBalanceProcessingTest() { @@ -273,7 +277,7 @@ void shouldProcessAddressBalanceWithStakeKeysAndTokensSuccessfullyTest() { Mockito.when(addressRepository.findAllByAddressIn(Mockito.anyCollection())) .thenReturn(Collections.emptyList()); - Mockito.when(customAddressTokenBalanceRepository + Mockito.when(addressTokenBalanceRepository .findAllByAddressFingerprintPairIn(Mockito.anyCollection())) .thenReturn(Collections.emptyList()); Mockito.when(multiAssetService.findMultiAssetsByFingerprintIn(Mockito.anySet())) @@ -299,7 +303,7 @@ void shouldProcessAddressBalanceWithStakeKeysAndTokensSuccessfullyTest() { Mockito.verifyNoMoreInteractions(addressTokenRepository); Mockito.verify(multiAssetRepository, Mockito.times(1)).saveAll(multiAssetsCaptor.capture()); Mockito.verifyNoMoreInteractions(multiAssetRepository); - Mockito.verify(customAddressTokenBalanceRepository, Mockito.times(1)) + Mockito.verify(addressTokenBalanceRepository, Mockito.times(1)) .findAllByAddressFingerprintPairIn(Mockito.anyCollection()); Mockito.verify(addressTokenBalanceRepository, Mockito.times(2)) .saveAll(addressTokenBalancesCaptor.capture()); @@ -417,7 +421,7 @@ void shouldProcessAddressBalanceWithExistingAddressAndTokensDataSuccessfullyTest Mockito.when(addressRepository.findAllByAddressIn(Mockito.anyCollection())) .thenReturn(new ArrayList<>(addressMap.values())); - Mockito.when(customAddressTokenBalanceRepository + Mockito.when(addressTokenBalanceRepository .findAllByAddressFingerprintPairIn(Mockito.anyCollection())) .thenReturn(givenAddressTokenBalances); Mockito.when(multiAssetService.findMultiAssetsByFingerprintIn(Mockito.anySet())) @@ -443,7 +447,7 @@ void shouldProcessAddressBalanceWithExistingAddressAndTokensDataSuccessfullyTest Mockito.verifyNoMoreInteractions(addressTokenRepository); Mockito.verify(multiAssetRepository, Mockito.times(1)).saveAll(multiAssetsCaptor.capture()); Mockito.verifyNoMoreInteractions(multiAssetRepository); - Mockito.verify(customAddressTokenBalanceRepository, Mockito.times(1)) + Mockito.verify(addressTokenBalanceRepository, Mockito.times(1)) .findAllByAddressFingerprintPairIn(Mockito.anyCollection()); Mockito.verify(addressTokenBalanceRepository, Mockito.times(2)) .saveAll(addressTokenBalancesCaptor.capture()); @@ -535,7 +539,7 @@ void shouldSkipAddressTokenBalanceProcessingOnNotMintedAssetTest() { Mockito.when(addressRepository.findAllByAddressIn(Mockito.anyCollection())) .thenReturn(Collections.emptyList()); - Mockito.when(customAddressTokenBalanceRepository + Mockito.when(addressTokenBalanceRepository .findAllByAddressFingerprintPairIn(Mockito.anyCollection())) .thenReturn(Collections.emptyList()); Mockito.when(multiAssetService.findMultiAssetsByFingerprintIn(Mockito.anySet())) @@ -561,7 +565,7 @@ void shouldSkipAddressTokenBalanceProcessingOnNotMintedAssetTest() { Mockito.verifyNoMoreInteractions(addressTokenRepository); Mockito.verify(multiAssetRepository, Mockito.times(1)).saveAll(multiAssetsCaptor.capture()); Mockito.verifyNoMoreInteractions(multiAssetRepository); - Mockito.verify(customAddressTokenBalanceRepository, Mockito.times(1)) + Mockito.verify(addressTokenBalanceRepository, Mockito.times(1)) .findAllByAddressFingerprintPairIn(Mockito.anyCollection()); Mockito.verify(addressTokenBalanceRepository, Mockito.times(2)) .saveAll(addressTokenBalancesCaptor.capture()); @@ -618,7 +622,7 @@ void shouldFailIfMultiAssetNotFoundOnAddressTokenBalanceUpdateTest() { Mockito.when(addressRepository.findAllByAddressIn(Mockito.anyCollection())) .thenReturn(Collections.emptyList()); - Mockito.when(customAddressTokenBalanceRepository + Mockito.when(addressTokenBalanceRepository .findAllByAddressFingerprintPairIn(Mockito.anyCollection())) .thenReturn(Collections.emptyList()); Mockito.when(multiAssetService.findMultiAssetsByFingerprintIn(Mockito.anySet())) @@ -682,14 +686,11 @@ void shouldRollbackTxsWithNoTokensSuccessfullyTest() { .thenReturn(new ArrayList<>(addressMap.values())); Mockito.when(addressRepository.findAllStakeAddressByAddressIn(Mockito.anyCollection())) .thenReturn(new ArrayList<>(stakeAddressMap.values())); - Mockito.when(customAddressTokenBalanceRepository - .findAllByAddressMultiAssetIdPairIn(Mockito.anyCollection())) - .thenReturn(Collections.emptyList()); Assertions.assertDoesNotThrow(() -> victim.rollbackAddressBalances(txMap.values())); Mockito.verify(addressRepository, Mockito.times(1)).saveAll(addressesCaptor.capture()); - Mockito.verify(addressTokenBalanceRepository, Mockito.times(1)).saveAll(addressTokenBalancesCaptor.capture()); + Mockito.verify(addressTokenBalanceRepository, Mockito.never()).saveAll(addressTokenBalancesCaptor.capture()); Mockito.verify(stakeAddressRepository, Mockito.times(1)).saveAll(stakeAddressesCaptor.capture()); Mockito.verify(aggregatedDataCachingService, Mockito.times(4)) .subtractAccountTxCountAtEpoch(Mockito.anyInt(), Mockito.anyString(), Mockito.anyInt()); @@ -701,9 +702,6 @@ void shouldRollbackTxsWithNoTokensSuccessfullyTest() { Assertions.assertEquals(0L, address.getTxCount()); }); - Collection addressTokenBalances = addressTokenBalancesCaptor.getValue(); - Assertions.assertTrue(CollectionUtils.isEmpty(addressTokenBalances)); - Collection stakeAddresses = stakeAddressesCaptor.getValue(); stakeAddresses.forEach(stakeAddress -> Assertions.assertEquals(BigInteger.ZERO, stakeAddress.getBalance())); @@ -753,7 +751,7 @@ void shouldRollbackTxsWithTokensSuccessfullyTest() { .thenReturn(new ArrayList<>(addressMap.values())); Mockito.when(addressRepository.findAllStakeAddressByAddressIn(Mockito.anyCollection())) .thenReturn(new ArrayList<>(stakeAddressMap.values())); - Mockito.when(customAddressTokenBalanceRepository + Mockito.when(addressTokenBalanceRepository .findAllByAddressMultiAssetIdPairIn(Mockito.anyCollection())) .thenReturn(givenAddressTokenBalances); diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/BlockDataServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/BlockDataServiceImplTest.java similarity index 93% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/BlockDataServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/BlockDataServiceImplTest.java index 7e38c048..82ef3421 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/BlockDataServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/BlockDataServiceImplTest.java @@ -1,13 +1,12 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.util.Map; import org.springframework.data.util.Pair; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBatchBlockData; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.BlockDataServiceImpl; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBatchBlockData; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/CostModelServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/CostModelServiceImplTest.java similarity index 96% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/CostModelServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/CostModelServiceImplTest.java index 939f9c5d..b8ba572b 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/CostModelServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/CostModelServiceImplTest.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.yaci.core.model.ProtocolParamUpdate; import com.bloxbean.cardano.yaci.core.model.Update; -import org.cardanofoundation.explorer.consumercommon.entity.CostModel; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.CostModelRepository; +import org.cardanofoundation.ledgersync.consumercommon.entity.CostModel; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.CostModelRepository; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/DatumServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/DatumServiceImplTest.java similarity index 93% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/DatumServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/DatumServiceImplTest.java index 1064f6e5..6a41e14b 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/DatumServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/DatumServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.util.Arrays; import java.util.Collection; @@ -10,12 +10,12 @@ import com.bloxbean.cardano.yaci.core.model.Datum; import com.bloxbean.cardano.yaci.core.model.Witnesses; import lombok.SneakyThrows; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; import org.cardanofoundation.ledgersync.common.util.CborSerializationUtil; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.DatumRepository; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.repository.DatumRepository; import org.mockito.Mockito; import org.junit.jupiter.api.Assertions; @@ -92,8 +92,8 @@ void handleDatumWitnessOutputExist() { Mockito.when(aggregatedTxOut.getInlineDatum()).thenReturn(inlineDatum); Mockito.when(aggregatedTxOut2.getInlineDatum()).thenReturn(inlineDatum2); - Set datums = new HashSet<>(); - datums.add(org.cardanofoundation.explorer.consumercommon.entity.Datum.builder() + Set datums = new HashSet<>(); + datums.add(org.cardanofoundation.ledgersync.consumercommon.entity.Datum.builder() .hash("81c4b709d63f814af964013721d35aa0f4c91e75de8274db47dfd5a4b377eb7d").build()); Mockito.when(datumRepository.getExistHashByHashIn(Mockito.anySet())) @@ -154,8 +154,8 @@ void handleDatumWitnessOutputNull() { Mockito.when(inlineDatum2.getJson()).thenReturn( "{\"bytes\":\"a8799fd8799fd8799fd8799f582069a4199509a6bc81daf91eea261f14b8e67870fa501accbad154cd8857d5a257ff02ff581c0a0297ac3c9004d38307c8601351df65392952dc0f1ee66694dd227447617364666173644b6661736466736164666173d87a9fffd8799fffd8799fd8799f581c0a0297ac3c9004d38307c8601351df65392952dc0f1ee66694dd2274ffd87a9fffff9fff200000486173646661736466ffff\"}"); - Set datums = new HashSet<>(); - datums.add(org.cardanofoundation.explorer.consumercommon.entity.Datum.builder() + Set datums = new HashSet<>(); + datums.add(org.cardanofoundation.ledgersync.consumercommon.entity.Datum.builder() .hash("81c4b709d63f814af964013721d35aa0f4c91e75de8274db47dfd5a4b377eb7d").build()); Mockito.when(datumRepository.getExistHashByHashIn(Mockito.anySet())).thenReturn(datums); @@ -203,14 +203,14 @@ void handleDatumWithExistsData() { Mockito.when(transactionWitness.getDatums()).thenReturn(datumsWitness); - Set datums = new HashSet<>(); - datums.add(org.cardanofoundation.explorer.consumercommon.entity.Datum.builder() + Set datums = new HashSet<>(); + datums.add(org.cardanofoundation.ledgersync.consumercommon.entity.Datum.builder() .hash("81c4b709d63f814af964013721d35aa0f4c91e75de8274db47dfd5a4b377eb7d").build()); Mockito.when(datumRepository.getExistHashByHashIn(Mockito.anySet())).thenReturn(datums); DatumServiceImpl laclase = new DatumServiceImpl(datumRepository); - Map actualDatum = laclase.handleDatum(aggregatedTxs, txMap); + Map actualDatum = laclase.handleDatum(aggregatedTxs, txMap); Assertions.assertEquals(actualDatum.keySet().size(), 2); diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochParamServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/EpochParamServiceImplTest.java similarity index 91% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochParamServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/EpochParamServiceImplTest.java index b2f67847..daef2449 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochParamServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/EpochParamServiceImplTest.java @@ -1,22 +1,21 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; - -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.Epoch; -import org.cardanofoundation.explorer.consumercommon.entity.EpochParam; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; -import org.cardanofoundation.explorer.consumercommon.enumeration.EraType; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.mapper.EpochParamMapper; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.BlockRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.EpochParamRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.EpochRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ParamProposalRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CostModelService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.GenesisDataService; +package org.cardanofoundation.ledgersync.service.impl; + +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.Epoch; +import org.cardanofoundation.ledgersync.consumercommon.entity.EpochParam; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.EraType; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.mapper.EpochParamMapper; +import org.cardanofoundation.ledgersync.repository.BlockRepository; +import org.cardanofoundation.ledgersync.repository.EpochParamRepository; +import org.cardanofoundation.ledgersync.repository.EpochRepository; +import org.cardanofoundation.ledgersync.repository.ParamProposalRepository; +import org.cardanofoundation.ledgersync.service.CostModelService; +import org.cardanofoundation.ledgersync.service.GenesisDataService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mock; import org.mockito.Mockito; import java.util.List; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/EpochServiceImplTest.java similarity index 89% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/EpochServiceImplTest.java index bb7e6686..64838a20 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/EpochServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/EpochServiceImplTest.java @@ -1,14 +1,14 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.Epoch; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.Epoch; import org.cardanofoundation.ledgersync.common.common.Era; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.EpochRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AggregatedDataCachingService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.GenesisDataService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.EpochRepository; +import org.cardanofoundation.ledgersync.repository.TxRepository; +import org.cardanofoundation.ledgersync.service.AggregatedDataCachingService; +import org.cardanofoundation.ledgersync.service.GenesisDataService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentMatchers; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/GenesisServiceTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/GenesisServiceTest.java similarity index 98% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/GenesisServiceTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/GenesisServiceTest.java index 3639108e..9ff8b991 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/GenesisServiceTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/GenesisServiceTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.math.BigInteger; import java.sql.Timestamp; @@ -14,19 +14,19 @@ import org.springframework.web.reactive.function.client.WebClient; import com.fasterxml.jackson.databind.ObjectMapper; -import org.cardanofoundation.explorer.consumercommon.entity.CostModel; -import org.cardanofoundation.explorer.consumercommon.entity.EpochParam; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.CostModel; +import org.cardanofoundation.ledgersync.consumercommon.entity.EpochParam; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.dto.GenesisData; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.genesis.GenesisDataServiceImpl; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.genesis.GenesisLocalFetching; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.genesis.GenesisWebClientFetching; +import org.cardanofoundation.ledgersync.dto.GenesisData; +import org.cardanofoundation.ledgersync.service.impl.genesis.GenesisDataServiceImpl; +import org.cardanofoundation.ledgersync.service.impl.genesis.GenesisLocalFetching; +import org.cardanofoundation.ledgersync.service.impl.genesis.GenesisWebClientFetching; import org.mockito.InjectMocks; import org.mockito.junit.jupiter.MockitoExtension; -import static org.cardanofoundation.ledgersync.explorerconsumer.service.impl.genesis.GenesisDataServiceImpl.COIN_PER_BYTE; +import static org.cardanofoundation.ledgersync.service.impl.genesis.GenesisDataServiceImpl.COIN_PER_BYTE; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MultiAssetServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/MultiAssetServiceImplTest.java similarity index 94% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MultiAssetServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/MultiAssetServiceImplTest.java index d346e196..1ad3e805 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/MultiAssetServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/MultiAssetServiceImplTest.java @@ -1,19 +1,19 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.yaci.core.model.Amount; -import org.cardanofoundation.explorer.consumercommon.entity.*; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MaTxMintProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MaTxOutProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MultiAssetTotalVolumeProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.MultiAssetTxCountProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MaTxMintRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MultiAssetRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MultiAssetTxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AggregatedDataCachingService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.projection.MaTxMintProjection; +import org.cardanofoundation.ledgersync.projection.MaTxOutProjection; +import org.cardanofoundation.ledgersync.projection.MultiAssetTotalVolumeProjection; +import org.cardanofoundation.ledgersync.projection.MultiAssetTxCountProjection; +import org.cardanofoundation.ledgersync.repository.MaTxMintRepository; +import org.cardanofoundation.ledgersync.repository.MultiAssetRepository; +import org.cardanofoundation.ledgersync.repository.MultiAssetTxOutRepository; +import org.cardanofoundation.ledgersync.service.AggregatedDataCachingService; +import org.cardanofoundation.ledgersync.service.BlockDataService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ParamProposalServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/ParamProposalServiceImplTest.java similarity index 94% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ParamProposalServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/ParamProposalServiceImplTest.java index 10262f1e..cdba678d 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ParamProposalServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/ParamProposalServiceImplTest.java @@ -1,8 +1,7 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.math.BigInteger; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -12,12 +11,11 @@ import org.springframework.data.util.Pair; import org.springframework.util.CollectionUtils; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ParamProposalRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.CostModelService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.ParamProposalServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.ParamProposalRepository; +import org.cardanofoundation.ledgersync.service.CostModelService; import org.mockito.AdditionalAnswers; import org.mockito.Mock; import org.mockito.Mockito; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/RedeemerServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/RedeemerServiceImplTest.java similarity index 91% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/RedeemerServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/RedeemerServiceImplTest.java index 4edcd12f..e1bbae3f 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/RedeemerServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/RedeemerServiceImplTest.java @@ -1,22 +1,19 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; -import com.bloxbean.cardano.client.plutus.spec.ExUnits; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; -import com.bloxbean.cardano.yaci.core.model.Amount; -import com.bloxbean.cardano.yaci.core.model.Datum; -import com.bloxbean.cardano.yaci.core.model.Witnesses; +import com.bloxbean.cardano.yaci.core.model.*; import com.bloxbean.cardano.yaci.core.model.certs.*; -import org.cardanofoundation.explorer.consumercommon.entity.RedeemerData; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptPurposeType; +import org.cardanofoundation.ledgersync.consumercommon.entity.RedeemerData; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptPurposeType; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.TxOutProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.RedeemerDataRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.RedeemerRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxOutRepository; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.projection.TxOutProjection; +import org.cardanofoundation.ledgersync.repository.RedeemerDataRepository; +import org.cardanofoundation.ledgersync.repository.RedeemerRepository; +import org.cardanofoundation.ledgersync.repository.TxOutRepository; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -32,8 +29,8 @@ import java.math.BigInteger; import java.util.*; -import static org.cardanofoundation.ledgersync.explorerconsumer.util.CertificateUtil.buildStakeDelegationCert; -import static org.cardanofoundation.ledgersync.explorerconsumer.util.CertificateUtil.buildStakeRegistrationCert; +import static org.cardanofoundation.ledgersync.util.CertificateUtil.buildStakeDelegationCert; +import static org.cardanofoundation.ledgersync.util.CertificateUtil.buildStakeRegistrationCert; @ExtendWith(MockitoExtension.class) class RedeemerServiceImplTest { @@ -48,7 +45,7 @@ class RedeemerServiceImplTest { RedeemerDataRepository redeemerDataRepository; @Captor - ArgumentCaptor> redeemersCaptor; + ArgumentCaptor> redeemersCaptor; @Captor ArgumentCaptor> redeemerDataCaptor; @@ -119,7 +116,7 @@ void shouldHandleRedeemersSuccessfullyTest() { Collection redeemerDataCollection = redeemerDataCaptor.getValue(); Assertions.assertEquals(2, redeemerDataCollection.size()); - Collection redeemers = redeemersCaptor.getValue(); + Collection redeemers = redeemersCaptor.getValue(); redeemers.forEach(redeemer -> { ScriptPurposeType purpose = redeemer.getPurpose(); @@ -241,9 +238,9 @@ void shouldHandleSpendRedeemerFromFallbackTxOutSuccessfullyTest() { Collection redeemerDataCollection = redeemerDataCaptor.getValue(); Assertions.assertEquals(1, redeemerDataCollection.size()); - Collection redeemers = redeemersCaptor.getValue(); + Collection redeemers = redeemersCaptor.getValue(); Assertions.assertEquals(1, redeemers.size()); - org.cardanofoundation.explorer.consumercommon.entity.Redeemer redeemer = new ArrayList<>( + Redeemer redeemer = new ArrayList<>( redeemers).get(0); Assertions.assertEquals(spendRedeemer.getIndex(), redeemer.getIndex()); Assertions.assertEquals(paymentCred, redeemer.getScriptHash()); diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ReferenceInputServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/ReferenceInputServiceImplTest.java similarity index 90% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ReferenceInputServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/ReferenceInputServiceImplTest.java index 3d47fe77..75c15d63 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/ReferenceInputServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/ReferenceInputServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.util.Collection; import java.util.Collections; @@ -9,13 +9,12 @@ import org.springframework.data.util.Pair; import org.springframework.util.CollectionUtils; -import org.cardanofoundation.explorer.consumercommon.entity.ReferenceTxIn; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ReferenceInputRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxOutService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.ReferenceInputServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.ReferenceTxIn; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxOut; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.repository.ReferenceInputRepository; +import org.cardanofoundation.ledgersync.service.TxOutService; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/SlotLeaderServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/SlotLeaderServiceImplTest.java similarity index 91% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/SlotLeaderServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/SlotLeaderServiceImplTest.java index a99784f5..a01a529d 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/SlotLeaderServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/SlotLeaderServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.math.BigInteger; import java.util.Optional; @@ -9,13 +9,12 @@ import com.bloxbean.cardano.yaci.core.model.byron.ByronBlockCons; import com.bloxbean.cardano.yaci.core.model.byron.ByronBlockHead; import com.bloxbean.cardano.yaci.core.model.byron.ByronMainBlock; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; -import org.cardanofoundation.explorer.consumercommon.entity.SlotLeader; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedSlotLeader; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolHashRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.SlotLeaderRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.SlotLeaderServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.SlotLeader; +import org.cardanofoundation.ledgersync.aggregate.AggregatedSlotLeader; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.repository.PoolHashRepository; +import org.cardanofoundation.ledgersync.repository.SlotLeaderRepository; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/StakeAddressServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/StakeAddressServiceImplTest.java similarity index 92% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/StakeAddressServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/StakeAddressServiceImplTest.java index 203aa341..e51f604c 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/StakeAddressServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/StakeAddressServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.util.Collections; import java.util.List; @@ -8,10 +8,9 @@ import org.springframework.util.CollectionUtils; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.StakeAddressRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.StakeAddressServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.repository.StakeAddressRepository; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TransactionServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TransactionServiceImplTest.java similarity index 91% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TransactionServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TransactionServiceImplTest.java index ca8c742b..27d7e6d2 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TransactionServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TransactionServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.util.ArrayList; import java.util.Collection; @@ -12,23 +12,23 @@ import com.bloxbean.cardano.yaci.core.model.certs.Certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredType; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.dto.EUTXOWrapper; -import org.cardanofoundation.ledgersync.explorerconsumer.factory.CertificateSyncServiceFactory; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ExtraKeyWitnessRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.dto.EUTXOWrapper; +import org.cardanofoundation.ledgersync.factory.CertificateSyncServiceFactory; +import org.cardanofoundation.ledgersync.repository.ExtraKeyWitnessRepository; +import org.cardanofoundation.ledgersync.repository.TxRepository; +import org.cardanofoundation.ledgersync.service.*; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import static org.cardanofoundation.ledgersync.explorerconsumer.util.CertificateUtil.buildStakeDelegationCert; -import static org.cardanofoundation.ledgersync.explorerconsumer.util.CertificateUtil.buildStakeRegistrationCert; -import static org.cardanofoundation.ledgersync.explorerconsumer.util.TestStringUtils.generateRandomHash; +import static org.cardanofoundation.ledgersync.util.CertificateUtil.buildStakeDelegationCert; +import static org.cardanofoundation.ledgersync.util.CertificateUtil.buildStakeRegistrationCert; +import static org.cardanofoundation.ledgersync.util.TestStringUtils.generateRandomHash; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxBootstrapWitnessServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxBootstrapWitnessServiceImplTest.java similarity index 87% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxBootstrapWitnessServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxBootstrapWitnessServiceImplTest.java index 49f03b40..a65ca775 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxBootstrapWitnessServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxBootstrapWitnessServiceImplTest.java @@ -1,11 +1,11 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.yaci.core.model.BootstrapWitness; import com.bloxbean.cardano.yaci.core.model.Witnesses; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxBootstrapWitnesses; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxBootstrapWitnessRepository; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxBootstrapWitnesses; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.TxBootstrapWitnessRepository; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxChartServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxChartServiceImplTest.java similarity index 96% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxChartServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxChartServiceImplTest.java index 93c4caef..2e748d83 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxChartServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxChartServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.math.BigInteger; import java.sql.Timestamp; @@ -9,12 +9,11 @@ import java.util.Collections; import java.util.List; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxChart; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.TxTimeProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxChartRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.TxChartServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxChart; +import org.cardanofoundation.ledgersync.projection.TxTimeProjection; +import org.cardanofoundation.ledgersync.repository.TxChartRepository; +import org.cardanofoundation.ledgersync.repository.TxRepository; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxInServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxInServiceImplTest.java similarity index 96% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxInServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxInServiceImplTest.java index 5de47ec4..1fac6533 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxInServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxInServiceImplTest.java @@ -1,20 +1,21 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.explorer.consumercommon.entity.Tx.TxBuilder; + +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx.TxBuilder; import org.cardanofoundation.ledgersync.common.common.Era; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddressBalance; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx.AggregatedTxBuilder; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxInRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.UnconsumeTxInRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MultiAssetService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxOutService; -import org.cardanofoundation.ledgersync.explorerconsumer.util.TestStringUtils; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddressBalance; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx.AggregatedTxBuilder; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.repository.TxInRepository; +import org.cardanofoundation.ledgersync.repository.UnconsumeTxInRepository; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.MultiAssetService; +import org.cardanofoundation.ledgersync.service.TxOutService; +import org.cardanofoundation.ledgersync.util.TestStringUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataHashServiceTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataHashServiceTest.java similarity index 80% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataHashServiceTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataHashServiceTest.java index 0a3e7fcf..e50b5421 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataHashServiceTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataHashServiceTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import java.util.ArrayList; import java.util.Collection; @@ -8,11 +8,10 @@ import org.springframework.util.ObjectUtils; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxMetadataHash; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxMetaDataHashRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.TxMetaDataHashServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxMetadataHash; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.TxMetaDataHashRepository; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataServiceTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataServiceTest.java similarity index 80% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataServiceTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataServiceTest.java index edeadbac..c829b356 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxMetaDataServiceTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxMetaDataServiceTest.java @@ -1,17 +1,16 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.client.metadata.cbor.CBORMetadataMap; import com.bloxbean.cardano.yaci.core.model.AuxData; import com.fasterxml.jackson.databind.ObjectMapper; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.explorer.consumercommon.entity.TxMetadataHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxMetadataHash; import org.cardanofoundation.ledgersync.common.util.CborSerializationUtil; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxMetadataRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.TxMetaDataServiceImpl; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.TxMetadataRepository; +import org.cardanofoundation.ledgersync.service.BlockDataService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -79,7 +78,7 @@ void testHandleAuxiliaryData() { AuxData auxData = new AuxData(cbor, """ {"1":{"cardano": "First Metadata from cardanocli-js"}} - """, null, null, null); + """, null, null, null, null); auxiliaryDataMap.put(1, auxData); diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxOutServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxOutServiceImplTest.java similarity index 96% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxOutServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxOutServiceImplTest.java index 8274dd54..db629e25 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/TxOutServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxOutServiceImplTest.java @@ -1,21 +1,21 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; +package org.cardanofoundation.ledgersync.service.impl; import com.bloxbean.cardano.yaci.core.model.Amount; -import org.cardanofoundation.explorer.consumercommon.entity.*; -import org.cardanofoundation.explorer.consumercommon.enumeration.TokenType; +import org.cardanofoundation.ledgersync.consumercommon.entity.*; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.TokenType; import org.cardanofoundation.ledgersync.common.util.HexUtil; import org.cardanofoundation.ledgersync.common.util.JsonUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedAddress; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxIn; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTxOut; -import org.cardanofoundation.ledgersync.explorerconsumer.dto.EUTXOWrapper; -import org.cardanofoundation.ledgersync.explorerconsumer.projection.TxOutProjection; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.FailedTxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.MultiAssetTxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxOutRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MultiAssetService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.ScriptService; +import org.cardanofoundation.ledgersync.aggregate.AggregatedAddress; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxIn; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTxOut; +import org.cardanofoundation.ledgersync.dto.EUTXOWrapper; +import org.cardanofoundation.ledgersync.projection.TxOutProjection; +import org.cardanofoundation.ledgersync.repository.FailedTxOutRepository; +import org.cardanofoundation.ledgersync.repository.MultiAssetTxOutRepository; +import org.cardanofoundation.ledgersync.repository.TxOutRepository; +import org.cardanofoundation.ledgersync.service.MultiAssetService; +import org.cardanofoundation.ledgersync.service.ScriptService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxWitnessServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxWitnessServiceImplTest.java new file mode 100644 index 00000000..70b19f53 --- /dev/null +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/TxWitnessServiceImplTest.java @@ -0,0 +1,280 @@ +package org.cardanofoundation.ledgersync.service.impl; + +import com.bloxbean.cardano.yaci.core.model.VkeyWitness; +import com.bloxbean.cardano.yaci.core.model.Witnesses; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.consumercommon.entity.TxWitness; +import org.cardanofoundation.ledgersync.repository.TxWitnessRepository; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.*; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +@ExtendWith(MockitoExtension.class) +class TxWitnessServiceImplTest { + + @Mock + TxWitnessRepository txWitnessRepository; + + @InjectMocks + TxWitnessServiceImpl txWitnessServiceImpl; + + @Captor + ArgumentCaptor> txWitnessesCaptor; + + @Test + void handleTxWitness_whenSamePairKeyAndSignatureInEachTransaction() { + Map txMap = new HashMap<>(); + + List vkWitnesses1 = new ArrayList<>(); + vkWitnesses1.add( + new VkeyWitness("91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig1")); + vkWitnesses1.add( + new VkeyWitness("91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig1")); + vkWitnesses1.add( + new VkeyWitness("91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig1")); + + List vkWitnesses2 = new ArrayList<>(); + vkWitnesses2.add( + new VkeyWitness("aaaaaa05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig2")); + vkWitnesses2.add( + new VkeyWitness("aaaaaa05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig2")); + + AggregatedTx aggregatedTx1 = AggregatedTx + .builder() + .hash("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .witnesses(Witnesses.builder().vkeyWitnesses(vkWitnesses1).build()) + .build(); + + AggregatedTx aggregatedTx2 = AggregatedTx + .builder() + .hash("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .witnesses(Witnesses.builder().vkeyWitnesses(vkWitnesses2).build()) + .build(); + + Collection aggregatedTxs = new ArrayList<>(List.of(aggregatedTx1, aggregatedTx2)); + + txMap.put("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1", + Tx.builder().hash("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .build()); + txMap.put("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1", + Tx.builder().hash("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .build()); + + txWitnessServiceImpl.handleTxWitness(aggregatedTxs, txMap); + + verify(txWitnessRepository, times(1)) + .saveAll(txWitnessesCaptor.capture()); + + List txWitnesses = txWitnessesCaptor.getValue(); + + assertThat(txWitnesses).hasSize(2); + assertThat(txWitnesses.stream().map(TxWitness::getKey)) + .contains("91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", "aaaaaa05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228"); + + for (var txWitness : txWitnesses) { + if (txWitness.getKey().equals("91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228")) { + assertEquals("sig1", txWitness.getSignature()); + assertEquals(3, txWitness.getIndexArrSize()); + assertThat(txWitness.getIndexArr()).contains(0, 1, 2); + } else { + assertEquals("sig2", txWitness.getSignature()); + assertEquals(2, txWitness.getIndexArrSize()); + assertThat(txWitness.getIndexArr()).contains(0, 1); + } + } + } + + @Test + void handleTxWitness_whenDiffPairKeyAndSignatureInEachTransaction() { + Map txMap = new HashMap<>(); + + List vkWitnesses1 = new ArrayList<>(); + vkWitnesses1.add( + new VkeyWitness("91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig1")); + vkWitnesses1.add( + new VkeyWitness("bb636d88c3201329267561e58f217bd4eaeb8e7c7378eee00c18a56bed743663", + "sig2")); + + List vkWitnesses2 = new ArrayList<>(); + vkWitnesses2.add( + new VkeyWitness("aaaaaa05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig1")); + + vkWitnesses2.add( + new VkeyWitness("bbbbbb05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig2")); + + AggregatedTx aggregatedTx1 = AggregatedTx + .builder() + .hash("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .witnesses(Witnesses.builder().vkeyWitnesses(vkWitnesses1).build()) + .build(); + + AggregatedTx aggregatedTx2 = AggregatedTx + .builder() + .hash("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .witnesses(Witnesses.builder().vkeyWitnesses(vkWitnesses2).build()) + .build(); + + Collection aggregatedTxs = new ArrayList<>(List.of(aggregatedTx1, aggregatedTx2)); + + txMap.put("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1", + Tx.builder().hash("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .build()); + txMap.put("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1", + Tx.builder().hash("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .build()); + + txWitnessServiceImpl.handleTxWitness(aggregatedTxs, txMap); + + verify(txWitnessRepository, times(1)) + .saveAll(txWitnessesCaptor.capture()); + + List txWitnesses = txWitnessesCaptor.getValue(); + + assertEquals(4, txWitnesses.size()); + assertThat(txWitnesses.stream().map(TxWitness::getKey)).contains( + "91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "bb636d88c3201329267561e58f217bd4eaeb8e7c7378eee00c18a56bed743663", + "bbbbbb05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "aaaaaa05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228"); + + assertThat(txWitnesses.stream().map(txWitness -> txWitness.getTx().getHash())).contains( + "b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1", + "bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1"); + + for (var txWitness : txWitnesses) { + if (txWitness.getTx().getHash().equals("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1")) { + if (txWitness.getKey().equals("bb636d88c3201329267561e58f217bd4eaeb8e7c7378eee00c18a56bed743663")) { + assertEquals("sig2", txWitness.getSignature()); + assertThat(txWitness.getIndexArr()).contains(1); + assertEquals(1, txWitness.getIndexArrSize()); + } else { + assertEquals("sig1", txWitness.getSignature()); + assertThat(txWitness.getIndexArr()).contains(0); + assertEquals(1, txWitness.getIndexArrSize()); + } + } else { + if (txWitness.getKey().equals("bbbbbb05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228")) { + assertEquals("sig2", txWitness.getSignature()); + assertThat(txWitness.getIndexArr()).contains(1); + assertEquals(1, txWitness.getIndexArrSize()); + } else { + assertEquals("sig1", txWitness.getSignature()); + assertThat(txWitness.getIndexArr()).contains(0); + assertEquals(1, txWitness.getIndexArrSize()); + } + } + } + } + + @Test + void handleTxWitness_WhenSameAndDiffPairKeyAndSignatureInEachTransaction() { + Map txMap = new HashMap<>(); + + List vkWitnesses1 = new ArrayList<>(); + vkWitnesses1.add( + new VkeyWitness("91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig1")); + vkWitnesses1.add( + new VkeyWitness("bb636d88c3201329267561e58f217bd4eaeb8e7c7378eee00c18a56bed743663", + "sig2")); + vkWitnesses1.add( + new VkeyWitness("bb636d88c3201329267561e58f217bd4eaeb8e7c7378eee00c18a56bed743663", + "sig2")); + + List vkWitnesses2 = new ArrayList<>(); + vkWitnesses2.add( + new VkeyWitness("aaaaaa05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig1")); + + vkWitnesses2.add( + new VkeyWitness("bbbbbb05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig2")); + + vkWitnesses2.add( + new VkeyWitness("aaaaaa05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "sig1")); + + AggregatedTx aggregatedTx1 = AggregatedTx + .builder() + .hash("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .witnesses(Witnesses.builder().vkeyWitnesses(vkWitnesses1).build()) + .build(); + + AggregatedTx aggregatedTx2 = AggregatedTx + .builder() + .hash("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .witnesses(Witnesses.builder().vkeyWitnesses(vkWitnesses2).build()) + .build(); + + Collection aggregatedTxs = new ArrayList<>(List.of(aggregatedTx1, aggregatedTx2)); + + txMap.put("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1", + Tx.builder().hash("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .build()); + txMap.put("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1", + Tx.builder().hash("bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1") + .build()); + + txWitnessServiceImpl.handleTxWitness(aggregatedTxs, txMap); + + verify(txWitnessRepository, times(1)) + .saveAll(txWitnessesCaptor.capture()); + + List txWitnesses = txWitnessesCaptor.getValue(); + + assertEquals(4, txWitnesses.size()); + + assertThat(txWitnesses.stream().map(TxWitness::getKey)).contains( + "91274605d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "bb636d88c3201329267561e58f217bd4eaeb8e7c7378eee00c18a56bed743663", + "bbbbbb05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228", + "aaaaaa05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228"); + assertThat(txWitnesses.stream().map(txWitness -> txWitness.getTx().getHash())).contains( + "b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1", + "bbbbbbbbb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1"); + + for (var txWitness : txWitnesses) { + if (txWitness.getTx().getHash().equals("b9787d0eb3a22ce58572353cf2374b3bff003af66cd0a925f75fe767501355c1")) { + if (txWitness.getKey().equals("bb636d88c3201329267561e58f217bd4eaeb8e7c7378eee00c18a56bed743663")) { + assertEquals("sig2", txWitness.getSignature()); + assertThat(txWitness.getIndexArr()).contains(1, 2); + assertEquals(2, txWitness.getIndexArrSize()); + } else { + assertEquals("sig1", txWitness.getSignature()); + assertThat(txWitness.getIndexArr()).contains(0); + assertEquals(1, txWitness.getIndexArrSize()); + } + } else { + if (txWitness.getKey().equals("bbbbbb05d7f9a5df9b9b72aa3da9f946390cc30fbcd055d1fbec1d06797b6228")) { + assertEquals("sig2", txWitness.getSignature()); + assertThat(txWitness.getIndexArr()).contains(1); + assertEquals(1, txWitness.getIndexArrSize()); + } else { + assertEquals("sig1", txWitness.getSignature()); + assertThat(txWitness.getIndexArr()).contains(0, 2); + assertEquals(2, txWitness.getIndexArrSize()); + } + } + } + } +} \ No newline at end of file diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/WithdrawalsServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/WithdrawalsServiceImplTest.java similarity index 86% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/WithdrawalsServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/WithdrawalsServiceImplTest.java index 9417c44b..cf678170 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/WithdrawalsServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/WithdrawalsServiceImplTest.java @@ -1,13 +1,12 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl; - -import com.bloxbean.cardano.client.plutus.spec.RedeemerTag; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedTx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.WithdrawalRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.WithdrawalsServiceImpl; -import org.cardanofoundation.ledgersync.explorerconsumer.util.TestStringUtils; +package org.cardanofoundation.ledgersync.service.impl; + +import com.bloxbean.cardano.yaci.core.model.RedeemerTag; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedTx; +import org.cardanofoundation.ledgersync.repository.WithdrawalRepository; +import org.cardanofoundation.ledgersync.util.TestStringUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockAggregatorServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/BlockAggregatorServiceImplTest.java similarity index 96% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockAggregatorServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/BlockAggregatorServiceImplTest.java index b213d133..2c40de3b 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockAggregatorServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/BlockAggregatorServiceImplTest.java @@ -1,9 +1,8 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import co.nstant.in.cbor.model.Array; import com.bloxbean.cardano.client.crypto.Bech32; import com.bloxbean.cardano.client.crypto.Blake2bUtil; -import com.bloxbean.cardano.client.plutus.spec.ExUnits; import com.bloxbean.cardano.yaci.core.model.*; import com.bloxbean.cardano.yaci.core.model.certs.Certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredType; @@ -13,14 +12,14 @@ import org.cardanofoundation.ledgersync.common.common.constant.Constant; import org.cardanofoundation.ledgersync.common.util.CborSerializationUtil; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.*; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolHashRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.SlotLeaderRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SlotLeaderService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.BlockDataServiceImpl; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.SlotLeaderServiceImpl; +import org.cardanofoundation.ledgersync.aggregate.*; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.repository.PoolHashRepository; +import org.cardanofoundation.ledgersync.repository.SlotLeaderRepository; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.SlotLeaderService; +import org.cardanofoundation.ledgersync.service.impl.BlockDataServiceImpl; +import org.cardanofoundation.ledgersync.service.impl.SlotLeaderServiceImpl; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -37,7 +36,7 @@ import java.util.*; import java.util.stream.IntStream; -import static org.cardanofoundation.ledgersync.explorerconsumer.util.CertificateUtil.*; +import static org.cardanofoundation.ledgersync.util.CertificateUtil.*; @ExtendWith(MockitoExtension.class) class BlockAggregatorServiceImplTest { @@ -630,7 +629,7 @@ private static List givenTxWitnessesBlock949034Preprod() { List datumList = List.of( buildDatum("19077a", "{\\\"int\\\":1914}") ); - var redeemer = Redeemer.deserialize((Array) CborSerializationUtil.deserialize(HexUtil.decodeHexString("840000d87b9f5820561940091ccf4859b053c522d7b82be8de0d39c0ce9221c4e18289e0192ec95dff821a00109f3e1a14616369"))); + var redeemer = Redeemer.deserializePreConway((Array) CborSerializationUtil.deserialize(HexUtil.decodeHexString("840000d87b9f5820561940091ccf4859b053c522d7b82be8de0d39c0ce9221c4e18289e0192ec95dff821a00109f3e1a14616369"))); List redeemers = List.of( // fake for test redeemer diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockSyncServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/BlockSyncServiceImplTest.java similarity index 91% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockSyncServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/BlockSyncServiceImplTest.java index 0f26d746..0c2ac168 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/BlockSyncServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/BlockSyncServiceImplTest.java @@ -1,12 +1,12 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; - -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedSlotLeader; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.BlockRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TxRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.*; +package org.cardanofoundation.ledgersync.service.impl.block; + +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.aggregate.AggregatedSlotLeader; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.repository.BlockRepository; +import org.cardanofoundation.ledgersync.repository.TxRepository; +import org.cardanofoundation.ledgersync.service.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -16,6 +16,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.util.Pair; +import java.sql.Timestamp; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -121,6 +123,8 @@ void shouldSyncBlockWithNullSlotLeaderSuccessfullyTest() { Mockito.when(aggregatedBlock.getPrevBlockHash()) .thenReturn("d4b8de7a11d929a323373cbab6c1a9bdc931beffff11db111cf9d57356ee1937"); Mockito.when(aggregatedBlock.getBlockNo()).thenReturn(1L); + Mockito.when(aggregatedBlock.getBlockTime()).thenReturn(Timestamp.valueOf(LocalDateTime.of(2019, 7, 25, 2, 4, 16))); + Mockito.when(aggregatedBlock.getSlotNo()).thenReturn(10000L); Mockito.when(blockDataService.getBlockSize()).thenReturn(1); Mockito.when(blockDataService.getFirstAndLastBlock()) .thenReturn(Pair.of(aggregatedBlock, aggregatedBlock)); @@ -174,6 +178,8 @@ void shouldSyncSuccessfullyTest() { .thenReturn("45899e8002b27df291e09188bfe3aeb5397ac03546a7d0ead93aa2500860f1af"); Mockito.when(aggregatedBlock.getBlockNo()).thenReturn(47l); Mockito.when(aggregatedBlock.getSlotLeader()).thenReturn(slotLeader); + Mockito.when(aggregatedBlock.getBlockTime()).thenReturn(Timestamp.valueOf(LocalDateTime.of(2019, 7, 25, 2, 4, 16))); + Mockito.when(aggregatedBlock.getSlotNo()).thenReturn(10000L); Mockito.when(slotLeader.getHashRaw()) .thenReturn("aae9293510344ddd636364c2673e34e03e79e3eefa8dbaa70e326f7d"); Mockito.when(slotLeader.getPrefix()).thenReturn(ConsumerConstant.SHELLEY_SLOT_LEADER_PREFIX); diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronEbbAggregatorServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/ByronEbbAggregatorServiceImplTest.java similarity index 89% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronEbbAggregatorServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/ByronEbbAggregatorServiceImplTest.java index 8b9ad7a4..c3a98970 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronEbbAggregatorServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/ByronEbbAggregatorServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import java.sql.Timestamp; import java.time.LocalDateTime; @@ -11,10 +11,9 @@ import com.bloxbean.cardano.yaci.core.model.byron.ByronEbHead; import com.bloxbean.cardano.yaci.store.events.ByronEbBlockEvent; import com.bloxbean.cardano.yaci.store.events.EventMetadata; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.SlotLeaderService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block.ByronEbbAggregatorServiceImpl; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.SlotLeaderService; import org.mockito.Mock; import org.mockito.Mockito; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronMainAggregatorServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/ByronMainAggregatorServiceImplTest.java similarity index 94% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronMainAggregatorServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/ByronMainAggregatorServiceImplTest.java index be6f707c..07a317f2 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/ByronMainAggregatorServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/ByronMainAggregatorServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import java.math.BigInteger; import java.sql.Timestamp; @@ -24,14 +24,14 @@ import com.bloxbean.cardano.yaci.core.model.byron.payload.ByronTxPayload; import com.bloxbean.cardano.yaci.store.events.ByronMainBlockEvent; import com.bloxbean.cardano.yaci.store.events.EventMetadata; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBatchBlockData; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.constant.ConsumerConstant; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolHashRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.SlotLeaderRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BlockDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.BlockDataServiceImpl; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.SlotLeaderServiceImpl; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBatchBlockData; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.constant.ConsumerConstant; +import org.cardanofoundation.ledgersync.repository.PoolHashRepository; +import org.cardanofoundation.ledgersync.repository.SlotLeaderRepository; +import org.cardanofoundation.ledgersync.service.BlockDataService; +import org.cardanofoundation.ledgersync.service.impl.BlockDataServiceImpl; +import org.cardanofoundation.ledgersync.service.impl.SlotLeaderServiceImpl; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/RollbackServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/RollbackServiceImplTest.java similarity index 95% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/RollbackServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/RollbackServiceImplTest.java index 7a95bab3..8ea0ef2a 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/block/RollbackServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/block/RollbackServiceImplTest.java @@ -1,19 +1,18 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block; +package org.cardanofoundation.ledgersync.service.impl.block; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; -import org.cardanofoundation.explorer.consumercommon.entity.Block; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.*; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AddressBalanceService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.AggregatedDataCachingService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.EpochService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.MultiAssetService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.TxChartService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.block.RollbackServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.Block; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.repository.*; +import org.cardanofoundation.ledgersync.service.AddressBalanceService; +import org.cardanofoundation.ledgersync.service.AggregatedDataCachingService; +import org.cardanofoundation.ledgersync.service.EpochService; +import org.cardanofoundation.ledgersync.service.MultiAssetService; +import org.cardanofoundation.ledgersync.service.TxChartService; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/GenesisKeyDelegationServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/GenesisKeyDelegationServiceImplTest.java similarity index 64% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/GenesisKeyDelegationServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/GenesisKeyDelegationServiceImplTest.java index ee06b574..b8914bb0 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/GenesisKeyDelegationServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/GenesisKeyDelegationServiceImplTest.java @@ -1,12 +1,11 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import java.util.Collections; import com.bloxbean.cardano.yaci.core.model.certs.GenesisKeyDelegation; -import org.cardanofoundation.explorer.consumercommon.entity.Redeemer; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.GenesisKeyDelegationServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.Redeemer; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; import org.mockito.Mockito; import org.junit.jupiter.api.Assertions; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/MoveInstantaneousServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/MoveInstantaneousServiceImplTest.java similarity index 89% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/MoveInstantaneousServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/MoveInstantaneousServiceImplTest.java index 0ded2de1..739505e4 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/MoveInstantaneousServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/MoveInstantaneousServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import java.math.BigInteger; import java.util.Collections; @@ -8,13 +8,12 @@ import com.bloxbean.cardano.yaci.core.model.certs.MoveInstataneous; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredType; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredential; -import org.cardanofoundation.explorer.consumercommon.entity.Reserve; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Treasury; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.MoveInstantaneousServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.Reserve; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Treasury; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRegistrationServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRegistrationServiceImplTest.java similarity index 95% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRegistrationServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRegistrationServiceImplTest.java index d0e2282c..ecbbdc1c 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRegistrationServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRegistrationServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import java.math.BigInteger; import java.util.List; @@ -9,15 +9,14 @@ import com.bloxbean.cardano.yaci.core.model.PoolParams; import com.bloxbean.cardano.yaci.core.model.Relay; import com.bloxbean.cardano.yaci.core.model.certs.PoolRegistration; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; -import org.cardanofoundation.explorer.consumercommon.entity.PoolMetadataRef; -import org.cardanofoundation.explorer.consumercommon.entity.PoolRelay; -import org.cardanofoundation.explorer.consumercommon.entity.PoolUpdate; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.PoolRegistrationServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolMetadataRef; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolRelay; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolUpdate; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; import org.mockito.AdditionalAnswers; import org.mockito.ArgumentCaptor; import org.mockito.Captor; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRetirementServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRetirementServiceImplTest.java similarity index 84% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRetirementServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRetirementServiceImplTest.java index 43d62660..b63fc3bb 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/PoolRetirementServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/PoolRetirementServiceImplTest.java @@ -1,23 +1,21 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; - -import java.util.Collections; -import java.util.Optional; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.PoolRetirement; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.PoolRetirementServiceImpl; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.junit.jupiter.MockitoExtension; - +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Collections; +import java.util.Optional; @ExtendWith(MockitoExtension.class) class PoolRetirementServiceImplTest { diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDelegationServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDelegationServiceImplTest.java similarity index 89% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDelegationServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDelegationServiceImplTest.java index 09d34a1c..67c6a725 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDelegationServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDelegationServiceImplTest.java @@ -1,29 +1,27 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; - -import java.util.Collections; -import java.util.Map; -import java.util.Optional; +package org.cardanofoundation.ledgersync.service.impl.certificate; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredType; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredential; import com.bloxbean.cardano.yaci.core.model.certs.StakeDelegation; import com.bloxbean.cardano.yaci.core.model.certs.StakePoolId; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; import org.cardanofoundation.ledgersync.common.util.HexUtil; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.StakeDelegationServiceImpl; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.junit.jupiter.MockitoExtension; - +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Collections; +import java.util.Map; +import java.util.Optional; @ExtendWith(MockitoExtension.class) class StakeDelegationServiceImplTest { diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDeregistrationServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDeregistrationServiceImplTest.java similarity index 85% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDeregistrationServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDeregistrationServiceImplTest.java index 6cf42e8c..307c160a 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeDeregistrationServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeDeregistrationServiceImplTest.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import java.util.Collections; import java.util.Map; @@ -6,11 +6,10 @@ import com.bloxbean.cardano.yaci.core.model.certs.StakeCredType; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredential; import com.bloxbean.cardano.yaci.core.model.certs.StakeDeregistration; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.StakeDeregistrationServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegistrationServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegistrationServiceImplTest.java similarity index 79% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegistrationServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegistrationServiceImplTest.java index adfbe5f2..57d6d0d0 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/StakeRegistrationServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/StakeRegistrationServiceImplTest.java @@ -1,15 +1,14 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate; +package org.cardanofoundation.ledgersync.service.impl.certificate; import java.util.Map; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredType; import com.bloxbean.cardano.yaci.core.model.certs.StakeCredential; import com.bloxbean.cardano.yaci.core.model.certs.StakeRegistration; -import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress; -import org.cardanofoundation.explorer.consumercommon.entity.Tx; -import org.cardanofoundation.ledgersync.explorerconsumer.aggregate.AggregatedBlock; -import org.cardanofoundation.ledgersync.explorerconsumer.service.BatchCertificateDataService; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.StakeRegistrationServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeAddress; +import org.cardanofoundation.ledgersync.consumercommon.entity.Tx; +import org.cardanofoundation.ledgersync.aggregate.AggregatedBlock; +import org.cardanofoundation.ledgersync.service.BatchCertificateDataService; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateDataServiceImplTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateDataServiceImplTest.java similarity index 82% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateDataServiceImplTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateDataServiceImplTest.java index 273b2ce7..66401873 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/service/impl/certificate/batch/BatchCertificateDataServiceImplTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/service/impl/certificate/batch/BatchCertificateDataServiceImplTest.java @@ -1,33 +1,32 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.batch; +package org.cardanofoundation.ledgersync.service.impl.certificate.batch; import java.util.List; import java.util.Optional; -import org.cardanofoundation.explorer.consumercommon.entity.Delegation; -import org.cardanofoundation.explorer.consumercommon.entity.PoolHash; -import org.cardanofoundation.explorer.consumercommon.entity.PoolMetadataRef; -import org.cardanofoundation.explorer.consumercommon.entity.PoolOwner; -import org.cardanofoundation.explorer.consumercommon.entity.PoolRelay; -import org.cardanofoundation.explorer.consumercommon.entity.PoolRetire; -import org.cardanofoundation.explorer.consumercommon.entity.PoolUpdate; -import org.cardanofoundation.explorer.consumercommon.entity.PotTransfer; -import org.cardanofoundation.explorer.consumercommon.entity.Reserve; -import org.cardanofoundation.explorer.consumercommon.entity.StakeDeregistration; -import org.cardanofoundation.explorer.consumercommon.entity.StakeRegistration; -import org.cardanofoundation.explorer.consumercommon.entity.Treasury; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.DelegationRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolHashRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolMetadataRefRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolOwnerRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolRelayRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolRetireRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PoolUpdateRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.PotTransferRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.ReserveRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.StakeDeregistrationRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.StakeRegistrationRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.repository.TreasuryRepository; -import org.cardanofoundation.ledgersync.explorerconsumer.service.impl.certificate.batch.BatchCertificateDataServiceImpl; +import org.cardanofoundation.ledgersync.consumercommon.entity.Delegation; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolHash; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolMetadataRef; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolOwner; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolRelay; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolRetire; +import org.cardanofoundation.ledgersync.consumercommon.entity.PoolUpdate; +import org.cardanofoundation.ledgersync.consumercommon.entity.PotTransfer; +import org.cardanofoundation.ledgersync.consumercommon.entity.Reserve; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeDeregistration; +import org.cardanofoundation.ledgersync.consumercommon.entity.StakeRegistration; +import org.cardanofoundation.ledgersync.consumercommon.entity.Treasury; +import org.cardanofoundation.ledgersync.repository.DelegationRepository; +import org.cardanofoundation.ledgersync.repository.PoolHashRepository; +import org.cardanofoundation.ledgersync.repository.PoolMetadataRefRepository; +import org.cardanofoundation.ledgersync.repository.PoolOwnerRepository; +import org.cardanofoundation.ledgersync.repository.PoolRelayRepository; +import org.cardanofoundation.ledgersync.repository.PoolRetireRepository; +import org.cardanofoundation.ledgersync.repository.PoolUpdateRepository; +import org.cardanofoundation.ledgersync.repository.PotTransferRepository; +import org.cardanofoundation.ledgersync.repository.ReserveRepository; +import org.cardanofoundation.ledgersync.repository.StakeDeregistrationRepository; +import org.cardanofoundation.ledgersync.repository.StakeRegistrationRepository; +import org.cardanofoundation.ledgersync.repository.TreasuryRepository; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/CertificateUtil.java b/application/src/test/java/org/cardanofoundation/ledgersync/util/CertificateUtil.java similarity index 96% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/CertificateUtil.java rename to application/src/test/java/org/cardanofoundation/ledgersync/util/CertificateUtil.java index 539025bc..2454aa5e 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/CertificateUtil.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/util/CertificateUtil.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; import java.util.Set; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/DatumFormatUtilTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/util/DatumFormatUtilTest.java similarity index 90% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/DatumFormatUtilTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/util/DatumFormatUtilTest.java index c028225b..780f77a3 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/DatumFormatUtilTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/util/DatumFormatUtilTest.java @@ -1,5 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; +import org.cardanofoundation.ledgersync.util.DatumFormatUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/EpochParamUtilTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/util/EpochParamUtilTest.java similarity index 96% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/EpochParamUtilTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/util/EpochParamUtilTest.java index dc46879c..c6c19d7f 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/EpochParamUtilTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/util/EpochParamUtilTest.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; -import org.cardanofoundation.explorer.consumercommon.entity.ParamProposal; +import org.cardanofoundation.ledgersync.consumercommon.entity.ParamProposal; import org.junit.jupiter.api.Test; import java.math.BigInteger; diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/FileUtilTest.java b/application/src/test/java/org/cardanofoundation/ledgersync/util/FileUtilTest.java similarity index 90% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/FileUtilTest.java rename to application/src/test/java/org/cardanofoundation/ledgersync/util/FileUtilTest.java index 1c6d8525..ea065bc7 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/FileUtilTest.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/util/FileUtilTest.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Profile; -import org.cardanofoundation.ledgersync.explorerconsumer.util.FileUtil; +import org.cardanofoundation.ledgersync.util.FileUtil; public class FileUtilTest { diff --git a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/TestStringUtils.java b/application/src/test/java/org/cardanofoundation/ledgersync/util/TestStringUtils.java similarity index 84% rename from application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/TestStringUtils.java rename to application/src/test/java/org/cardanofoundation/ledgersync/util/TestStringUtils.java index 54e3d7b8..2aade7ec 100644 --- a/application/src/test/java/org/cardanofoundation/ledgersync/explorerconsumer/util/TestStringUtils.java +++ b/application/src/test/java/org/cardanofoundation/ledgersync/util/TestStringUtils.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.ledgersync.explorerconsumer.util; +package org.cardanofoundation.ledgersync.util; import java.util.Random; diff --git a/build.gradle b/build.gradle index 0e3ccac2..4c15f01e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { id 'maven-publish' id 'signing' - id 'org.flywaydb.flyway' version '9.7.0' - id 'nu.studer.jooq' version '8.2' + id 'org.flywaydb.flyway' version '9.22.3' + id 'nu.studer.jooq' version '8.2.3' - id 'io.spring.dependency-management' version '1.1.3' + id 'io.spring.dependency-management' version '1.1.4' id 'org.ajoberstar.grgit' version '5.2.0' } @@ -31,8 +31,8 @@ subprojects { dependencyManagement { imports { - mavenBom("org.springframework.boot:spring-boot-dependencies:3.1.4") - mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.4" + mavenBom("org.springframework.boot:spring-boot-dependencies:3.2.2") + mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.0" } } diff --git a/components/consumer-common/build.gradle b/components/consumer-common/build.gradle index 6b869f2c..9a76e05c 100644 --- a/components/consumer-common/build.gradle +++ b/components/consumer-common/build.gradle @@ -4,7 +4,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation(libs.hibernate.jpamodelgen) - implementation(libs.hibernate.types.'60') + implementation(libs.hypersistence.utils.hibernate) implementation(libs.cardano.client.lib) compileOnly(libs.lombok) diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AdaPots_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AdaPots_.java similarity index 96% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AdaPots_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AdaPots_.java index 81f1436b..748c0f2f 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AdaPots_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AdaPots_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressTokenBalance_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTokenBalance_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressTokenBalance_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTokenBalance_.java index 7b12d4f5..9ef264c1 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressTokenBalance_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTokenBalance_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressToken_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressToken_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressToken_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressToken_.java index 7e5f4fd1..f088067b 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressToken_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressToken_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressTxBalance_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTxBalance_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressTxBalance_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTxBalance_.java index d6283bb6..a2813dee 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/AddressTxBalance_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTxBalance_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Address_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Address_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Address_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Address_.java index bf17b87c..85468505 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Address_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Address_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/BaseEntity_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/BaseEntity_.java similarity index 86% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/BaseEntity_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/BaseEntity_.java index 3287983f..dafc4ba6 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/BaseEntity_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/BaseEntity_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Block_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Block_.java similarity index 97% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Block_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Block_.java index 6c5a9179..b5d52733 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Block_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Block_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.ListAttribute; import jakarta.persistence.metamodel.SingularAttribute; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/CostModel_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/CostModel_.java similarity index 90% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/CostModel_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/CostModel_.java index d74d4d29..f0a36ef2 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/CostModel_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/CostModel_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Datum_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Datum_.java similarity index 92% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Datum_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Datum_.java index f96558ea..6fd7d24e 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Datum_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Datum_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Delegation_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Delegation_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Delegation_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Delegation_.java index e52c0163..ec61fbe5 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Delegation_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Delegation_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/DelistedPool_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/DelistedPool_.java similarity index 88% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/DelistedPool_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/DelistedPool_.java index c470f80a..3a07ea2f 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/DelistedPool_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/DelistedPool_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochParam_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochParam_.java similarity index 98% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochParam_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochParam_.java index 7c3f832a..584941d3 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochParam_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochParam_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochStake_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochStake_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochStake_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochStake_.java index c7c7562e..ecbc6e75 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochStake_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochStake_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochSyncTime_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochSyncTime_.java similarity index 92% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochSyncTime_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochSyncTime_.java index 28f47639..93b9edb6 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/EpochSyncTime_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/EpochSyncTime_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Epoch_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Epoch_.java similarity index 96% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Epoch_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Epoch_.java index 06ce8f4c..9ac6c838 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Epoch_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Epoch_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ExtraKeyWitness_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ExtraKeyWitness_.java similarity index 90% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ExtraKeyWitness_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ExtraKeyWitness_.java index 6dc46af8..91ea8ac4 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ExtraKeyWitness_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ExtraKeyWitness_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/FailedTxOut_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/FailedTxOut_.java similarity index 96% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/FailedTxOut_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/FailedTxOut_.java index 1d51c744..6760c4fd 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/FailedTxOut_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/FailedTxOut_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MaTxMint_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxMint_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MaTxMint_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxMint_.java index d4ada699..76dc66c9 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MaTxMint_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxMint_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MaTxOut_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxOut_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MaTxOut_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxOut_.java index 70518b09..2f908bb2 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MaTxOut_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxOut_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Meta_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Meta_.java similarity index 92% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Meta_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Meta_.java index 96585c4c..c5fd51c4 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Meta_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Meta_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MultiAsset_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MultiAsset_.java similarity index 96% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MultiAsset_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MultiAsset_.java index 45b841c0..a87e01d5 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/MultiAsset_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/MultiAsset_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.ListAttribute; import jakarta.persistence.metamodel.SingularAttribute; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ParamProposal_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ParamProposal_.java similarity index 98% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ParamProposal_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ParamProposal_.java index 2aca1ffa..a015346d 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ParamProposal_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ParamProposal_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolHash_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolHash_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolHash_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolHash_.java index ae7f4e25..53223eac 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolHash_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolHash_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.ListAttribute; import jakarta.persistence.metamodel.SingularAttribute; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolMetadataRef_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolMetadataRef_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolMetadataRef_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolMetadataRef_.java index 3e6397d5..fe896bb0 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolMetadataRef_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolMetadataRef_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineData_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineData_.java similarity index 96% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineData_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineData_.java index 74b320b9..85cb9eba 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineData_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineData_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineFetchError_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineFetchError_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineFetchError_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineFetchError_.java index c81199b2..cbce557e 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineFetchError_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineFetchError_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOwner_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOwner_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOwner_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOwner_.java index 5c1665e9..21f79519 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolOwner_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOwner_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolRelay_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRelay_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolRelay_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRelay_.java index 77018fa0..98242c38 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolRelay_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRelay_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolRetire_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRetire_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolRetire_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRetire_.java index 71be0912..41301d98 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolRetire_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRetire_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolStake_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolStake_.java similarity index 90% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolStake_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolStake_.java index dd8967a5..5dac427c 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolStake_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolStake_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolUpdate_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolUpdate_.java similarity index 97% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolUpdate_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolUpdate_.java index c612badf..4fe7e9d7 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PoolUpdate_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PoolUpdate_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PotTransfer_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PotTransfer_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PotTransfer_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PotTransfer_.java index f30e4ea5..3fe89784 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/PotTransfer_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/PotTransfer_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/RedeemerData_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/RedeemerData_.java similarity index 92% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/RedeemerData_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/RedeemerData_.java index a97e127f..9e0855d6 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/RedeemerData_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/RedeemerData_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Redeemer_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Redeemer_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Redeemer_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Redeemer_.java index 59b4e36e..75aef2d0 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Redeemer_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Redeemer_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ReferenceTxIn_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ReferenceTxIn_.java similarity index 92% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ReferenceTxIn_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ReferenceTxIn_.java index 67ced067..12f3cad3 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ReferenceTxIn_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ReferenceTxIn_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Reserve_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Reserve_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Reserve_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Reserve_.java index df575dc4..0c1f918b 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Reserve_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Reserve_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ReservedPoolTicker_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ReservedPoolTicker_.java similarity index 91% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ReservedPoolTicker_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ReservedPoolTicker_.java index 5a296508..2801560c 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/ReservedPoolTicker_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/ReservedPoolTicker_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Reward_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Reward_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Reward_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Reward_.java index ecb40196..cf72fe43 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Reward_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Reward_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/RollbackHistory_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/RollbackHistory_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/RollbackHistory_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/RollbackHistory_.java index 832e1e5b..806dd045 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/RollbackHistory_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/RollbackHistory_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/SchemaVersion_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/SchemaVersion_.java similarity index 92% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/SchemaVersion_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/SchemaVersion_.java index ed31a241..7ea2ed8e 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/SchemaVersion_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/SchemaVersion_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Script_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Script_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Script_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Script_.java index 8ea04895..50f0b5ac 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Script_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Script_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/SlotLeader_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/SlotLeader_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/SlotLeader_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/SlotLeader_.java index dbf9d9df..1b0aaa09 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/SlotLeader_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/SlotLeader_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.ListAttribute; import jakarta.persistence.metamodel.SingularAttribute; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeAddress_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeAddress_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeAddress_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeAddress_.java index 4ffea55c..43fecc9b 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeAddress_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeAddress_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.ListAttribute; import jakarta.persistence.metamodel.SingularAttribute; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeDeregistration_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeDeregistration_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeDeregistration_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeDeregistration_.java index 0f5c4d67..08386baa 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeDeregistration_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeDeregistration_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeRegistration_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeRegistration_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeRegistration_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeRegistration_.java index 7558b092..6f936e2c 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/StakeRegistration_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/StakeRegistration_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Treasury_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Treasury_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Treasury_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Treasury_.java index 835f2f45..e99174bb 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Treasury_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Treasury_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxChart_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxChart_.java similarity index 95% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxChart_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxChart_.java index 4f6e8396..c58fff14 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxChart_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxChart_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxIn_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxIn_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxIn_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxIn_.java index 4968d9bd..d621e2a1 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxIn_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxIn_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxMetadataHash_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadataHash_.java similarity index 88% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxMetadataHash_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadataHash_.java index 1ef17fb0..8e31a088 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxMetadataHash_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadataHash_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxMetadata_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadata_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxMetadata_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadata_.java index 436bc081..81bfdebf 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxMetadata_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadata_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxOut_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxOut_.java similarity index 97% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxOut_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxOut_.java index c5cb7905..b61a61b2 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/TxOut_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/TxOut_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.ListAttribute; import jakarta.persistence.metamodel.SingularAttribute; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Tx_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Tx_.java similarity index 97% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Tx_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Tx_.java index 280614b4..fe31a05a 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Tx_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Tx_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.ListAttribute; import jakarta.persistence.metamodel.SingularAttribute; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/UnconsumeTxIn_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/UnconsumeTxIn_.java similarity index 92% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/UnconsumeTxIn_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/UnconsumeTxIn_.java index 4261fc79..629787f8 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/UnconsumeTxIn_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/UnconsumeTxIn_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Withdrawal_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Withdrawal_.java similarity index 94% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Withdrawal_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Withdrawal_.java index 9f3843ce..0dcb0166 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/Withdrawal_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/Withdrawal_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressToken_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressToken_.java similarity index 91% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressToken_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressToken_.java index a220cdeb..329e5681 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressToken_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressToken_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity.aggregation; +package org.cardanofoundation.ledgersync.consumercommon.entity.aggregation; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressTxBalance_.java b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressTxBalance_.java similarity index 93% rename from components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressTxBalance_.java rename to components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressTxBalance_.java index 5ed89b94..9361e772 100644 --- a/components/consumer-common/generated/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressTxBalance_.java +++ b/components/consumer-common/generated/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressTxBalance_.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity.aggregation; +package org.cardanofoundation.ledgersync.consumercommon.entity.aggregation; import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.StaticMetamodel; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ReportType.java b/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ReportType.java deleted file mode 100644 index 999a1e00..00000000 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ReportType.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration; - -public enum ReportType { - STAKE_KEY, - POOL_ID; -} diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/constants/ValidationConstant.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/constants/ValidationConstant.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/constants/ValidationConstant.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/constants/ValidationConstant.java index 30957ac6..71de340b 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/constants/ValidationConstant.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/constants/ValidationConstant.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.constants; +package org.cardanofoundation.ledgersync.consumercommon.constants; import java.math.BigInteger; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AdaPots.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AdaPots.java similarity index 90% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AdaPots.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AdaPots.java index 299c88fc..d99ee011 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AdaPots.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AdaPots.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; -import org.cardanofoundation.explorer.consumercommon.validation.Word63Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word63Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Address.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Address.java similarity index 89% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Address.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Address.java index 27b50d84..eea9c4fa 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Address.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Address.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; -import org.cardanofoundation.explorer.consumercommon.validation.Word128Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word128Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressToken.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressToken.java similarity index 94% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressToken.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressToken.java index a88cb312..22b322c9 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressToken.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressToken.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Word128Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word128Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressTokenBalance.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTokenBalance.java similarity index 90% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressTokenBalance.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTokenBalance.java index 20892e68..cc05b05c 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressTokenBalance.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTokenBalance.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.math.BigInteger; import java.util.Objects; @@ -20,7 +20,7 @@ import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.cardanofoundation.explorer.consumercommon.validation.Word128Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word128Type; import org.hibernate.Hibernate; @Entity @@ -55,9 +55,6 @@ public class AddressTokenBalance extends BaseEntity { foreignKey = @ForeignKey(value = ConstraintMode.NO_CONSTRAINT, name = "none")) private StakeAddress stakeAddress; - @Column(name = "stake_address_id", updatable = false, insertable = false) - private Long stakeAddressId; - @Column(name = "balance", nullable = false, precision = 39) @Word128Type @Digits(integer = 39, fraction = 0) diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressTxBalance.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTxBalance.java similarity index 94% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressTxBalance.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTxBalance.java index a4921e59..c788038a 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/AddressTxBalance.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/AddressTxBalance.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.math.BigInteger; import java.sql.Timestamp; @@ -21,7 +21,7 @@ import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.cardanofoundation.explorer.consumercommon.validation.Word128Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word128Type; import org.hibernate.Hibernate; @Entity diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/BaseEntity.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/BaseEntity.java similarity index 96% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/BaseEntity.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/BaseEntity.java index 09583281..b9e57d84 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/BaseEntity.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.io.Serializable; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Block.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Block.java similarity index 97% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Block.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Block.java index db21e6e1..f4e830ea 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Block.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Block.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.sql.Timestamp; import java.util.List; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/CostModel.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/CostModel.java similarity index 90% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/CostModel.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/CostModel.java index bcbfb5e3..389dfade 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/CostModel.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/CostModel.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Datum.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Datum.java similarity index 92% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Datum.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Datum.java index c0243da3..35237f87 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Datum.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Datum.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Delegation.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Delegation.java similarity index 94% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Delegation.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Delegation.java index 8a86fdf8..a8594b97 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Delegation.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Delegation.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Word63Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word63Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/DelistedPool.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/DelistedPool.java similarity index 88% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/DelistedPool.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/DelistedPool.java index b41d7e3a..b92134fd 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/DelistedPool.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/DelistedPool.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Epoch.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Epoch.java similarity index 88% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Epoch.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Epoch.java index 5c170c44..1fcd9417 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Epoch.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Epoch.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.enumeration.EraType; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.Word128Type; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.EraType; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word128Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; import java.math.BigInteger; import java.sql.Timestamp; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochParam.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochParam.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochParam.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochParam.java index 84e7ad33..839df6ca 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochParam.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochParam.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; -import org.cardanofoundation.explorer.consumercommon.validation.Word64Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word64Type; import java.math.BigInteger; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochStake.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochStake.java similarity index 91% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochStake.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochStake.java index 3e8f8a0c..efd0ca55 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochStake.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochStake.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochSyncTime.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochSyncTime.java similarity index 85% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochSyncTime.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochSyncTime.java index 8e36162e..3af848b4 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/EpochSyncTime.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/EpochSyncTime.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.enumeration.SyncStateType; -import org.cardanofoundation.explorer.consumercommon.validation.Word63Type; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.SyncStateType; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word63Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ExtraKeyWitness.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ExtraKeyWitness.java similarity index 91% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ExtraKeyWitness.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ExtraKeyWitness.java index 0d88f5ce..0f755fdb 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ExtraKeyWitness.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ExtraKeyWitness.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/FailedTxOut.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/FailedTxOut.java similarity index 88% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/FailedTxOut.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/FailedTxOut.java index 8761521e..ff0db3c9 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/FailedTxOut.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/FailedTxOut.java @@ -1,9 +1,9 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.TxIndex; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.TxIndex; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MaTxMint.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxMint.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MaTxMint.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxMint.java index 98293c52..6253b62b 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MaTxMint.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxMint.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Int65Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Int65Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MaTxOut.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxOut.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MaTxOut.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxOut.java index 1d48c31e..ceee8dbc 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MaTxOut.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MaTxOut.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Word64Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word64Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Meta.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Meta.java similarity index 95% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Meta.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Meta.java index 89cc2b64..3efc2269 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Meta.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Meta.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.sql.Timestamp; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MultiAsset.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MultiAsset.java similarity index 86% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MultiAsset.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MultiAsset.java index 4d558d6a..93ca8271 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/MultiAsset.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/MultiAsset.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.enumeration.converter.ByteConverter; -import org.cardanofoundation.explorer.consumercommon.validation.Asset32Type; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.converter.ByteConverter; +import org.cardanofoundation.ledgersync.consumercommon.validation.Asset32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; import java.math.BigInteger; import java.sql.Timestamp; import java.util.List; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ParamProposal.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ParamProposal.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ParamProposal.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ParamProposal.java index 07903505..1398a02a 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ParamProposal.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ParamProposal.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.math.BigInteger; import java.util.Objects; @@ -21,11 +21,11 @@ import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; -import org.cardanofoundation.explorer.consumercommon.validation.Word64Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word64Type; import org.hibernate.Hibernate; @Entity diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolHash.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolHash.java similarity index 91% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolHash.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolHash.java index 192dee2e..875db747 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolHash.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolHash.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; import java.math.BigInteger; import java.util.List; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolMetadataRef.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolMetadataRef.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolMetadataRef.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolMetadataRef.java index b4b28d4d..c9b89803 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolMetadataRef.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolMetadataRef.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineData.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineData.java similarity index 97% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineData.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineData.java index a68bea9f..4c2d82d5 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineData.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineData.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineFetchError.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineFetchError.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineFetchError.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineFetchError.java index 5fe1e8e1..c54bd68a 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOfflineFetchError.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOfflineFetchError.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.sql.Timestamp; import java.util.Objects; @@ -20,7 +20,7 @@ import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; import org.hibernate.Hibernate; @Entity diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOwner.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOwner.java similarity index 96% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOwner.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOwner.java index 0059fbda..df12dc30 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolOwner.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolOwner.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.util.Objects; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolRelay.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRelay.java similarity index 96% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolRelay.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRelay.java index 5b8fd34c..4cef1793 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolRelay.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRelay.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolRetire.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRetire.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolRetire.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRetire.java index 227a217f..610bc012 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolRetire.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolRetire.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolStake.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolStake.java similarity index 95% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolStake.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolStake.java index be1101fc..ad3382f1 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolStake.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolStake.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.math.BigInteger; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolUpdate.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolUpdate.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolUpdate.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolUpdate.java index b4e22d45..2516359b 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PoolUpdate.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PoolUpdate.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PotTransfer.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PotTransfer.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PotTransfer.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PotTransfer.java index af5dfc93..33002701 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/PotTransfer.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/PotTransfer.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Int65Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Int65Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Redeemer.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Redeemer.java similarity index 83% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Redeemer.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Redeemer.java index a4244e6f..d0a7b4f8 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Redeemer.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Redeemer.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptPurposeType; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; -import org.cardanofoundation.explorer.consumercommon.validation.Word63Type; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptPurposeType; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word63Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/RedeemerData.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/RedeemerData.java similarity index 92% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/RedeemerData.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/RedeemerData.java index a809aa2a..30e925d4 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/RedeemerData.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/RedeemerData.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ReferenceTxIn.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ReferenceTxIn.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ReferenceTxIn.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ReferenceTxIn.java index cdf7b542..3d5ad75e 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ReferenceTxIn.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ReferenceTxIn.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.TxIndex; +import org.cardanofoundation.ledgersync.consumercommon.validation.TxIndex; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Reserve.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Reserve.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Reserve.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Reserve.java index ade19a3d..1a96dab2 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Reserve.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Reserve.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Int65Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Int65Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ReservedPoolTicker.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ReservedPoolTicker.java similarity index 89% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ReservedPoolTicker.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ReservedPoolTicker.java index 3db46fc0..8e257a5e 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/ReservedPoolTicker.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/ReservedPoolTicker.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; import org.hibernate.Hibernate; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Reward.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Reward.java similarity index 91% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Reward.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Reward.java index d667f740..997883cb 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Reward.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Reward.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.enumeration.RewardType; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.RewardType; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/RollbackHistory.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/RollbackHistory.java similarity index 94% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/RollbackHistory.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/RollbackHistory.java index 72749598..9c055ec6 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/RollbackHistory.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/RollbackHistory.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.sql.Timestamp; import java.time.LocalDateTime; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/SchemaVersion.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/SchemaVersion.java similarity index 94% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/SchemaVersion.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/SchemaVersion.java index 8e03561b..9ca975f2 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/SchemaVersion.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/SchemaVersion.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Script.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Script.java similarity index 86% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Script.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Script.java index 0b05a365..28bed236 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Script.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Script.java @@ -1,8 +1,8 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/SlotLeader.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/SlotLeader.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/SlotLeader.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/SlotLeader.java index b8886ddb..47e723d3 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/SlotLeader.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/SlotLeader.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; import java.util.List; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeAddress.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeAddress.java similarity index 86% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeAddress.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeAddress.java index d2cacdb4..0a020222 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeAddress.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeAddress.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Addr29Type; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Addr29Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; import java.math.BigInteger; import java.util.List; @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.cardanofoundation.explorer.consumercommon.validation.Word128Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word128Type; import org.hibernate.Hibernate; @Entity diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeDeregistration.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeDeregistration.java similarity index 94% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeDeregistration.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeDeregistration.java index a88e14bf..b2f96577 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeDeregistration.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeDeregistration.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeRegistration.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeRegistration.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeRegistration.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeRegistration.java index 377422fd..e0fbf401 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/StakeRegistration.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/StakeRegistration.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Treasury.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Treasury.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Treasury.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Treasury.java index 8ebc144c..a39b27dd 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Treasury.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Treasury.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Int65Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Int65Type; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Tx.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Tx.java similarity index 89% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Tx.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Tx.java index 1adc5763..ac2c290d 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Tx.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Tx.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.math.BigInteger; import java.util.List; @@ -24,10 +24,10 @@ import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.Word31Type; -import org.cardanofoundation.explorer.consumercommon.validation.Word64Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word31Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word64Type; import org.hibernate.Hibernate; @Entity diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxBootstrapWitnesses.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxBootstrapWitnesses.java similarity index 95% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxBootstrapWitnesses.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxBootstrapWitnesses.java index ae128149..97324640 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxBootstrapWitnesses.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxBootstrapWitnesses.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import jakarta.persistence.*; import lombok.*; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxChart.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxChart.java similarity index 96% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxChart.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxChart.java index 65dd1138..62e7af11 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxChart.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxChart.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.math.BigInteger; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxIn.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxIn.java similarity index 94% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxIn.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxIn.java index 119c843c..f8133a9e 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxIn.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxIn.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.TxIndex; +import org.cardanofoundation.ledgersync.consumercommon.validation.TxIndex; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxMetadata.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadata.java similarity index 92% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxMetadata.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadata.java index 66d2106b..b4529c4b 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxMetadata.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadata.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.math.BigInteger; import java.util.Objects; @@ -21,7 +21,7 @@ import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.cardanofoundation.explorer.consumercommon.validation.Word64Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word64Type; import org.hibernate.Hibernate; @Entity diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxMetadataHash.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadataHash.java similarity index 76% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxMetadataHash.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadataHash.java index ce249a0b..3498bf55 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxMetadataHash.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxMetadataHash.java @@ -1,18 +1,12 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; import java.util.Objects; import jakarta.persistence.Column; -import jakarta.persistence.ConstraintMode; import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.ForeignKey; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxOut.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxOut.java similarity index 87% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxOut.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxOut.java index 022bdc35..f0c67aee 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxOut.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxOut.java @@ -1,10 +1,10 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.enumeration.TokenType; -import org.cardanofoundation.explorer.consumercommon.validation.Hash28Type; -import org.cardanofoundation.explorer.consumercommon.validation.Hash32Type; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; -import org.cardanofoundation.explorer.consumercommon.validation.TxIndex; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.TokenType; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash28Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Hash32Type; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.TxIndex; import java.math.BigInteger; import java.util.List; import java.util.Objects; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxWitness.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxWitness.java similarity index 91% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxWitness.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxWitness.java index d706f219..a8455417 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/TxWitness.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/TxWitness.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import com.vladmihalcea.hibernate.type.array.IntArrayType; +import io.hypersistence.utils.hibernate.type.array.IntArrayType; import jakarta.persistence.*; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/UnconsumeTxIn.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/UnconsumeTxIn.java similarity index 93% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/UnconsumeTxIn.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/UnconsumeTxIn.java index 9badc767..1772a6df 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/UnconsumeTxIn.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/UnconsumeTxIn.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.TxIndex; +import org.cardanofoundation.ledgersync.consumercommon.validation.TxIndex; import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Withdrawal.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Withdrawal.java similarity index 90% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Withdrawal.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Withdrawal.java index 0db2c8dd..f52550c7 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/Withdrawal.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/Withdrawal.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.entity; +package org.cardanofoundation.ledgersync.consumercommon.entity; -import org.cardanofoundation.explorer.consumercommon.validation.Lovelace; +import org.cardanofoundation.ledgersync.consumercommon.validation.Lovelace; import java.math.BigInteger; import java.util.Objects; import jakarta.persistence.Column; @@ -10,8 +10,6 @@ import jakarta.persistence.ForeignKey; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import jakarta.persistence.UniqueConstraint; import jakarta.validation.constraints.Digits; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressToken.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressToken.java similarity index 70% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressToken.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressToken.java index 4a6185a8..f6e59a45 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressToken.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressToken.java @@ -1,11 +1,11 @@ -package org.cardanofoundation.explorer.consumercommon.entity.aggregation; +package org.cardanofoundation.ledgersync.consumercommon.entity.aggregation; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.validation.constraints.Digits; -import org.cardanofoundation.explorer.consumercommon.entity.BaseEntity; -import org.cardanofoundation.explorer.consumercommon.validation.Word128Type; +import org.cardanofoundation.ledgersync.consumercommon.entity.BaseEntity; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word128Type; import java.math.BigInteger; import java.time.LocalDate; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressTxBalance.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressTxBalance.java similarity index 73% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressTxBalance.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressTxBalance.java index ccfd305e..3ae0b07d 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/entity/aggregation/AggregateAddressTxBalance.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/entity/aggregation/AggregateAddressTxBalance.java @@ -1,11 +1,11 @@ -package org.cardanofoundation.explorer.consumercommon.entity.aggregation; +package org.cardanofoundation.ledgersync.consumercommon.entity.aggregation; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.validation.constraints.Digits; -import org.cardanofoundation.explorer.consumercommon.entity.BaseEntity; -import org.cardanofoundation.explorer.consumercommon.validation.Word128Type; +import org.cardanofoundation.ledgersync.consumercommon.entity.BaseEntity; +import org.cardanofoundation.ledgersync.consumercommon.validation.Word128Type; import java.math.BigInteger; import java.time.LocalDate; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/EraType.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/EraType.java similarity index 92% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/EraType.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/EraType.java index e10d60d7..3717dafc 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/EraType.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/EraType.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration; +package org.cardanofoundation.ledgersync.consumercommon.enumeration; import lombok.AccessLevel; import lombok.Getter; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ReportStatus.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ReportStatus.java similarity index 53% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ReportStatus.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ReportStatus.java index e38d44e8..6a1fec45 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ReportStatus.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ReportStatus.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration; +package org.cardanofoundation.ledgersync.consumercommon.enumeration; public enum ReportStatus { IN_PROGRESS, diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ReportType.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ReportType.java new file mode 100644 index 00000000..352dec94 --- /dev/null +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ReportType.java @@ -0,0 +1,6 @@ +package org.cardanofoundation.ledgersync.consumercommon.enumeration; + +public enum ReportType { + STAKE_KEY, + POOL_ID; +} diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/RewardType.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/RewardType.java similarity index 91% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/RewardType.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/RewardType.java index 8ae35efd..a2899fa0 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/RewardType.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/RewardType.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration; +package org.cardanofoundation.ledgersync.consumercommon.enumeration; import java.util.HashMap; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ScriptPurposeType.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ScriptPurposeType.java similarity index 91% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ScriptPurposeType.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ScriptPurposeType.java index 4f07ac67..69de31b5 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ScriptPurposeType.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ScriptPurposeType.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration; +package org.cardanofoundation.ledgersync.consumercommon.enumeration; import java.util.HashMap; import java.util.Map; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ScriptType.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ScriptType.java similarity index 85% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ScriptType.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ScriptType.java index 759ae8da..92d3e07c 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/ScriptType.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/ScriptType.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration; +package org.cardanofoundation.ledgersync.consumercommon.enumeration; import java.util.HashMap; import java.util.Map; @@ -14,7 +14,8 @@ public enum ScriptType { MULTISIG("multisig"), TIMELOCK("timelock"), PLUTUSV1("plutusv1"), - PLUTUSV2("plutusv2"); + PLUTUSV2("plutusv2"), + PLUTUSV3("plutusv3"); String value; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/SyncStateType.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/SyncStateType.java similarity index 90% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/SyncStateType.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/SyncStateType.java index 90cbfe39..3d756750 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/SyncStateType.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/SyncStateType.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration; +package org.cardanofoundation.ledgersync.consumercommon.enumeration; import java.util.HashMap; import java.util.Map; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/TokenType.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/TokenType.java similarity index 90% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/TokenType.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/TokenType.java index 44f4ff49..d37b098d 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/TokenType.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/TokenType.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration; +package org.cardanofoundation.ledgersync.consumercommon.enumeration; import java.util.HashMap; import java.util.Map; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ByteConverter.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ByteConverter.java similarity index 85% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ByteConverter.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ByteConverter.java index b711eb84..d0780b06 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ByteConverter.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ByteConverter.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration.converter; +package org.cardanofoundation.ledgersync.consumercommon.enumeration.converter; import com.bloxbean.cardano.client.util.HexUtil; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/RewardTypeConverter.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/RewardTypeConverter.java similarity index 73% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/RewardTypeConverter.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/RewardTypeConverter.java index 81a2f031..9491d75f 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/RewardTypeConverter.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/RewardTypeConverter.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration.converter; +package org.cardanofoundation.ledgersync.consumercommon.enumeration.converter; -import org.cardanofoundation.explorer.consumercommon.enumeration.RewardType; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.RewardType; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ScriptPurposeTypeConverter.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ScriptPurposeTypeConverter.java similarity index 74% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ScriptPurposeTypeConverter.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ScriptPurposeTypeConverter.java index d068a7ac..6725df67 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ScriptPurposeTypeConverter.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ScriptPurposeTypeConverter.java @@ -1,7 +1,7 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration.converter; +package org.cardanofoundation.ledgersync.consumercommon.enumeration.converter; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptPurposeType; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptPurposeType; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ScriptTypeConverter.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ScriptTypeConverter.java similarity index 73% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ScriptTypeConverter.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ScriptTypeConverter.java index 2a7ee9f4..17802012 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/ScriptTypeConverter.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/ScriptTypeConverter.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration.converter; +package org.cardanofoundation.ledgersync.consumercommon.enumeration.converter; -import org.cardanofoundation.explorer.consumercommon.enumeration.ScriptType; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.ScriptType; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/SyncStateTypeConverter.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/SyncStateTypeConverter.java similarity index 73% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/SyncStateTypeConverter.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/SyncStateTypeConverter.java index 1ba1f62e..72960473 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/SyncStateTypeConverter.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/SyncStateTypeConverter.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration.converter; +package org.cardanofoundation.ledgersync.consumercommon.enumeration.converter; -import org.cardanofoundation.explorer.consumercommon.enumeration.SyncStateType; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.SyncStateType; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/TokenTypeConverter.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/TokenTypeConverter.java similarity index 73% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/TokenTypeConverter.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/TokenTypeConverter.java index 0be0a8b6..fed46e93 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/enumeration/converter/TokenTypeConverter.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/enumeration/converter/TokenTypeConverter.java @@ -1,6 +1,6 @@ -package org.cardanofoundation.explorer.consumercommon.enumeration.converter; +package org.cardanofoundation.ledgersync.consumercommon.enumeration.converter; -import org.cardanofoundation.explorer.consumercommon.enumeration.TokenType; +import org.cardanofoundation.ledgersync.consumercommon.enumeration.TokenType; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Addr29Type.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Addr29Type.java similarity index 89% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Addr29Type.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Addr29Type.java index ec81bc8a..cc0df5db 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Addr29Type.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Addr29Type.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.validation; +package org.cardanofoundation.ledgersync.consumercommon.validation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Addr29TypeValidator.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Addr29TypeValidator.java similarity index 57% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Addr29TypeValidator.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Addr29TypeValidator.java index 311591d7..7e350924 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Addr29TypeValidator.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Addr29TypeValidator.java @@ -1,14 +1,13 @@ -package org.cardanofoundation.explorer.consumercommon.validation; - -import static org.cardanofoundation.explorer.consumercommon.constants.ValidationConstant.ADDRESS_MAX_BYTES; +package org.cardanofoundation.ledgersync.consumercommon.validation; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import org.cardanofoundation.ledgersync.consumercommon.constants.ValidationConstant; public class Addr29TypeValidator implements ConstraintValidator { @Override public boolean isValid(String bytes, ConstraintValidatorContext constraintValidatorContext) { - return bytes.length() == ADDRESS_MAX_BYTES; + return bytes.length() == ValidationConstant.ADDRESS_MAX_BYTES; } } diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Asset32Type.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Asset32Type.java similarity index 89% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Asset32Type.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Asset32Type.java index f8bd500c..38bf5199 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Asset32Type.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Asset32Type.java @@ -1,4 +1,4 @@ -package org.cardanofoundation.explorer.consumercommon.validation; +package org.cardanofoundation.ledgersync.consumercommon.validation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Asset32TypeValidator.java b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Asset32TypeValidator.java similarity index 70% rename from components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Asset32TypeValidator.java rename to components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Asset32TypeValidator.java index fb389f76..d7dd5088 100644 --- a/components/consumer-common/src/main/java/org/cardanofoundation/explorer/consumercommon/validation/Asset32TypeValidator.java +++ b/components/consumer-common/src/main/java/org/cardanofoundation/ledgersync/consumercommon/validation/Asset32TypeValidator.java @@ -1,9 +1,8 @@ -package org.cardanofoundation.explorer.consumercommon.validation; - -import static org.cardanofoundation.explorer.consumercommon.constants.ValidationConstant.ASSET_MAX_BYTES; +package org.cardanofoundation.ledgersync.consumercommon.validation; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import org.cardanofoundation.ledgersync.consumercommon.constants.ValidationConstant; public class Asset32TypeValidator implements ConstraintValidator { @@ -16,6 +15,6 @@ public class Asset32TypeValidator implements ConstraintValidator { @@ -17,6 +16,6 @@ public class Hash28TypeValidator implements ConstraintValidator { @@ -16,6 +15,6 @@ public class Hash32TypeValidator implements ConstraintValidator checkHealthStatus() { + var healthStatus = healthStatusService.getHealthStatus(); + + if (Boolean.TRUE.equals(healthStatus.isHealthy)) { + return ResponseEntity.ok().body(healthStatus); + } + + return ResponseEntity.internalServerError().body(healthStatus); + } +} diff --git a/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/listener/BlockEventListener.java b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/listener/BlockEventListener.java new file mode 100644 index 00000000..cb681c8e --- /dev/null +++ b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/listener/BlockEventListener.java @@ -0,0 +1,54 @@ +package org.cardanofoundation.ledgersync.streamer.listener; + +import com.bloxbean.cardano.yaci.store.events.*; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.cardanofoundation.ledgersync.streamer.service.HealthCheckCachingService; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.time.ZoneOffset; + +@Component +@RequiredArgsConstructor +@Slf4j +public class BlockEventListener { + private final HealthCheckCachingService healthCheckCachingService; + + @EventListener + @Transactional + public void handleRollback(RollbackEvent rollbackEvent) { + healthCheckCachingService.saveLatestEventTime(LocalDateTime.now(ZoneOffset.UTC)); + healthCheckCachingService.saveLatestSlotNo(rollbackEvent.getRollbackTo().getSlot()); + } + + @EventListener + @Transactional + public void handleBlockHeader(BlockHeaderEvent blockHeaderEvent) { + healthCheckCachingService.saveLatestEventTime(LocalDateTime.now(ZoneOffset.UTC)); + healthCheckCachingService.saveLatestSlotNo(blockHeaderEvent.getBlockHeader().getHeaderBody().getSlot()); + } + + @EventListener + @Transactional + public void handleGenesisBlock(GenesisBlockEvent genesisBlockEvent) { + healthCheckCachingService.saveLatestEventTime(LocalDateTime.now(ZoneOffset.UTC)); + healthCheckCachingService.saveLatestSlotNo(genesisBlockEvent.getSlot()); + } + + @EventListener + @Transactional + public void handleByronBlockEvent(ByronMainBlockEvent byronMainBlockEvent) { + healthCheckCachingService.saveLatestEventTime(LocalDateTime.now(ZoneOffset.UTC)); + healthCheckCachingService.saveLatestSlotNo(byronMainBlockEvent.getMetadata().getSlot()); + } + + @EventListener + @Transactional + public void handleByronEbBlock(ByronEbBlockEvent byronEbBlockEvent) { + healthCheckCachingService.saveLatestEventTime(LocalDateTime.now(ZoneOffset.UTC)); + healthCheckCachingService.saveLatestSlotNo(byronEbBlockEvent.getMetadata().getSlot()); + } +} diff --git a/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/HealthCheckCachingService.java b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/HealthCheckCachingService.java new file mode 100644 index 00000000..146c7611 --- /dev/null +++ b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/HealthCheckCachingService.java @@ -0,0 +1,20 @@ +package org.cardanofoundation.ledgersync.streamer.service; + +import java.time.LocalDateTime; + +public interface HealthCheckCachingService { + + /** + * Cache most recent slot no + */ + void saveLatestSlotNo(Long slotNo); + + Long getLatestSlotNo(); + + /** + * Cache the time when the most recent data was published + */ + void saveLatestEventTime(LocalDateTime insertTime); + + LocalDateTime getLatestEventTime(); +} diff --git a/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/HealthStatusService.java b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/HealthStatusService.java new file mode 100644 index 00000000..f4d762c5 --- /dev/null +++ b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/HealthStatusService.java @@ -0,0 +1,7 @@ +package org.cardanofoundation.ledgersync.streamer.service; + +import org.cardanofoundation.ledgersync.streamer.healthcheck.HealthStatus; + +public interface HealthStatusService { + HealthStatus getHealthStatus(); +} diff --git a/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/impl/HealthCheckCachingServiceImpl.java b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/impl/HealthCheckCachingServiceImpl.java new file mode 100644 index 00000000..bf76e23d --- /dev/null +++ b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/impl/HealthCheckCachingServiceImpl.java @@ -0,0 +1,43 @@ +package org.cardanofoundation.ledgersync.streamer.service.impl; + +import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; +import org.cardanofoundation.ledgersync.streamer.service.HealthCheckCachingService; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.concurrent.atomic.AtomicLong; + +@Service +@RequiredArgsConstructor +public class HealthCheckCachingServiceImpl implements HealthCheckCachingService { + private final AtomicLong latestSlotNo = new AtomicLong(); + private LocalDateTime latestEventTime; + + @PostConstruct + void init() { + latestSlotNo.set(-10); // dummy value + latestEventTime = LocalDateTime.now(ZoneOffset.UTC); + } + + @Override + public void saveLatestSlotNo(Long slotNo) { + latestSlotNo.set(slotNo); + } + + @Override + public Long getLatestSlotNo() { + return latestSlotNo.get(); + } + + @Override + public void saveLatestEventTime(LocalDateTime eventTime) { + latestEventTime = eventTime; + } + + @Override + public LocalDateTime getLatestEventTime() { + return latestEventTime; + } +} diff --git a/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/impl/HealthStatusServiceImpl.java b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/impl/HealthStatusServiceImpl.java new file mode 100644 index 00000000..9272b246 --- /dev/null +++ b/streamer-app/src/main/java/org/cardanofoundation/ledgersync/streamer/service/impl/HealthStatusServiceImpl.java @@ -0,0 +1,74 @@ +package org.cardanofoundation.ledgersync.streamer.service.impl; + +import com.bloxbean.cardano.yaci.store.common.config.StoreProperties; +import com.bloxbean.cardano.yaci.store.core.service.HealthService; +import lombok.RequiredArgsConstructor; +import org.cardanofoundation.ledgersync.streamer.healthcheck.HealthStatus; +import org.cardanofoundation.ledgersync.streamer.healthcheck.Message; +import org.cardanofoundation.ledgersync.streamer.service.HealthCheckCachingService; +import org.cardanofoundation.ledgersync.streamer.service.HealthStatusService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.temporal.ChronoUnit; + +@Service +@RequiredArgsConstructor +public class HealthStatusServiceImpl implements HealthStatusService { + private final HealthCheckCachingService healthCheckCachingService; + private final StoreProperties storeProperties; + private final HealthService healthService; + + @Value("${streamer.healthcheck.event-time-threshold}") + private long publishedTimeThreshold; + + @Value("${streamer.healthcheck.keepalive-time-threshold}") + private Long keepAliveResponseTimeThresholdInSecond; + + @Override + public HealthStatus getHealthStatus() { + final LocalDateTime latestEventTime = healthCheckCachingService.getLatestEventTime(); + final Long latestSlotNo = healthCheckCachingService.getLatestSlotNo(); + boolean hasStopSlot = storeProperties.getSyncStopSlot() != 0; + boolean isHealthy = true; + Message message = Message.IS_CRAWLING; + + if (isOutOfThreshold(publishedTimeThreshold, latestEventTime)) { + isHealthy = false; + if (isConnectionToNodeHealthy()) { + message = Message.CONNECTION_HEALTHY_BUT_DATA_CRAWLING_NOT_HEALTHY; + } else { + message = Message.IS_NOT_CRAWLING; + } + } + + if (isHealthy && latestSlotNo != null && hasStopSlot && latestSlotNo >= storeProperties.getSyncStopSlot()){ + message = Message.STOP_SLOT_HAS_REACHED; + } + + return HealthStatus.builder() + .isHealthy(isHealthy) + .hasStopSlot(hasStopSlot) + .messageCode(message.getCode()) + .messageDesc(message.getDesc()) + .build(); + } + + private boolean isOutOfThreshold(Long threshold, LocalDateTime time) { + long value = ChronoUnit.SECONDS.between(time, LocalDateTime.now(ZoneOffset.UTC)); + return threshold <= value; + } + + private LocalDateTime getLastKeepAliveResponseTime() { + return Instant.ofEpochMilli(healthService.getHealthStatus().getLastKeepAliveResponseTime()).atZone(ZoneId.of("UTC")).toLocalDateTime(); + } + + private boolean isConnectionToNodeHealthy() { + return healthService.getHealthStatus().isConnectionAlive() && + !isOutOfThreshold(keepAliveResponseTimeThresholdInSecond, getLastKeepAliveResponseTime()); + } +} diff --git a/streamer-app/src/main/resources/application.yml b/streamer-app/src/main/resources/application.yml index 27ac9f4a..9683ada6 100644 --- a/streamer-app/src/main/resources/application.yml +++ b/streamer-app/src/main/resources/application.yml @@ -24,4 +24,21 @@ spring: producer-properties: max.request.size: 200000000 - defaultBinder: ${scs_binder} +streamer: + healthcheck: + event-time-threshold: ${EVENT_TIME_THRESHOLD_IN_SECOND:120} + keepalive-time-threshold: ${KEEPALIVE_TIME_THRESHOLD_IN_SECOND:120} + +management: + endpoints: + enabled-by-default: false + web: + exposure: + include: "health,prometheus,health-status" + endpoint: + health: + enabled: true + prometheus: + enabled: true + health-status: + enabled: true