fix: ETH fees
This commit is contained in:
parent
7dd395672a
commit
60ae126712
1 changed files with 9 additions and 7 deletions
|
|
@ -205,18 +205,20 @@ function generateTx (_toAddress, wallet, amount, includesFee, cryptoCode) {
|
|||
.then(([gas, gasPrice, txCount, baseFeePerGas]) => {
|
||||
lastUsedNonces[fromAddress] = txCount
|
||||
|
||||
const toSend = includesFee
|
||||
? new BN(amount.times(0.99999).toFixed(0, BigNumber.ROUND_DOWN)).minus(gasPrice.times(gas))
|
||||
: amount
|
||||
|
||||
const maxPriorityFeePerGas = new BN(web3.utils.toWei('2.5', 'gwei')) // web3 default value
|
||||
const maxFeePerGas = new BN(2).times(baseFeePerGas).plus(maxPriorityFeePerGas)
|
||||
const neededPriority = new BN(web3.utils.toWei('2.0', 'gwei'))
|
||||
const maxFeePerGas = baseFeePerGas.plus(neededPriority)
|
||||
const newGasPrice = BigNumber.minimum(maxFeePerGas, baseFeePerGas.plus(maxPriorityFeePerGas))
|
||||
|
||||
const toSend = includesFee
|
||||
? new BN(amount).minus(newGasPrice.times(gas))
|
||||
: amount
|
||||
|
||||
const rawTx = {
|
||||
chainId: 1,
|
||||
nonce: txCount,
|
||||
maxPriorityFeePerGas: web3.utils.toHex(web3.utils.toWei(maxPriorityFeePerGas.toString(), 'gwei')),
|
||||
maxFeePerGas: web3.utils.toHex(web3.utils.toWei(maxFeePerGas.toString(), 'gwei')),
|
||||
maxPriorityFeePerGas: web3.utils.toHex(maxPriorityFeePerGas),
|
||||
maxFeePerGas: web3.utils.toHex(maxFeePerGas),
|
||||
gasLimit: hex(gas),
|
||||
to: toAddress,
|
||||
from: fromAddress,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue