From be50e9e8b6fd13daf87d7e4a9f73a570df92954f Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Mon, 22 Apr 2024 11:54:43 +0200 Subject: [PATCH 1/8] replace sats-connect with @sats-connect/core --- package-lock.json | 90 +++++++++++++------ package.json | 2 +- src/app/hooks/useSignBatchPsbtTx.ts | 2 +- src/app/hooks/useStxAccountRequest.ts | 2 +- src/app/hooks/useStxAddressRequest.ts | 2 +- .../btcSendScreen/useSendBtcRequest.ts | 10 +-- .../screens/confirmBtcTransaction/index.tsx | 2 +- .../screens/confirmStxTransaction/index.tsx | 2 +- src/app/screens/connect/addressPurposeBox.tsx | 2 +- .../connect/authenticationRequest/index.tsx | 2 +- .../connect/btcSelectAddressScreen/index.tsx | 2 +- .../useBtcAddressRequest.ts | 10 +-- .../connect/stxSelectAccountScreen/index.tsx | 2 +- .../connect/stxSelectAddressScreen/index.tsx | 2 +- src/app/screens/createInscription/index.tsx | 2 +- .../screens/signBatchPsbtRequest/index.tsx | 2 +- src/app/screens/signMessageRequest/index.tsx | 2 +- .../useSignMessageRequest.ts | 2 +- src/app/screens/signPsbtRequest/index.tsx | 2 +- .../screens/signPsbtRequest/useSignPsbt.ts | 14 +-- .../useSignPsbtValidationGate.ts | 2 +- src/app/screens/signatureRequest/index.tsx | 2 +- src/app/utils/constants.ts | 2 +- src/background/background.ts | 2 +- src/common/types/inpage-types.ts | 2 +- src/common/types/message-types.ts | 4 +- .../utils/legacy-external-message-handler.ts | 2 +- src/common/utils/rpc/btc/getAccounts.ts | 2 +- src/common/utils/rpc/btc/getAddresses.ts | 2 +- src/common/utils/rpc/btc/sendTransfer.ts | 2 +- src/common/utils/rpc/btc/signMessage.ts | 2 +- src/common/utils/rpc/btc/signPsbt.ts | 2 +- src/common/utils/rpc/getInfo.ts | 2 +- src/common/utils/rpc/helpers.ts | 2 +- src/common/utils/rpc/index.ts | 2 +- .../utils/rpc/stx/callContract/index.ts.ts | 2 +- .../rpc/stx/callContract/paramsSchema.ts | 2 +- .../utils/rpc/stx/deployContract/index.ts.ts | 2 +- .../rpc/stx/deployContract/paramsSchema.ts | 2 +- src/common/utils/rpc/stx/getAccounts/index.ts | 2 +- .../utils/rpc/stx/getAddresses/index.ts | 2 +- .../utils/rpc/stx/rpcResponseMessages.ts | 2 +- src/common/utils/rpc/stx/signMessage/index.ts | 2 +- .../rpc/stx/signStructuredMessage/index.ts | 2 +- .../utils/rpc/stx/signTransaction/index.ts | 2 +- src/common/utils/rpc/stx/transferStx/index.ts | 2 +- src/inpage/index.ts | 2 +- src/inpage/sats.inpage.ts | 4 +- 48 files changed, 126 insertions(+), 90 deletions(-) diff --git a/package-lock.json b/package-lock.json index e989f22af..47a08fbef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.42.1", "@react-spring/web": "^9.6.1", + "@sats-connect/core": "0.0.8", "@scure/btc-signer": "1.2.1", "@secretkeylabs/xverse-core": "13.4.0", "@stacks/connect": "7.4.1", @@ -67,7 +68,6 @@ "redux": "^4.0.5", "redux-persist": "^6.0.0", "redux-state-sync": "^3.1.4", - "sats-connect": "2.1.0", "stream-browserify": "^3.0.0", "string-to-color": "^2.2.2", "styled-components": "^5.3.5", @@ -1307,6 +1307,28 @@ "linux" ] }, + "node_modules/@sats-connect/core": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.8.tgz", + "integrity": "sha512-vb7drnd8lFfO4ahCzaVAFkX1eHF1J7jheJl2V/JuuJd5f1sy6nHeNzKMp1zmiuql8uNwe0Sx1WrK1I+4tUmDHg==", + "dependencies": { + "axios": "1.6.8", + "bitcoin-address-validation": "2.2.3", + "buffer": "6.0.3", + "jsontokens": "4.0.1", + "lodash.omit": "4.5.0" + } + }, + "node_modules/@sats-connect/core/node_modules/axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/@scure/base": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", @@ -7149,9 +7171,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -9472,6 +9494,11 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.omit": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", + "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==" + }, "node_modules/lodash.padend": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", @@ -14460,16 +14487,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "node_modules/sats-connect": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sats-connect/-/sats-connect-2.1.0.tgz", - "integrity": "sha512-HCPG3L0GModbC2g4uk+ezpSUr8kfCw1y5kv6LC9N8ZNNSRFTTK/CX9eSStV7bBGk5po+euaLsRy4YlLihRcnnw==", - "dependencies": { - "jsontokens": "^4.0.1", - "process": "^0.11.10", - "util": "^0.12.4" - } - }, "node_modules/scheduler": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", @@ -17730,6 +17747,30 @@ "dev": true, "optional": true }, + "@sats-connect/core": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.8.tgz", + "integrity": "sha512-vb7drnd8lFfO4ahCzaVAFkX1eHF1J7jheJl2V/JuuJd5f1sy6nHeNzKMp1zmiuql8uNwe0Sx1WrK1I+4tUmDHg==", + "requires": { + "axios": "1.6.8", + "bitcoin-address-validation": "2.2.3", + "buffer": "6.0.3", + "jsontokens": "4.0.1", + "lodash.omit": "4.5.0" + }, + "dependencies": { + "axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "requires": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + } + } + }, "@scure/base": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", @@ -22382,9 +22423,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" }, "for-each": { "version": "0.3.3", @@ -24013,6 +24054,11 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "lodash.omit": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", + "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==" + }, "lodash.padend": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", @@ -27437,16 +27483,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "sats-connect": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sats-connect/-/sats-connect-2.1.0.tgz", - "integrity": "sha512-HCPG3L0GModbC2g4uk+ezpSUr8kfCw1y5kv6LC9N8ZNNSRFTTK/CX9eSStV7bBGk5po+euaLsRy4YlLihRcnnw==", - "requires": { - "jsontokens": "^4.0.1", - "process": "^0.11.10", - "util": "^0.12.4" - } - }, "scheduler": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", diff --git a/package.json b/package.json index 288c2e0b3..95d0f9691 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.42.1", "@react-spring/web": "^9.6.1", + "@sats-connect/core": "0.0.8", "@scure/btc-signer": "1.2.1", "@secretkeylabs/xverse-core": "13.4.0", "@stacks/connect": "7.4.1", @@ -66,7 +67,6 @@ "redux": "^4.0.5", "redux-persist": "^6.0.0", "redux-state-sync": "^3.1.4", - "sats-connect": "2.1.0", "stream-browserify": "^3.0.0", "string-to-color": "^2.2.2", "styled-components": "^5.3.5", diff --git a/src/app/hooks/useSignBatchPsbtTx.ts b/src/app/hooks/useSignBatchPsbtTx.ts index 98248742b..11c448b3a 100644 --- a/src/app/hooks/useSignBatchPsbtTx.ts +++ b/src/app/hooks/useSignBatchPsbtTx.ts @@ -1,10 +1,10 @@ import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types'; import useWalletSelector from '@hooks/useWalletSelector'; +import { SignMultiplePsbtPayload, SignMultipleTransactionOptions } from '@sats-connect/core'; import { InputToSign, signPsbt } from '@secretkeylabs/xverse-core'; import { decodeToken } from 'jsontokens'; import { useMemo } from 'react'; import { useLocation } from 'react-router-dom'; -import { SignMultiplePsbtPayload, SignMultipleTransactionOptions } from 'sats-connect'; import useSeedVault from './useSeedVault'; const useSignBatchPsbtTx = () => { diff --git a/src/app/hooks/useStxAccountRequest.ts b/src/app/hooks/useStxAccountRequest.ts index 805bbe3af..091540230 100644 --- a/src/app/hooks/useStxAccountRequest.ts +++ b/src/app/hooks/useStxAccountRequest.ts @@ -4,12 +4,12 @@ import { sendUserRejectionMessage, } from '@common/utils/rpc/stx/rpcResponseMessages'; import useWalletSelector from '@hooks/useWalletSelector'; +import { GetAddressOptions } from '@sats-connect/core'; import { bip32, bip39, bs58 } from '@secretkeylabs/xverse-core'; import { GAIA_HUB_URL } from '@secretkeylabs/xverse-core/constant'; import { decodeToken } from 'jsontokens'; import { useCallback, useMemo } from 'react'; import { useLocation } from 'react-router-dom'; -import { GetAddressOptions } from 'sats-connect'; import useSeedVault from './useSeedVault'; const useStxAccountRequest = () => { diff --git a/src/app/hooks/useStxAddressRequest.ts b/src/app/hooks/useStxAddressRequest.ts index 1af610442..7c5f836ac 100644 --- a/src/app/hooks/useStxAddressRequest.ts +++ b/src/app/hooks/useStxAddressRequest.ts @@ -1,10 +1,10 @@ import { MESSAGE_SOURCE } from '@common/types/message-types'; import { sendGetAddressesSuccessResponseMessage } from '@common/utils/rpc/stx/rpcResponseMessages'; import useWalletSelector from '@hooks/useWalletSelector'; +import { GetAddressOptions } from '@sats-connect/core'; import { decodeToken } from 'jsontokens'; import { useCallback, useMemo } from 'react'; import { useLocation } from 'react-router-dom'; -import { GetAddressOptions } from 'sats-connect'; const useStxAddressRequest = () => { // Params diff --git a/src/app/screens/btcSendScreen/useSendBtcRequest.ts b/src/app/screens/btcSendScreen/useSendBtcRequest.ts index 46dea9439..4fbbf4e89 100644 --- a/src/app/screens/btcSendScreen/useSendBtcRequest.ts +++ b/src/app/screens/btcSendScreen/useSendBtcRequest.ts @@ -1,14 +1,14 @@ +import { + BitcoinNetworkType, + SendBtcTransactionOptions, + SendBtcTransactionPayload, +} from '@sats-connect/core'; import { Recipient, SettingsNetwork, signBtcTransaction } from '@secretkeylabs/xverse-core'; import { useQuery } from '@tanstack/react-query'; import BigNumber from 'bignumber.js'; import { decodeToken } from 'jsontokens'; import { useMemo, useState } from 'react'; import { useLocation } from 'react-router-dom'; -import { - BitcoinNetworkType, - SendBtcTransactionOptions, - SendBtcTransactionPayload, -} from 'sats-connect'; import useBtcClient from '../../hooks/useBtcClient'; import useSeedVault from '../../hooks/useSeedVault'; import useWalletSelector from '../../hooks/useWalletSelector'; diff --git a/src/app/screens/confirmBtcTransaction/index.tsx b/src/app/screens/confirmBtcTransaction/index.tsx index 61a9eb014..e451ebec1 100644 --- a/src/app/screens/confirmBtcTransaction/index.tsx +++ b/src/app/screens/confirmBtcTransaction/index.tsx @@ -9,6 +9,7 @@ import useBtcClient from '@hooks/useBtcClient'; import useOrdinalsByAddress from '@hooks/useOrdinalsByAddress'; import { useResetUserFlow } from '@hooks/useResetUserFlow'; import useWalletSelector from '@hooks/useWalletSelector'; +import { Return, RpcErrorCode } from '@sats-connect/core'; import { BtcTransactionBroadcastResponse, Recipient } from '@secretkeylabs/xverse-core'; import { useMutation } from '@tanstack/react-query'; import { isLedgerAccount } from '@utils/helper'; @@ -17,7 +18,6 @@ import BigNumber from 'bignumber.js'; import { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { Return, RpcErrorCode } from 'sats-connect'; import SendLayout from '../../layouts/sendLayout'; function ConfirmBtcTransaction() { diff --git a/src/app/screens/confirmStxTransaction/index.tsx b/src/app/screens/confirmStxTransaction/index.tsx index e8fe5b664..719b36158 100644 --- a/src/app/screens/confirmStxTransaction/index.tsx +++ b/src/app/screens/confirmStxTransaction/index.tsx @@ -20,6 +20,7 @@ import useStxWalletData from '@hooks/queries/useStxWalletData'; import useNetworkSelector from '@hooks/useNetwork'; import useOnOriginTabClose from '@hooks/useOnTabClosed'; import useWalletSelector from '@hooks/useWalletSelector'; +import { StxRequests } from '@sats-connect/core'; import { StacksTransaction, TokenTransferPayload, @@ -39,7 +40,6 @@ import BigNumber from 'bignumber.js'; import { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { StxRequests } from 'sats-connect'; import styled from 'styled-components'; const AlertContainer = styled.div((props) => ({ diff --git a/src/app/screens/connect/addressPurposeBox.tsx b/src/app/screens/connect/addressPurposeBox.tsx index 783d46021..f20da1ced 100644 --- a/src/app/screens/connect/addressPurposeBox.tsx +++ b/src/app/screens/connect/addressPurposeBox.tsx @@ -1,5 +1,5 @@ +import { AddressPurpose } from '@sats-connect/core'; import { getTruncatedAddress } from '@utils/helper'; -import { AddressPurpose } from 'sats-connect'; import styled from 'styled-components'; const AddressBox = styled.div((props) => ({ diff --git a/src/app/screens/connect/authenticationRequest/index.tsx b/src/app/screens/connect/authenticationRequest/index.tsx index 8e36c235a..8068df19a 100644 --- a/src/app/screens/connect/authenticationRequest/index.tsx +++ b/src/app/screens/connect/authenticationRequest/index.tsx @@ -11,6 +11,7 @@ import useSeedVault from '@hooks/useSeedVault'; import useWalletSelector from '@hooks/useWalletSelector'; import Transport from '@ledgerhq/hw-transport-webusb'; import { animated, useSpring } from '@react-spring/web'; +import { AddressPurpose } from '@sats-connect/core'; import SelectAccount from '@screens/connect/selectAccount'; import { AnalyticsEvents, @@ -27,7 +28,6 @@ import { decodeToken } from 'jsontokens'; import { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { AddressPurpose } from 'sats-connect'; import styled from 'styled-components'; import validUrl from 'valid-url'; import AddressPurposeBox from '../addressPurposeBox'; diff --git a/src/app/screens/connect/btcSelectAddressScreen/index.tsx b/src/app/screens/connect/btcSelectAddressScreen/index.tsx index d59167483..cf1a438b1 100644 --- a/src/app/screens/connect/btcSelectAddressScreen/index.tsx +++ b/src/app/screens/connect/btcSelectAddressScreen/index.tsx @@ -3,6 +3,7 @@ import stxIcon from '@assets/img/dashboard/stx_icon.svg'; import OrdinalsIcon from '@assets/img/nftDashboard/white_ordinals_icon.svg'; import useWalletSelector from '@hooks/useWalletSelector'; import { animated, useTransition } from '@react-spring/web'; +import { AddressPurpose } from '@sats-connect/core'; import SelectAccount from '@screens/connect/selectAccount'; import { AnalyticsEvents, getAppIconFromWebManifest } from '@secretkeylabs/xverse-core'; import Button from '@ui-library/button'; @@ -12,7 +13,6 @@ import { trackMixPanel } from '@utils/mixpanel'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { AddressPurpose } from 'sats-connect'; import AddressPurposeBox from '../addressPurposeBox'; import PermissionsList from '../permissionsList'; import { diff --git a/src/app/screens/connect/btcSelectAddressScreen/useBtcAddressRequest.ts b/src/app/screens/connect/btcSelectAddressScreen/useBtcAddressRequest.ts index 3a1a80ae2..977e1c670 100644 --- a/src/app/screens/connect/btcSelectAddressScreen/useBtcAddressRequest.ts +++ b/src/app/screens/connect/btcSelectAddressScreen/useBtcAddressRequest.ts @@ -1,10 +1,6 @@ import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types'; import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers'; import useWalletSelector from '@hooks/useWalletSelector'; -import { SettingsNetwork } from '@secretkeylabs/xverse-core'; -import { decodeToken } from 'jsontokens'; -import { useMemo } from 'react'; -import { useLocation } from 'react-router-dom'; import { Address, AddressPurpose, @@ -15,7 +11,11 @@ import { GetAddressResponse, Return, RpcErrorCode, -} from 'sats-connect'; +} from '@sats-connect/core'; +import { SettingsNetwork } from '@secretkeylabs/xverse-core'; +import { decodeToken } from 'jsontokens'; +import { useMemo } from 'react'; +import { useLocation } from 'react-router-dom'; const useAddressRequestParams = (network: SettingsNetwork) => { const { search } = useLocation(); diff --git a/src/app/screens/connect/stxSelectAccountScreen/index.tsx b/src/app/screens/connect/stxSelectAccountScreen/index.tsx index 0fab995bd..7d148b73b 100644 --- a/src/app/screens/connect/stxSelectAccountScreen/index.tsx +++ b/src/app/screens/connect/stxSelectAccountScreen/index.tsx @@ -3,6 +3,7 @@ import ActionButton from '@components/button'; import useStxAccountRequest from '@hooks/useStxAccountRequest'; import useWalletSelector from '@hooks/useWalletSelector'; import { animated, useTransition } from '@react-spring/web'; +import { AddressPurpose } from '@sats-connect/core'; import SelectAccount from '@screens/connect/selectAccount'; import { getAppIconFromWebManifest } from '@secretkeylabs/xverse-core'; import { StickyHorizontalSplitButtonContainer } from '@ui-library/common.styled'; @@ -10,7 +11,6 @@ import Spinner from '@ui-library/spinner'; import { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { AddressPurpose } from 'sats-connect'; import AddressPurposeBox from '../addressPurposeBox'; import { AddressBoxContainer, diff --git a/src/app/screens/connect/stxSelectAddressScreen/index.tsx b/src/app/screens/connect/stxSelectAddressScreen/index.tsx index 1c8613945..99350f99d 100644 --- a/src/app/screens/connect/stxSelectAddressScreen/index.tsx +++ b/src/app/screens/connect/stxSelectAddressScreen/index.tsx @@ -3,6 +3,7 @@ import ActionButton from '@components/button'; import useStxAddressRequest from '@hooks/useStxAddressRequest'; import useWalletSelector from '@hooks/useWalletSelector'; import { animated, useTransition } from '@react-spring/web'; +import { AddressPurpose } from '@sats-connect/core'; import SelectAccount from '@screens/connect/selectAccount'; import { getAppIconFromWebManifest } from '@secretkeylabs/xverse-core'; import { StickyHorizontalSplitButtonContainer } from '@ui-library/common.styled'; @@ -10,7 +11,6 @@ import Spinner from '@ui-library/spinner'; import { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { AddressPurpose } from 'sats-connect'; import AddressPurposeBox from '../addressPurposeBox'; import { AddressBoxContainer, diff --git a/src/app/screens/createInscription/index.tsx b/src/app/screens/createInscription/index.tsx index e6a4a064c..766222e96 100644 --- a/src/app/screens/createInscription/index.tsx +++ b/src/app/screens/createInscription/index.tsx @@ -7,6 +7,7 @@ import { NumericFormat } from 'react-number-format'; import { useLocation } from 'react-router-dom'; import styled from 'styled-components'; +import { CreateInscriptionPayload, CreateRepeatInscriptionsPayload } from '@sats-connect/core'; import { BtcFeeResponse, currencySymbolMap, @@ -17,7 +18,6 @@ import { useInscriptionFees, UTXO, } from '@secretkeylabs/xverse-core'; -import { CreateInscriptionPayload, CreateRepeatInscriptionsPayload } from 'sats-connect'; import SettingIcon from '@assets/img/dashboard/faders_horizontal.svg'; import OrdinalsIcon from '@assets/img/nftDashboard/white_ordinals_icon.svg'; diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx index e578b6fa8..d040d9e6c 100644 --- a/src/app/screens/signBatchPsbtRequest/index.tsx +++ b/src/app/screens/signBatchPsbtRequest/index.tsx @@ -20,6 +20,7 @@ import useSignBatchPsbtTx from '@hooks/useSignBatchPsbtTx'; import useTransactionContext from '@hooks/useTransactionContext'; import useWalletSelector from '@hooks/useWalletSelector'; import { ArrowLeft, ArrowRight } from '@phosphor-icons/react'; +import { SignMultiplePsbtPayload } from '@sats-connect/core'; import { RuneSummary, btcTransaction, parseSummaryForRunes } from '@secretkeylabs/xverse-core'; import Callout from '@ui-library/callout'; import Spinner from '@ui-library/spinner'; @@ -28,7 +29,6 @@ import BigNumber from 'bignumber.js'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { SignMultiplePsbtPayload } from 'sats-connect'; import styled from 'styled-components'; const OuterContainer = styled.div` diff --git a/src/app/screens/signMessageRequest/index.tsx b/src/app/screens/signMessageRequest/index.tsx index 6c37e3e36..603eb54c5 100644 --- a/src/app/screens/signMessageRequest/index.tsx +++ b/src/app/screens/signMessageRequest/index.tsx @@ -11,6 +11,7 @@ import LedgerConnectionView from '@components/ledger/connectLedgerView'; import RequestError from '@components/requests/requestError'; import useWalletSelector from '@hooks/useWalletSelector'; import Transport from '@ledgerhq/hw-transport-webusb'; +import { Return, RpcErrorCode } from '@sats-connect/core'; import CollapsableContainer from '@screens/signatureRequest/collapsableContainer'; import SignatureRequestMessage from '@screens/signatureRequest/signatureRequestMessage'; import { finalizeMessageSignature } from '@screens/signatureRequest/utils'; @@ -20,7 +21,6 @@ import { getTruncatedAddress, isHardwareAccount } from '@utils/helper'; import { handleBip322LedgerMessageSigning } from '@utils/ledger'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Return, RpcErrorCode } from 'sats-connect'; import styled from 'styled-components'; import { useSignMessageRequest, useSignMessageValidation } from './useSignMessageRequest'; diff --git a/src/app/screens/signMessageRequest/useSignMessageRequest.ts b/src/app/screens/signMessageRequest/useSignMessageRequest.ts index e5bb984d6..a9e810342 100644 --- a/src/app/screens/signMessageRequest/useSignMessageRequest.ts +++ b/src/app/screens/signMessageRequest/useSignMessageRequest.ts @@ -1,13 +1,13 @@ import useSeedVault from '@hooks/useSeedVault'; import useWalletReducer from '@hooks/useWalletReducer'; import useWalletSelector from '@hooks/useWalletSelector'; +import { BitcoinNetworkType, SignMessageOptions, SignMessagePayload } from '@sats-connect/core'; import { SettingsNetwork, signBip322Message } from '@secretkeylabs/xverse-core'; import { isHardwareAccount } from '@utils/helper'; import { decodeToken } from 'jsontokens'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation } from 'react-router-dom'; -import { BitcoinNetworkType, SignMessageOptions, SignMessagePayload } from 'sats-connect'; const useSignMessageRequestParams = (network: SettingsNetwork) => { const { search } = useLocation(); diff --git a/src/app/screens/signPsbtRequest/index.tsx b/src/app/screens/signPsbtRequest/index.tsx index dd8d0080f..e8af8afa9 100644 --- a/src/app/screens/signPsbtRequest/index.tsx +++ b/src/app/screens/signPsbtRequest/index.tsx @@ -5,6 +5,7 @@ import useBtcClient from '@hooks/useBtcClient'; import useHasFeature from '@hooks/useHasFeature'; import useTransactionContext from '@hooks/useTransactionContext'; import useWalletSelector from '@hooks/useWalletSelector'; +import { RpcErrorCode } from '@sats-connect/core'; import { RuneSummary, Transport, @@ -14,7 +15,6 @@ import { import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { RpcErrorCode } from 'sats-connect'; import useSignPsbt from './useSignPsbt'; import useSignPsbtValidationGate from './useSignPsbtValidationGate'; diff --git a/src/app/screens/signPsbtRequest/useSignPsbt.ts b/src/app/screens/signPsbtRequest/useSignPsbt.ts index 5724bde68..6fdd7a6aa 100644 --- a/src/app/screens/signPsbtRequest/useSignPsbt.ts +++ b/src/app/screens/signPsbtRequest/useSignPsbt.ts @@ -2,6 +2,13 @@ import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types' import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers'; import useTransactionContext from '@hooks/useTransactionContext'; import useWalletSelector from '@hooks/useWalletSelector'; +import { + BitcoinNetworkType, + Return, + RpcErrorCode, + SignTransactionOptions, + SignTransactionPayload, +} from '@sats-connect/core'; import { InputToSign, SettingsNetwork, @@ -12,13 +19,6 @@ import { import { decodeToken } from 'jsontokens'; import { useEffect, useMemo, useState } from 'react'; import { useLocation } from 'react-router-dom'; -import { - BitcoinNetworkType, - Return, - RpcErrorCode, - SignTransactionOptions, - SignTransactionPayload, -} from 'sats-connect'; import useBtcClient from '../../hooks/useBtcClient'; import useSeedVault from '../../hooks/useSeedVault'; diff --git a/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts b/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts index a0dac2140..ac78215bd 100644 --- a/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts +++ b/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts @@ -1,8 +1,8 @@ import useWalletSelector from '@hooks/useWalletSelector'; +import { SignTransactionPayload } from '@sats-connect/core'; import { btcTransaction } from '@secretkeylabs/xverse-core'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { SignTransactionPayload } from 'sats-connect'; type Props = { payload: SignTransactionPayload | undefined; diff --git a/src/app/screens/signatureRequest/index.tsx b/src/app/screens/signatureRequest/index.tsx index 4774a02de..37e95f09c 100644 --- a/src/app/screens/signatureRequest/index.tsx +++ b/src/app/screens/signatureRequest/index.tsx @@ -16,6 +16,7 @@ import useSignatureRequest, { import useWalletReducer from '@hooks/useWalletReducer'; import useWalletSelector from '@hooks/useWalletSelector'; import Transport from '@ledgerhq/hw-transport-webusb'; +import { Return } from '@sats-connect/core'; import { buf2hex, hashMessage, signStxMessage } from '@secretkeylabs/xverse-core'; import { SignaturePayload, StructuredDataSignaturePayload } from '@stacks/connect'; import { getNetworkType, getTruncatedAddress, isHardwareAccount } from '@utils/helper'; @@ -23,7 +24,6 @@ import { signatureVrsToRsv } from '@utils/ledger'; import { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { Return } from 'sats-connect'; import CollapsableContainer from './collapsableContainer'; import { ActionDisclaimer, diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts index da50595d7..cfed8836d 100644 --- a/src/app/utils/constants.ts +++ b/src/app/utils/constants.ts @@ -1,6 +1,6 @@ /* eslint-disable prefer-destructuring */ +import { Provider } from '@sats-connect/core'; import type { NetworkType } from '@secretkeylabs/xverse-core'; -import { Provider } from 'sats-connect'; export const GAMMA_URL = 'https://gamma.io/'; export const TERMS_LINK = 'https://xverse.app/terms'; diff --git a/src/background/background.ts b/src/background/background.ts index f2103cf61..0a6cf6183 100755 --- a/src/background/background.ts +++ b/src/background/background.ts @@ -7,7 +7,7 @@ import { } from '@common/utils/legacy-external-message-handler'; import internalBackgroundMessageHandler from '@common/utils/messageHandlers'; import handleRPCRequest from '@common/utils/rpc'; -import { Requests } from 'sats-connect'; +import { Requests } from '@sats-connect/core'; // Listen for connection to the content-script - port for two-way communication chrome.runtime.onConnect.addListener((port) => { diff --git a/src/common/types/inpage-types.ts b/src/common/types/inpage-types.ts index 3e817d29d..e48354620 100644 --- a/src/common/types/inpage-types.ts +++ b/src/common/types/inpage-types.ts @@ -1,4 +1,4 @@ -import { RpcBase } from 'sats-connect'; +import { RpcBase } from '@sats-connect/core'; /** * Inpage Script (Stacks Provider / BitcoinProvider) <-> Content Script diff --git a/src/common/types/message-types.ts b/src/common/types/message-types.ts index 114fb044d..416c23a6d 100644 --- a/src/common/types/message-types.ts +++ b/src/common/types/message-types.ts @@ -1,4 +1,3 @@ -import { FinishedTxPayload, SignatureData, SponsoredFinishedTxPayload } from '@stacks/connect'; import { CreateInscriptionResponse, CreateRepeatInscriptionsResponse, @@ -8,7 +7,8 @@ import { SignTransactionResponse, type Params, type Requests, -} from 'sats-connect'; +} from '@sats-connect/core'; +import { FinishedTxPayload, SignatureData, SponsoredFinishedTxPayload } from '@stacks/connect'; export const MESSAGE_SOURCE = 'xverse-wallet'; diff --git a/src/common/utils/legacy-external-message-handler.ts b/src/common/utils/legacy-external-message-handler.ts index dcb925e37..c518a9ba3 100644 --- a/src/common/utils/legacy-external-message-handler.ts +++ b/src/common/utils/legacy-external-message-handler.ts @@ -1,5 +1,5 @@ +import { RpcErrorResponse } from '@sats-connect/core'; import { SignatureData } from '@stacks/connect'; -import { RpcErrorResponse } from 'sats-connect'; import { getTabIdFromPort } from '.'; import { InternalMethods, diff --git a/src/common/utils/rpc/btc/getAccounts.ts b/src/common/utils/rpc/btc/getAccounts.ts index 0bec5b8fa..75c028900 100644 --- a/src/common/utils/rpc/btc/getAccounts.ts +++ b/src/common/utils/rpc/btc/getAccounts.ts @@ -1,6 +1,6 @@ import { WebBtcMessage } from '@common/types/message-types'; import { getTabIdFromPort } from '@common/utils'; -import { AddressPurpose, RpcErrorCode } from 'sats-connect'; +import { AddressPurpose, RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/btc/getAddresses.ts b/src/common/utils/rpc/btc/getAddresses.ts index 40bd5def0..22dc8bb27 100644 --- a/src/common/utils/rpc/btc/getAddresses.ts +++ b/src/common/utils/rpc/btc/getAddresses.ts @@ -1,6 +1,6 @@ import { WebBtcMessage } from '@common/types/message-types'; import { getTabIdFromPort } from '@common/utils'; -import { AddressPurpose, RpcErrorCode } from 'sats-connect'; +import { AddressPurpose, RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/btc/sendTransfer.ts b/src/common/utils/rpc/btc/sendTransfer.ts index 9f6e67d02..0f2ff081d 100644 --- a/src/common/utils/rpc/btc/sendTransfer.ts +++ b/src/common/utils/rpc/btc/sendTransfer.ts @@ -1,6 +1,6 @@ import { WebBtcMessage } from '@common/types/message-types'; import { getTabIdFromPort } from '@common/utils'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/btc/signMessage.ts b/src/common/utils/rpc/btc/signMessage.ts index 969545e75..00f326adc 100644 --- a/src/common/utils/rpc/btc/signMessage.ts +++ b/src/common/utils/rpc/btc/signMessage.ts @@ -1,5 +1,5 @@ import { WebBtcMessage } from '@common/types/message-types'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/btc/signPsbt.ts b/src/common/utils/rpc/btc/signPsbt.ts index 3f7d62eb4..96444bee6 100644 --- a/src/common/utils/rpc/btc/signPsbt.ts +++ b/src/common/utils/rpc/btc/signPsbt.ts @@ -1,5 +1,5 @@ import { WebBtcMessage } from '@common/types/message-types'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/getInfo.ts b/src/common/utils/rpc/getInfo.ts index f68003c09..ebfc50c44 100644 --- a/src/common/utils/rpc/getInfo.ts +++ b/src/common/utils/rpc/getInfo.ts @@ -1,4 +1,4 @@ -import { Requests, Return, RpcId } from 'sats-connect'; +import { Requests, Return, RpcId } from '@sats-connect/core'; import { keys } from 'ts-transformer-keys'; import { makeRpcSuccessResponse, sendRpcResponse } from './helpers'; diff --git a/src/common/utils/rpc/helpers.ts b/src/common/utils/rpc/helpers.ts index 355f56237..841387e37 100644 --- a/src/common/utils/rpc/helpers.ts +++ b/src/common/utils/rpc/helpers.ts @@ -6,7 +6,7 @@ import { RpcErrorResponse, RpcId, RpcSuccessResponse, -} from 'sats-connect'; +} from '@sats-connect/core'; export const makeRPCError = (id: RpcId, error: RpcError): RpcErrorResponse => ({ jsonrpc: '2.0', diff --git a/src/common/utils/rpc/index.ts b/src/common/utils/rpc/index.ts index b4b2d8ecc..4c3079038 100644 --- a/src/common/utils/rpc/index.ts +++ b/src/common/utils/rpc/index.ts @@ -1,5 +1,5 @@ import { WebBtcMessage } from '@common/types/message-types'; -import { Requests, RpcErrorCode } from 'sats-connect'; +import { Requests, RpcErrorCode } from '@sats-connect/core'; import { getTabIdFromPort } from '..'; import { handleGetAccounts, diff --git a/src/common/utils/rpc/stx/callContract/index.ts.ts b/src/common/utils/rpc/stx/callContract/index.ts.ts index 23c1c8d87..f59871659 100644 --- a/src/common/utils/rpc/stx/callContract/index.ts.ts +++ b/src/common/utils/rpc/stx/callContract/index.ts.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; import { callContractParamsSchema } from './paramsSchema'; diff --git a/src/common/utils/rpc/stx/callContract/paramsSchema.ts b/src/common/utils/rpc/stx/callContract/paramsSchema.ts index aedaa1806..021e2d61a 100644 --- a/src/common/utils/rpc/stx/callContract/paramsSchema.ts +++ b/src/common/utils/rpc/stx/callContract/paramsSchema.ts @@ -1,5 +1,5 @@ /* eslint-disable import/prefer-default-export */ -import { CallContractParams } from 'sats-connect'; +import { CallContractParams } from '@sats-connect/core'; import { z } from 'zod'; export const callContractParamsSchema = z.object({ diff --git a/src/common/utils/rpc/stx/deployContract/index.ts.ts b/src/common/utils/rpc/stx/deployContract/index.ts.ts index 0ba64cfd1..a25f878f3 100644 --- a/src/common/utils/rpc/stx/deployContract/index.ts.ts +++ b/src/common/utils/rpc/stx/deployContract/index.ts.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; import { deployContractParamsSchema } from './paramsSchema'; diff --git a/src/common/utils/rpc/stx/deployContract/paramsSchema.ts b/src/common/utils/rpc/stx/deployContract/paramsSchema.ts index 4ce56e714..ac58111df 100644 --- a/src/common/utils/rpc/stx/deployContract/paramsSchema.ts +++ b/src/common/utils/rpc/stx/deployContract/paramsSchema.ts @@ -1,5 +1,5 @@ /* eslint-disable import/prefer-default-export */ -import { DeployContractParams } from 'sats-connect'; +import { DeployContractParams } from '@sats-connect/core'; import { z } from 'zod'; export const deployContractParamsSchema = z.object({ diff --git a/src/common/utils/rpc/stx/getAccounts/index.ts b/src/common/utils/rpc/stx/getAccounts/index.ts index f637d9d74..5bf1cac22 100644 --- a/src/common/utils/rpc/stx/getAccounts/index.ts +++ b/src/common/utils/rpc/stx/getAccounts/index.ts @@ -1,6 +1,6 @@ import { WebBtcMessage } from '@common/types/message-types'; import { getTabIdFromPort, isUndefined } from '@common/utils'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { listenForPopupClose, makeSearchParamsWithDefaults, diff --git a/src/common/utils/rpc/stx/getAddresses/index.ts b/src/common/utils/rpc/stx/getAddresses/index.ts index 1771f492d..5dfc056ed 100644 --- a/src/common/utils/rpc/stx/getAddresses/index.ts +++ b/src/common/utils/rpc/stx/getAddresses/index.ts @@ -1,5 +1,5 @@ import { WebBtcMessage } from '@common/types/message-types'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { listenForPopupClose, makeSearchParamsWithDefaults, diff --git a/src/common/utils/rpc/stx/rpcResponseMessages.ts b/src/common/utils/rpc/stx/rpcResponseMessages.ts index fa7b5a0b5..62bed3b13 100644 --- a/src/common/utils/rpc/stx/rpcResponseMessages.ts +++ b/src/common/utils/rpc/stx/rpcResponseMessages.ts @@ -1,5 +1,5 @@ /* eslint-disable import/prefer-default-export */ -import { Return, RpcErrorCode, RpcId } from 'sats-connect'; +import { Return, RpcErrorCode, RpcId } from '@sats-connect/core'; import { ZodError } from 'zod'; import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '../helpers'; diff --git a/src/common/utils/rpc/stx/signMessage/index.ts b/src/common/utils/rpc/stx/signMessage/index.ts index 4c70b73c0..4ce99f688 100644 --- a/src/common/utils/rpc/stx/signMessage/index.ts +++ b/src/common/utils/rpc/stx/signMessage/index.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; import { rpcParamsSchema } from './paramsSchema'; diff --git a/src/common/utils/rpc/stx/signStructuredMessage/index.ts b/src/common/utils/rpc/stx/signStructuredMessage/index.ts index 24c97ef32..66c5ab013 100644 --- a/src/common/utils/rpc/stx/signStructuredMessage/index.ts +++ b/src/common/utils/rpc/stx/signStructuredMessage/index.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; diff --git a/src/common/utils/rpc/stx/signTransaction/index.ts b/src/common/utils/rpc/stx/signTransaction/index.ts index d44ac7194..75e677386 100644 --- a/src/common/utils/rpc/stx/signTransaction/index.ts +++ b/src/common/utils/rpc/stx/signTransaction/index.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, diff --git a/src/common/utils/rpc/stx/transferStx/index.ts b/src/common/utils/rpc/stx/transferStx/index.ts index 336bc6129..aeba8ad3c 100644 --- a/src/common/utils/rpc/stx/transferStx/index.ts +++ b/src/common/utils/rpc/stx/transferStx/index.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; import paramsSchema from './paramsSchema'; diff --git a/src/inpage/index.ts b/src/inpage/index.ts index 36482678d..cf0561f7e 100644 --- a/src/inpage/index.ts +++ b/src/inpage/index.ts @@ -1,5 +1,5 @@ +import { BitcoinProvider } from '@sats-connect/core'; import { StacksProvider } from '@stacks/connect'; -import { BitcoinProvider } from 'sats-connect'; import { XverseProviderInfo } from '@utils/constants'; import SatsMethodsProvider from './sats.inpage'; diff --git a/src/inpage/sats.inpage.ts b/src/inpage/sats.inpage.ts index ef39f2830..4e3597f64 100644 --- a/src/inpage/sats.inpage.ts +++ b/src/inpage/sats.inpage.ts @@ -18,7 +18,6 @@ import { SignMessageResponseMessage, SignPsbtResponseMessage, } from '@common/types/message-types'; -import { nanoid } from 'nanoid'; import { BitcoinProvider, CreateInscriptionResponse, @@ -30,7 +29,8 @@ import { RpcResponse, SignMultipleTransactionsResponse, SignTransactionResponse, -} from 'sats-connect'; +} from '@sats-connect/core'; +import { nanoid } from 'nanoid'; import { isValidLegacyEvent, isValidRpcEvent } from './utils'; const SatsMethodsProvider: BitcoinProvider = { From e0e0a20ae21245add56242b0366ff2ce8459e24d Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Wed, 24 Apr 2024 12:51:00 +0200 Subject: [PATCH 2/8] store active account in background worker --- src/app/hooks/useWalletReducer.ts | 14 ++++++++++++++ src/common/types/message-types.ts | 2 ++ src/common/types/messages.ts | 10 +++++++++- src/common/utils/messageHandlers.ts | 18 +++++++++++++++++ src/common/utils/rpc/index.ts | 30 ++++++++++++++++++++++------- 5 files changed, 66 insertions(+), 8 deletions(-) diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts index 0d655a994..4857f86fd 100644 --- a/src/app/hooks/useWalletReducer.ts +++ b/src/app/hooks/useWalletReducer.ts @@ -1,3 +1,5 @@ +import { InternalMethods } from '@common/types/message-types'; +import { sendMessage } from '@common/types/messages'; import { filterLedgerAccounts, getDeviceAccountIndex } from '@common/utils/ledger'; import useBtcWalletData from '@hooks/queries/useBtcWalletData'; import useStxWalletData from '@hooks/queries/useStxWalletData'; @@ -303,6 +305,12 @@ const useWalletReducer = () => { ), ); dispatch(fetchAccountAction(account, accountsList)); + sendMessage({ + method: InternalMethods.ChangeActiveAccount, + payload: { + account, + }, + }); }; const changeNetwork = async (changedNetwork: SettingsNetwork) => { @@ -324,6 +332,12 @@ const useWalletReducer = () => { stxPublicKey: wallet.stxPublicKey, }; dispatch(setWalletAction(wallet)); + sendMessage({ + method: InternalMethods.ChangeActiveAccount, + payload: { + account, + }, + }); const networkObject = changedNetwork.type === 'Mainnet' ? new StacksMainnet({ url: changedNetwork.address }) diff --git a/src/common/types/message-types.ts b/src/common/types/message-types.ts index 416c23a6d..67c323ade 100644 --- a/src/common/types/message-types.ts +++ b/src/common/types/message-types.ts @@ -35,6 +35,8 @@ export enum RpcMethods { export enum InternalMethods { OriginatingTabClosed = 'OriginatingTabClosed', + ChangeActiveAccount = 'AccountChanged', + RequestActiveAccount = 'RequestActiveAccount', } export type ExtensionMethods = diff --git a/src/common/types/messages.ts b/src/common/types/messages.ts index 263d7a288..abd8f4e44 100644 --- a/src/common/types/messages.ts +++ b/src/common/types/messages.ts @@ -1,3 +1,4 @@ +import { Account } from '@secretkeylabs/xverse-core'; import { ExtensionMethods, InternalMethods, Message } from './message-types'; /** @@ -13,7 +14,14 @@ type OriginatingTabClosed = BackgroundMessage< { tabId: number } >; -export type BackgroundMessages = OriginatingTabClosed; +type ChangeActiveAccount = BackgroundMessage< + InternalMethods.ChangeActiveAccount, + { account: Account } +>; + +type RequestActiveAccount = BackgroundMessage; + +export type BackgroundMessages = OriginatingTabClosed | ChangeActiveAccount | RequestActiveAccount; export function sendMessage(message: BackgroundMessages) { return chrome.runtime.sendMessage(message); diff --git a/src/common/utils/messageHandlers.ts b/src/common/utils/messageHandlers.ts index d28e8ed64..1753ed3c0 100644 --- a/src/common/utils/messageHandlers.ts +++ b/src/common/utils/messageHandlers.ts @@ -1,3 +1,5 @@ +import { InternalMethods } from '@common/types/message-types'; +import { Account } from '@secretkeylabs/xverse-core'; import { BackgroundMessages } from 'common/types/messages'; function validateMessagesAreFromExtension(sender: chrome.runtime.MessageSender) { @@ -5,6 +7,8 @@ function validateMessagesAreFromExtension(sender: chrome.runtime.MessageSender) return sender.url?.startsWith(chrome.runtime.getURL('')); } +let activeAccount: Account | null = null; + async function internalBackgroundMessageHandler( message: BackgroundMessages, sender: chrome.runtime.MessageSender, @@ -13,6 +17,20 @@ async function internalBackgroundMessageHandler( if (!validateMessagesAreFromExtension(sender)) { return; } + switch (message.method) { + case InternalMethods.ChangeActiveAccount: { + const { account } = message.payload; + activeAccount = account; + sendResponse(); + break; + } + case InternalMethods.RequestActiveAccount: { + sendResponse(activeAccount); + break; + } + default: + sendResponse(); + } sendResponse(); } diff --git a/src/common/utils/rpc/index.ts b/src/common/utils/rpc/index.ts index 4c3079038..6a00ca252 100644 --- a/src/common/utils/rpc/index.ts +++ b/src/common/utils/rpc/index.ts @@ -1,4 +1,5 @@ -import { WebBtcMessage } from '@common/types/message-types'; +import { InternalMethods, WebBtcMessage } from '@common/types/message-types'; +import { sendMessage } from '@common/types/messages'; import { Requests, RpcErrorCode } from '@sats-connect/core'; import { getTabIdFromPort } from '..'; import { @@ -9,7 +10,7 @@ import { handleSignPsbt, } from './btc'; import handleGetInfo from './getInfo'; -import { makeRPCError, sendRpcResponse } from './helpers'; +import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from './helpers'; import callContract from './stx/callContract/index.ts'; import deployContract from './stx/deployContract/index.ts'; import handleGetStxAccounts from './stx/getAccounts'; @@ -25,25 +26,30 @@ const handleRPCRequest = async ( ) => { try { switch (message.method) { - case 'getInfo': + case 'getInfo': { handleGetInfo(message.id, getTabIdFromPort(port)); break; - case 'getAddresses': + } + case 'getAddresses': { await handleGetAddresses(message as WebBtcMessage<'getAddresses'>, port); break; + } case 'getAccounts': { await handleGetAccounts(message as WebBtcMessage<'getAccounts'>, port); break; } - case 'signMessage': + case 'signMessage': { await handleSignMessage(message as WebBtcMessage<'signMessage'>, port); break; - case 'sendTransfer': + } + case 'sendTransfer': { await handleSendTransfer(message as WebBtcMessage<'sendTransfer'>, port); break; - case 'signPsbt': + } + case 'signPsbt': { await handleSignPsbt(message as WebBtcMessage<'signPsbt'>, port); break; + } // Stacks methods @@ -82,6 +88,15 @@ const handleRPCRequest = async ( ); break; } + case 'runes_getBalance': { + const account = await sendMessage({ + method: InternalMethods.RequestActiveAccount, + payload: undefined, + }); + console.log(account); + sendRpcResponse(getTabIdFromPort(port), makeRpcSuccessResponse(message.id, account)); + break; + } default: sendRpcResponse( getTabIdFromPort(port), @@ -93,6 +108,7 @@ const handleRPCRequest = async ( break; } } catch (e: any) { + console.log(e); sendRpcResponse( getTabIdFromPort(port), makeRPCError(message.id as string, { From 6d121fd6ebf459cca117c2b6860e37142e1d088f Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Wed, 24 Apr 2024 16:46:28 +0200 Subject: [PATCH 3/8] added support for runes_getBalance method --- package-lock.json | 1040 +++++++++++++---- package.json | 9 +- .../axios-fetch-adapter+0.3.1.patch | 36 + src/app/hooks/useWalletReducer.ts | 15 - src/common/types/message-types.ts | 2 - src/common/types/messages.ts | 10 +- src/common/utils/messageHandlers.ts | 18 - src/common/utils/rpc/index.ts | 13 +- src/common/utils/rpc/runes/getBalance.ts | 24 + 9 files changed, 896 insertions(+), 271 deletions(-) create mode 100644 patches/@vespaiach/axios-fetch-adapter+0.3.1.patch create mode 100644 src/common/utils/rpc/runes/getBalance.ts diff --git a/package-lock.json b/package-lock.json index c3dd6b5ca..5e1662c7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,14 +7,15 @@ "": { "name": "xverse-web-extension", "version": "0.34.0", + "hasInstallScript": true, "dependencies": { "@ledgerhq/hw-transport-webusb": "^6.27.13", "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.42.1", "@react-spring/web": "^9.6.1", - "@sats-connect/core": "0.0.8", + "@sats-connect/core": "0.0.9-7e4d74e", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.4.0", + "@secretkeylabs/xverse-core": "13.4.0-cecd4d5", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.9.0", @@ -25,6 +26,7 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "@vespaiach/axios-fetch-adapter": "0.3.1", "alex-sdk": "0.1.26", "argon2-browser": "^1.18.0", "axios": "^1.1.3", @@ -118,6 +120,7 @@ "html-webpack-plugin": "^5.5.0", "husky": "^8.0.3", "lint-staged": "^13.2.3", + "patch-package": "8.0.0", "path": "^0.12.7", "prettier": "^2.7.1", "prettier-plugin-organize-imports": "^3.2.3", @@ -144,7 +147,7 @@ }, "../xverse-core": { "name": "@secretkeylabs/xverse-core", - "version": "11.2.0", + "version": "12.0.1", "extraneous": true, "license": "ISC", "dependencies": { @@ -178,6 +181,7 @@ "c32check": "^2.0.0", "ecdsa-sig-formatter": "^1.0.11", "ecpair": "^2.1.0", + "json-bigint": "^1.0.0", "jsontokens": "^4.0.1", "ledger-bitcoin": "^0.2.1", "process": "^0.11.10", @@ -186,6 +190,7 @@ "varuint-bitcoin": "^1.1.2" }, "devDependencies": { + "@types/json-bigint": "^1.0.4", "@types/react": "^18.2.18", "@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/parser": "^5.58.0", @@ -215,7 +220,8 @@ }, "peerDependencies": { "bignumber.js": "^9.0.0", - "react": ">18.0.0" + "react": ">18.0.0", + "react-dom": ">18.0.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1308,9 +1314,9 @@ ] }, "node_modules/@sats-connect/core": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.8.tgz", - "integrity": "sha512-vb7drnd8lFfO4ahCzaVAFkX1eHF1J7jheJl2V/JuuJd5f1sy6nHeNzKMp1zmiuql8uNwe0Sx1WrK1I+4tUmDHg==", + "version": "0.0.9-7e4d74e", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9-7e4d74e.tgz", + "integrity": "sha512-571EdC05ZFK6SW+v7KOrumBYjHwHNRGFmBO0PU2BEA0nak6yg+bIVcJrpyQgE1aGoy2CMpkEZMMoYSwl/vUm5g==", "dependencies": { "axios": "1.6.8", "bitcoin-address-validation": "2.2.3", @@ -1405,9 +1411,10 @@ } }, "node_modules/@secretkeylabs/xverse-core": { - "version": "13.4.0", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.4.0/f38348f7f27a5d9cce1f5d506f50d33fe942b0a4", - "integrity": "sha512-NqCOWRkAzOuy4WSrY1ysFwXPfTyyWOJ28vu4kGV4Z3PfLSToqmFapDN10JFnNBO8i64G/6K1TRh5sypb9By10Q==", + "version": "13.4.0-cecd4d5", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.4.0-cecd4d5/f544befc793ff220eb913548aea5da3b4093048b", + "integrity": "sha512-3I4HXRZ6Vs/IMXe6nfAfwF4CcvByyIyQQdvOw/1hMlrvN+CoEDFFI1E66Ytzj8wVrTfyff8odK2xBBl5Nj4t3A==", + "license": "ISC", "dependencies": { "@bitcoinerlab/secp256k1": "^1.0.2", "@noble/curves": "^1.2.0", @@ -1479,14 +1486,14 @@ "dev": true }, "node_modules/@stacks/auth": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.0.tgz", - "integrity": "sha512-3a6FwP5yNngQfalu78MltQzCROL4l+MNngnCxFKo52EJfIdJp8TWKuwkzHN/jLzrvdUoq1lQjKlxoINCiUP03g==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.1.tgz", + "integrity": "sha512-nr5VeLIJBVI72eWYs/oQ7nrmuZxe89AlS5Lt/WxCcUDK9Z+oqQR1qsxBo86yVDlmrxoNWncHWD38LX54HsOEzA==", "dependencies": { "@stacks/common": "^6.13.0", - "@stacks/encryption": "^6.13.0", + "@stacks/encryption": "^6.13.1", "@stacks/network": "^6.13.0", - "@stacks/profile": "^6.13.0", + "@stacks/profile": "^6.13.1", "cross-fetch": "^3.1.5", "jsontokens": "^4.0.1" } @@ -1503,9 +1510,9 @@ ] }, "node_modules/@stacks/auth/node_modules/@stacks/encryption": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.0.tgz", - "integrity": "sha512-CsacBxY1XBVXBuJ5erJPjB5FmQ8KGJ/ft02/pIM6WrJ31ZcBdkn2BPV1AsPSD5qsIkiMdHAe14WKIwm8M2SWtQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz", + "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -1528,9 +1535,9 @@ } }, "node_modules/@stacks/auth/node_modules/@types/node": { - "version": "18.19.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz", - "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "dependencies": { "undici-types": "~5.26.4" } @@ -1601,9 +1608,9 @@ ] }, "node_modules/@stacks/encryption/node_modules/@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "dependencies": { "undici-types": "~5.26.4" } @@ -1618,13 +1625,13 @@ } }, "node_modules/@stacks/profile": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.0.tgz", - "integrity": "sha512-IIOPtP+bHu53j426UTFn+JFgv9G3JyybtJ6TDcc4zxoMvs8sLKEVTyjZNFrP38DjkoAGo1qWNWqoJhURfL55Uw==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.1.tgz", + "integrity": "sha512-GCDE13hwoUYZvZKTb5c0Tr74DcxIP/n4bffcYrKa5UabITPQ7JwsJIOyDoAwdtl3lu7fi9aBsKrdfHpBBUSQIQ==", "dependencies": { "@stacks/common": "^6.13.0", "@stacks/network": "^6.13.0", - "@stacks/transactions": "^6.13.0", + "@stacks/transactions": "^6.13.1", "jsontokens": "^4.0.1", "schema-inspector": "^2.0.2", "zone-file": "^2.0.0-beta.3" @@ -1651,9 +1658,9 @@ } }, "node_modules/@stacks/profile/node_modules/@stacks/transactions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.0.tgz", - "integrity": "sha512-xrx09qsXL/tWCkvAArzsFQqtZKDXyedjdVB9uX8xw+cQCi3xZ7r5MHMKzvEsTgJz3EO+MkQBXcvI1uzfuoqhcA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz", + "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -1664,17 +1671,17 @@ } }, "node_modules/@stacks/stacking": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.13.0.tgz", - "integrity": "sha512-ivzFZkVpqzneJ71T1eZTW8Rr5oVYrs4HkwZqGHxDEySb1I6p96hojH5gEguj9g7szQiyeYLj1dreCvhLh6ET6A==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.14.0.tgz", + "integrity": "sha512-P6ITXYpb5q4hgWMPimJW84mih3hQuQ0ko7AcnJ4SPy17nt1rxEz7/zgyRnqg1Lc18zt4HqfF9SKM7+Sqt/EMZA==", "dependencies": { "@noble/hashes": "1.1.5", "@scure/base": "1.1.1", "@stacks/common": "^6.13.0", - "@stacks/encryption": "^6.13.0", + "@stacks/encryption": "^6.13.1", "@stacks/network": "^6.13.0", "@stacks/stacks-blockchain-api-types": "^0.61.0", - "@stacks/transactions": "^6.13.0", + "@stacks/transactions": "^6.13.1", "bs58": "^5.0.0" } }, @@ -1701,9 +1708,9 @@ ] }, "node_modules/@stacks/stacking/node_modules/@stacks/encryption": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.0.tgz", - "integrity": "sha512-CsacBxY1XBVXBuJ5erJPjB5FmQ8KGJ/ft02/pIM6WrJ31ZcBdkn2BPV1AsPSD5qsIkiMdHAe14WKIwm8M2SWtQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz", + "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -1731,9 +1738,9 @@ "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w==" }, "node_modules/@stacks/stacking/node_modules/@stacks/transactions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.0.tgz", - "integrity": "sha512-xrx09qsXL/tWCkvAArzsFQqtZKDXyedjdVB9uX8xw+cQCi3xZ7r5MHMKzvEsTgJz3EO+MkQBXcvI1uzfuoqhcA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz", + "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -1744,9 +1751,9 @@ } }, "node_modules/@stacks/stacking/node_modules/@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "dependencies": { "undici-types": "~5.26.4" } @@ -1757,13 +1764,13 @@ "integrity": "sha512-Mw5dBPx3DySPupwaq0iBdm1WdEVXIfhjUVaTjI2iSyzWz4Fgs3U7JCaAezLbgNu7Q69c/ZN4JUDWuo9FVjy7oA==" }, "node_modules/@stacks/storage": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.0.tgz", - "integrity": "sha512-BDgGBysgoo756SUGQ7vTtJKPBhZLBbl9UrO7YoAoVO8vfB569X7PiQbUxwE8R7iLutnlBgP+mnpGDhV9UQo1vA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.1.tgz", + "integrity": "sha512-XnzRAETDKW7Ij3cuUNllrrnLOCwctV/XrIHgVWnD04LNL5R9apkwp9IkzaFbyJZ+XrkUBKwtdCgVYype2XgT6w==", "dependencies": { - "@stacks/auth": "^6.13.0", + "@stacks/auth": "^6.13.1", "@stacks/common": "^6.13.0", - "@stacks/encryption": "^6.13.0", + "@stacks/encryption": "^6.13.1", "@stacks/network": "^6.13.0", "base64-js": "^1.5.1", "jsontokens": "^4.0.1" @@ -1781,9 +1788,9 @@ ] }, "node_modules/@stacks/storage/node_modules/@stacks/encryption": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.0.tgz", - "integrity": "sha512-CsacBxY1XBVXBuJ5erJPjB5FmQ8KGJ/ft02/pIM6WrJ31ZcBdkn2BPV1AsPSD5qsIkiMdHAe14WKIwm8M2SWtQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz", + "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -1806,9 +1813,9 @@ } }, "node_modules/@stacks/storage/node_modules/@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "dependencies": { "undici-types": "~5.26.4" } @@ -1838,19 +1845,19 @@ ] }, "node_modules/@stacks/wallet-sdk": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.0.tgz", - "integrity": "sha512-2+jJ3SWrhPVLc4mokFekwqPLU8tP6ffDC379A4I2xrKWwPk3zjx3/SlqtUnf8CJkwgmsBozRS6SBqd7obIvQAg==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.1.tgz", + "integrity": "sha512-262CYKAm1j8oVxfGUIJrHp867j9gm5NrqPM85s0TfCv2QhfLDkvme6nKgmvtL2TecAZkBa5tu8M5DQ7z92WvAQ==", "dependencies": { "@scure/bip32": "1.1.3", "@scure/bip39": "1.1.0", - "@stacks/auth": "^6.13.0", + "@stacks/auth": "^6.13.1", "@stacks/common": "^6.13.0", - "@stacks/encryption": "^6.13.0", + "@stacks/encryption": "^6.13.1", "@stacks/network": "^6.13.0", - "@stacks/profile": "^6.13.0", - "@stacks/storage": "^6.13.0", - "@stacks/transactions": "^6.13.0", + "@stacks/profile": "^6.13.1", + "@stacks/storage": "^6.13.1", + "@stacks/transactions": "^6.13.1", "buffer": "^6.0.3", "c32check": "^2.0.0", "jsontokens": "^4.0.1", @@ -1870,9 +1877,9 @@ ] }, "node_modules/@stacks/wallet-sdk/node_modules/@stacks/encryption": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.0.tgz", - "integrity": "sha512-CsacBxY1XBVXBuJ5erJPjB5FmQ8KGJ/ft02/pIM6WrJ31ZcBdkn2BPV1AsPSD5qsIkiMdHAe14WKIwm8M2SWtQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz", + "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -1895,9 +1902,9 @@ } }, "node_modules/@stacks/wallet-sdk/node_modules/@stacks/transactions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.0.tgz", - "integrity": "sha512-xrx09qsXL/tWCkvAArzsFQqtZKDXyedjdVB9uX8xw+cQCi3xZ7r5MHMKzvEsTgJz3EO+MkQBXcvI1uzfuoqhcA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz", + "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -1908,9 +1915,9 @@ } }, "node_modules/@stacks/wallet-sdk/node_modules/@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "dependencies": { "undici-types": "~5.26.4" } @@ -3064,6 +3071,14 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@vespaiach/axios-fetch-adapter": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@vespaiach/axios-fetch-adapter/-/axios-fetch-adapter-0.3.1.tgz", + "integrity": "sha512-+1F52VWXmQHSRFSv4/H0wtnxfvjRMPK5531e880MIjypPdUSX6QZuoDgEVeCE1vjhzDdxCVX7rOqkub7StEUwQ==", + "peerDependencies": { + "axios": ">=0.26.0" + } + }, "node_modules/@vitest/expect": { "version": "0.34.6", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz", @@ -3414,6 +3429,12 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "node_modules/@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true + }, "node_modules/@zondax/ledger-stacks": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz", @@ -3463,9 +3484,9 @@ } }, "node_modules/@zondax/ledger-stacks/node_modules/@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "dependencies": { "undici-types": "~5.26.4" } @@ -3935,6 +3956,15 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -4579,12 +4609,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4726,6 +4762,21 @@ "node": ">=6.0" } }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, "node_modules/cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", @@ -5549,6 +5600,22 @@ "node": ">= 10" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -6097,6 +6164,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-get-iterator": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", @@ -7151,6 +7237,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/find-yarn-workspace-root": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", + "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", + "dev": true, + "dependencies": { + "micromatch": "^4.0.2" + } + }, "node_modules/flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -7399,15 +7494,6 @@ "node": ">=12" } }, - "node_modules/fs-extra/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/fs-monkey": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz", @@ -7420,9 +7506,12 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.5", @@ -7477,14 +7566,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7669,11 +7762,11 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7737,6 +7830,17 @@ "minimalistic-assert": "^1.0.1" } }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -8961,6 +9065,24 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "node_modules/json-stable-stringify": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", + "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "isarray": "^2.0.5", + "jsonify": "^0.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", @@ -8996,13 +9118,13 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jsonfile/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "node_modules/jsonify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", "dev": true, - "engines": { - "node": ">= 10.0.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/jsonp": { @@ -9060,6 +9182,15 @@ "node": ">=0.10.0" } }, + "node_modules/klaw-sync": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", + "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.11" + } + }, "node_modules/language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -12834,6 +12965,15 @@ "node": ">= 0.8.0" } }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -13002,6 +13142,191 @@ "tslib": "^2.0.3" } }, + "node_modules/patch-package": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz", + "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==", + "dev": true, + "dependencies": { + "@yarnpkg/lockfile": "^1.1.0", + "chalk": "^4.1.2", + "ci-info": "^3.7.0", + "cross-spawn": "^7.0.3", + "find-yarn-workspace-root": "^2.0.0", + "fs-extra": "^9.0.0", + "json-stable-stringify": "^1.0.2", + "klaw-sync": "^6.0.0", + "minimist": "^1.2.6", + "open": "^7.4.2", + "rimraf": "^2.6.3", + "semver": "^7.5.3", + "slash": "^2.0.0", + "tmp": "^0.0.33", + "yaml": "^2.2.2" + }, + "bin": { + "patch-package": "index.js" + }, + "engines": { + "node": ">=14", + "npm": ">5" + } + }, + "node_modules/patch-package/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/patch-package/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/patch-package/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/patch-package/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/patch-package/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/patch-package/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/patch-package/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/patch-package/node_modules/open": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", + "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "dev": true, + "dependencies": { + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/patch-package/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/patch-package/node_modules/semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/patch-package/node_modules/slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/patch-package/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/patch-package/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/path": { "version": "0.12.7", "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", @@ -14718,6 +15043,22 @@ "node": ">= 0.8.0" } }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -15413,6 +15754,18 @@ "node": ">=14.0.0" } }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -15938,6 +16291,15 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/unload": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz", @@ -17748,9 +18110,9 @@ "optional": true }, "@sats-connect/core": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.8.tgz", - "integrity": "sha512-vb7drnd8lFfO4ahCzaVAFkX1eHF1J7jheJl2V/JuuJd5f1sy6nHeNzKMp1zmiuql8uNwe0Sx1WrK1I+4tUmDHg==", + "version": "0.0.9-7e4d74e", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9-7e4d74e.tgz", + "integrity": "sha512-571EdC05ZFK6SW+v7KOrumBYjHwHNRGFmBO0PU2BEA0nak6yg+bIVcJrpyQgE1aGoy2CMpkEZMMoYSwl/vUm5g==", "requires": { "axios": "1.6.8", "bitcoin-address-validation": "2.2.3", @@ -17821,9 +18183,9 @@ } }, "@secretkeylabs/xverse-core": { - "version": "13.4.0", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.4.0/f38348f7f27a5d9cce1f5d506f50d33fe942b0a4", - "integrity": "sha512-NqCOWRkAzOuy4WSrY1ysFwXPfTyyWOJ28vu4kGV4Z3PfLSToqmFapDN10JFnNBO8i64G/6K1TRh5sypb9By10Q==", + "version": "13.4.0-cecd4d5", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.4.0-cecd4d5/f544befc793ff220eb913548aea5da3b4093048b", + "integrity": "sha512-3I4HXRZ6Vs/IMXe6nfAfwF4CcvByyIyQQdvOw/1hMlrvN+CoEDFFI1E66Ytzj8wVrTfyff8odK2xBBl5Nj4t3A==", "requires": { "@bitcoinerlab/secp256k1": "^1.0.2", "@noble/curves": "^1.2.0", @@ -17889,14 +18251,14 @@ "dev": true }, "@stacks/auth": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.0.tgz", - "integrity": "sha512-3a6FwP5yNngQfalu78MltQzCROL4l+MNngnCxFKo52EJfIdJp8TWKuwkzHN/jLzrvdUoq1lQjKlxoINCiUP03g==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.1.tgz", + "integrity": "sha512-nr5VeLIJBVI72eWYs/oQ7nrmuZxe89AlS5Lt/WxCcUDK9Z+oqQR1qsxBo86yVDlmrxoNWncHWD38LX54HsOEzA==", "requires": { "@stacks/common": "^6.13.0", - "@stacks/encryption": "^6.13.0", + "@stacks/encryption": "^6.13.1", "@stacks/network": "^6.13.0", - "@stacks/profile": "^6.13.0", + "@stacks/profile": "^6.13.1", "cross-fetch": "^3.1.5", "jsontokens": "^4.0.1" }, @@ -17907,9 +18269,9 @@ "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==" }, "@stacks/encryption": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.0.tgz", - "integrity": "sha512-CsacBxY1XBVXBuJ5erJPjB5FmQ8KGJ/ft02/pIM6WrJ31ZcBdkn2BPV1AsPSD5qsIkiMdHAe14WKIwm8M2SWtQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz", + "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==", "requires": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -17932,9 +18294,9 @@ } }, "@types/node": { - "version": "18.19.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz", - "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "requires": { "undici-types": "~5.26.4" } @@ -18003,9 +18365,9 @@ "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==" }, "@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "requires": { "undici-types": "~5.26.4" } @@ -18022,13 +18384,13 @@ } }, "@stacks/profile": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.0.tgz", - "integrity": "sha512-IIOPtP+bHu53j426UTFn+JFgv9G3JyybtJ6TDcc4zxoMvs8sLKEVTyjZNFrP38DjkoAGo1qWNWqoJhURfL55Uw==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.1.tgz", + "integrity": "sha512-GCDE13hwoUYZvZKTb5c0Tr74DcxIP/n4bffcYrKa5UabITPQ7JwsJIOyDoAwdtl3lu7fi9aBsKrdfHpBBUSQIQ==", "requires": { "@stacks/common": "^6.13.0", "@stacks/network": "^6.13.0", - "@stacks/transactions": "^6.13.0", + "@stacks/transactions": "^6.13.1", "jsontokens": "^4.0.1", "schema-inspector": "^2.0.2", "zone-file": "^2.0.0-beta.3" @@ -18049,9 +18411,9 @@ } }, "@stacks/transactions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.0.tgz", - "integrity": "sha512-xrx09qsXL/tWCkvAArzsFQqtZKDXyedjdVB9uX8xw+cQCi3xZ7r5MHMKzvEsTgJz3EO+MkQBXcvI1uzfuoqhcA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz", + "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==", "requires": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -18064,17 +18426,17 @@ } }, "@stacks/stacking": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.13.0.tgz", - "integrity": "sha512-ivzFZkVpqzneJ71T1eZTW8Rr5oVYrs4HkwZqGHxDEySb1I6p96hojH5gEguj9g7szQiyeYLj1dreCvhLh6ET6A==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.14.0.tgz", + "integrity": "sha512-P6ITXYpb5q4hgWMPimJW84mih3hQuQ0ko7AcnJ4SPy17nt1rxEz7/zgyRnqg1Lc18zt4HqfF9SKM7+Sqt/EMZA==", "requires": { "@noble/hashes": "1.1.5", "@scure/base": "1.1.1", "@stacks/common": "^6.13.0", - "@stacks/encryption": "^6.13.0", + "@stacks/encryption": "^6.13.1", "@stacks/network": "^6.13.0", "@stacks/stacks-blockchain-api-types": "^0.61.0", - "@stacks/transactions": "^6.13.0", + "@stacks/transactions": "^6.13.1", "bs58": "^5.0.0" }, "dependencies": { @@ -18089,9 +18451,9 @@ "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==" }, "@stacks/encryption": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.0.tgz", - "integrity": "sha512-CsacBxY1XBVXBuJ5erJPjB5FmQ8KGJ/ft02/pIM6WrJ31ZcBdkn2BPV1AsPSD5qsIkiMdHAe14WKIwm8M2SWtQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz", + "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==", "requires": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -18119,9 +18481,9 @@ "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w==" }, "@stacks/transactions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.0.tgz", - "integrity": "sha512-xrx09qsXL/tWCkvAArzsFQqtZKDXyedjdVB9uX8xw+cQCi3xZ7r5MHMKzvEsTgJz3EO+MkQBXcvI1uzfuoqhcA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz", + "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==", "requires": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -18132,9 +18494,9 @@ } }, "@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "requires": { "undici-types": "~5.26.4" } @@ -18147,13 +18509,13 @@ "integrity": "sha512-Mw5dBPx3DySPupwaq0iBdm1WdEVXIfhjUVaTjI2iSyzWz4Fgs3U7JCaAezLbgNu7Q69c/ZN4JUDWuo9FVjy7oA==" }, "@stacks/storage": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.0.tgz", - "integrity": "sha512-BDgGBysgoo756SUGQ7vTtJKPBhZLBbl9UrO7YoAoVO8vfB569X7PiQbUxwE8R7iLutnlBgP+mnpGDhV9UQo1vA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.1.tgz", + "integrity": "sha512-XnzRAETDKW7Ij3cuUNllrrnLOCwctV/XrIHgVWnD04LNL5R9apkwp9IkzaFbyJZ+XrkUBKwtdCgVYype2XgT6w==", "requires": { - "@stacks/auth": "^6.13.0", + "@stacks/auth": "^6.13.1", "@stacks/common": "^6.13.0", - "@stacks/encryption": "^6.13.0", + "@stacks/encryption": "^6.13.1", "@stacks/network": "^6.13.0", "base64-js": "^1.5.1", "jsontokens": "^4.0.1" @@ -18165,9 +18527,9 @@ "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==" }, "@stacks/encryption": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.0.tgz", - "integrity": "sha512-CsacBxY1XBVXBuJ5erJPjB5FmQ8KGJ/ft02/pIM6WrJ31ZcBdkn2BPV1AsPSD5qsIkiMdHAe14WKIwm8M2SWtQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz", + "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==", "requires": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -18190,9 +18552,9 @@ } }, "@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "requires": { "undici-types": "~5.26.4" } @@ -18220,19 +18582,19 @@ } }, "@stacks/wallet-sdk": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.0.tgz", - "integrity": "sha512-2+jJ3SWrhPVLc4mokFekwqPLU8tP6ffDC379A4I2xrKWwPk3zjx3/SlqtUnf8CJkwgmsBozRS6SBqd7obIvQAg==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.1.tgz", + "integrity": "sha512-262CYKAm1j8oVxfGUIJrHp867j9gm5NrqPM85s0TfCv2QhfLDkvme6nKgmvtL2TecAZkBa5tu8M5DQ7z92WvAQ==", "requires": { "@scure/bip32": "1.1.3", "@scure/bip39": "1.1.0", - "@stacks/auth": "^6.13.0", + "@stacks/auth": "^6.13.1", "@stacks/common": "^6.13.0", - "@stacks/encryption": "^6.13.0", + "@stacks/encryption": "^6.13.1", "@stacks/network": "^6.13.0", - "@stacks/profile": "^6.13.0", - "@stacks/storage": "^6.13.0", - "@stacks/transactions": "^6.13.0", + "@stacks/profile": "^6.13.1", + "@stacks/storage": "^6.13.1", + "@stacks/transactions": "^6.13.1", "buffer": "6.0.3", "c32check": "^2.0.0", "jsontokens": "^4.0.1", @@ -18246,9 +18608,9 @@ "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==" }, "@stacks/encryption": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.0.tgz", - "integrity": "sha512-CsacBxY1XBVXBuJ5erJPjB5FmQ8KGJ/ft02/pIM6WrJ31ZcBdkn2BPV1AsPSD5qsIkiMdHAe14WKIwm8M2SWtQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz", + "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==", "requires": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -18271,9 +18633,9 @@ } }, "@stacks/transactions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.0.tgz", - "integrity": "sha512-xrx09qsXL/tWCkvAArzsFQqtZKDXyedjdVB9uX8xw+cQCi3xZ7r5MHMKzvEsTgJz3EO+MkQBXcvI1uzfuoqhcA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz", + "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==", "requires": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -18284,9 +18646,9 @@ } }, "@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "requires": { "undici-types": "~5.26.4" } @@ -19189,6 +19551,12 @@ "eslint-visitor-keys": "^3.3.0" } }, + "@vespaiach/axios-fetch-adapter": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@vespaiach/axios-fetch-adapter/-/axios-fetch-adapter-0.3.1.tgz", + "integrity": "sha512-+1F52VWXmQHSRFSv4/H0wtnxfvjRMPK5531e880MIjypPdUSX6QZuoDgEVeCE1vjhzDdxCVX7rOqkub7StEUwQ==", + "requires": {} + }, "@vitest/expect": { "version": "0.34.6", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz", @@ -19484,6 +19852,12 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true + }, "@zondax/ledger-stacks": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz", @@ -19533,9 +19907,9 @@ } }, "@types/node": { - "version": "18.19.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.29.tgz", - "integrity": "sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g==", + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", "requires": { "undici-types": "~5.26.4" } @@ -19894,6 +20268,12 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true + }, "available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -20412,12 +20792,15 @@ "dev": true }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" } }, "callsites": { @@ -20512,6 +20895,12 @@ "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "dev": true }, + "ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true + }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", @@ -21157,6 +21546,16 @@ "execa": "^5.0.0" } }, + "define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + } + }, "define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -21599,6 +21998,19 @@ "which-typed-array": "^1.1.10" } }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "es-get-iterator": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", @@ -22406,6 +22818,15 @@ "path-exists": "^4.0.0" } }, + "find-yarn-workspace-root": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", + "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", + "dev": true, + "requires": { + "micromatch": "^4.0.2" + } + }, "flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -22573,14 +22994,6 @@ "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" - }, - "dependencies": { - "universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true - } } }, "fs-monkey": { @@ -22595,9 +23008,9 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "function.prototype.name": { "version": "1.1.5", @@ -22634,14 +23047,15 @@ "dev": true }, "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "get-stream": { @@ -22773,11 +23187,11 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "requires": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" } }, "has-proto": { @@ -22817,6 +23231,14 @@ "minimalistic-assert": "^1.0.1" } }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -23658,6 +24080,18 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "json-stable-stringify": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", + "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", + "dev": true, + "requires": { + "call-bind": "^1.0.5", + "isarray": "^2.0.5", + "jsonify": "^0.0.1", + "object-keys": "^1.1.1" + } + }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", @@ -23683,16 +24117,14 @@ "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" - }, - "dependencies": { - "universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true - } } }, + "jsonify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", + "dev": true + }, "jsonp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz", @@ -23744,6 +24176,15 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, + "klaw-sync": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", + "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11" + } + }, "language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -26306,6 +26747,12 @@ "type-check": "^0.4.0" } }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true + }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -26426,6 +26873,141 @@ "tslib": "^2.0.3" } }, + "patch-package": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz", + "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==", + "dev": true, + "requires": { + "@yarnpkg/lockfile": "^1.1.0", + "chalk": "^4.1.2", + "ci-info": "^3.7.0", + "cross-spawn": "^7.0.3", + "find-yarn-workspace-root": "^2.0.0", + "fs-extra": "^9.0.0", + "json-stable-stringify": "^1.0.2", + "klaw-sync": "^6.0.0", + "minimist": "^1.2.6", + "open": "^7.4.2", + "rimraf": "^2.6.3", + "semver": "^7.5.3", + "slash": "^2.0.0", + "tmp": "^0.0.33", + "yaml": "^2.2.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "open": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", + "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "dev": true, + "requires": { + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, "path": { "version": "0.12.7", "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", @@ -27687,6 +28269,19 @@ "send": "0.18.0" } }, + "set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "requires": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + } + }, "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -28189,6 +28784,15 @@ "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==", "dev": true }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.2" + } + }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -28576,6 +29180,12 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, + "universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true + }, "unload": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz", diff --git a/package.json b/package.json index bd016f388..f9d7e5b61 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.42.1", "@react-spring/web": "^9.6.1", - "@sats-connect/core": "0.0.8", + "@sats-connect/core": "0.0.9-7e4d74e", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.4.0", + "@secretkeylabs/xverse-core": "13.4.0-cecd4d5", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.9.0", @@ -24,6 +24,7 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "@vespaiach/axios-fetch-adapter": "0.3.1", "alex-sdk": "0.1.26", "argon2-browser": "^1.18.0", "axios": "^1.1.3", @@ -87,7 +88,8 @@ "style": "prettier --write \"src/**/*.{ts,tsx}\"", "prepare": "husky install", "uitest": "npx playwright test", - "uitest:report": "playwright show-report" + "uitest:report": "playwright show-report", + "postinstall": "patch-package" }, "overrides": { "buffer": "6.0.3" @@ -134,6 +136,7 @@ "eslint-plugin-playwright": "^1.5.4", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.31.8", + "patch-package": "8.0.0", "eslint-plugin-react-hooks": "^4.6.0", "fork-ts-checker-webpack-plugin": "^9.0.2", "glob": "^7.1.6", diff --git a/patches/@vespaiach/axios-fetch-adapter+0.3.1.patch b/patches/@vespaiach/axios-fetch-adapter+0.3.1.patch new file mode 100644 index 000000000..78a076a46 --- /dev/null +++ b/patches/@vespaiach/axios-fetch-adapter+0.3.1.patch @@ -0,0 +1,36 @@ +diff --git a/node_modules/@vespaiach/axios-fetch-adapter/index.js b/node_modules/@vespaiach/axios-fetch-adapter/index.js +index 527e282..649926f 100644 +--- a/node_modules/@vespaiach/axios-fetch-adapter/index.js ++++ b/node_modules/@vespaiach/axios-fetch-adapter/index.js +@@ -1,8 +1,9 @@ + import axios from 'axios'; +-import settle from 'axios/lib/core/settle'; +-import buildURL from 'axios/lib/helpers/buildURL'; +-import buildFullPath from 'axios/lib/core/buildFullPath'; +-import { isUndefined, isStandardBrowserEnv, isFormData } from 'axios/lib/utils'; ++import settle from 'axios/unsafe/core/settle'; ++import buildURL from 'axios/unsafe/helpers/buildURL'; ++import buildFullPath from 'axios/unsafe/core/buildFullPath'; ++import * as browserUtils from 'axios/unsafe/platform/browser'; ++import * as utils from 'axios/unsafe/utils'; + + /** + * - Create a request object +@@ -106,7 +107,7 @@ function createRequest(config) { + + // In these cases the browser will automatically set the correct Content-Type, + // but only if that header hasn't been set yet. So that's why we're deleting it. +- if (isFormData(options.body) && isStandardBrowserEnv()) { ++ if (utils.default.isFormData(options.body) && browserUtils.default.isStandardBrowserEnv()) { + headers.delete('Content-Type'); + } + } +@@ -127,7 +128,7 @@ function createRequest(config) { + } + // This config is similar to XHR’s withCredentials flag, but with three available values instead of two. + // So if withCredentials is not set, default value 'same-origin' will be used +- if (!isUndefined(config.withCredentials)) { ++ if (!utils.default.isUndefined(config.withCredentials)) { + options.credentials = config.withCredentials ? 'include' : 'omit'; + } + \ No newline at end of file diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts index 4857f86fd..f080bb308 100644 --- a/src/app/hooks/useWalletReducer.ts +++ b/src/app/hooks/useWalletReducer.ts @@ -1,5 +1,3 @@ -import { InternalMethods } from '@common/types/message-types'; -import { sendMessage } from '@common/types/messages'; import { filterLedgerAccounts, getDeviceAccountIndex } from '@common/utils/ledger'; import useBtcWalletData from '@hooks/queries/useBtcWalletData'; import useStxWalletData from '@hooks/queries/useStxWalletData'; @@ -14,7 +12,6 @@ import { createWalletAccount, decryptSeedPhraseCBC, getBnsName, - newWallet, restoreWalletWithAccounts, walletFromSeedPhrase, } from '@secretkeylabs/xverse-core'; @@ -305,12 +302,6 @@ const useWalletReducer = () => { ), ); dispatch(fetchAccountAction(account, accountsList)); - sendMessage({ - method: InternalMethods.ChangeActiveAccount, - payload: { - account, - }, - }); }; const changeNetwork = async (changedNetwork: SettingsNetwork) => { @@ -332,12 +323,6 @@ const useWalletReducer = () => { stxPublicKey: wallet.stxPublicKey, }; dispatch(setWalletAction(wallet)); - sendMessage({ - method: InternalMethods.ChangeActiveAccount, - payload: { - account, - }, - }); const networkObject = changedNetwork.type === 'Mainnet' ? new StacksMainnet({ url: changedNetwork.address }) diff --git a/src/common/types/message-types.ts b/src/common/types/message-types.ts index 67c323ade..416c23a6d 100644 --- a/src/common/types/message-types.ts +++ b/src/common/types/message-types.ts @@ -35,8 +35,6 @@ export enum RpcMethods { export enum InternalMethods { OriginatingTabClosed = 'OriginatingTabClosed', - ChangeActiveAccount = 'AccountChanged', - RequestActiveAccount = 'RequestActiveAccount', } export type ExtensionMethods = diff --git a/src/common/types/messages.ts b/src/common/types/messages.ts index abd8f4e44..263d7a288 100644 --- a/src/common/types/messages.ts +++ b/src/common/types/messages.ts @@ -1,4 +1,3 @@ -import { Account } from '@secretkeylabs/xverse-core'; import { ExtensionMethods, InternalMethods, Message } from './message-types'; /** @@ -14,14 +13,7 @@ type OriginatingTabClosed = BackgroundMessage< { tabId: number } >; -type ChangeActiveAccount = BackgroundMessage< - InternalMethods.ChangeActiveAccount, - { account: Account } ->; - -type RequestActiveAccount = BackgroundMessage; - -export type BackgroundMessages = OriginatingTabClosed | ChangeActiveAccount | RequestActiveAccount; +export type BackgroundMessages = OriginatingTabClosed; export function sendMessage(message: BackgroundMessages) { return chrome.runtime.sendMessage(message); diff --git a/src/common/utils/messageHandlers.ts b/src/common/utils/messageHandlers.ts index 1753ed3c0..d28e8ed64 100644 --- a/src/common/utils/messageHandlers.ts +++ b/src/common/utils/messageHandlers.ts @@ -1,5 +1,3 @@ -import { InternalMethods } from '@common/types/message-types'; -import { Account } from '@secretkeylabs/xverse-core'; import { BackgroundMessages } from 'common/types/messages'; function validateMessagesAreFromExtension(sender: chrome.runtime.MessageSender) { @@ -7,8 +5,6 @@ function validateMessagesAreFromExtension(sender: chrome.runtime.MessageSender) return sender.url?.startsWith(chrome.runtime.getURL('')); } -let activeAccount: Account | null = null; - async function internalBackgroundMessageHandler( message: BackgroundMessages, sender: chrome.runtime.MessageSender, @@ -17,20 +13,6 @@ async function internalBackgroundMessageHandler( if (!validateMessagesAreFromExtension(sender)) { return; } - switch (message.method) { - case InternalMethods.ChangeActiveAccount: { - const { account } = message.payload; - activeAccount = account; - sendResponse(); - break; - } - case InternalMethods.RequestActiveAccount: { - sendResponse(activeAccount); - break; - } - default: - sendResponse(); - } sendResponse(); } diff --git a/src/common/utils/rpc/index.ts b/src/common/utils/rpc/index.ts index 6a00ca252..b90d216d4 100644 --- a/src/common/utils/rpc/index.ts +++ b/src/common/utils/rpc/index.ts @@ -1,5 +1,4 @@ -import { InternalMethods, WebBtcMessage } from '@common/types/message-types'; -import { sendMessage } from '@common/types/messages'; +import { WebBtcMessage } from '@common/types/message-types'; import { Requests, RpcErrorCode } from '@sats-connect/core'; import { getTabIdFromPort } from '..'; import { @@ -10,7 +9,8 @@ import { handleSignPsbt, } from './btc'; import handleGetInfo from './getInfo'; -import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from './helpers'; +import { makeRPCError, sendRpcResponse } from './helpers'; +import handleGetRunesBalance from './runes/getBalance'; import callContract from './stx/callContract/index.ts'; import deployContract from './stx/deployContract/index.ts'; import handleGetStxAccounts from './stx/getAccounts'; @@ -89,12 +89,7 @@ const handleRPCRequest = async ( break; } case 'runes_getBalance': { - const account = await sendMessage({ - method: InternalMethods.RequestActiveAccount, - payload: undefined, - }); - console.log(account); - sendRpcResponse(getTabIdFromPort(port), makeRpcSuccessResponse(message.id, account)); + await handleGetRunesBalance(message.id, getTabIdFromPort(port)); break; } default: diff --git a/src/common/utils/rpc/runes/getBalance.ts b/src/common/utils/rpc/runes/getBalance.ts new file mode 100644 index 000000000..68593441c --- /dev/null +++ b/src/common/utils/rpc/runes/getBalance.ts @@ -0,0 +1,24 @@ +import { RpcErrorCode, RpcId } from '@sats-connect/core'; +import { getRunesClient } from '@secretkeylabs/xverse-core'; +import rootStore from '@stores/index'; +import fetchAdapter from '@vespaiach/axios-fetch-adapter'; +import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '../helpers'; + +const handleGetRunesBalance = async (requestId: RpcId, tabId: number) => { + const { ordinalsAddress, network } = rootStore.store.getState().walletState; + const runesApi = getRunesClient(network.type, fetchAdapter); + try { + const balance = await runesApi.getRuneBalance(ordinalsAddress); + sendRpcResponse(tabId, makeRpcSuccessResponse(requestId, balance as any)); + } catch (error) { + sendRpcResponse( + tabId, + makeRPCError(requestId, { + code: RpcErrorCode.INTERNAL_ERROR, + message: (error as any).message, + }), + ); + } +}; + +export default handleGetRunesBalance; From d5d50b5bb7ace4cb6e138730b3a62b325410d523 Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Tue, 30 Apr 2024 17:41:29 +0300 Subject: [PATCH 4/8] use updated core version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 78db72eb4..22477abcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@react-spring/web": "^9.6.1", "@sats-connect/core": "0.0.9-7e4d74e", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.6.1-d75220b", + "@secretkeylabs/xverse-core": "13.6.1-0fa98b8", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.13.1", @@ -1411,9 +1411,9 @@ } }, "node_modules/@secretkeylabs/xverse-core": { - "version": "13.6.1-d75220b", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.6.1-d75220b/4e5ba4d4731606e9fb9ad2f81da0e75711811f74", - "integrity": "sha512-uB84m+3QuA07WTs8ezVX9BTX7G9s3jtb+1nhfNx4hl/t87dZUV3fVKrKiGxTR6iGs6r04VaHVI2wOZ3wnk08WA==", + "version": "13.6.1-0fa98b8", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.6.1-0fa98b8/1d88e38a009c5743122dd065e5b20625f404fe78", + "integrity": "sha512-RdJAWTjPKTz5nKyYRcMnO/Tp/0W/xEwOsfE2AXO4ui5lCN/QGrhiviwBO78EyGOuX6ZMq9xOUaOHYAtrYhw3vA==", "license": "ISC", "dependencies": { "@bitcoinerlab/secp256k1": "^1.0.2", @@ -17980,9 +17980,9 @@ } }, "@secretkeylabs/xverse-core": { - "version": "13.6.1-d75220b", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.6.1-d75220b/4e5ba4d4731606e9fb9ad2f81da0e75711811f74", - "integrity": "sha512-uB84m+3QuA07WTs8ezVX9BTX7G9s3jtb+1nhfNx4hl/t87dZUV3fVKrKiGxTR6iGs6r04VaHVI2wOZ3wnk08WA==", + "version": "13.6.1-0fa98b8", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.6.1-0fa98b8/1d88e38a009c5743122dd065e5b20625f404fe78", + "integrity": "sha512-RdJAWTjPKTz5nKyYRcMnO/Tp/0W/xEwOsfE2AXO4ui5lCN/QGrhiviwBO78EyGOuX6ZMq9xOUaOHYAtrYhw3vA==", "requires": { "@bitcoinerlab/secp256k1": "^1.0.2", "@noble/curves": "^1.2.0", diff --git a/package.json b/package.json index e8f2efba1..d37b11f76 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@react-spring/web": "^9.6.1", "@sats-connect/core": "0.0.9-7e4d74e", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.6.1-d75220b", + "@secretkeylabs/xverse-core": "13.6.1-0fa98b8", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.13.1", From a55cebcc1817eafee907aee636e52d73d758a1a2 Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Tue, 14 May 2024 10:36:31 +0300 Subject: [PATCH 5/8] update core packages --- package-lock.json | 28 ++++++++++++------------ package.json | 4 ++-- src/common/utils/rpc/runes/getBalance.ts | 12 ++++++++-- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 22477abcc..dbd430b69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,9 +13,9 @@ "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.43.1", "@react-spring/web": "^9.6.1", - "@sats-connect/core": "0.0.9-7e4d74e", + "@sats-connect/core": "^0.0.9-c7cae71", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.6.1-0fa98b8", + "@secretkeylabs/xverse-core": "13.6.5", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.13.1", @@ -1314,9 +1314,9 @@ ] }, "node_modules/@sats-connect/core": { - "version": "0.0.9-7e4d74e", - "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9-7e4d74e.tgz", - "integrity": "sha512-571EdC05ZFK6SW+v7KOrumBYjHwHNRGFmBO0PU2BEA0nak6yg+bIVcJrpyQgE1aGoy2CMpkEZMMoYSwl/vUm5g==", + "version": "0.0.9-c7cae71", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9-c7cae71.tgz", + "integrity": "sha512-YOTaXpVAfE2uTk4KZ64asT4BCo0XyAvARimZTT0ebYbd+/FYBzSTV9/8Ge/BgpTQTRf09IpiBgV9Mma4hqsmBg==", "dependencies": { "axios": "1.6.8", "bitcoin-address-validation": "2.2.3", @@ -1411,9 +1411,9 @@ } }, "node_modules/@secretkeylabs/xverse-core": { - "version": "13.6.1-0fa98b8", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.6.1-0fa98b8/1d88e38a009c5743122dd065e5b20625f404fe78", - "integrity": "sha512-RdJAWTjPKTz5nKyYRcMnO/Tp/0W/xEwOsfE2AXO4ui5lCN/QGrhiviwBO78EyGOuX6ZMq9xOUaOHYAtrYhw3vA==", + "version": "13.6.5", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.6.5/d040738bda961a6881aafc5b48cd3e5cee27b4f2", + "integrity": "sha512-dh1zjApZMzLcNbCNXgwEfZvlgnYcRDJUJzRelDSj/wmg7fCESsct0ANa3DQonNYi27T8XokCufeu0JMX3Pvj9g==", "license": "ISC", "dependencies": { "@bitcoinerlab/secp256k1": "^1.0.2", @@ -17907,9 +17907,9 @@ "optional": true }, "@sats-connect/core": { - "version": "0.0.9-7e4d74e", - "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9-7e4d74e.tgz", - "integrity": "sha512-571EdC05ZFK6SW+v7KOrumBYjHwHNRGFmBO0PU2BEA0nak6yg+bIVcJrpyQgE1aGoy2CMpkEZMMoYSwl/vUm5g==", + "version": "0.0.9-c7cae71", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9-c7cae71.tgz", + "integrity": "sha512-YOTaXpVAfE2uTk4KZ64asT4BCo0XyAvARimZTT0ebYbd+/FYBzSTV9/8Ge/BgpTQTRf09IpiBgV9Mma4hqsmBg==", "requires": { "axios": "1.6.8", "bitcoin-address-validation": "2.2.3", @@ -17980,9 +17980,9 @@ } }, "@secretkeylabs/xverse-core": { - "version": "13.6.1-0fa98b8", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.6.1-0fa98b8/1d88e38a009c5743122dd065e5b20625f404fe78", - "integrity": "sha512-RdJAWTjPKTz5nKyYRcMnO/Tp/0W/xEwOsfE2AXO4ui5lCN/QGrhiviwBO78EyGOuX6ZMq9xOUaOHYAtrYhw3vA==", + "version": "13.6.5", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.6.5/d040738bda961a6881aafc5b48cd3e5cee27b4f2", + "integrity": "sha512-dh1zjApZMzLcNbCNXgwEfZvlgnYcRDJUJzRelDSj/wmg7fCESsct0ANa3DQonNYi27T8XokCufeu0JMX3Pvj9g==", "requires": { "@bitcoinerlab/secp256k1": "^1.0.2", "@noble/curves": "^1.2.0", diff --git a/package.json b/package.json index d37b11f76..cf892a819 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.43.1", "@react-spring/web": "^9.6.1", - "@sats-connect/core": "0.0.9-7e4d74e", + "@sats-connect/core": "^0.0.9-c7cae71", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.6.1-0fa98b8", + "@secretkeylabs/xverse-core": "13.6.5", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.13.1", diff --git a/src/common/utils/rpc/runes/getBalance.ts b/src/common/utils/rpc/runes/getBalance.ts index 68593441c..c5d8655e6 100644 --- a/src/common/utils/rpc/runes/getBalance.ts +++ b/src/common/utils/rpc/runes/getBalance.ts @@ -8,8 +8,16 @@ const handleGetRunesBalance = async (requestId: RpcId, tabId: number) => { const { ordinalsAddress, network } = rootStore.store.getState().walletState; const runesApi = getRunesClient(network.type, fetchAdapter); try { - const balance = await runesApi.getRuneBalance(ordinalsAddress); - sendRpcResponse(tabId, makeRpcSuccessResponse(requestId, balance as any)); + const runesBalances = await runesApi.getRuneBalances(ordinalsAddress); + sendRpcResponse( + tabId, + makeRpcSuccessResponse<'runes_getBalance'>(requestId, { + balances: runesBalances.map((runeBalance) => ({ + ...runeBalance, + amount: runeBalance.amount.toString(), + })), + }), + ); } catch (error) { sendRpcResponse( tabId, From 69904f744eeea31f1e1df352613d03e6f8f5db3b Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Fri, 17 May 2024 14:31:23 +0300 Subject: [PATCH 6/8] use latest @sats-connect/core --- package-lock.json | 15 ++++++++------- package.json | 2 +- src/common/utils/rpc/runes/getBalance.ts | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ca045c0e..f7a9dafae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,12 +7,13 @@ "": { "name": "xverse-web-extension", "version": "0.35.0", + "hasInstallScript": true, "dependencies": { "@ledgerhq/hw-transport-webusb": "^6.27.13", "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.43.1", "@react-spring/web": "^9.6.1", - "@sats-connect/core": "^0.0.9-c7cae71", + "@sats-connect/core": "0.0.9", "@scure/btc-signer": "1.2.1", "@secretkeylabs/xverse-core": "13.6.5", "@stacks/connect": "7.4.1", @@ -1313,9 +1314,9 @@ ] }, "node_modules/@sats-connect/core": { - "version": "0.0.9-c7cae71", - "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9-c7cae71.tgz", - "integrity": "sha512-YOTaXpVAfE2uTk4KZ64asT4BCo0XyAvARimZTT0ebYbd+/FYBzSTV9/8Ge/BgpTQTRf09IpiBgV9Mma4hqsmBg==", + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9.tgz", + "integrity": "sha512-7/hY7VF9OqNDYcXlADluMKCTDu9f4OENWkWWO8K1LqanuyZhepu3fBRQKSCT6Xr/3KorvSH/e8sSTcJCzuVOAA==", "dependencies": { "axios": "1.6.8", "bitcoin-address-validation": "2.2.3", @@ -17906,9 +17907,9 @@ "optional": true }, "@sats-connect/core": { - "version": "0.0.9-c7cae71", - "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9-c7cae71.tgz", - "integrity": "sha512-YOTaXpVAfE2uTk4KZ64asT4BCo0XyAvARimZTT0ebYbd+/FYBzSTV9/8Ge/BgpTQTRf09IpiBgV9Mma4hqsmBg==", + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9.tgz", + "integrity": "sha512-7/hY7VF9OqNDYcXlADluMKCTDu9f4OENWkWWO8K1LqanuyZhepu3fBRQKSCT6Xr/3KorvSH/e8sSTcJCzuVOAA==", "requires": { "axios": "1.6.8", "bitcoin-address-validation": "2.2.3", diff --git a/package.json b/package.json index 122726a61..9f194ae19 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.43.1", "@react-spring/web": "^9.6.1", - "@sats-connect/core": "^0.0.9-c7cae71", + "@sats-connect/core": "0.0.9", "@scure/btc-signer": "1.2.1", "@secretkeylabs/xverse-core": "13.6.5", "@stacks/connect": "7.4.1", diff --git a/src/common/utils/rpc/runes/getBalance.ts b/src/common/utils/rpc/runes/getBalance.ts index c5d8655e6..5b5154e27 100644 --- a/src/common/utils/rpc/runes/getBalance.ts +++ b/src/common/utils/rpc/runes/getBalance.ts @@ -6,6 +6,7 @@ import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '../helper const handleGetRunesBalance = async (requestId: RpcId, tabId: number) => { const { ordinalsAddress, network } = rootStore.store.getState().walletState; + // TODO: Remove the fetchAdapter once a newer version of axios is released const runesApi = getRunesClient(network.type, fetchAdapter); try { const runesBalances = await runesApi.getRuneBalances(ordinalsAddress); From 1113d0d2686e694ca77f8949b302644e89d199d2 Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Mon, 20 May 2024 10:38:00 +0300 Subject: [PATCH 7/8] update axios version and remove adapter and patch script --- package-lock.json | 540 +----------------- package.json | 5 +- .../axios-fetch-adapter+0.3.1.patch | 36 -- src/common/utils/rpc/runes/getBalance.ts | 4 +- 4 files changed, 31 insertions(+), 554 deletions(-) delete mode 100644 patches/@vespaiach/axios-fetch-adapter+0.3.1.patch diff --git a/package-lock.json b/package-lock.json index 281b552e5..c15d22c34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,6 @@ "": { "name": "xverse-web-extension", "version": "0.35.1", - "hasInstallScript": true, "dependencies": { "@ledgerhq/hw-transport-webusb": "^6.27.13", "@phosphor-icons/react": "^2.0.10", @@ -26,10 +25,9 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", - "@vespaiach/axios-fetch-adapter": "0.3.1", "alex-sdk": "0.1.26", "argon2-browser": "^1.18.0", - "axios": "^1.1.3", + "axios": "1.7.0", "bignumber.js": "^9.1.0", "bip39": "^3.0.3", "buffer": "6.0.3", @@ -120,7 +118,6 @@ "html-webpack-plugin": "^5.5.0", "husky": "^8.0.3", "lint-staged": "^13.2.3", - "patch-package": "8.0.0", "path": "^0.12.7", "prettier": "^2.7.1", "prettier-plugin-organize-imports": "^3.2.3", @@ -1489,6 +1486,16 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz", "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==" }, + "node_modules/@secretkeylabs/xverse-core/node_modules/axios": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/@secretkeylabs/xverse-core/node_modules/bip39": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz", @@ -2868,14 +2875,6 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@vespaiach/axios-fetch-adapter": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@vespaiach/axios-fetch-adapter/-/axios-fetch-adapter-0.3.1.tgz", - "integrity": "sha512-+1F52VWXmQHSRFSv4/H0wtnxfvjRMPK5531e880MIjypPdUSX6QZuoDgEVeCE1vjhzDdxCVX7rOqkub7StEUwQ==", - "peerDependencies": { - "axios": ">=0.26.0" - } - }, "node_modules/@vitest/expect": { "version": "0.34.6", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz", @@ -3226,12 +3225,6 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, - "node_modules/@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "dev": true - }, "node_modules/@zondax/ledger-stacks": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz", @@ -3753,15 +3746,6 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -3783,11 +3767,11 @@ } }, "node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz", + "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -4559,21 +4543,6 @@ "node": ">=6.0" } }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, "node_modules/cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", @@ -7034,15 +7003,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/find-yarn-workspace-root": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", - "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", - "dev": true, - "dependencies": { - "micromatch": "^4.0.2" - } - }, "node_modules/flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -8862,24 +8822,6 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "node_modules/json-stable-stringify": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", - "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.5", - "isarray": "^2.0.5", - "jsonify": "^0.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", @@ -8915,15 +8857,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jsonify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", - "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/jsonp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz", @@ -8979,15 +8912,6 @@ "node": ">=0.10.0" } }, - "node_modules/klaw-sync": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", - "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.11" - } - }, "node_modules/language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -12762,15 +12686,6 @@ "node": ">= 0.8.0" } }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -12939,191 +12854,6 @@ "tslib": "^2.0.3" } }, - "node_modules/patch-package": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz", - "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==", - "dev": true, - "dependencies": { - "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^4.1.2", - "ci-info": "^3.7.0", - "cross-spawn": "^7.0.3", - "find-yarn-workspace-root": "^2.0.0", - "fs-extra": "^9.0.0", - "json-stable-stringify": "^1.0.2", - "klaw-sync": "^6.0.0", - "minimist": "^1.2.6", - "open": "^7.4.2", - "rimraf": "^2.6.3", - "semver": "^7.5.3", - "slash": "^2.0.0", - "tmp": "^0.0.33", - "yaml": "^2.2.2" - }, - "bin": { - "patch-package": "index.js" - }, - "engines": { - "node": ">=14", - "npm": ">5" - } - }, - "node_modules/patch-package/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/patch-package/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/patch-package/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/patch-package/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/patch-package/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/patch-package/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/patch-package/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/patch-package/node_modules/open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", - "dev": true, - "dependencies": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/patch-package/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/patch-package/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/patch-package/node_modules/slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/patch-package/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/patch-package/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/path": { "version": "0.12.7", "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", @@ -15551,18 +15281,6 @@ "node": ">=14.0.0" } }, - "node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -18049,6 +17767,16 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz", "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==" }, + "axios": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "requires": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "bip39": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz", @@ -19161,12 +18889,6 @@ "eslint-visitor-keys": "^3.3.0" } }, - "@vespaiach/axios-fetch-adapter": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@vespaiach/axios-fetch-adapter/-/axios-fetch-adapter-0.3.1.tgz", - "integrity": "sha512-+1F52VWXmQHSRFSv4/H0wtnxfvjRMPK5531e880MIjypPdUSX6QZuoDgEVeCE1vjhzDdxCVX7rOqkub7StEUwQ==", - "requires": {} - }, "@vitest/expect": { "version": "0.34.6", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz", @@ -19462,12 +19184,6 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, - "@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "dev": true - }, "@zondax/ledger-stacks": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz", @@ -19878,12 +19594,6 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, - "at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true - }, "available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -19896,11 +19606,11 @@ "dev": true }, "axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz", + "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==", "requires": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -20505,12 +20215,6 @@ "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "dev": true }, - "ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true - }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", @@ -22428,15 +22132,6 @@ "path-exists": "^4.0.0" } }, - "find-yarn-workspace-root": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", - "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", - "dev": true, - "requires": { - "micromatch": "^4.0.2" - } - }, "flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -23690,18 +23385,6 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "json-stable-stringify": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", - "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", - "dev": true, - "requires": { - "call-bind": "^1.0.5", - "isarray": "^2.0.5", - "jsonify": "^0.0.1", - "object-keys": "^1.1.1" - } - }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", @@ -23729,12 +23412,6 @@ "universalify": "^2.0.0" } }, - "jsonify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", - "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", - "dev": true - }, "jsonp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz", @@ -23786,15 +23463,6 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, - "klaw-sync": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", - "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11" - } - }, "language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -26357,12 +26025,6 @@ "type-check": "^0.4.0" } }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true - }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -26483,141 +26145,6 @@ "tslib": "^2.0.3" } }, - "patch-package": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz", - "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==", - "dev": true, - "requires": { - "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^4.1.2", - "ci-info": "^3.7.0", - "cross-spawn": "^7.0.3", - "find-yarn-workspace-root": "^2.0.0", - "fs-extra": "^9.0.0", - "json-stable-stringify": "^1.0.2", - "klaw-sync": "^6.0.0", - "minimist": "^1.2.6", - "open": "^7.4.2", - "rimraf": "^2.6.3", - "semver": "^7.5.3", - "slash": "^2.0.0", - "tmp": "^0.0.33", - "yaml": "^2.2.2" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "requires": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", - "dev": true, - "requires": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" - } - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, "path": { "version": "0.12.7", "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", @@ -28394,15 +27921,6 @@ "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==", "dev": true }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", diff --git a/package.json b/package.json index a84698bd5..3c036324c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "test": "vitest ./src", "style": "prettier --write \"src/**/*.{ts,tsx}\"", "prepare": "husky install", - "postinstall": "patch-package", "e2etest": "npx playwright test", "e2etest:ui": "npx playwright test --ui", "smoketest": "npx playwright test --grep \"#smoketest\"", @@ -38,10 +37,9 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", - "@vespaiach/axios-fetch-adapter": "0.3.1", "alex-sdk": "0.1.26", "argon2-browser": "^1.18.0", - "axios": "^1.1.3", + "axios": "1.7.0", "bignumber.js": "^9.1.0", "bip39": "^3.0.3", "buffer": "6.0.3", @@ -145,7 +143,6 @@ "html-webpack-plugin": "^5.5.0", "husky": "^8.0.3", "lint-staged": "^13.2.3", - "patch-package": "8.0.0", "path": "^0.12.7", "prettier": "^2.7.1", "prettier-plugin-organize-imports": "^3.2.3", diff --git a/patches/@vespaiach/axios-fetch-adapter+0.3.1.patch b/patches/@vespaiach/axios-fetch-adapter+0.3.1.patch deleted file mode 100644 index 78a076a46..000000000 --- a/patches/@vespaiach/axios-fetch-adapter+0.3.1.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/node_modules/@vespaiach/axios-fetch-adapter/index.js b/node_modules/@vespaiach/axios-fetch-adapter/index.js -index 527e282..649926f 100644 ---- a/node_modules/@vespaiach/axios-fetch-adapter/index.js -+++ b/node_modules/@vespaiach/axios-fetch-adapter/index.js -@@ -1,8 +1,9 @@ - import axios from 'axios'; --import settle from 'axios/lib/core/settle'; --import buildURL from 'axios/lib/helpers/buildURL'; --import buildFullPath from 'axios/lib/core/buildFullPath'; --import { isUndefined, isStandardBrowserEnv, isFormData } from 'axios/lib/utils'; -+import settle from 'axios/unsafe/core/settle'; -+import buildURL from 'axios/unsafe/helpers/buildURL'; -+import buildFullPath from 'axios/unsafe/core/buildFullPath'; -+import * as browserUtils from 'axios/unsafe/platform/browser'; -+import * as utils from 'axios/unsafe/utils'; - - /** - * - Create a request object -@@ -106,7 +107,7 @@ function createRequest(config) { - - // In these cases the browser will automatically set the correct Content-Type, - // but only if that header hasn't been set yet. So that's why we're deleting it. -- if (isFormData(options.body) && isStandardBrowserEnv()) { -+ if (utils.default.isFormData(options.body) && browserUtils.default.isStandardBrowserEnv()) { - headers.delete('Content-Type'); - } - } -@@ -127,7 +128,7 @@ function createRequest(config) { - } - // This config is similar to XHR’s withCredentials flag, but with three available values instead of two. - // So if withCredentials is not set, default value 'same-origin' will be used -- if (!isUndefined(config.withCredentials)) { -+ if (!utils.default.isUndefined(config.withCredentials)) { - options.credentials = config.withCredentials ? 'include' : 'omit'; - } - \ No newline at end of file diff --git a/src/common/utils/rpc/runes/getBalance.ts b/src/common/utils/rpc/runes/getBalance.ts index 5b5154e27..56e070df1 100644 --- a/src/common/utils/rpc/runes/getBalance.ts +++ b/src/common/utils/rpc/runes/getBalance.ts @@ -1,13 +1,11 @@ import { RpcErrorCode, RpcId } from '@sats-connect/core'; import { getRunesClient } from '@secretkeylabs/xverse-core'; import rootStore from '@stores/index'; -import fetchAdapter from '@vespaiach/axios-fetch-adapter'; import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '../helpers'; const handleGetRunesBalance = async (requestId: RpcId, tabId: number) => { const { ordinalsAddress, network } = rootStore.store.getState().walletState; - // TODO: Remove the fetchAdapter once a newer version of axios is released - const runesApi = getRunesClient(network.type, fetchAdapter); + const runesApi = getRunesClient(network.type); try { const runesBalances = await runesApi.getRuneBalances(ordinalsAddress); sendRpcResponse( From 188ecb09edb9b350c04f8a94ab2e9c1d89aab20e Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Tue, 21 May 2024 14:11:58 +0300 Subject: [PATCH 8/8] update core version --- package-lock.json | 38 +++++++++----------------------------- package.json | 2 +- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 78ebddc56..69712b6a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@react-spring/web": "^9.6.1", "@sats-connect/core": "0.0.9", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.7.0", + "@secretkeylabs/xverse-core": "13.7.1", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.13.1", @@ -1408,9 +1408,9 @@ } }, "node_modules/@secretkeylabs/xverse-core": { - "version": "13.7.0", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.7.0/7603ccb2d8e66f38fac90a4e16a3ab9cafc5e1d0", - "integrity": "sha512-mx6/pmmQzKhesFo2dZAjlD95vaPJP9VsKy1cMVMiRonSVUj4qAtge5skHJHeX5cDVfnVpzgcm4nzWwvjynV9Iw==", + "version": "13.7.1", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.7.1/a0d1c4ea750be9bfa448e206b246388c422254e8", + "integrity": "sha512-t+H6kOFBANnD0xrOg8P+bc9VA1WP6W1xc0A7qeS3Yb3MALg4wsiGQ8bEWPuEut+bInMvF98BiUM8rSotyjc2vA==", "license": "ISC", "dependencies": { "@bitcoinerlab/secp256k1": "^1.0.2", @@ -1429,7 +1429,7 @@ "@tanstack/react-query": "^4.29.3", "@zondax/ledger-stacks": "^1.0.4", "async-mutex": "^0.4.0", - "axios": "1.6.2", + "axios": "1.7.0", "base64url": "^3.0.1", "bip32": "^4.0.0", "bip39": "3.0.3", @@ -1487,16 +1487,6 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz", "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==" }, - "node_modules/@secretkeylabs/xverse-core/node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/@secretkeylabs/xverse-core/node_modules/bip39": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz", @@ -17699,9 +17689,9 @@ } }, "@secretkeylabs/xverse-core": { - "version": "13.7.0", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.7.0/7603ccb2d8e66f38fac90a4e16a3ab9cafc5e1d0", - "integrity": "sha512-mx6/pmmQzKhesFo2dZAjlD95vaPJP9VsKy1cMVMiRonSVUj4qAtge5skHJHeX5cDVfnVpzgcm4nzWwvjynV9Iw==", + "version": "13.7.1", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.7.1/a0d1c4ea750be9bfa448e206b246388c422254e8", + "integrity": "sha512-t+H6kOFBANnD0xrOg8P+bc9VA1WP6W1xc0A7qeS3Yb3MALg4wsiGQ8bEWPuEut+bInMvF98BiUM8rSotyjc2vA==", "requires": { "@bitcoinerlab/secp256k1": "^1.0.2", "@noble/curves": "^1.2.0", @@ -17719,7 +17709,7 @@ "@tanstack/react-query": "^4.29.3", "@zondax/ledger-stacks": "^1.0.4", "async-mutex": "^0.4.0", - "axios": "1.6.2", + "axios": "1.7.0", "base64url": "^3.0.1", "bip32": "^4.0.0", "bip39": "3.0.3", @@ -17768,16 +17758,6 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz", "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==" }, - "axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", - "requires": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "bip39": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz", diff --git a/package.json b/package.json index 9755b1a98..b76880dbf 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@react-spring/web": "^9.6.1", "@sats-connect/core": "0.0.9", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.7.0", + "@secretkeylabs/xverse-core": "13.7.1", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.13.1",