Skip to content

Commit 9e79ca8

Browse files
Fix validateC2ENativeTransfer
1 parent f159b08 commit 9e79ca8

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎src/main/scala/units/ELUpdater.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ class ELUpdater(
17391739
s"$errorPrefix: got address: ${elTransferEvent.to}, expected: ${expectedTransfer.to}"
17401740
)
17411741
_ <- Either.cond(
1742-
elTransferEvent.amount == expectedTransfer.amount,
1742+
elTransferEvent.amount.bigInteger == WAmount(expectedTransfer.amount).scale(NativeTokenElDecimals - NativeTokenClDecimals).raw,
17431743
(),
17441744
s"$errorPrefix: got amount: ${elTransferEvent.amount}, expected ${expectedTransfer.amount}"
17451745
)

‎src/test/scala/units/C2ETransfersTestSuite.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class C2ETransfersTestSuite extends BaseTestSuite {
9999
"Native Transfers via Deposits" - {
100100
val userAmount = 1
101101
val nativeTokensClAmount = UnitsConvert.toUnitsInWaves(userAmount)
102-
val nativeTokensElAmount = BigInt("1000000000000000000").bigInteger
102+
val nativeTokensElAmount = WAmount(nativeTokensClAmount).scale(NativeTokenElDecimals - NativeTokenClDecimals)
103103
val destElAddress = EthAddress.unsafeFrom(s"0x$validTransferRecipient")
104104

105105
def mkNativeTransfer(d: ExtensionDomain): InvokeScriptTransaction = d.ChainContract.transfer(
@@ -115,7 +115,7 @@ class C2ETransfersTestSuite extends BaseTestSuite {
115115

116116
"Conversion works as expected" in withExtensionDomain(settings) { d =>
117117
nativeTokensClAmount shouldBe 100_000_000L
118-
nativeTokensElAmount shouldBe BigInt("1000000000000000000").bigInteger // 1_000_000_000_000_000_000
118+
nativeTokensElAmount.raw shouldBe BigInt("1000000000000000000").bigInteger // 1_000_000_000_000_000_000
119119
}
120120

121121
"Validation passes if transfer logs match" in withExtensionDomain(settings) { d =>
@@ -127,7 +127,7 @@ class C2ETransfersTestSuite extends BaseTestSuite {
127127
mkNativeTransfer(d)
128128
)
129129

130-
val transferLogEntries = List(getLogsResponseEntry(StandardBridge.ETHBridgeFinalized(destElAddress, nativeTokensElAmount)))
130+
val transferLogEntries = List(getLogsResponseEntry(StandardBridge.ETHBridgeFinalized(destElAddress, nativeTokensElAmount.raw)))
131131
val ecGoodBlock = d
132132
.createEcBlockBuilder("0", second)
133133
.buildAndSetLogs(transferLogEntries)
@@ -186,7 +186,7 @@ class C2ETransfersTestSuite extends BaseTestSuite {
186186
)
187187

188188
val wrongButValidTransferRecipient = EthAddress.unsafeFrom(s"0x2222222222222222222222222222222222222222")
189-
val transferLogEntries = List(getLogsResponseEntry(StandardBridge.ETHBridgeFinalized(wrongButValidTransferRecipient, nativeTokensElAmount)))
189+
val transferLogEntries = List(getLogsResponseEntry(StandardBridge.ETHBridgeFinalized(wrongButValidTransferRecipient, nativeTokensElAmount.raw)))
190190
val ecBadBlock = d
191191
.createEcBlockBuilder("0", second)
192192
.buildAndSetLogs(transferLogEntries)

0 commit comments

Comments
 (0)