From 3405514d983e31d6828a6b80de0d5a40ff4f45b9 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Thu, 13 Mar 2025 11:08:36 +0000 Subject: [PATCH 1/2] fix: fee for sweeps --- lib/plugins/wallet/geth/base.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/plugins/wallet/geth/base.js b/lib/plugins/wallet/geth/base.js index cb6a6fcb..1b8d91ce 100644 --- a/lib/plugins/wallet/geth/base.js +++ b/lib/plugins/wallet/geth/base.js @@ -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 maxFeePerGas = baseFeePerGas.times(2).plus(maxPriorityFeePerGas) - const newGasPrice = BN.minimum(maxFeePerGas, baseFeePerGas.plus(maxPriorityFeePerGas)) const toSend = includesFee - ? new BN(amount).minus(newGasPrice.times(gas)) + ? new BN(amount).minus(maxFeePerGas.times(gas)) : amount const rawTx = { From c22c5bab6d6da80f501226b687c38bfc4124e51d Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Fri, 14 Mar 2025 14:27:07 +0000 Subject: [PATCH 2/2] chore: lamassu coins bump on admin --- new-lamassu-admin/package-lock.json | 8 ++++---- new-lamassu-admin/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json index 5bc42a8c..2dc8ff12 100644 --- a/new-lamassu-admin/package-lock.json +++ b/new-lamassu-admin/package-lock.json @@ -10,7 +10,7 @@ "license": "../LICENSE", "dependencies": { "@apollo/react-hooks": "^3.1.3", - "@lamassu/coins": "v1.5.3", + "@lamassu/coins": "v1.6.0", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.2", "@material-ui/lab": "^4.0.0-alpha.61", @@ -1222,9 +1222,9 @@ "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" }, "node_modules/@lamassu/coins": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@lamassu/coins/-/coins-1.5.3.tgz", - "integrity": "sha512-rcDFefIh17B3nrgxJhUBxngL6ilyHcS/WwPN92tIS4Z4jpFKFaqAZ1bJiLZbtxrOJpeSxR2fZfW7xqCdexIAhQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@lamassu/coins/-/coins-1.6.0.tgz", + "integrity": "sha512-Rl6NmbAwZQwltEw60YIxTmI9Idiae7MhucV44Zv8mQ+bBaVW88SE4lXFR1dbyETYS+2uWjX0qIvBw7KolAiGtQ==", "dependencies": { "@lamassu/bolt11": "1.5.1", "bech32": "2.0.0", diff --git a/new-lamassu-admin/package.json b/new-lamassu-admin/package.json index 79b1aae4..eb8e8471 100644 --- a/new-lamassu-admin/package.json +++ b/new-lamassu-admin/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "@apollo/react-hooks": "^3.1.3", - "@lamassu/coins": "v1.5.3", + "@lamassu/coins": "v1.6.0", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.2", "@material-ui/lab": "^4.0.0-alpha.61",