lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1212 from josepfo/fix/eth-display-amount

Browse source 
fix: eth bn to bn convertion
This commit is contained in:
Rafael Taranto 2022-05-12 10:16:23 +01:00 • committed by GitHub
commit e94f1ff223
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/plugins/wallet/geth/base.js
View file

@ -40,7 +40,6 @@ function connect (url) {
} }
const hex = bigNum => '0x' + bigNum.integerValue(BN.ROUND_DOWN).toString(16) const hex = bigNum => '0x' + bigNum.integerValue(BN.ROUND_DOWN).toString(16)
const bn2bn = bn => new BN(bn.toString(16), 16)
function privateKey (account) { function privateKey (account) {
return defaultWallet(account).getPrivateKey() return defaultWallet(account).getPrivateKey()
@ -92,7 +91,7 @@ function _balance (includePending, address, cryptoCode) {
const block = includePending ? 'pending' : undefined const block = includePending ? 'pending' : undefined
return pify(web3.eth.getBalance)(address.toLowerCase(), block) return pify(web3.eth.getBalance)(address.toLowerCase(), block)
/* NOTE: Convert bn.js bignum to bignumber.js bignum */ /* NOTE: Convert bn.js bignum to bignumber.js bignum */
.then(balance => balance ? BN(balance.toString(16), 16) : BN(0)) .then(balance => balance ? BN(balance) : BN(0))
} }
function generateTx (_toAddress, wallet, amount, includesFee, cryptoCode) { function generateTx (_toAddress, wallet, amount, includesFee, cryptoCode) {
@ -126,10 +125,10 @@ function generateTx (_toAddress, wallet, amount, includesFee, cryptoCode) {
return Promise.all(promises) return Promise.all(promises)
.then(([gas, gasPrice, txCount, { baseFeePerGas }]) => [ .then(([gas, gasPrice, txCount, { baseFeePerGas }]) => [
bn2bn(gas), BN(gas),
bn2bn(gasPrice), BN(gasPrice),
_.max([1, txCount, lastUsedNonces[fromAddress] + 1]), _.max([1, txCount, lastUsedNonces[fromAddress] + 1]),
bn2bn(baseFeePerGas) BN(baseFeePerGas)
]) ])
.then(([gas, gasPrice, txCount, baseFeePerGas]) => { .then(([gas, gasPrice, txCount, baseFeePerGas]) => {
lastUsedNonces[fromAddress] = txCount lastUsedNonces[fromAddress] = txCount