Merge branch 'release/1.4.0'

README.md

@@ -188,7 +188,7 @@ class UserPartitionResolver implements TxQueuePartitionResolver {
 ### TxObserverConfigurer
 Configurer for basic observer components. Allows you to define all bean-components through one bean: 
 - TxQueuePartitionResolver;
-- TxEnqueuePredicate (default implementation is `com.wavesenterprise.we.tx.observer.starter.TxObserverEnablerConfig.TxEnqueuePredicateConfigurerImpl`);
+- TxEnqueuePredicate (default implementation is `com.wavesenterprise.sdk.tx.observer.starter.TxObserverEnablerConfig.TxEnqueuePredicateConfigurerImpl`);
 - ObjectMapper;
 - PrivateContentResolver;  
 

gradle.properties

@@ -31,7 +31,7 @@ kotlinModuleVersion=2.13.2
 
 weNodeClientVersion=1.3.1
 weSdkSpringVersion=1.0.3
-weFlywayStarterVersion=1.0.0
+weFlywayStarterVersion=1.1.0
 feignVersion=11.9
 jacksonModuleKotlin=2.13.3
 junitVersion=5.3.2

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/conditional/ConditionalOnJpaMode.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/conditional/ConditionalOnJpaMode.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.common.conditional
+package com.wavesenterprise.sdk.tx.observer.common.conditional
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/conditional/ConditionalOnTracker.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/conditional/ConditionalOnTracker.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.common.conditional
+package com.wavesenterprise.sdk.tx.observer.common.conditional
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/jpa/util/EntityManager.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/jpa/util/EntityManager.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.common.jpa.util
+package com.wavesenterprise.sdk.tx.observer.common.jpa.util
 
 import javax.persistence.EntityManager
 

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/jpa/util/JpaUtils.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/jpa/util/JpaUtils.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.common.jpa.util
+package com.wavesenterprise.sdk.tx.observer.common.jpa.util
 
 import javax.persistence.criteria.CriteriaBuilder
 import javax.persistence.criteria.Predicate

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/executor/TxExecutor.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/executor/TxExecutor.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.common.tx.executor
+package com.wavesenterprise.sdk.tx.observer.common.tx.executor
 
 interface TxExecutor {
     fun <T> required(block: () -> T): T

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/executor/TxExecutorImpl.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/executor/TxExecutorImpl.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.common.tx.executor
+package com.wavesenterprise.sdk.tx.observer.common.tx.executor
 
 import org.springframework.transaction.TransactionDefinition
 import org.springframework.transaction.TransactionException

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/handler/TxHandler.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/handler/TxHandler.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.common.tx.handler
+package com.wavesenterprise.sdk.tx.observer.common.tx.handler
 
 import com.wavesenterprise.sdk.node.domain.tx.Tx
 

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/subscriber/TxSubscriber.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/subscriber/TxSubscriber.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.common.tx.subscriber
+package com.wavesenterprise.sdk.tx.observer.common.tx.subscriber
 
 import com.wavesenterprise.sdk.node.domain.tx.Tx
 

we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt → we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt

@@ -1,7 +1,7 @@
-package com.wavesenterprise.we.tx.observer.common.tx.subscriber
+package com.wavesenterprise.sdk.tx.observer.common.tx.subscriber
 
 import com.wavesenterprise.sdk.node.domain.tx.Tx
-import com.wavesenterprise.we.tx.observer.common.tx.handler.TxHandler
+import com.wavesenterprise.sdk.tx.observer.common.tx.handler.TxHandler
 
 class TxSubscriberImpl(
     val predicate: (Tx) -> Boolean,

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/WeBlockInfo.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/WeBlockInfo.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.api.block
+package com.wavesenterprise.sdk.tx.observer.api.block
 
 import com.wavesenterprise.sdk.node.domain.Height
 import com.wavesenterprise.sdk.node.domain.Signature

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/WeRollbackInfo.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/WeRollbackInfo.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.api.block
+package com.wavesenterprise.sdk.tx.observer.api.block
 
 import com.wavesenterprise.sdk.node.domain.Height
 import com.wavesenterprise.sdk.node.domain.Signature

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/subscriber/BlockSubscriber.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/BlockSubscriber.kt

@@ -1,6 +1,6 @@
-package com.wavesenterprise.we.tx.observer.api.block.subscriber
+package com.wavesenterprise.sdk.tx.observer.api.block.subscriber
 
-import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo
+import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo
 
 /**
  * Subscriber handling a new block with transactions. Can be invoked multiple times for a liquid block.

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/RollbackSubscriber.kt

@@ -0,0 +1,7 @@
+package com.wavesenterprise.sdk.tx.observer.api.block.subscriber
+
+import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo
+
+interface RollbackSubscriber {
+    fun onRollback(weRollbackInfo: WeRollbackInfo)
+}

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/exceptions.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/exceptions.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.api
+package com.wavesenterprise.sdk.tx.observer.api
 
 open class BlockListenerException(message: String, cause: Throwable) : RuntimeException(message, cause)
 

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/key/KeyEvent.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/key/KeyEvent.kt

@@ -1,10 +1,10 @@
-package com.wavesenterprise.we.tx.observer.api.key
+package com.wavesenterprise.sdk.tx.observer.api.key
 
 import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx
 
 /**
  * Class processed in @TxListener methods for 105 transaction.
- * @see com.wavesenterprise.we.tx.observer.api.tx.TxListener
+ * @see com.wavesenterprise.sdk.tx.observer.api.tx.TxListener
  * @property payload parametrized object obtained from the results of transaction ExecutedContractTx (105)
  * @property tx transaction ExecutedContractTx (105)
  * @property key key by which filtering takes place in KeyFilter

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/key/KeyFilter.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/key/KeyFilter.kt

@@ -1,8 +1,8 @@
-package com.wavesenterprise.we.tx.observer.api.key
+package com.wavesenterprise.sdk.tx.observer.api.key
 
 /**
  * Annotation filters the KeyEvent by the keys from the contract state.
- * @see com.wavesenterprise.we.tx.observer.api.key.KeyEvent
+ * @see com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent
  * @property keyRegexp the key is in the form of a regular expression
  * @property keyPrefix the key in the form of a prefix or a full string
  */

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/partition/TxQueuePartitionResolver.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/partition/TxQueuePartitionResolver.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.api.partition
+package com.wavesenterprise.sdk.tx.observer.api.partition
 
 import com.wavesenterprise.sdk.node.domain.tx.Tx
 

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/MessageFilter.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/MessageFilter.kt

@@ -1,9 +1,9 @@
-package com.wavesenterprise.we.tx.observer.api.privacy
+package com.wavesenterprise.sdk.tx.observer.api.privacy
 
 /**
  * Annotation containing an array of filters.
  * @property filters array of MessageFilter
- * @see com.wavesenterprise.we.tx.observer.api.privacy.MessageFilter
+ * @see com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilter
  */
 annotation class MessageFilters(
     vararg val filters: MessageFilter = []

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PolicyFilter.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PolicyFilter.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.api.privacy
+package com.wavesenterprise.sdk.tx.observer.api.privacy
 
 /**
  * Annotation which filters privacy data by policy name.

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PrivateContentResolver.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PrivateContentResolver.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.api.privacy
+package com.wavesenterprise.sdk.tx.observer.api.privacy
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.wavesenterprise.sdk.node.domain.tx.CreatePolicyTx

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PrivateDataEvent.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PrivateDataEvent.kt

@@ -1,9 +1,9 @@
-package com.wavesenterprise.we.tx.observer.api.privacy
+package com.wavesenterprise.sdk.tx.observer.api.privacy
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.wavesenterprise.sdk.node.domain.tx.CreatePolicyTx
 import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx
-import com.wavesenterprise.we.tx.observer.api.NoPayloadException
+import com.wavesenterprise.sdk.tx.observer.api.NoPayloadException
 
 /**
  * Class processed in @TxListener methods for privacy transactions (112, 113, 114)

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/tx/TxEnqueuePredicate.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/tx/TxEnqueuePredicate.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.api.tx
+package com.wavesenterprise.sdk.tx.observer.api.tx
 
 import com.wavesenterprise.sdk.node.domain.tx.Tx
 

we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/tx/TxListener.kt → we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/tx/TxListener.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.api.tx
+package com.wavesenterprise.sdk.tx.observer.api.tx
 
 /**
  * Listener for processing previously filtered transactions in TxEnqueuePredicate implementations.
@@ -23,10 +23,10 @@ package com.wavesenterprise.we.tx.observer.api.tx
  * }
  * ```
  * @property filterExpression filter transaction by spel expression
- * @see com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate
- * @see com.wavesenterprise.we.tx.observer.api.key.KeyEvent
- * @see com.wavesenterprise.we.tx.observer.api.privacy.PolicyFilter
- * @see com.wavesenterprise.we.tx.observer.api.privacy.MessageFilter
+ * @see com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate
+ * @see com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent
+ * @see com.wavesenterprise.sdk.tx.observer.api.privacy.PolicyFilter
+ * @see com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilter
  */
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt

@@ -1,7 +1,7 @@
-package com.wavesenterprise.we.tx.observer.core.spring.component
+package com.wavesenterprise.sdk.tx.observer.core.spring.component
 
 import com.wavesenterprise.sdk.node.domain.tx.Tx
-import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate
+import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate
 
 class AndTxEnqueuePredicate(
     private val predicates: List<TxEnqueuePredicate>,

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt

@@ -1,10 +1,10 @@
-package com.wavesenterprise.we.tx.observer.core.spring.component
+package com.wavesenterprise.sdk.tx.observer.core.spring.component
 
 import com.github.benmanes.caffeine.cache.Caffeine
 import com.wavesenterprise.sdk.node.client.blocking.cache.CaffeineLoadingCache
 import com.wavesenterprise.sdk.node.domain.TxId
 import com.wavesenterprise.sdk.node.domain.tx.Tx
-import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate
+import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate
 import java.time.Duration
 
 class CachingTxEnqueuePredicate(

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt

@@ -1,10 +1,10 @@
-package com.wavesenterprise.we.tx.observer.core.spring.component
+package com.wavesenterprise.sdk.tx.observer.core.spring.component
 
 import com.wavesenterprise.sdk.node.domain.Height
 import com.wavesenterprise.sdk.node.domain.Signature
 import com.wavesenterprise.sdk.node.domain.blocks.BlockAtHeight
 import com.wavesenterprise.sdk.node.domain.tx.TxInfo
-import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo
+import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo
 
 data class HttpApiWeBlockInfo(
     private val blocksAtHeight: BlockAtHeight,

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/LoggingBlockSubscriber.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/LoggingBlockSubscriber.kt

@@ -1,7 +1,7 @@
-package com.wavesenterprise.we.tx.observer.core.spring.component
+package com.wavesenterprise.sdk.tx.observer.core.spring.component
 
-import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo
-import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber
+import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo
+import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt

@@ -1,7 +1,7 @@
-package com.wavesenterprise.we.tx.observer.core.spring.component
+package com.wavesenterprise.sdk.tx.observer.core.spring.component
 
 import com.wavesenterprise.sdk.node.domain.tx.Tx
-import com.wavesenterprise.we.tx.observer.api.key.KeyEvent
+import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent
 import java.lang.reflect.Method
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/OffsetProvider.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/OffsetProvider.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.core.spring.component
+package com.wavesenterprise.sdk.tx.observer.core.spring.component
 
 interface OffsetProvider {
     fun provideOffset(upperBound: Int): Int

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/RandomOffsetProvider.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/RandomOffsetProvider.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.core.spring.component
+package com.wavesenterprise.sdk.tx.observer.core.spring.component
 
 import kotlin.random.Random
 

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt

@@ -1,9 +1,9 @@
-package com.wavesenterprise.we.tx.observer.core.spring.component
+package com.wavesenterprise.sdk.tx.observer.core.spring.component
 
 import com.wavesenterprise.sdk.node.domain.TxType
 import com.wavesenterprise.sdk.node.domain.tx.Tx
 import com.wavesenterprise.sdk.node.domain.tx.Tx.Companion.type
-import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate
+import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate
 
 class TxTypeEnqueuedPredicate(
     val txTypes: List<TxType>,

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt

@@ -1,15 +1,15 @@
-package com.wavesenterprise.we.tx.observer.core.spring.executor
+package com.wavesenterprise.sdk.tx.observer.core.spring.executor
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.treeToValue
 import com.wavesenterprise.sdk.node.client.http.tx.TxDto
 import com.wavesenterprise.sdk.node.client.http.tx.TxDto.Companion.toDomain
-import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriber
-import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler
-import com.wavesenterprise.we.tx.observer.core.spring.partition.PollingTxSubscriber
-import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus
-import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository
+import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriber
+import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler
+import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PollingTxSubscriber
+import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus
+import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository
 import io.micrometer.core.annotation.Timed
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.core.spring.executor
+package com.wavesenterprise.sdk.tx.observer.core.spring.executor
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -8,14 +8,14 @@ import com.wavesenterprise.sdk.node.domain.TxType
 import com.wavesenterprise.sdk.node.domain.tx.AtomicTx
 import com.wavesenterprise.sdk.node.domain.tx.Tx
 import com.wavesenterprise.sdk.node.domain.tx.Tx.Companion.type
-import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo
-import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber
-import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate
-import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer
-import com.wavesenterprise.we.tx.observer.core.spring.partition.TxQueuePartitionResolveService
-import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx
-import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus
-import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository
+import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo
+import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber
+import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate
+import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer
+import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxQueuePartitionResolveService
+import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx
+import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus
+import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository
 import org.springframework.transaction.annotation.Transactional
 
 open class EnqueueingBlockSubscriber(

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt

@@ -0,0 +1,13 @@
+package com.wavesenterprise.sdk.tx.observer.core.spring.executor
+
+import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo
+import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.RollbackSubscriber
+import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer
+
+class MetricRollbackSubscriber(
+    private val rollbackCountMetricsContainer: AddableLongMetricsContainer,
+) : RollbackSubscriber {
+    override fun onRollback(weRollbackInfo: WeRollbackInfo) {
+        rollbackCountMetricsContainer.add(1)
+    }
+}

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/MetricsUtils.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricsUtils.kt

@@ -1,4 +1,4 @@
-package com.wavesenterprise.we.tx.observer.core.spring.executor
+package com.wavesenterprise.sdk.tx.observer.core.spring.executor
 
 const val NODE_HEIGHT = "nodeHeight"
 const val OBSERVER_HEIGHT = "observerHeight"

we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt → we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt

@@ -1,9 +1,9 @@
-package com.wavesenterprise.we.tx.observer.core.spring.executor
+package com.wavesenterprise.sdk.tx.observer.core.spring.executor
 
-import com.wavesenterprise.we.tx.observer.api.block.WeRollbackInfo
-import com.wavesenterprise.we.tx.observer.api.block.subscriber.RollbackSubscriber
-import com.wavesenterprise.we.tx.observer.domain.RollbackInfo
-import com.wavesenterprise.we.tx.observer.jpa.repository.RollbackInfoRepository
+import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo
+import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.RollbackSubscriber
+import com.wavesenterprise.sdk.tx.observer.domain.RollbackInfo
+import com.wavesenterprise.sdk.tx.observer.jpa.repository.RollbackInfoRepository
 
 class PersistingRollbackSubscriber(
     private val rollbackInfoRepository: RollbackInfoRepository,