From 3e81e591ad3c452591e708ad6a1bfb9d1576c6d2 Mon Sep 17 00:00:00 2001 From: CrypticaScriptura <7396812+CrypticaScriptura@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:58:21 -0500 Subject: [PATCH 1/4] feat: add USDC --- lib/new-admin/config/accounts.js | 10 +++++----- lib/plugins/common/ccxt.js | 4 ++-- lib/plugins/exchange/binanceus.js | 4 ++-- lib/plugins/exchange/bitfinex.js | 4 ++-- lib/plugins/exchange/bitstamp.js | 4 ++-- lib/plugins/exchange/kraken.js | 4 ++-- new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx | 3 +++ new-lamassu-admin/src/pages/Wallet/helper.jsx | 2 +- .../src/styling/logos/icon-usdc-colour.svg | 5 +++++ 9 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 new-lamassu-admin/src/styling/logos/icon-usdc-colour.svg diff --git a/lib/new-admin/config/accounts.js b/lib/new-admin/config/accounts.js index 8a2279d9..c5b21f2e 100644 --- a/lib/new-admin/config/accounts.js +++ b/lib/new-admin/config/accounts.js @@ -3,7 +3,7 @@ const _ = require('lodash/fp') const { ALL } = require('../../plugins/common/ccxt') -const { BTC, BCH, DASH, ETH, LTC, USDT, ZEC, XMR, LN, TRX, USDT_TRON } = COINS +const { BTC, BCH, DASH, ETH, LTC, USDT, ZEC, XMR, LN, TRX, USDT_TRON, USDC } = COINS const { bitpay, coinbase, itbit, bitstamp, kraken, binanceus, cex, binance, bitfinex } = ALL const TICKER = 'ticker' @@ -31,9 +31,9 @@ const ALL_ACCOUNTS = [ { code: 'mock-ticker', display: 'Mock (Caution!)', class: TICKER, cryptos: ALL_CRYPTOS, dev: true }, { code: 'bitcoind', display: 'bitcoind', class: WALLET, cryptos: [BTC] }, { code: 'no-layer2', display: 'No Layer 2', class: LAYER_2, cryptos: ALL_CRYPTOS }, - { code: 'infura', display: 'Infura/Alchemy', class: WALLET, cryptos: [ETH, USDT] }, + { code: 'infura', display: 'Infura/Alchemy', class: WALLET, cryptos: [ETH, USDT, USDC] }, { code: 'trongrid', display: 'Trongrid', class: WALLET, cryptos: [TRX, USDT_TRON] }, - { code: 'geth', display: 'geth (deprecated)', class: WALLET, cryptos: [ETH, USDT] }, + { code: 'geth', display: 'geth (deprecated)', class: WALLET, cryptos: [ETH, USDT, USDC] }, { code: 'zcashd', display: 'zcashd', class: WALLET, cryptos: [ZEC] }, { code: 'litecoind', display: 'litecoind', class: WALLET, cryptos: [LTC] }, { code: 'dashd', display: 'dashd', class: WALLET, cryptos: [DASH] }, @@ -61,8 +61,8 @@ const ALL_ACCOUNTS = [ { code: 'none', display: 'None', class: ZERO_CONF, cryptos: ALL_CRYPTOS }, { code: 'blockcypher', display: 'Blockcypher', class: ZERO_CONF, cryptos: [BTC] }, { code: 'mock-zero-conf', display: 'Mock 0-conf', class: ZERO_CONF, cryptos: ALL_CRYPTOS, dev: true }, - { code: 'scorechain', display: 'Scorechain', class: WALLET_SCORING, cryptos: [BTC, ETH, LTC, BCH, DASH, USDT, USDT_TRON, TRX] }, - { code: 'elliptic', display: 'Elliptic', class: WALLET_SCORING, cryptos: [BTC, ETH, LTC, BCH, USDT, USDT_TRON, TRX, ZEC] }, + { code: 'scorechain', display: 'Scorechain', class: WALLET_SCORING, cryptos: [BTC, ETH, LTC, BCH, DASH, USDT, USDC, USDT_TRON, TRX] }, + { code: 'elliptic', display: 'Elliptic', class: WALLET_SCORING, cryptos: [BTC, ETH, LTC, BCH, USDT, USDC, USDT_TRON, TRX, ZEC] }, { code: 'mock-scoring', display: 'Mock scoring', class: WALLET_SCORING, cryptos: ALL_CRYPTOS, dev: true }, { code: 'sumsub', display: 'Sumsub', class: COMPLIANCE }, { code: 'mock-compliance', display: 'Mock Compliance', class: COMPLIANCE, dev: true }, diff --git a/lib/plugins/common/ccxt.js b/lib/plugins/common/ccxt.js index 825c30b7..46c7b50c 100644 --- a/lib/plugins/common/ccxt.js +++ b/lib/plugins/common/ccxt.js @@ -12,7 +12,7 @@ const binance = require('../exchange/binance') const bitfinex = require('../exchange/bitfinex') const logger = require('../../logger') -const { BTC, BCH, DASH, ETH, LTC, ZEC, USDT, TRX, USDT_TRON, LN } = COINS +const { BTC, BCH, DASH, ETH, LTC, ZEC, USDT, TRX, USDT_TRON, LN, USDC } = COINS const ALL = { cex: cex, @@ -22,7 +22,7 @@ const ALL = { itbit: itbit, bitpay: bitpay, coinbase: { - CRYPTO: [BTC, ETH, LTC, DASH, ZEC, BCH, USDT, USDT_TRON, TRX, LN], + CRYPTO: [BTC, ETH, LTC, DASH, ZEC, BCH, USDT, USDT_TRON, TRX, LN, USDC], FIAT: 'ALL_CURRENCIES', DEFAULT_FIAT_MARKET: 'EUR' }, diff --git a/lib/plugins/exchange/binanceus.js b/lib/plugins/exchange/binanceus.js index e8f0c371..1c57b239 100644 --- a/lib/plugins/exchange/binanceus.js +++ b/lib/plugins/exchange/binanceus.js @@ -4,8 +4,8 @@ const _ = require('lodash/fp') const { ORDER_TYPES } = require('./consts') const ORDER_TYPE = ORDER_TYPES.MARKET -const { BTC, BCH, DASH, ETH, LTC, ZEC, USDT, USDT_TRON, LN } = COINS -const CRYPTO = [BTC, ETH, LTC, DASH, ZEC, BCH, USDT, USDT_TRON, LN] +const { BTC, BCH, DASH, ETH, LTC, ZEC, USDT, USDT_TRON, LN, USDC } = COINS +const CRYPTO = [BTC, ETH, LTC, DASH, ZEC, BCH, USDT, USDT_TRON, LN, USDC] const FIAT = ['USD'] const DEFAULT_FIAT_MARKET = 'USD' const REQUIRED_CONFIG_FIELDS = ['apiKey', 'privateKey', 'currencyMarket'] diff --git a/lib/plugins/exchange/bitfinex.js b/lib/plugins/exchange/bitfinex.js index 4e4d85ce..a8796f7d 100644 --- a/lib/plugins/exchange/bitfinex.js +++ b/lib/plugins/exchange/bitfinex.js @@ -4,8 +4,8 @@ const _ = require('lodash/fp') const { ORDER_TYPES } = require('./consts') const ORDER_TYPE = ORDER_TYPES.MARKET -const { BTC, ETH, LTC, BCH, USDT, LN } = COINS -const CRYPTO = [BTC, ETH, LTC, BCH, USDT, LN] +const { BTC, ETH, LTC, BCH, USDT, LN, USDC } = COINS +const CRYPTO = [BTC, ETH, LTC, BCH, USDT, LN, USDC] const FIAT = ['USD', 'EUR'] const DEFAULT_FIAT_MARKET = 'EUR' const AMOUNT_PRECISION = 8 diff --git a/lib/plugins/exchange/bitstamp.js b/lib/plugins/exchange/bitstamp.js index bd745d49..959e7619 100644 --- a/lib/plugins/exchange/bitstamp.js +++ b/lib/plugins/exchange/bitstamp.js @@ -4,8 +4,8 @@ const _ = require('lodash/fp') const { ORDER_TYPES } = require('./consts') const ORDER_TYPE = ORDER_TYPES.MARKET -const { BTC, ETH, LTC, BCH, USDT, LN } = COINS -const CRYPTO = [BTC, ETH, LTC, BCH, USDT, LN] +const { BTC, ETH, LTC, BCH, USDT, LN, USDC } = COINS +const CRYPTO = [BTC, ETH, LTC, BCH, USDT, LN, USDC] const FIAT = ['USD', 'EUR'] const DEFAULT_FIAT_MARKET = 'EUR' const AMOUNT_PRECISION = 8 diff --git a/lib/plugins/exchange/kraken.js b/lib/plugins/exchange/kraken.js index 0f050ccf..29e80630 100644 --- a/lib/plugins/exchange/kraken.js +++ b/lib/plugins/exchange/kraken.js @@ -4,8 +4,8 @@ const { ORDER_TYPES } = require('./consts') const { COINS } = require('@lamassu/coins') const ORDER_TYPE = ORDER_TYPES.MARKET -const { BTC, BCH, DASH, ETH, LTC, ZEC, XMR, USDT, TRX, USDT_TRON, LN } = COINS -const CRYPTO = [BTC, ETH, LTC, DASH, ZEC, BCH, XMR, USDT, TRX, USDT_TRON, LN] +const { BTC, BCH, DASH, ETH, LTC, ZEC, XMR, USDT, TRX, USDT_TRON, LN, USDC } = COINS +const CRYPTO = [BTC, ETH, LTC, DASH, ZEC, BCH, XMR, USDT, TRX, USDT_TRON, LN, USDC] const FIAT = ['USD', 'EUR'] const DEFAULT_FIAT_MARKET = 'EUR' const AMOUNT_PRECISION = 6 diff --git a/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx b/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx index b33e9abd..1e362d40 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx +++ b/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx @@ -9,6 +9,7 @@ import LitecoinLogo from 'src/styling/logos/icon-litecoin-colour.svg?react' import MoneroLogo from 'src/styling/logos/icon-monero-colour.svg?react' import TetherLogo from 'src/styling/logos/icon-tether-colour.svg?react' import TronLogo from 'src/styling/logos/icon-tron-colour.svg?react' +import USDCLogo from 'src/styling/logos/icon-usdc-colour.svg' import ZCashLogo from 'src/styling/logos/icon-zcash-colour.svg?react' import { Button } from 'src/components/buttons' @@ -56,6 +57,8 @@ const getLogo = code => { case 'USDT': case 'USDT_TRON': return TetherLogo + case 'USDC': + return USDCLogo case 'XMR': return MoneroLogo case 'TRX': diff --git a/new-lamassu-admin/src/pages/Wallet/helper.jsx b/new-lamassu-admin/src/pages/Wallet/helper.jsx index ff4c97c0..bd6d90a6 100644 --- a/new-lamassu-admin/src/pages/Wallet/helper.jsx +++ b/new-lamassu-admin/src/pages/Wallet/helper.jsx @@ -202,7 +202,7 @@ const getAdvancedWalletElementsOverrides = ( const has0Conf = R.complement( /* NOTE: List of coins without 0conf settings. */ - R.pipe(R.prop('id'), R.flip(R.includes)(['ETH', 'USDT'])) + R.pipe(R.prop('id'), R.flip(R.includes)(['ETH', 'USDT', 'USDC'])) ) const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => { diff --git a/new-lamassu-admin/src/styling/logos/icon-usdc-colour.svg b/new-lamassu-admin/src/styling/logos/icon-usdc-colour.svg new file mode 100644 index 00000000..5dfea926 --- /dev/null +++ b/new-lamassu-admin/src/styling/logos/icon-usdc-colour.svg @@ -0,0 +1,5 @@ + + + + + From 5af38b390e625e9a16b4144fccf9a2b2b63c618f Mon Sep 17 00:00:00 2001 From: CrypticaScriptura <7396812+CrypticaScriptura@users.noreply.github.com> Date: Fri, 28 Feb 2025 07:45:51 -0500 Subject: [PATCH 2/4] feat: usdc (bump l-c) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bbedb762..f0e1b844 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@ethereumjs/tx": "^3.5.1", "@graphql-tools/merge": "^6.2.5", "@haensl/subset-sum": "^3.0.5", - "@lamassu/coins": "v1.4.12", + "@lamassu/coins": "v1.5.4", "@simplewebauthn/server": "^3.0.0", "@vonage/auth": "1.5.0", "@vonage/server-client": "1.7.0", From ca2f5fe37630ab18bcb81c2e15ebff9861aedd6a Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Wed, 12 Mar 2025 10:00:30 +0000 Subject: [PATCH 3/4] chore: lamassu-coins version bump --- package-lock.json | 149 ++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 78 insertions(+), 73 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd3ccdbe..1a14c8a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -990,38 +990,6 @@ "secp256k1": "^4.0.2", "secrets.js-grempe": "^1.1.0", "superagent": "3.8.3" - }, - "dependencies": { - "bech32": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", - "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" - }, - "bitcoinjs-message": { - "version": "npm:@bitgo-forks/bitcoinjs-message@1.0.0-master.2", - "resolved": "https://registry.npmjs.org/@bitgo-forks/bitcoinjs-message/-/bitcoinjs-message-1.0.0-master.2.tgz", - "integrity": "sha512-XSDGM3rA75vcDxeKqHPexika/TgWUFWdfKTv1lV8TZTb5XFHHD6ARckLdMOBiCf29eZSzbJQvF/OIWqNqMl/2A==", - "requires": { - "bech32": "^1.1.3", - "bs58check": "^2.1.2", - "buffer-equals": "^1.0.3", - "create-hash": "^1.1.2", - "secp256k1": "5.0.0", - "varuint-bitcoin": "^1.0.1" - }, - "dependencies": { - "secp256k1": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-5.0.0.tgz", - "integrity": "sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA==", - "requires": { - "elliptic": "^6.5.4", - "node-addon-api": "^5.0.0", - "node-gyp-build": "^4.2.0" - } - } - } - } } }, "@bitgo/sdk-coin-bch": { @@ -1137,6 +1105,11 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" + }, + "buffer-equals": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz", + "integrity": "sha512-99MsCq0j5+RhubVEtKQgKaD6EM+UP3xJgIvQqwJ3SOLDUekzxMX1ylXBng+Wa2sh7mGT0W6RUly8ojjr1Tt6nA==" } } }, @@ -1230,6 +1203,40 @@ "fastpriorityqueue": "^0.7.1", "typeforce": "^1.11.3", "varuint-bitcoin": "^1.1.2" + }, + "dependencies": { + "bip174": { + "version": "npm:@bitgo-forks/bip174@3.1.0-master.4", + "resolved": "https://registry.npmjs.org/@bitgo-forks/bip174/-/bip174-3.1.0-master.4.tgz", + "integrity": "sha512-WDRNzPSdJGDqQNqfN+L5KHNHFDmNOPYnUnT7NkEkfHWn5m1jSOfcf8Swaslt5P0xcSDiERdN2gZxFc6XtOqRYg==" + }, + "bitcoinjs-lib": { + "version": "npm:@bitgo-forks/bitcoinjs-lib@7.1.0-master.7", + "resolved": "https://registry.npmjs.org/@bitgo-forks/bitcoinjs-lib/-/bitcoinjs-lib-7.1.0-master.7.tgz", + "integrity": "sha512-FZle7954KnbbVXFCc5uYGtjq+0PFOnFxVchNwt3Kcv2nVusezTp29aeQwDi2Y+lM1dCoup2gJGXMkkREenY7KQ==", + "requires": { + "bech32": "^2.0.0", + "bip174": "npm:@bitgo-forks/bip174@3.1.0-master.4", + "bs58check": "^2.1.2", + "create-hash": "^1.1.0", + "fastpriorityqueue": "^0.7.1", + "json5": "^2.2.3", + "ripemd160": "^2.0.2", + "typeforce": "^1.11.3", + "varuint-bitcoin": "^1.1.2", + "wif": "^2.0.1" + } + }, + "ecpair": { + "version": "npm:@bitgo/ecpair@2.1.0-rc.0", + "resolved": "https://registry.npmjs.org/@bitgo/ecpair/-/ecpair-2.1.0-rc.0.tgz", + "integrity": "sha512-qPZetcEA1Lzzm9NsqsGF9NGorAGaXrv20eZjopLUjsdwftWcsYTE7lwzE/Xjdf4fcq6G4+vjrCudWAMGNfJqOQ==", + "requires": { + "randombytes": "^2.1.0", + "typeforce": "^1.18.0", + "wif": "^2.0.6" + } + } } }, "@bitgo/utxo-ord": { @@ -2358,16 +2365,16 @@ } }, "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==" } } }, "@lamassu/coins": { - "version": "1.4.12", - "resolved": "https://registry.npmjs.org/@lamassu/coins/-/coins-1.4.12.tgz", - "integrity": "sha512-DN3cH6KeEaKkidZWr9QOdoeKzS5aYvTnuVikPdwJJWtUFZG8b0+X3K4+3fEgtMY4JTrNdmjrGzaf5dOHNc9z6Q==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@lamassu/coins/-/coins-1.6.0.tgz", + "integrity": "sha512-Rl6NmbAwZQwltEw60YIxTmI9Idiae7MhucV44Zv8mQ+bBaVW88SE4lXFR1dbyETYS+2uWjX0qIvBw7KolAiGtQ==", "requires": { "@lamassu/bolt11": "1.5.1", "bech32": "2.0.0", @@ -4311,11 +4318,6 @@ "safe-buffer": "^5.2.1" } }, - "bip174": { - "version": "npm:@bitgo-forks/bip174@3.1.0-master.4", - "resolved": "https://registry.npmjs.org/@bitgo-forks/bip174/-/bip174-3.1.0-master.4.tgz", - "integrity": "sha512-WDRNzPSdJGDqQNqfN+L5KHNHFDmNOPYnUnT7NkEkfHWn5m1jSOfcf8Swaslt5P0xcSDiERdN2gZxFc6XtOqRYg==" - }, "bip32": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bip32/-/bip32-3.1.0.tgz", @@ -4354,21 +4356,34 @@ "resolved": "https://registry.npmjs.org/bitcoin-ops/-/bitcoin-ops-1.4.1.tgz", "integrity": "sha512-pef6gxZFztEhaE9RY9HmWVmiIHqCb2OyS4HPKkpc6CIiiOa3Qmuoylxc5P2EkU3w+5eTSifI9SEZC88idAIGow==" }, - "bitcoinjs-lib": { - "version": "npm:@bitgo-forks/bitcoinjs-lib@7.1.0-master.7", - "resolved": "https://registry.npmjs.org/@bitgo-forks/bitcoinjs-lib/-/bitcoinjs-lib-7.1.0-master.7.tgz", - "integrity": "sha512-FZle7954KnbbVXFCc5uYGtjq+0PFOnFxVchNwt3Kcv2nVusezTp29aeQwDi2Y+lM1dCoup2gJGXMkkREenY7KQ==", + "bitcoinjs-message": { + "version": "npm:@bitgo-forks/bitcoinjs-message@1.0.0-master.2", + "resolved": "https://registry.npmjs.org/@bitgo-forks/bitcoinjs-message/-/bitcoinjs-message-1.0.0-master.2.tgz", + "integrity": "sha512-XSDGM3rA75vcDxeKqHPexika/TgWUFWdfKTv1lV8TZTb5XFHHD6ARckLdMOBiCf29eZSzbJQvF/OIWqNqMl/2A==", "requires": { - "bech32": "^2.0.0", - "bip174": "npm:@bitgo-forks/bip174@3.1.0-master.4", + "bech32": "^1.1.3", "bs58check": "^2.1.2", - "create-hash": "^1.1.0", - "fastpriorityqueue": "^0.7.1", - "json5": "^2.2.3", - "ripemd160": "^2.0.2", - "typeforce": "^1.11.3", - "varuint-bitcoin": "^1.1.2", - "wif": "^2.0.1" + "buffer-equals": "^1.0.3", + "create-hash": "^1.1.2", + "secp256k1": "5.0.0", + "varuint-bitcoin": "^1.0.1" + }, + "dependencies": { + "bech32": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", + "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" + }, + "secp256k1": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-5.0.0.tgz", + "integrity": "sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA==", + "requires": { + "elliptic": "^6.5.4", + "node-addon-api": "^5.0.0", + "node-gyp-build": "^4.2.0" + } + } } }, "bitcore-lib": { @@ -6180,16 +6195,6 @@ "safe-buffer": "^5.0.1" } }, - "ecpair": { - "version": "npm:@bitgo/ecpair@2.1.0-rc.0", - "resolved": "https://registry.npmjs.org/@bitgo/ecpair/-/ecpair-2.1.0-rc.0.tgz", - "integrity": "sha512-qPZetcEA1Lzzm9NsqsGF9NGorAGaXrv20eZjopLUjsdwftWcsYTE7lwzE/Xjdf4fcq6G4+vjrCudWAMGNfJqOQ==", - "requires": { - "randombytes": "^2.1.0", - "typeforce": "^1.18.0", - "wif": "^2.0.6" - } - }, "ecurve": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/ecurve/-/ecurve-1.0.6.tgz", @@ -15233,9 +15238,9 @@ "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==" }, "tiny-secp256k1": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.6.tgz", - "integrity": "sha512-FmqJZGduTyvsr2cF3375fqGHUovSwDi/QytexX1Se4BPuPZpTE5Ftp5fg+EFSuEf3lhZqgCRjEG3ydUQ/aNiwA==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.7.tgz", + "integrity": "sha512-eb+F6NabSnjbLwNoC+2o5ItbmP1kg7HliWue71JgLegQt6A5mTN8YbvTLCazdlg6e5SV6A+r8OGvZYskdlmhqQ==", "requires": { "bindings": "^1.3.0", "bn.js": "^4.11.8", @@ -15245,9 +15250,9 @@ }, "dependencies": { "bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==" } } }, diff --git a/package.json b/package.json index bbedb762..f61d0720 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@ethereumjs/tx": "^3.5.1", "@graphql-tools/merge": "^6.2.5", "@haensl/subset-sum": "^3.0.5", - "@lamassu/coins": "v1.4.12", + "@lamassu/coins": "v1.6.0", "@simplewebauthn/server": "^3.0.0", "@vonage/auth": "1.5.0", "@vonage/server-client": "1.7.0", From afb4764903e2a1f65df0bd98b3bdb21c11a189dd Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Thu, 13 Mar 2025 08:18:47 +0000 Subject: [PATCH 4/4] fix: remove old method of updating cashbox --- lib/routes/cashboxRoutes.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/routes/cashboxRoutes.js b/lib/routes/cashboxRoutes.js index 6fcc88bf..27d29f14 100644 --- a/lib/routes/cashboxRoutes.js +++ b/lib/routes/cashboxRoutes.js @@ -28,8 +28,7 @@ function cashboxRemoval (req, res, next) { return cashbox.createCashboxBatch(req.deviceId, machine.cashbox) .then(batch => Promise.all([ cashbox.getBatchById(batch.id), - getMachineName(batch.device_id), - setMachine({ deviceId: req.deviceId, action: 'emptyCashInBills' }, operatorId) + getMachineName(batch.device_id) ])) }) .then(([batch, machineName]) => res.status(200).send({ batch: _.merge(batch, { machineName }), status: 'OK' }))