diff --git a/bin/lamassu-eth-sweep-to-new-wallet b/bin/lamassu-eth-sweep-to-new-wallet index 8cb2ec6b..57fb4f0b 100644 --- a/bin/lamassu-eth-sweep-to-new-wallet +++ b/bin/lamassu-eth-sweep-to-new-wallet @@ -263,7 +263,7 @@ settingsLoader.loadLatest() } const opts = { - chainId: 3, + chainId: 1, nonce: 0, includesFee: true } diff --git a/lib/plugins/wallet/geth/base.js b/lib/plugins/wallet/geth/base.js index 44a3cbb7..d17878ef 100644 --- a/lib/plugins/wallet/geth/base.js +++ b/lib/plugins/wallet/geth/base.js @@ -10,6 +10,7 @@ const Tx = require('ethereumjs-tx') const { default: PQueue } = require('p-queue') const util = require('ethereumjs-util') const coins = require('@lamassu/coins') +const { BigNumber } = require('bignumber.js') const _pify = require('pify') const BN = require('../../../bn') @@ -205,7 +206,7 @@ function generateTx (_toAddress, wallet, amount, includesFee, cryptoCode) { lastUsedNonces[fromAddress] = txCount const toSend = includesFee - ? amount.minus(gasPrice.times(gas)) + ? 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