From e2e48e274015df3fc30a9eb051f79b9989ab979f Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Thu, 9 Apr 2026 11:25:54 +0300 Subject: [PATCH 1/3] bumped dependencies --- .sbtopts | 4 +++- build.sbt | 10 +++++----- src/main/scala/units/ConsensusClientDependencies.scala | 5 +++-- .../units/client/engine/LoggedEngineApiClient.scala | 4 ++-- src/test/scala/units/RideCreateMerkleRootTest.scala | 10 +++++----- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.sbtopts b/.sbtopts index ccf701eb..c903d808 100644 --- a/.sbtopts +++ b/.sbtopts @@ -1 +1,3 @@ ---mem 2048 +-mem 2048 +-J--add-exports=java.base/sun.nio.ch=ALL-UNNAMED +-J--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED diff --git a/build.sbt b/build.sbt index b4b57e24..d8a5e6c3 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ git.uncommittedSignifier := Some("DIRTY") inScope(Global)( Seq( onChangedBuildSource := ReloadOnSourceChanges, - scalaVersion := "3.7.4", + scalaVersion := "3.8.1", organization := "network.units", organizationName := "Units Network", resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.mavenLocal), @@ -39,7 +39,7 @@ dependencyOverrides ++= Seq( "org.playframework" %% "play-json" % "3.0.6", "com.squareup.okhttp3" % "okhttp" % "4.12.0", "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", - "com.squareup.okio" % "okio" % "3.6.0", + "com.squareup.okio" % "okio" % "3.16.4", "com.squareup.okio" % "okio-jvm" % "3.16.4", "org.reactivestreams" % "reactive-streams" % "1.0.4", "org.jetbrains.kotlin" % "kotlin-stdlib" % "2.2.20", @@ -48,15 +48,15 @@ dependencyOverrides ++= Seq( ) libraryDependencies ++= { - val node = "1.6.1" + val node = "1.6.2-SNAPSHOT" val sttpVersion = "3.11.0" Seq( "com.wavesplatform" % "node-testkit" % node % Test, "com.wavesplatform" % "node" % node % Provided, "com.softwaremill.sttp.client3" %% "core" % sttpVersion, "com.softwaremill.sttp.client3" %% "play-json" % sttpVersion, - "com.github.jwt-scala" %% "jwt-play-json" % "11.0.3", - ("org.web3j" % "core" % "4.9.8").excludeAll( + "com.github.jwt-scala" %% "jwt-play-json" % "11.0.4", + ("org.web3j" % "core" % "4.13.0").excludeAll( ExclusionRule("org.slf4j", "slf4j-api"), ExclusionRule("org.bouncycastle", "bcprov-jdk15on") ) diff --git a/src/main/scala/units/ConsensusClientDependencies.scala b/src/main/scala/units/ConsensusClientDependencies.scala index 477425d5..81961268 100644 --- a/src/main/scala/units/ConsensusClientDependencies.scala +++ b/src/main/scala/units/ConsensusClientDependencies.scala @@ -1,7 +1,8 @@ package units +import com.typesafe.scalalogging.Logger import com.wavesplatform.network.{PeerDatabaseImpl, PeerInfo} -import com.wavesplatform.utils.{LoggerFacade, Schedulers} +import com.wavesplatform.utils.Schedulers import io.netty.channel.Channel import io.netty.channel.group.DefaultChannelGroup import io.netty.util.concurrent.GlobalEventExecutor @@ -18,7 +19,7 @@ import scala.io.Source // A helper to create ConsensusClient due to Scala secondary constructors limitations class ConsensusClientDependencies(val config: ClientConfig) extends AutoCloseable { - protected lazy val log: LoggerFacade = LoggerFacade(LoggerFactory.getLogger(classOf[ConsensusClient])) + protected lazy val log = Logger(LoggerFactory.getLogger(classOf[ConsensusClient])) private val blockObserverScheduler = Schedulers.singleThread(s"block-observer-${config.chainContract}", reporter = { e => log.warn("Error in BlockObserver", e) }) diff --git a/src/main/scala/units/client/engine/LoggedEngineApiClient.scala b/src/main/scala/units/client/engine/LoggedEngineApiClient.scala index 50abfed4..68d5ce44 100644 --- a/src/main/scala/units/client/engine/LoggedEngineApiClient.scala +++ b/src/main/scala/units/client/engine/LoggedEngineApiClient.scala @@ -1,6 +1,6 @@ package units.client.engine -import com.wavesplatform.utils.LoggerFacade +import com.typesafe.scalalogging.Logger import org.slf4j.LoggerFactory import play.api.libs.json.JsObject import units.client.engine.EngineApiClient.PayloadId @@ -12,7 +12,7 @@ import units.{BlockHash, Result} import scala.util.chaining.scalaUtilChainingOps class LoggedEngineApiClient(underlying: EngineApiClient) extends EngineApiClient { - protected val log: LoggerFacade = LoggerFacade(LoggerFactory.getLogger(underlying.getClass)) + protected val log = Logger(LoggerFactory.getLogger(underlying.getClass)) override def forkchoiceUpdated(blockHash: BlockHash, finalizedBlockHash: BlockHash, requestId: Int): Result[PayloadStatus] = wrap(requestId, s"forkchoiceUpdated($blockHash, f=$finalizedBlockHash)", underlying.forkchoiceUpdated(blockHash, finalizedBlockHash, _)) diff --git a/src/test/scala/units/RideCreateMerkleRootTest.scala b/src/test/scala/units/RideCreateMerkleRootTest.scala index d333fe59..9a12489d 100644 --- a/src/test/scala/units/RideCreateMerkleRootTest.scala +++ b/src/test/scala/units/RideCreateMerkleRootTest.scala @@ -23,20 +23,20 @@ class RideCreateMerkleRootTest extends BaseTestSuite { | } """.stripMargin ) - d.appendBlock(d.createBlock(PlainBlockVersion, Seq(setScript(secondSigner, dApp)))) + d.appendBlock(d.createBlock(Seq(setScript(secondSigner, dApp)), version = PlainBlockVersion)) val failedC2ETransferIndexes = List(11L, 12L, 103L, 104L) - val transferIndex = 103L - val transferIndexInBlock = failedC2ETransferIndexes.indexOf(transferIndex) + val transferIndex = 103L + val transferIndexInBlock = failedC2ETransferIndexes.indexOf(transferIndex) val root: Array[Byte] = BridgeMerkleTree.getFailedTransfersRootHash(failedC2ETransferIndexes) val proofs: Seq[Array[Byte]] = BridgeMerkleTree .mkFailedTransferProofs(failedC2ETransferIndexes, transferIndexInBlock) .reverse - val digests = ARR(proofs.map(b => CONST_BYTESTR(ByteStr(b)).explicitGet()).toVector, limited = false).explicitGet() + val digests = ARR(proofs.map(b => CONST_BYTESTR(ByteStr(b)).explicitGet()).toVector, limited = false).explicitGet() val invokeTx = invoke(func = Some("merkle"), args = Seq(digests, CONST_LONG(transferIndex), CONST_LONG(transferIndexInBlock))) - d.appendBlock(d.createBlock(PlainBlockVersion, Seq(invokeTx))) + d.appendBlock(d.createBlock(Seq(invokeTx), version = PlainBlockVersion)) val actual = d.blockchain.accountData(secondAddress, "root").get.value actual shouldBe ByteStr(root) From f0ec789f3295616789205eb3ff47fb90da08f384 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Thu, 9 Apr 2026 11:34:17 +0300 Subject: [PATCH 2/3] wip --- .github/workflows/check-pr.yml | 16 ++--- .github/workflows/publish-docker-image.yml | 8 +-- build.sbt | 69 +++++++++++-------- .../scala/units/docker/BaseContainer.scala | 4 +- 4 files changed, 53 insertions(+), 44 deletions(-) diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index 51af4ba4..7328f1de 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -18,14 +18,14 @@ jobs: JAVA_OPTS: -Dfile.encoding=UTF-8 BRANCH_NAME: ${{ github.head_ref || github.ref_name }} steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'sbt' - uses: foundry-rs/foundry-toolchain@v1 - - uses: sbt/setup-sbt@v1 + - uses: sbt/setup-sbt@508b753e53cb6095967669e0911487d2b9bc9f41 # v1.1.22 - name: Run tests run: sbt -Dcc.it.max-parallel-suites=2 -Dlogback.test.level=OFF --batch "scalafmtCheck;test;docker;consensus-client-it/test" env: @@ -50,16 +50,16 @@ jobs: timeout-minutes: 15 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: submodules: recursive - - uses: actions/setup-java@v4 + - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'sbt' - uses: foundry-rs/foundry-toolchain@v1 - - uses: sbt/setup-sbt@v1 + - uses: sbt/setup-sbt@508b753e53cb6095967669e0911487d2b9bc9f41 # v1.1.22 - run: | sbt --batch docker cd local-network diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index a49aadcc..ff6d7f6f 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -24,7 +24,7 @@ jobs: attestations: write id-token: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: regclient/actions/regctl-installer@4d6888fcc4842c9630f60ebc91715a45dd9bd7a3 - uses: proudust/gh-describe@70f72d4f6304ea053cf5a3d71c36211d5acc0c73 id: ghd @@ -58,12 +58,12 @@ jobs: echo EOF } >> "$GITHUB_OUTPUT" id: annotations - - uses: actions/setup-java@v4 + - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'sbt' - - uses: sbt/setup-sbt@v1 + - uses: sbt/setup-sbt@508b753e53cb6095967669e0911487d2b9bc9f41 # v1.1.22 - run: sbt -Dproject.version=${{ steps.versions.outputs.cc-version }} --batch buildTarballsForDocker - uses: docker/login-action@v3 with: diff --git a/build.sbt b/build.sbt index d8a5e6c3..454438fe 100644 --- a/build.sbt +++ b/build.sbt @@ -4,16 +4,16 @@ import scala.sys.process.{Process, ProcessLogger} enablePlugins(UniversalDeployPlugin, GitVersioning, VersionObject) -git.useGitDescribe := true -git.baseVersion := "1.4.0" +git.useGitDescribe := true +git.baseVersion := "1.4.0" git.uncommittedSignifier := Some("DIRTY") inScope(Global)( Seq( onChangedBuildSource := ReloadOnSourceChanges, - scalaVersion := "3.8.1", - organization := "network.units", - organizationName := "Units Network", + scalaVersion := "3.8.1", + organization := "network.units", + organizationName := "Units Network", resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.mavenLocal), scalacOptions ++= Seq( "-feature", @@ -31,32 +31,41 @@ inScope(Global)( ) ) -name := "consensus-client" +name := "consensus-client" maintainer := "Units Network Team" +def nettyModule(module: String): ModuleID = "io.netty" % s"netty-$module" % "4.2.10.Final" + // These overrides are needed so that there are no different versions of the same component on the classpath when the extension is installed dependencyOverrides ++= Seq( - "org.playframework" %% "play-json" % "3.0.6", - "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "org.playframework" %% "play-json" % "3.0.6", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", - "com.squareup.okio" % "okio" % "3.16.4", - "com.squareup.okio" % "okio-jvm" % "3.16.4", - "org.reactivestreams" % "reactive-streams" % "1.0.4", - "org.jetbrains.kotlin" % "kotlin-stdlib" % "2.2.20", - "org.jetbrains.kotlin" % "kotlin-stdlib-jdk7" % "1.8.21", - "org.jetbrains.kotlin" % "kotlin-stdlib-jdk8" % "1.8.21" + "com.squareup.okio" % "okio" % "3.16.4", + "com.squareup.okio" % "okio-jvm" % "3.16.4", + "org.apache.httpcomponents" % "httpclient" % "4.5.14", + "org.reactivestreams" % "reactive-streams" % "1.0.4", + "org.jetbrains.kotlin" % "kotlin-stdlib" % "2.2.20", + "org.jetbrains.kotlin" % "kotlin-stdlib-jdk7" % "1.8.21", + "org.jetbrains.kotlin" % "kotlin-stdlib-jdk8" % "1.8.21", + nettyModule("codec-http2"), + nettyModule("codec-http"), + nettyModule("handler-proxy"), + nettyModule("codec-socks"), + nettyModule("transport-native-unix-common"), + nettyModule("resolver-dns") ) libraryDependencies ++= { - val node = "1.6.2-SNAPSHOT" + val node = "1.6.2-SNAPSHOT" val sttpVersion = "3.11.0" Seq( - "com.wavesplatform" % "node-testkit" % node % Test, - "com.wavesplatform" % "node" % node % Provided, - "com.softwaremill.sttp.client3" %% "core" % sttpVersion, - "com.softwaremill.sttp.client3" %% "play-json" % sttpVersion, - "com.github.jwt-scala" %% "jwt-play-json" % "11.0.4", - ("org.web3j" % "core" % "4.13.0").excludeAll( + "com.wavesplatform" % "node-testkit" % node % Test, + "com.wavesplatform" % "node" % node % Provided, + "com.softwaremill.sttp.client3" %% "core" % sttpVersion, + "com.softwaremill.sttp.client3" %% "play-json" % sttpVersion, + "com.github.jwt-scala" %% "jwt-play-json" % "11.0.4", + ("org.web3j" % "core" % "4.13.0").excludeAll( ExclusionRule("org.slf4j", "slf4j-api"), ExclusionRule("org.bouncycastle", "bcprov-jdk15on") ) @@ -66,12 +75,12 @@ libraryDependencies ++= { Compile / packageDoc / publishArtifact := false def makeJarName( - org: String, - name: String, - revision: String, - artifactName: String, - artifactClassifier: Option[String] -): String = + org: String, + name: String, + revision: String, + artifactName: String, + artifactClassifier: Option[String] + ): String = org + "." + name + "-" + Option(artifactName.replace(name, "")).filterNot(_.isEmpty).map(_ + "-").getOrElse("") + @@ -81,7 +90,7 @@ def makeJarName( def getJarFullFilename(dep: Attributed[File]): String = { val filename: Option[String] = for { - module <- dep.metadata.get(AttributeKey[ModuleID]("moduleID")) + module <- dep.metadata.get(AttributeKey[ModuleID]("moduleID")) artifact <- dep.metadata.get(AttributeKey[Artifact]("artifact")) } yield makeJarName(module.organization, module.name, module.revision, artifact.name, artifact.classifier) filename.getOrElse(dep.data.getName) @@ -94,14 +103,14 @@ def universalDepMappings(deps: Seq[Attributed[File]]): Seq[(File, String)] = Universal / mappings += { val jar = (Compile / packageBin).value - val id = projectID.value + val id = projectID.value val art = (Compile / packageBin / artifact).value jar -> ("lib/" + makeJarName(id.organization, id.name, id.revision, art.name, art.classifier)) } Universal / mappings ++= universalDepMappings((Runtime / dependencyClasspath).value.filterNot { p => p.get(AttributeKey[ModuleID]("moduleID")).exists { m => m.organization == "org.scala-lang" || - m.organization.startsWith("com.fasterxml.jackson") + m.organization.startsWith("com.fasterxml.jackson") } }) diff --git a/consensus-client-it/src/test/scala/units/docker/BaseContainer.scala b/consensus-client-it/src/test/scala/units/docker/BaseContainer.scala index d0292e48..d5ebdeb7 100644 --- a/consensus-client-it/src/test/scala/units/docker/BaseContainer.scala +++ b/consensus-client-it/src/test/scala/units/docker/BaseContainer.scala @@ -1,11 +1,11 @@ package units.docker -import com.wavesplatform.utils.LoggerFacade +import com.typesafe.scalalogging.Logger import org.slf4j.LoggerFactory import org.testcontainers.containers.wait.strategy.DockerHealthcheckWaitStrategy abstract class BaseContainer(val hostName: String) { - protected lazy val log = LoggerFacade(LoggerFactory.getLogger(s"${getClass.getSimpleName}.$hostName")) + protected lazy val log = Logger(LoggerFactory.getLogger(s"${getClass.getSimpleName}.$hostName")) protected val container: GenericContainer From d8b824f19e8106459987377fd919f0800ac93771 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Thu, 9 Apr 2026 12:15:39 +0300 Subject: [PATCH 3/3] silence warnings --- .../src/test/scala/units/ManyTransfersTestSuite.scala | 1 - .../src/test/scala/units/MultipleTransfersTestSuite.scala | 1 - .../scala/units/MultipleTransfersViaDepositsTestSuite.scala | 1 - .../units/block/validation/AssetInvalidAmountTestSuite.scala | 1 - .../units/block/validation/AssetInvalidBridgeTestSuite.scala | 1 - .../units/block/validation/AssetInvalidRecipientTestSuite.scala | 1 - .../units/block/validation/AssetInvalidSenderTestSuite.scala | 2 -- .../units/block/validation/AssetInvalidTokenTestSuite.scala | 1 - .../test/scala/units/block/validation/AssetValidTestSuite.scala | 1 - .../scala/units/block/validation/BaseBlockValidationSuite.scala | 1 - .../units/block/validation/NativeInvalidAmountTestSuite.scala | 1 - .../units/block/validation/NativeInvalidBridgeTestSuite.scala | 1 - .../block/validation/NativeInvalidRecipientTestSuite.scala | 1 - .../units/block/validation/NativeInvalidSenderTestSuite.scala | 2 -- .../units/block/validation/NativeMissingDepositTestSuite.scala | 2 -- .../block/validation/NativeUnexpectedDepositTestSuite.scala | 1 - .../block/validation/NativeUnexpectedWithdrawalTestSuite.scala | 1 - .../scala/units/block/validation/NativeValidTestSuite.scala | 1 - .../scala/units/block/validation/NoTransfersTestSuite.scala | 2 -- 19 files changed, 23 deletions(-) diff --git a/consensus-client-it/src/test/scala/units/ManyTransfersTestSuite.scala b/consensus-client-it/src/test/scala/units/ManyTransfersTestSuite.scala index 175021d0..9c333edc 100644 --- a/consensus-client-it/src/test/scala/units/ManyTransfersTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/ManyTransfersTestSuite.scala @@ -2,7 +2,6 @@ package units import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.state.IntegerDataEntry -import com.wavesplatform.transaction.Asset.IssuedAsset import com.wavesplatform.transaction.smart.InvokeScriptTransaction import com.wavesplatform.transaction.{Asset, TxHelpers} import monix.execution.atomic.AtomicInt diff --git a/consensus-client-it/src/test/scala/units/MultipleTransfersTestSuite.scala b/consensus-client-it/src/test/scala/units/MultipleTransfersTestSuite.scala index f50bd740..7566cb93 100644 --- a/consensus-client-it/src/test/scala/units/MultipleTransfersTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/MultipleTransfersTestSuite.scala @@ -2,7 +2,6 @@ package units import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.transaction.Asset -import com.wavesplatform.transaction.Asset.IssuedAsset import com.wavesplatform.transaction.smart.InvokeScriptTransaction import monix.execution.atomic.AtomicInt import org.web3j.protocol.core.DefaultBlockParameterName diff --git a/consensus-client-it/src/test/scala/units/MultipleTransfersViaDepositsTestSuite.scala b/consensus-client-it/src/test/scala/units/MultipleTransfersViaDepositsTestSuite.scala index 9138bed9..0283e1e4 100644 --- a/consensus-client-it/src/test/scala/units/MultipleTransfersViaDepositsTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/MultipleTransfersViaDepositsTestSuite.scala @@ -2,7 +2,6 @@ package units import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.state.IntegerDataEntry -import com.wavesplatform.transaction.Asset.IssuedAsset import com.wavesplatform.transaction.{Asset, TxHelpers} import com.wavesplatform.transaction.smart.InvokeScriptTransaction import monix.execution.atomic.AtomicInt diff --git a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidAmountTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidAmountTestSuite.scala index f2a1da3d..92fd3878 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidAmountTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidAmountTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock import units.el.* diff --git a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidBridgeTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidBridgeTestSuite.scala index 8937acdb..cef7fd1c 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidBridgeTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidBridgeTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock import units.el.* diff --git a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidRecipientTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidRecipientTestSuite.scala index a16a4502..16ff636f 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidRecipientTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidRecipientTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock import units.el.* diff --git a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidSenderTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidSenderTestSuite.scala index ee51c69e..dc17686a 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidSenderTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidSenderTestSuite.scala @@ -1,10 +1,8 @@ package units.block.validation -import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock import units.el.* diff --git a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidTokenTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidTokenTestSuite.scala index 54f666b6..dc985e03 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidTokenTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/AssetInvalidTokenTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock import units.el.* diff --git a/consensus-client-it/src/test/scala/units/block/validation/AssetValidTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/AssetValidTestSuite.scala index 45abb737..82b13fb5 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/AssetValidTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/AssetValidTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.scalatest.concurrent.PatienceConfiguration.{Interval, Timeout} import units.* import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} diff --git a/consensus-client-it/src/test/scala/units/block/validation/BaseBlockValidationSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/BaseBlockValidationSuite.scala index fdb2ea28..4e6d15f4 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/BaseBlockValidationSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/BaseBlockValidationSuite.scala @@ -8,7 +8,6 @@ import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.crypto.Keccak256 import com.wavesplatform.state.{BinaryDataEntry, Height, IntegerDataEntry, StringDataEntry} import com.wavesplatform.transaction.Asset.IssuedAsset -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import com.wavesplatform.transaction.{Asset, TxHelpers} import monix.execution.atomic.AtomicInt import org.web3j.protocol.core.DefaultBlockParameterName diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidAmountTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidAmountTestSuite.scala index cd5fedc7..ec9848d4 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidAmountTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidAmountTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.web3j.protocol.core.DefaultBlockParameterName import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidBridgeTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidBridgeTestSuite.scala index 8f6592bf..461ddf71 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidBridgeTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidBridgeTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.web3j.protocol.core.DefaultBlockParameterName import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidRecipientTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidRecipientTestSuite.scala index 159dc9ee..04eed7c2 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidRecipientTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidRecipientTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.web3j.protocol.core.DefaultBlockParameterName import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidSenderTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidSenderTestSuite.scala index da406602..2b88c826 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidSenderTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NativeInvalidSenderTestSuite.scala @@ -1,10 +1,8 @@ package units.block.validation -import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.web3j.protocol.core.DefaultBlockParameterName import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeMissingDepositTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeMissingDepositTestSuite.scala index 510c219a..3ed6ba5c 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NativeMissingDepositTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NativeMissingDepositTestSuite.scala @@ -1,10 +1,8 @@ package units.block.validation -import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.web3j.protocol.core.DefaultBlockParameterName import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeUnexpectedDepositTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeUnexpectedDepositTestSuite.scala index 48ad89c5..3f465fef 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NativeUnexpectedDepositTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NativeUnexpectedDepositTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.web3j.protocol.core.DefaultBlockParameterName import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeUnexpectedWithdrawalTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeUnexpectedWithdrawalTestSuite.scala index dd64995e..1bbf9e1a 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NativeUnexpectedWithdrawalTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NativeUnexpectedWithdrawalTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.web3j.protocol.core.DefaultBlockParameterName import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.{EcBlock, Withdrawal} diff --git a/consensus-client-it/src/test/scala/units/block/validation/NativeValidTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NativeValidTestSuite.scala index 59717762..b8e072d1 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NativeValidTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NativeValidTestSuite.scala @@ -5,7 +5,6 @@ import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.scalatest.concurrent.PatienceConfiguration.{Interval, Timeout} import org.web3j.protocol.core.DefaultBlockParameterName import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} diff --git a/consensus-client-it/src/test/scala/units/block/validation/NoTransfersTestSuite.scala b/consensus-client-it/src/test/scala/units/block/validation/NoTransfersTestSuite.scala index 6817966f..e54d1ef2 100644 --- a/consensus-client-it/src/test/scala/units/block/validation/NoTransfersTestSuite.scala +++ b/consensus-client-it/src/test/scala/units/block/validation/NoTransfersTestSuite.scala @@ -1,10 +1,8 @@ package units.block.validation -import com.wavesplatform.account.* import com.wavesplatform.common.utils.EitherExt2.explicitGet import com.wavesplatform.lang.v1.compiler.Terms import com.wavesplatform.transaction.TxHelpers -import com.wavesplatform.transaction.smart.InvokeScriptTransaction import org.scalatest.concurrent.PatienceConfiguration.{Interval, Timeout} import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex} import units.client.engine.model.EcBlock