diff --git a/package.json b/package.json index ee034ed7..9cd999e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "btc-assets-api", - "version": "2.5.9", + "version": "2.5.10", "title": "Bitcoin/RGB++ Assets API", "description": "", "main": "index.js", @@ -26,7 +26,6 @@ ] }, "dependencies": { - "@cell-studio/mempool.js": "^2.4.0", "@ckb-lumos/base": "^0.22.2 ", "@ckb-lumos/ckb-indexer": "^0.22.2", "@ckb-lumos/codec": "^0.22.2", @@ -42,6 +41,7 @@ "@fastify/swagger": "8.14.0", "@fastify/swagger-ui": "^3.0.0", "@immobiliarelabs/fastify-sentry": "^8.0.1", + "@mempool/mempool.js": "^3.0.0", "@nervosnetwork/ckb-sdk-utils": "^0.109.5", "@rgbpp-sdk/btc": "0.0.0-snap-20250214153203", "@rgbpp-sdk/ckb": "0.0.0-snap-20250214153203", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7d525128..abad9363 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,6 @@ importers: .: dependencies: - '@cell-studio/mempool.js': - specifier: ^2.4.0 - version: 2.5.3 '@ckb-lumos/base': specifier: '^0.22.2 ' version: 0.22.2 @@ -56,6 +53,9 @@ importers: '@immobiliarelabs/fastify-sentry': specifier: ^8.0.1 version: 8.0.2 + '@mempool/mempool.js': + specifier: ^3.0.0 + version: 3.0.0 '@nervosnetwork/ckb-sdk-utils': specifier: ^0.109.5 version: 0.109.5 @@ -277,9 +277,6 @@ packages: '@bitcoinerlab/secp256k1@1.2.0': resolution: {integrity: sha512-jeujZSzb3JOZfmJYI0ph1PVpCRV5oaexCgy+RvCXV8XlY+XFB/2n3WOcvBsKLsOw78KYgnQrQWb2HrKE4be88Q==} - '@cell-studio/mempool.js@2.5.3': - resolution: {integrity: sha512-GRJYCErcL4kMWo4us1gAn/rwXuhPgrIzKQgPO+Ppg7Js0lD2IU80+VzLuNLeRw/6NyezfjjBSKXUFWqKh0aJ3w==} - '@ckb-lumos/base@0.22.2': resolution: {integrity: sha512-nosUCSa5rTV2IzxbEpqzrvUeQNXB66mgA0h40+QEdnE/gV/s4ke83AScrTAxWkErJy1G/sToIHCc2kWwO95DfQ==} engines: {node: '>=12.0.0'} @@ -778,6 +775,9 @@ packages: resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} hasBin: true + '@mempool/mempool.js@3.0.0': + resolution: {integrity: sha512-ZfNDcPA0HLpE8u+6/Tl/53F0WTL1CebwIrOIUeajvlXiXlDkhj/pTxnXQhMoxKOJK3qQnUjt6CQuX/TGBaFw7A==} + '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': resolution: {integrity: sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==} cpu: [arm64] @@ -1364,9 +1364,6 @@ packages: resolution: {integrity: sha512-hFatb7eZFdtiWjjmGRSm/K/uxZpmcBlM+YoeMB3VpOPXk3xa6+7zctg3LRbUzoimom5bwGrePF0jXReO6b4zNQ==} engines: {node: '>=14.0.0'} - axios@1.6.7: - resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==} - axios@1.7.4: resolution: {integrity: sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==} @@ -3611,18 +3608,6 @@ packages: utf-8-validate: optional: true - ws@8.3.0: - resolution: {integrity: sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - xdg-app-paths@5.1.0: resolution: {integrity: sha512-RAQ3WkPf4KTU1A8RtFx3gWywzVKe00tfOPFfl2NDGqbIFENQO4kqAJp7mhQjNj/33W5x5hiWWUdyfPq/5SU3QA==} engines: {node: '>=6'} @@ -3790,15 +3775,6 @@ snapshots: dependencies: '@noble/curves': 1.8.1 - '@cell-studio/mempool.js@2.5.3': - dependencies: - axios: 1.6.7 - ws: 8.3.0 - transitivePeerDependencies: - - bufferutil - - debug - - utf-8-validate - '@ckb-lumos/base@0.22.2': dependencies: '@ckb-lumos/bi': 0.22.2 @@ -4309,6 +4285,15 @@ snapshots: - encoding - supports-color + '@mempool/mempool.js@3.0.0': + dependencies: + axios: 1.7.4 + ws: 8.18.0 + transitivePeerDependencies: + - bufferutil + - debug + - utf-8-validate + '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': optional: true @@ -5011,14 +4996,6 @@ snapshots: camel-case: 4.1.2 fast-glob: 3.3.3 - axios@1.6.7: - dependencies: - follow-redirects: 1.15.9 - form-data: 4.0.1 - proxy-from-env: 1.1.0 - transitivePeerDependencies: - - debug - axios@1.7.4: dependencies: follow-redirects: 1.15.9 @@ -7330,8 +7307,6 @@ snapshots: ws@8.18.0: {} - ws@8.3.0: {} - xdg-app-paths@5.1.0: dependencies: xdg-portable: 7.3.0 diff --git a/src/services/bitcoin/mempool.ts b/src/services/bitcoin/mempool.ts index a5a4f96c..acb7dd22 100644 --- a/src/services/bitcoin/mempool.ts +++ b/src/services/bitcoin/mempool.ts @@ -1,9 +1,9 @@ import { Cradle } from '../../container'; import { IBitcoinDataProvider } from './interface'; -import mempoolJS from '@cell-studio/mempool.js'; +import mempoolJS from '@mempool/mempool.js'; import { Block, RecommendedFees, Transaction, UTXO } from './schema'; import * as Sentry from '@sentry/node'; -import { FeesMempoolBlocks } from '@cell-studio/mempool.js/lib/interfaces/bitcoin/fees'; +import { FeesMempoolBlocks } from '@mempool/mempool.js/lib/interfaces/bitcoin/fees'; export class MempoolClient implements IBitcoinDataProvider { private mempool: ReturnType;