wip

phearnot · phearnot · commit d61fbfbcb445 · 2025-11-01T12:39:15.000+03:00
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -10,9 +10,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.*
 
-class BlockValidationAssetInvalidAmountTestSuite extends BaseBlockValidationSuite {
+class AssetInvalidAmountTestSuite extends BaseBlockValidationSuite {
   "Invalid block: asset token, invalid amount" in {
     val balanceBefore          = terc20.getBalance(elRecipient)
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -10,9 +10,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.*
 
-class BlockValidationAssetInvalidBridgeTestSuite extends BaseBlockValidationSuite {
+class AssetInvalidBridgeTestSuite extends BaseBlockValidationSuite {
   "Invalid block: asset token, invalid standardBridgeAddress" in {
     val balanceBefore          = terc20.getBalance(elRecipient)
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,18 +1,18 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 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.BlockHash
 import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRootHashHex
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
+import units.*
 
-class BlockValidationAssetInvalidRecipientTestSuite extends BaseBlockValidationSuite {
+class AssetInvalidRecipientTestSuite extends BaseBlockValidationSuite {
   "Invalid block: asset token, invalid recipient address" in {
     val balanceBefore          = terc20.getBalance(elRecipient)
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.account.*
 import com.wavesplatform.common.utils.EitherExt2.explicitGet
@@ -8,9 +8,9 @@ import com.wavesplatform.transaction.smart.InvokeScriptTransaction
 import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRootHashHex
 import units.client.engine.model.EcBlock
 import units.el.*
-import units.{BlockHash, TestNetworkClient}
+import units.*
 
-class BlockValidationAssetInvalidSenderTestSuite extends BaseBlockValidationSuite {
+class AssetInvalidSenderTestSuite extends BaseBlockValidationSuite {
   "Invalid block: asset token, invalid sender address" in {
     val balanceBefore          = terc20.getBalance(elRecipient)
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -10,9 +10,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.*
 
-class BlockValidationAssetInvalidTokenTestSuite extends BaseBlockValidationSuite {
+class AssetInvalidTokenTestSuite extends BaseBlockValidationSuite {
   "Invalid block: asset token, invalid token address" in {
     val balanceBefore          = terc20.getBalance(elRecipient)
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -10,9 +10,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.*
 
-class BlockValidationAssetValidTestSuite extends BaseBlockValidationSuite {
+class AssetValidTestSuite extends BaseBlockValidationSuite {
   "Valid block: asset token, correct transfer" in {
     val balanceBefore          = terc20.getBalance(elRecipient)
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -14,12 +14,12 @@ import org.web3j.protocol.core.DefaultBlockParameterName
 import org.web3j.tx.RawTransactionManager
 import org.web3j.tx.gas.DefaultGasProvider
 import play.api.libs.json.*
-import units.{BlockHash, ELUpdater}
 import units.client.engine.model.{EcBlock, Withdrawal}
 import units.docker.EcContainer
 import units.el.*
 import units.eth.{EmptyL2Block, EthAddress, EthereumConstants}
 import units.util.{BlockToPayloadMapper, HexBytesConverter}
+import units.{BaseDockerTestSuite, BlockHash, ELUpdater, UnitsConvert}
 
 import scala.concurrent.duration.DurationInt
 import scala.jdk.OptionConverters.RichOptional
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -11,9 +11,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNativeInvalidAmountTestSuite extends BaseBlockValidationSuite {
+class NativeInvalidAmountTestSuite extends BaseBlockValidationSuite {
   "Invalid block: native token, invalid amount" in {
     val ethBalanceBefore       = ec1.web3j.ethGetBalance(elRecipient.toString, DefaultBlockParameterName.LATEST).send().getBalance
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -11,9 +11,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNativeInvalidBridgeTestSuite extends BaseBlockValidationSuite {
+class NativeInvalidBridgeTestSuite extends BaseBlockValidationSuite {
   "Invalid block: native token, invalid standard bridge address" in {
     val ethBalanceBefore       = ec1.web3j.ethGetBalance(elRecipient.toString, DefaultBlockParameterName.LATEST).send().getBalance
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -11,9 +11,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNativeInvalidRecipientTestSuite extends BaseBlockValidationSuite {
+class NativeInvalidRecipientTestSuite extends BaseBlockValidationSuite {
   "Invalid block: native token, invalid recipient" in {
     val invalidRecipient = additionalMiner1RewardAddress
 
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.account.*
 import com.wavesplatform.common.utils.EitherExt2.explicitGet
@@ -9,9 +9,9 @@ import org.web3j.protocol.core.DefaultBlockParameterName
 import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRootHashHex
 import units.client.engine.model.EcBlock
 import units.el.*
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNativeInvalidSenderTestSuite extends BaseBlockValidationSuite {
+class NativeInvalidSenderTestSuite extends BaseBlockValidationSuite {
   "Invalid block: native token, invalid sender" in {
     val invalidSender = additionalMiner1RewardAddress
 
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.account.*
 import com.wavesplatform.common.utils.EitherExt2.explicitGet
@@ -8,9 +8,9 @@ import com.wavesplatform.transaction.smart.InvokeScriptTransaction
 import org.web3j.protocol.core.DefaultBlockParameterName
 import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRootHashHex
 import units.client.engine.model.EcBlock
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNativeMissingDepositTestSuite extends BaseBlockValidationSuite {
+class NativeMissingDepositTestSuite extends BaseBlockValidationSuite {
   "Invalid block: native token, missing deposited transaction" in {
     val ethBalanceBefore       = ec1.web3j.ethGetBalance(elRecipient.toString, DefaultBlockParameterName.LATEST).send().getBalance
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -11,9 +11,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNativeUnexpectedDepositTestSuite extends BaseBlockValidationSuite {
+class NativeUnexpectedDepositTestSuite extends BaseBlockValidationSuite {
   "Invalid block: unexpected deposited transaction" in {
     val ethBalanceBefore       = ec1.web3j.ethGetBalance(elRecipient.toString, DefaultBlockParameterName.LATEST).send().getBalance
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -11,9 +11,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.{EcBlock, Withdrawal}
 import units.el.*
 import units.eth.{EthAddress, Gwei}
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNativeUnexpectedWithdrawalTestSuite extends BaseBlockValidationSuite {
+class NativeUnexpectedWithdrawalTestSuite extends BaseBlockValidationSuite {
   "Invalid block: native token, unexpected extra withdrawal" in {
     val ethBalanceBefore       = ec1.web3j.ethGetBalance(elRecipient.toString, DefaultBlockParameterName.LATEST).send().getBalance
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.*
 import com.wavesplatform.account.*
@@ -11,9 +11,9 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRoo
 import units.client.engine.model.EcBlock
 import units.el.*
 import units.eth.EthAddress
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNativeValidTestSuite extends BaseBlockValidationSuite {
+class NativeValidTestSuite extends BaseBlockValidationSuite {
   "Valid block: native token, correct transfer" in {
     val ethBalanceBefore       = ec1.web3j.ethGetBalance(elRecipient.toString, DefaultBlockParameterName.LATEST).send().getBalance
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
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
@@ -1,4 +1,4 @@
-package units
+package units.block.validation
 
 import com.wavesplatform.account.*
 import com.wavesplatform.common.utils.EitherExt2.explicitGet
@@ -7,9 +7,9 @@ import com.wavesplatform.transaction.TxHelpers
 import com.wavesplatform.transaction.smart.InvokeScriptTransaction
 import units.client.contract.HasConsensusLayerDappTxHelpers.EmptyE2CTransfersRootHashHex
 import units.client.engine.model.EcBlock
-import units.{BlockHash, TestNetworkClient}
+import units.{BlockHash, NetworkL2Block, TestNetworkClient}
 
-class BlockValidationNoTransfersTestSuite extends BaseBlockValidationSuite {
+class NoTransfersTestSuite extends BaseBlockValidationSuite {
   "Valid block: no transfers" in {
     val elParentBlock: EcBlock = ec1.engineApi.getLastExecutionBlock().explicitGet()
 
diff --git a/src/main/scala/units/ELUpdater.scala b/src/main/scala/units/ELUpdater.scala
@@ -1088,7 +1088,7 @@ class ELUpdater(
             processInvalidBlock(contractBlock, prevState, Some(nodeChainInfo))
         }
       case contractBlock =>
-        (if (contractBlock.isEmpty) validateBlockSignature(networkBlock, prevState.epochInfo) else ().asRight[ClientError])
+        (if (contractBlock.isEmpty) validateBlockSignature(networkBlock, prevState.epochInfo) else ().asRight[String])
           .flatMap(_ => applyBlock(networkBlock, parentBlock, prevState.epochInfo)) match {
           case Right(_) =>
             logger.debug(s"Block ${networkBlock.hash} successfully applied")
@@ -1857,7 +1857,7 @@ object ELUpdater {
       )
       expectedAmount = WAmount(expectedTransfer.amount).scale(NativeTokenElDecimals - NativeTokenClDecimals)
       _ <- Either.raiseUnless(elTransferEvent.amount == expectedAmount)(
-        s"$errorPrefix: got amount: ${elTransferEvent.amount}, expected ${expectedAmount}"
+        s"$errorPrefix: got amount: ${elTransferEvent.amount}, expected $expectedAmount"
       )
     } yield ()
   }
diff --git a/src/main/scala/units/eth/EthAddress.scala b/src/main/scala/units/eth/EthAddress.scala
@@ -3,16 +3,7 @@ package units.eth
 import play.api.libs.json.*
 import units.util.HexBytesConverter
 
-class EthAddress private (val hex: String) {
-  def hexNoPrefix: String = hex.drop(2)
-
-  override def hashCode(): Int = hex.hashCode()
-  override def equals(that: Any): Boolean = that match {
-    case that: EthAddress => this.hex == that.hex
-    case _                => false
-  }
-  override def toString: String = hex
-}
+opaque type EthAddress = String
 
 object EthAddress {
   val AddressHexLength           = 40
@@ -21,7 +12,12 @@ object EthAddress {
   val EmptyHex = "0x" + "0" * EthAddress.AddressHexLength
   val empty    = unsafeFrom(EmptyHex)
 
-  implicit val ethAddressFormat: Format[EthAddress] = implicitly[Format[String]].bimap(unsafeFrom, _.hex)
+  extension (a: EthAddress) {
+    def hex: String = a
+    def hexNoPrefix: String = a.drop(2)
+  }
+
+  given Format[EthAddress] = implicitly[Format[String]]
 
   def from(hex: String): Either[String, EthAddress] = {
     for {
diff --git a/src/test/scala/units/client/contract/HasConsensusLayerDappTxHelpers.scala b/src/test/scala/units/client/contract/HasConsensusLayerDappTxHelpers.scala
@@ -18,6 +18,8 @@ import units.client.contract.HasConsensusLayerDappTxHelpers.DefaultFees.ChainCon
 import units.eth.{EthAddress, EthereumConstants}
 import units.{BlockHash, ELUpdater}
 
+import scala.annotation.targetName
+
 trait HasConsensusLayerDappTxHelpers {
   def currentHitSource: ByteStr
 
@@ -122,6 +124,7 @@ trait HasConsensusLayerDappTxHelpers {
     ): InvokeScriptTransaction =
       registerAsset(asset, erc20Address.hexNoPrefix, elDecimals, invoker)
 
+    @targetName("registerAssetHexString")
     def registerAsset(asset: IssuedAsset, erc20AddressHex: String, elDecimals: Int, invoker: KeyPair): InvokeScriptTransaction =
       registerAssets(List(asset), List(erc20AddressHex), List(elDecimals), invoker)
 
@@ -162,6 +165,7 @@ trait HasConsensusLayerDappTxHelpers {
         invoker: KeyPair = chainContractAccount
     ): InvokeScriptTransaction = issueAndRegister(erc20Address.hexNoPrefix, elDecimals, name, description, clDecimals, invoker)
 
+    @targetName("issueAndRegisterHexString")
     def issueAndRegister(
         erc20AddressHex: String,
         elDecimals: Int,
