-
Notifications
You must be signed in to change notification settings - Fork 3
Refactor native token transfers to use deposited transactions instead of withdrawals #58
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.
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
9e79ca8 to
621c6a1
Compare
consensus-client-it/src/test/scala/units/C2ENativeTokenTransfersViaDepositsTestSuite.scala
Outdated
Show resolved
Hide resolved
consensus-client-it/src/test/scala/units/MultipleTransfersViaDepositsTestSuite.scala
Outdated
Show resolved
Hide resolved
59eb7d5 to
701551f
Compare
|
|
||
| import com.wavesplatform.transaction.TxHelpers | ||
| import com.wavesplatform.state.IntegerDataEntry | ||
| import org.web3j.crypto.Credentials |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
never used
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, fixed
| val e2cWavesTxn = standardBridge.sendBridgeErc20(elSender, WWavesAddress, clRecipient.toAddress, wavesE2CAmount, nextNonce) | ||
|
|
||
| chainContract.waitForEpoch(waves1.api.height() + 1) // Bypass rollbacks | ||
| val e2cReceipts = List(e2cIssuedTxn, e2cIssuedTxn, e2cWavesTxn).map { txn => |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
e2cIssuedTxn appointed twice
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, fixed
0a2b9fb to
ab9939f
Compare
consensus-client-it/src/test/scala/units/BlockValidationTestSuite.scala
Outdated
Show resolved
Hide resolved
consensus-client-it/src/test/scala/units/docker/WavesNodeContainer.scala
Outdated
Show resolved
Hide resolved
consensus-client-it/src/test/scala/units/TestNetworkClient.scala
Outdated
Show resolved
Hide resolved
consensus-client-it/src/test/scala/units/TestNetworkClient.scala
Outdated
Show resolved
Hide resolved
consensus-client-it/src/test/scala/units/docker/WavesNodeContainer.scala
Outdated
Show resolved
Hide resolved
consensus-client-it/src/test/scala/units/docker/WavesNodeContainer.scala
Outdated
Show resolved
Hide resolved
consensus-client-it/src/test/scala/units/docker/WavesNodeContainer.scala
Outdated
Show resolved
Hide resolved
Co-authored-by: Vyatcheslav Suharnikov <[email protected]>
…iner.scala Co-authored-by: Vyatcheslav Suharnikov <[email protected]>
…iner.scala Co-authored-by: Vyatcheslav Suharnikov <[email protected]>
…iner.scala Co-authored-by: Vyatcheslav Suharnikov <[email protected]>
…iner.scala Co-authored-by: Vyatcheslav Suharnikov <[email protected]>
Co-authored-by: Vyatcheslav Suharnikov <[email protected]>
consensus-client-it/src/test/scala/units/BaseBlockValidationSuite.scala
Outdated
Show resolved
Hide resolved
consensus-client-it/src/test/scala/units/BaseBlockValidationSuite.scala
Outdated
Show resolved
Hide resolved
| val (nativeTransfers, assetTransfers) = transfers.partitionMap { | ||
| case x: ContractTransfer.Native => x.asLeft | ||
| case x: ContractTransfer.Asset => x.asRight | ||
| val nativeTransfersViaWithdrawals = transfers.flatMap { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| val nativeTransfersViaWithdrawals = transfers.flatMap { | |
| val nativeTransfersViaWithdrawals = transfers.collect { | |
| case x: ContractTransfer.NativeViaWithdrawal => x | |
| } |
scalelocal-network, because it tends to grow again and again