Skip to content

Process failed transfers #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phearnot merged 17 commits into from
Nov 20, 2025
Merged

Process failed transfers #71

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1e77191
Rebase on updated main
vladimirlogachev Nov 6, 2025
325c7a9
Simplify validation after strict transfers activation
vladimirlogachev Nov 6, 2025
141448f
Remove validateC2ENativeTransfer
vladimirlogachev Nov 6, 2025
e740a1b
Rename test suites
vladimirlogachev Nov 6, 2025
079bf5f
Cleanup
vladimirlogachev Nov 7, 2025
dc5c855
Add log
vladimirlogachev Nov 7, 2025
26fed16
Log failed transfers only if non-empty
vladimirlogachev Nov 7, 2025
236fa0b
Update contracts/waves/src/main.ride
vladimirlogachev Nov 10, 2025
5725dd9
Update contracts/waves/src/main.ride
vladimirlogachev Nov 10, 2025
e9caacb
Refactor assetTransferBeforeStrictGuard
vladimirlogachev Nov 10, 2025
56b252e
Update src/main/scala/units/ELUpdater.scala
vladimirlogachev Nov 10, 2025
666b74c
Update src/main/scala/units/el/DepositedTransaction.scala
vladimirlogachev Nov 10, 2025
8a156c7
Refactor DepositedTransaction.hash
vladimirlogachev Nov 10, 2025
74b8e41
Remove redundant checks
vladimirlogachev Nov 10, 2025
73c5a46
Refactor DepositedTransaction
vladimirlogachev Nov 11, 2025
1902a1b
Merge branch 'main' into failed-transfers-4
phearnot Nov 20, 2025
c20ec76
fixes
phearnot Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
check-pr:
name: Check PR
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: 45
env:
JAVA_OPTS: -Dfile.encoding=UTF-8
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
Expand Down
8 changes: 2 additions & 6 deletions consensus-client-it/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,11 @@ libraryDependencies ++= Seq(
).map(_ % Test)

Test / sourceGenerators += Def.task {
val generateSourcesFromContracts = Seq("Bridge", "StandardBridge", "ERC20")
val generateSourcesFromContracts = Seq("Bridge", "StandardBridge", "ERC20", "TERC20")
val contractSources = baseDirectory.value / ".." / "contracts" / "eth"
val compiledDir = contractSources / "target"
// --silent to bypass garbage "Counting objects" git logs
s"forge build --silent --config-path ${contractSources / "foundry.toml"} --contracts " +
s"${contractSources / "src" / "utils" / "TERC20.sol"} " +
s"${contractSources / "src" / "StandardBridge.sol"} " +
s"${contractSources / "src" / "Bridge.sol"} " +
s"${contractSources / "src" / "UnitsMintableERC20.sol"}" !
s"forge build --silent --config-path ${contractSources / "foundry.toml"} --contracts ${contractSources / "src"}" !

generateSourcesFromContracts.foreach { contract =>
val json = Json.parse(new FileInputStream(compiledDir / s"$contract.sol" / s"$contract.json"))
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationAssetInvalidAmountTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -49,14 +49,15 @@ class BlockValidationAssetInvalidAmountTestSuite extends BaseBlockValidationSuit
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationAssetInvalidBridgeTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -49,14 +49,15 @@ class BlockValidationAssetInvalidBridgeTestSuite extends BaseBlockValidationSuit
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationAssetInvalidRecipientTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -49,14 +49,15 @@ class BlockValidationAssetInvalidRecipientTestSuite extends BaseBlockValidationS
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationAssetInvalidSenderTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.{BlockHash, TestNetworkClient}
Expand Down Expand Up @@ -47,14 +47,15 @@ class BlockValidationAssetInvalidSenderTestSuite extends BaseBlockValidationSuit
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationAssetInvalidTokenTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -49,14 +49,15 @@ class BlockValidationAssetInvalidTokenTestSuite extends BaseBlockValidationSuite
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationAssetValidTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -47,14 +47,15 @@ class BlockValidationAssetValidTestSuite extends BaseBlockValidationSuite {
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationNativeInvalidAmountTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -49,14 +49,15 @@ class BlockValidationNativeInvalidAmountTestSuite extends BaseBlockValidationSui
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationNativeInvalidBridgeTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -49,14 +49,15 @@ class BlockValidationNativeInvalidBridgeTestSuite extends BaseBlockValidationSui
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions ...ensus-client-it/src/test/scala/units/BlockValidationNativeInvalidRecipientTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -49,14 +49,15 @@ class BlockValidationNativeInvalidRecipientTestSuite extends BaseBlockValidation
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationNativeInvalidSenderTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.{BlockHash, TestNetworkClient}
Expand Down Expand Up @@ -47,14 +47,15 @@ class BlockValidationNativeInvalidSenderTestSuite extends BaseBlockValidationSui
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
9 changes: 6 additions & 3 deletions consensus-client-it/src/test/scala/units/BlockValidationNativeMissingDepositTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.{BlockHash, TestNetworkClient}

class BlockValidationNativeMissingDepositTestSuite extends BaseBlockValidationSuite {
// Note: This test doesn't assert behavior in case of a failed transfer (which also means that the deposited tx is missing). For that case we have FailedTransfersTestSuite.
// This test only asserts behavior in case of a missing deposited tx while there were no unsuccessful transfers (meaning that the block is considered invalid).
"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()
Expand All @@ -36,14 +38,15 @@ class BlockValidationNativeMissingDepositTestSuite extends BaseBlockValidationSu
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions ...nsus-client-it/src/test/scala/units/BlockValidationNativeUnexpectedDepositTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.EcBlock
import units.el.*
import units.eth.EthAddress
Expand Down Expand Up @@ -39,14 +39,15 @@ class BlockValidationNativeUnexpectedDepositTestSuite extends BaseBlockValidatio
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
7 changes: 4 additions & 3 deletions ...s-client-it/src/test/scala/units/BlockValidationNativeUnexpectedWithdrawalTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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
import units.client.contract.HasConsensusLayerDappTxHelpers.{EmptyE2CTransfersRootHashHex, EmptyFailedC2ETransfersRootHashHex}
import units.client.engine.model.{EcBlock, Withdrawal}
import units.el.*
import units.eth.{EthAddress, Gwei}
Expand Down Expand Up @@ -49,14 +49,15 @@ class BlockValidationNativeUnexpectedWithdrawalTestSuite extends BaseBlockValida
TxHelpers.invoke(
invoker = actingMiner,
dApp = chainContractAddress,
func = Some("extendMainChain_v2"),
func = Some("extendMainChain_v3"),
args = List(
Terms.CONST_STRING(simulatedBlockHash.drop(2)).explicitGet(),
Terms.CONST_STRING(elParentBlock.hash.hexNoPrefix).explicitGet(),
Terms.CONST_BYTESTR(hitSource).explicitGet(),
Terms.CONST_STRING(EmptyE2CTransfersRootHashHex.drop(2)).explicitGet(),
Terms.CONST_LONG(0),
Terms.CONST_LONG(-1)
Terms.CONST_LONG(-1),
Terms.CONST_STRING(EmptyFailedC2ETransfersRootHashHex.drop(2)).explicitGet()
)
)
)
Expand Down
Loading