diff --git a/src/app_service/service/eth/dto/transaction.nim b/src/app_service/service/eth/dto/transaction.nim index db7022283a..4fc302f50c 100644 --- a/src/app_service/service/eth/dto/transaction.nim +++ b/src/app_service/service/eth/dto/transaction.nim @@ -22,7 +22,7 @@ type recipient*: Option[Address] # (optional) recipient in case of a bridge hop transaction amount*: Option[UInt256] # (optional) amount in case of a bridge hop transaction amountOutMin*: Option[UInt256] # (optional) amountOutMin in case of a bridge hop transaction - bonderFee*: Option[string] # (optional) bonderFee in case of a bridge hop transaction + bonderFee*: Option[UInt256] # (optional) bonderFee in case of a bridge hop transaction tokenID*: Option[UInt256] # (optional) chainID in case of a ERC721 transaction diff --git a/src/app_service/service/transaction/dto.nim b/src/app_service/service/transaction/dto.nim index a9b6337bd6..bb9f8efb0c 100644 --- a/src/app_service/service/transaction/dto.nim +++ b/src/app_service/service/transaction/dto.nim @@ -248,6 +248,7 @@ type gasFees*: SuggestedFeesDto tokenFees*: float bonderFees*: string + txBonderFees*: UInt256 # Unchanged value from Path V2 cost*: float estimatedTime*: int amountInLocked*: bool diff --git a/src/app_service/service/transaction/dto_conversion.nim b/src/app_service/service/transaction/dto_conversion.nim index 3725112c4d..1e72c04350 100644 --- a/src/app_service/service/transaction/dto_conversion.nim +++ b/src/app_service/service/transaction/dto_conversion.nim @@ -47,6 +47,7 @@ proc convertToOldRoute*(route: seq[TransactionPathDtoV2]): seq[TransactionPathDt trPath.tokenFees = parseFloat(value) value = conversion.wei2Eth(input = p.txBonderFees, decimals = p.fromToken.decimals) trPath.bonderFees = value + trPath.txBonderFees = p.txBonderFees trPath.tokenFees += parseFloat(value) # we add bonder fees to the token fees cause in the UI, atm, we show only token fees trPath.maxAmountIn = stint.fromHex(UInt256, "0x0") trPath.amountIn = p.amountIn diff --git a/src/app_service/service/transaction/service.nim b/src/app_service/service/transaction/service.nim index d4b9518a56..5cb540b42c 100644 --- a/src/app_service/service/transaction/service.nim +++ b/src/app_service/service/transaction/service.nim @@ -316,11 +316,12 @@ QtObject: path.transferTx = txData elif(route.bridgeName == HOP_TX_BRIDGE_NAME): hopTx = txData - hopTx.chainID = route.toNetwork.chainId.some + hopTx.chainID = route.fromNetwork.chainId.some + hopTx.chainIDTo = route.toNetwork.chainId.some hopTx.symbol = tokenSymbol.some hopTx.recipient = parseAddress(to_addr).some hopTx.amount = route.amountIn.some - hopTx.bonderFee = route.bonderFees.some + hopTx.bonderFee = route.txBonderFees.some path.hopTx = hopTx elif(route.bridgeName == ERC721_TRANSFER_NAME): eRC721TransferTx = txData diff --git a/vendor/status-go b/vendor/status-go index 0456dcef8b..5e88d5b498 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 0456dcef8bc21551782931c1f989e6a421d2fd78 +Subproject commit 5e88d5b4987ae27d257d90316b3ba3134b75f5b0