From ed108953d35b076b1c31742a7fa2ce7b162e7eac Mon Sep 17 00:00:00 2001 From: fbslo Date: Tue, 5 Nov 2024 21:29:21 +0100 Subject: [PATCH 1/3] add tx amount to confirmation memo --- src/libs/ethereum/sendEthereumTokens.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libs/ethereum/sendEthereumTokens.js b/src/libs/ethereum/sendEthereumTokens.js index 5a0b363..aa69658 100644 --- a/src/libs/ethereum/sendEthereumTokens.js +++ b/src/libs/ethereum/sendEthereumTokens.js @@ -38,7 +38,9 @@ async function start(depositAmount, address, sender, logger, depositTransaction) let serializedTx = tx.serialize(); let receipt = await web3.eth.sendSignedTransaction('0x' + serializedTx.toString('hex')); let { transactionHash, gasUsed, status } = receipt - sendDepositConfirmation(transactionHash, sender, depositTransaction) + + let confirmationAmount = (amount / Math.pow(10, process.env.ETHEREUM_TOKEN_PRECISION)).toString(); + sendDepositConfirmation(transactionHash, sender, depositTransaction, confirmationAmount) if (gasUsed < estimatedGasFee.estimatedGas){ //refund any extra fees let spendTransactionFeeInHETokens = parseFloat(gasUsed / hiveEngineTokenPriceInEther).toFixed(process.env.HIVE_TOKEN_PRECISION) let extraFeeRefund = (estimatedTransactionFeeInHETokens / Math.pow(10, process.env.ETHEREUM_TOKEN_PRECISION)) - spendTransactionFeeInHETokens @@ -76,12 +78,12 @@ async function sendFeeRefund(amount, sender){ let transaction = await hive.custom_json('ssc-mainnet-hive', json, process.env.HIVE_ACCOUNT, process.env.HIVE_ACCOUNT_PRIVATE_KEY, true); } -async function sendDepositConfirmation(transactionHash, sender, depositTransactionHash){ +async function sendDepositConfirmation(transactionHash, sender, depositTransactionHash, amount){ let memo; if (process.env.IS_LEO_BRIDGE_ENABLED && sender == 'leobridge'){ memo = `Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash}, depositTxHash: ${depositTransactionHash}` } else { - memo = `Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash}` + memo = `${amount} Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash}` } let json = { contractName: "tokens", contractAction: "transfer", contractPayload: { From 37a9936e93aafc29ec849da2b53e8d08a9e52a03 Mon Sep 17 00:00:00 2001 From: fbslo Date: Sat, 9 Nov 2024 13:38:56 +0100 Subject: [PATCH 2/3] Update sendEthereumTokens.js --- src/libs/ethereum/sendEthereumTokens.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ethereum/sendEthereumTokens.js b/src/libs/ethereum/sendEthereumTokens.js index aa69658..b1242ae 100644 --- a/src/libs/ethereum/sendEthereumTokens.js +++ b/src/libs/ethereum/sendEthereumTokens.js @@ -83,7 +83,7 @@ async function sendDepositConfirmation(transactionHash, sender, depositTransacti if (process.env.IS_LEO_BRIDGE_ENABLED && sender == 'leobridge'){ memo = `Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash}, depositTxHash: ${depositTransactionHash}` } else { - memo = `${amount} Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash}` + memo = `${amount} Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash} Transaction Id: ${depositTransactionHash}` } let json = { contractName: "tokens", contractAction: "transfer", contractPayload: { From e03ff0588d90e1413ff9c961b3a18e18a6ea6879 Mon Sep 17 00:00:00 2001 From: fbslo Date: Sat, 9 Nov 2024 13:39:20 +0100 Subject: [PATCH 3/3] Update sendEthereumTokens.js --- src/libs/ethereum/sendEthereumTokens.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ethereum/sendEthereumTokens.js b/src/libs/ethereum/sendEthereumTokens.js index b1242ae..b960011 100644 --- a/src/libs/ethereum/sendEthereumTokens.js +++ b/src/libs/ethereum/sendEthereumTokens.js @@ -83,7 +83,7 @@ async function sendDepositConfirmation(transactionHash, sender, depositTransacti if (process.env.IS_LEO_BRIDGE_ENABLED && sender == 'leobridge'){ memo = `Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash}, depositTxHash: ${depositTransactionHash}` } else { - memo = `${amount} Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash} Transaction Id: ${depositTransactionHash}` + memo = `Wrapped ${process.env.TOKEN_SYMBOL} tokens sent! Transaction Hash: ${transactionHash} Transaction Id: ${depositTransactionHash}` } let json = { contractName: "tokens", contractAction: "transfer", contractPayload: {