commit
3a82ad3b74
3 changed files with 6 additions and 7 deletions
|
|
@ -221,10 +221,9 @@ function generateTx (_toAddress, wallet, amount, includesFee, cryptoCode, txId)
|
||||||
|
|
||||||
const maxPriorityFeePerGas = new BN(web3.utils.toWei('1.0', 'gwei')) // web3 default value
|
const maxPriorityFeePerGas = new BN(web3.utils.toWei('1.0', 'gwei')) // web3 default value
|
||||||
const maxFeePerGas = baseFeePerGas.times(2).plus(maxPriorityFeePerGas)
|
const maxFeePerGas = baseFeePerGas.times(2).plus(maxPriorityFeePerGas)
|
||||||
const newGasPrice = BN.minimum(maxFeePerGas, baseFeePerGas.plus(maxPriorityFeePerGas))
|
|
||||||
|
|
||||||
const toSend = includesFee
|
const toSend = includesFee
|
||||||
? new BN(amount).minus(newGasPrice.times(gas))
|
? new BN(amount).minus(maxFeePerGas.times(gas))
|
||||||
: amount
|
: amount
|
||||||
|
|
||||||
const rawTx = {
|
const rawTx = {
|
||||||
|
|
|
||||||
8
new-lamassu-admin/package-lock.json
generated
8
new-lamassu-admin/package-lock.json
generated
|
|
@ -10,7 +10,7 @@
|
||||||
"license": "../LICENSE",
|
"license": "../LICENSE",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@apollo/react-hooks": "^3.1.3",
|
"@apollo/react-hooks": "^3.1.3",
|
||||||
"@lamassu/coins": "v1.5.3",
|
"@lamassu/coins": "v1.6.0",
|
||||||
"@material-ui/core": "4.12.4",
|
"@material-ui/core": "4.12.4",
|
||||||
"@material-ui/icons": "4.11.2",
|
"@material-ui/icons": "4.11.2",
|
||||||
"@material-ui/lab": "^4.0.0-alpha.61",
|
"@material-ui/lab": "^4.0.0-alpha.61",
|
||||||
|
|
@ -1222,9 +1222,9 @@
|
||||||
"integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
|
"integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
|
||||||
},
|
},
|
||||||
"node_modules/@lamassu/coins": {
|
"node_modules/@lamassu/coins": {
|
||||||
"version": "1.5.3",
|
"version": "1.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/@lamassu/coins/-/coins-1.5.3.tgz",
|
"resolved": "https://registry.npmjs.org/@lamassu/coins/-/coins-1.6.0.tgz",
|
||||||
"integrity": "sha512-rcDFefIh17B3nrgxJhUBxngL6ilyHcS/WwPN92tIS4Z4jpFKFaqAZ1bJiLZbtxrOJpeSxR2fZfW7xqCdexIAhQ==",
|
"integrity": "sha512-Rl6NmbAwZQwltEw60YIxTmI9Idiae7MhucV44Zv8mQ+bBaVW88SE4lXFR1dbyETYS+2uWjX0qIvBw7KolAiGtQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@lamassu/bolt11": "1.5.1",
|
"@lamassu/bolt11": "1.5.1",
|
||||||
"bech32": "2.0.0",
|
"bech32": "2.0.0",
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@apollo/react-hooks": "^3.1.3",
|
"@apollo/react-hooks": "^3.1.3",
|
||||||
"@lamassu/coins": "v1.5.3",
|
"@lamassu/coins": "v1.6.0",
|
||||||
"@material-ui/core": "4.12.4",
|
"@material-ui/core": "4.12.4",
|
||||||
"@material-ui/icons": "4.11.2",
|
"@material-ui/icons": "4.11.2",
|
||||||
"@material-ui/lab": "^4.0.0-alpha.61",
|
"@material-ui/lab": "^4.0.0-alpha.61",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue