From 27444c1c9d08255e8be982c8f3b8cf78e9d39a9a Mon Sep 17 00:00:00 2001 From: Fara Woolf Date: Mon, 16 Sep 2024 13:18:46 -0400 Subject: [PATCH 1/2] refactor: currency model imports --- package.json | 2 +- pnpm-lock.yaml | 13 +++++++++++-- src/app/common/hooks/use-convert-to-fiat-amount.ts | 4 ++-- .../fees-row/components/custom-fee-field.tsx | 4 ++-- .../fees-row/components/transaction-fee.tsx | 4 ++-- .../connect-ledger-asset-item-fallback.tsx | 4 ++-- .../hooks/use-stacks-broadcast-transaction.tsx | 4 ++-- .../hooks/use-stacks-transaction-summary.ts | 4 ++-- .../pages/fund/components/fiat-providers.utils.ts | 10 +++++----- src/app/pages/fund/components/fund.layout.tsx | 4 ++-- .../pages/fund/components/receive-funds-item.tsx | 6 +++--- src/app/pages/fund/fiat-providers-list.tsx | 4 ++-- src/app/pages/fund/fund.tsx | 9 ++++----- .../rpc-send-transfer-confirmation.tsx | 4 ++-- .../form/btc/btc-send-form-confirmation.tsx | 4 ++-- .../form/btc/btc-send-form.tsx | 4 ++-- .../form/stacks/stacks-send-form-confirmation.tsx | 6 +++--- .../form/stx/stx-send-form.tsx | 4 ++-- 18 files changed, 51 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 0b87e2b855a..f209c512a77 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "@leather.io/bitcoin": "0.11.2", "@leather.io/constants": "0.9.2", "@leather.io/crypto": "1.4.2", - "@leather.io/models": "0.13.0", + "@leather.io/models": "0.14.0", "@leather.io/query": "2.10.0", "@leather.io/stacks": "1.0.2", "@leather.io/tokens": "0.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d4f6421bd01..f4ea865ecfe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -45,8 +45,8 @@ importers: specifier: 1.4.2 version: 1.4.2 '@leather.io/models': - specifier: 0.13.0 - version: 0.13.0 + specifier: 0.14.0 + version: 0.14.0 '@leather.io/query': specifier: 2.10.0 version: 2.10.0(@stacks/network@6.13.0(encoding@0.1.13))(encoding@0.1.13)(react@18.3.1) @@ -2797,6 +2797,9 @@ packages: '@leather.io/models@0.13.0': resolution: {integrity: sha512-5pgaKKXVjHD7CVb89r/MOwrTxNxVG/NVWll91q9MWjkfq/KEn+O6Ceg9wo2QJCaV/XD9rxozljAJ1WOJrWCyXg==} + '@leather.io/models@0.14.0': + resolution: {integrity: sha512-XGgXDmZMyFVNGPAtd3Pua3d2/12J1Nlw5GMZB2sieBNdDC1iSwVrfAjy3UEMlvYuZR4YKqliX3P97McGDxmCgg==} + '@leather.io/panda-preset@0.3.8': resolution: {integrity: sha512-MEohMC7VA28v+um3uYxTeLYNOZ+XXg09MoAtgvHw+RJJFtO6bBXFcmgooSJv44aaBuhRb3Zx9erz4xErq3GzcQ==} @@ -17698,6 +17701,12 @@ snapshots: bignumber.js: 9.1.2 zod: 3.23.6 + '@leather.io/models@0.14.0': + dependencies: + '@stacks/stacks-blockchain-api-types': 7.8.2 + bignumber.js: 9.1.2 + zod: 3.23.6 + '@leather.io/panda-preset@0.3.8(jsdom@22.1.0)(typescript@5.4.5)': dependencies: '@pandacss/dev': 0.40.1(jsdom@22.1.0)(typescript@5.4.5) diff --git a/src/app/common/hooks/use-convert-to-fiat-amount.ts b/src/app/common/hooks/use-convert-to-fiat-amount.ts index 4146606a5cc..8b770cebbbb 100644 --- a/src/app/common/hooks/use-convert-to-fiat-amount.ts +++ b/src/app/common/hooks/use-convert-to-fiat-amount.ts @@ -1,10 +1,10 @@ import { useCallback } from 'react'; -import type { CryptoCurrencies, Money } from '@leather.io/models'; +import type { CryptoCurrency, Money } from '@leather.io/models'; import { useCryptoCurrencyMarketDataMeanAverage } from '@leather.io/query'; import { baseCurrencyAmountInQuote } from '@leather.io/utils'; -export function useConvertCryptoCurrencyToFiatAmount(currency: CryptoCurrencies) { +export function useConvertCryptoCurrencyToFiatAmount(currency: CryptoCurrency) { // TODO: unsafe type assumption const cryptoCurrencyMarketData = useCryptoCurrencyMarketDataMeanAverage( currency as 'BTC' | 'STX' diff --git a/src/app/components/fees-row/components/custom-fee-field.tsx b/src/app/components/fees-row/components/custom-fee-field.tsx index 235b51a57a6..9476d6f5080 100644 --- a/src/app/components/fees-row/components/custom-fee-field.tsx +++ b/src/app/components/fees-row/components/custom-fee-field.tsx @@ -4,13 +4,13 @@ import { SharedComponentsSelectors } from '@tests/selectors/shared-component.sel import { useField } from 'formik'; import { Flex, Stack, styled } from 'leather-styles/jsx'; -import type { CryptoCurrencies, StacksFeeEstimate } from '@leather.io/models'; +import type { CryptoCurrency, StacksFeeEstimate } from '@leather.io/models'; import { stxToMicroStx } from '@leather.io/utils'; import { SendFormWarningMessages } from '@app/common/warning-messages'; interface CustomFeeFieldProps { - feeCurrencySymbol: CryptoCurrencies; + feeCurrencySymbol: CryptoCurrency; lowFeeEstimate: StacksFeeEstimate; setFieldWarning(value: string): void; disableFeeSelection?: boolean; diff --git a/src/app/components/fees-row/components/transaction-fee.tsx b/src/app/components/fees-row/components/transaction-fee.tsx index a0298e7d9f6..79147aed9f5 100644 --- a/src/app/components/fees-row/components/transaction-fee.tsx +++ b/src/app/components/fees-row/components/transaction-fee.tsx @@ -1,14 +1,14 @@ import { SharedComponentsSelectors } from '@tests/selectors/shared-component.selectors'; import { styled } from 'leather-styles/jsx'; -import type { CryptoCurrencies, Money } from '@leather.io/models'; +import type { CryptoCurrency, Money } from '@leather.io/models'; import { formatDustUsdAmounts, i18nFormatCurrency } from '@leather.io/utils'; import { BasicTooltip } from '@app/ui/components/tooltip/basic-tooltip'; interface TransactionFeeProps { fee: string | number; - feeCurrencySymbol: CryptoCurrencies; + feeCurrencySymbol: CryptoCurrency; usdAmount: Money | null; } export function TransactionFee({ fee, feeCurrencySymbol, usdAmount }: TransactionFeeProps) { diff --git a/src/app/features/asset-list/_components/connect-ledger-asset-item-fallback.tsx b/src/app/features/asset-list/_components/connect-ledger-asset-item-fallback.tsx index 66ff32a67ae..f712dd6275f 100644 --- a/src/app/features/asset-list/_components/connect-ledger-asset-item-fallback.tsx +++ b/src/app/features/asset-list/_components/connect-ledger-asset-item-fallback.tsx @@ -1,6 +1,6 @@ import type React from 'react'; -import type { Blockchains, Currencies } from '@leather.io/models'; +import type { Blockchains, Currency } from '@leather.io/models'; import { ItemLayout, Pressable } from '@leather.io/ui'; import { capitalize } from '@app/common/utils'; @@ -12,7 +12,7 @@ import { ConnectLedgerButton } from './connect-ledger-asset-button'; interface ConnectLedgerAssetItemFallbackProps { chain: Blockchains; icon: React.ReactNode; - symbol: Currencies; + symbol: Currency; variant: AssetListVariant; } export function ConnectLedgerAssetItemFallback({ diff --git a/src/app/features/stacks-transaction-request/hooks/use-stacks-broadcast-transaction.tsx b/src/app/features/stacks-transaction-request/hooks/use-stacks-broadcast-transaction.tsx index 1fc72d4e6bc..d28ed476f39 100644 --- a/src/app/features/stacks-transaction-request/hooks/use-stacks-broadcast-transaction.tsx +++ b/src/app/features/stacks-transaction-request/hooks/use-stacks-broadcast-transaction.tsx @@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom'; import { AuthType, StacksTransaction } from '@stacks/transactions'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { delay, isError, isString } from '@leather.io/utils'; import { finalizeTxSignature } from '@shared/actions/finalize-tx-signature'; @@ -25,7 +25,7 @@ async function simulateShortDelayToAvoidUndefinedTabId() { } interface UseStacksBroadcastTransactionArgs { - token: CryptoCurrencies; + token: CryptoCurrency; decimals?: number; isIncreaseFeeTransaction?: boolean; } diff --git a/src/app/features/stacks-transaction-request/hooks/use-stacks-transaction-summary.ts b/src/app/features/stacks-transaction-request/hooks/use-stacks-transaction-summary.ts index b8dd4e2e739..50f75f4dde9 100644 --- a/src/app/features/stacks-transaction-request/hooks/use-stacks-transaction-summary.ts +++ b/src/app/features/stacks-transaction-request/hooks/use-stacks-transaction-summary.ts @@ -11,7 +11,7 @@ import { } from '@stacks/transactions'; import BigNumber from 'bignumber.js'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { useCryptoCurrencyMarketDataMeanAverage, useGetStacksNetworkBlockTimeQuery, @@ -30,7 +30,7 @@ import { getEstimatedConfirmationTime } from '@app/common/transactions/stacks/tr import { removeTrailingNullCharacters } from '@app/common/utils'; import { useCurrentNetworkState } from '@app/store/networks/networks.hooks'; -export function useStacksTransactionSummary(token: CryptoCurrencies) { +export function useStacksTransactionSummary(token: CryptoCurrency) { // TODO: unsafe type assumption const tokenMarketData = useCryptoCurrencyMarketDataMeanAverage(token as 'BTC' | 'STX'); const { isTestnet } = useCurrentNetworkState(); diff --git a/src/app/pages/fund/components/fiat-providers.utils.ts b/src/app/pages/fund/components/fiat-providers.utils.ts index 639cc25b578..7b2a10d6699 100644 --- a/src/app/pages/fund/components/fiat-providers.utils.ts +++ b/src/app/pages/fund/components/fiat-providers.utils.ts @@ -10,7 +10,7 @@ import OkxIcon from '@assets/images/fund/fiat-providers/okx-icon.png'; import TransakIcon from '@assets/images/fund/fiat-providers/transak-icon.png'; import { generateOnRampURL } from '@coinbase/cbpay-js'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { COINBASE_APP_ID, MOONPAY_API_KEY, TRANSAK_API_KEY } from '@shared/environment'; @@ -43,7 +43,7 @@ export const activeFiatProviderIcons: Record [ActiveFiatProviders.Transak]: TransakIcon, }; -function makeCoinbaseUrl(address: string, symbol: CryptoCurrencies) { +function makeCoinbaseUrl(address: string, symbol: CryptoCurrency) { const code = symbol.toUpperCase(); const onRampURL = generateOnRampURL({ @@ -58,12 +58,12 @@ function makeCoinbaseUrl(address: string, symbol: CryptoCurrencies) { return onRampURL; } -function makeMoonPayUrl(address: string, symbol: CryptoCurrencies) { +function makeMoonPayUrl(address: string, symbol: CryptoCurrency) { const code = symbol.toLowerCase(); return `https://buy.moonpay.com?apiKey=${MOONPAY_API_KEY}¤cyCode=${code}&walletAddress=${address}`; } -function makeTransakUrl(address: string, symbol: CryptoCurrencies) { +function makeTransakUrl(address: string, symbol: CryptoCurrency) { const screenTitle = 'Buy Stacks'; const code = symbol.toUpperCase(); @@ -82,7 +82,7 @@ interface GetProviderNameArgs { hasFastCheckoutProcess: boolean; key: string; name: string; - symbol: CryptoCurrencies; + symbol: CryptoCurrency; } export function getProviderUrl({ address, diff --git a/src/app/pages/fund/components/fund.layout.tsx b/src/app/pages/fund/components/fund.layout.tsx index 9e19290da02..a1ac5d63cf2 100644 --- a/src/app/pages/fund/components/fund.layout.tsx +++ b/src/app/pages/fund/components/fund.layout.tsx @@ -1,12 +1,12 @@ import { Stack, styled } from 'leather-styles/jsx'; -import type { Blockchains, CryptoCurrencies } from '@leather.io/models'; +import type { Blockchains, CryptoCurrency } from '@leather.io/models'; import { HasChildren } from '@app/common/has-children'; interface FundLayoutProps extends HasChildren { blockchain: Blockchains; - symbol: CryptoCurrencies; + symbol: CryptoCurrency; } export function FundLayout({ blockchain, symbol, children }: FundLayoutProps) { return ( diff --git a/src/app/pages/fund/components/receive-funds-item.tsx b/src/app/pages/fund/components/receive-funds-item.tsx index 2ebf5717cd0..5050aa23f72 100644 --- a/src/app/pages/fund/components/receive-funds-item.tsx +++ b/src/app/pages/fund/components/receive-funds-item.tsx @@ -3,7 +3,7 @@ import React from 'react'; import QRCodeIcon from '@assets/images/fund/qr-code-icon.png'; import { FundPageSelectors } from '@tests/selectors/fund.selectors'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { FundAccountTile } from './fund-account-tile'; import { BitcoinIconComponent, StacksIconComponent } from './icon-components'; @@ -13,7 +13,7 @@ interface CryptoDescription { IconComponent(): React.JSX.Element; } -const cryptoDescriptions: Record = { +const cryptoDescriptions: Record = { STX: { title: 'Receive STX from a friend or deposit from a separate wallet', IconComponent: StacksIconComponent, @@ -25,7 +25,7 @@ const cryptoDescriptions: Record = { }; interface ReceiveStxItemProps { onReceive(): void; - symbol: CryptoCurrencies; + symbol: CryptoCurrency; } export function ReceiveFundsItem({ onReceive, symbol }: ReceiveStxItemProps) { return ( diff --git a/src/app/pages/fund/fiat-providers-list.tsx b/src/app/pages/fund/fiat-providers-list.tsx index 24d007a8a32..1da1a10b9d1 100644 --- a/src/app/pages/fund/fiat-providers-list.tsx +++ b/src/app/pages/fund/fiat-providers-list.tsx @@ -2,7 +2,7 @@ import { useLocation, useNavigate } from 'react-router-dom'; import { Grid } from 'leather-styles/jsx'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { analytics } from '@shared/utils/analytics'; @@ -20,7 +20,7 @@ import { ReceiveFundsItem } from './components/receive-funds-item'; interface FiatProvidersProps { address: string; route: string; - symbol: CryptoCurrencies; + symbol: CryptoCurrency; } export function FiatProvidersList(props: FiatProvidersProps) { const { address, route, symbol } = props; diff --git a/src/app/pages/fund/fund.tsx b/src/app/pages/fund/fund.tsx index 9a895a7bcff..0bd5b63b2c6 100644 --- a/src/app/pages/fund/fund.tsx +++ b/src/app/pages/fund/fund.tsx @@ -3,7 +3,7 @@ import { Outlet, useParams } from 'react-router-dom'; import type { Blockchains, BtcCryptoAssetBalance, - CryptoCurrencies, + CryptoCurrency, StxCryptoAssetBalance, } from '@leather.io/models'; @@ -23,7 +23,7 @@ interface FundCryptoCurrencyInfo { balance?: BtcCryptoAssetBalance | StxCryptoAssetBalance; blockchain: Blockchains; route: string; - symbol: CryptoCurrencies; + symbol: CryptoCurrency; } export function FundPage() { @@ -31,7 +31,7 @@ export function FundPage() { const bitcoinSigner = useCurrentAccountNativeSegwitIndexZeroSignerNullable(); const { currency = 'STX' } = useParams(); - const fundCryptoCurrencyMap: Record = { + const fundCryptoCurrencyMap: Record = { BTC: { address: bitcoinSigner?.address, blockchain: 'bitcoin', @@ -46,8 +46,7 @@ export function FundPage() { }, }; - const { address, blockchain, route, symbol } = - fundCryptoCurrencyMap[currency as CryptoCurrencies]; + const { address, blockchain, route, symbol } = fundCryptoCurrencyMap[currency as CryptoCurrency]; if (!address) return ; diff --git a/src/app/pages/rpc-send-transfer/rpc-send-transfer-confirmation.tsx b/src/app/pages/rpc-send-transfer/rpc-send-transfer-confirmation.tsx index 25bdd2caef0..0ffe12f29e2 100644 --- a/src/app/pages/rpc-send-transfer/rpc-send-transfer-confirmation.tsx +++ b/src/app/pages/rpc-send-transfer/rpc-send-transfer-confirmation.tsx @@ -4,7 +4,7 @@ import { HStack, Stack, styled } from 'leather-styles/jsx'; import get from 'lodash.get'; import { decodeBitcoinTx } from '@leather.io/bitcoin'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { useBitcoinBroadcastTransaction, useCryptoCurrencyMarketDataMeanAverage, @@ -34,7 +34,7 @@ import { useCurrentAccountNativeSegwitAddressIndexZero } from '@app/store/accoun import { SendTransferConfirmationDetails } from './components/send-transfer-confirmation-details'; import { useRpcSendTransferRequestParams } from './use-rpc-send-transfer'; -const symbol: CryptoCurrencies = 'BTC'; +const symbol: CryptoCurrency = 'BTC'; function useRpcSendTransferConfirmationState() { const location = useLocation(); diff --git a/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form-confirmation.tsx b/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form-confirmation.tsx index 8eb8d0fd2c3..0c523cce76d 100644 --- a/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form-confirmation.tsx +++ b/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form-confirmation.tsx @@ -9,7 +9,7 @@ import { Stack } from 'leather-styles/jsx'; import get from 'lodash.get'; import { decodeBitcoinTx } from '@leather.io/bitcoin'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { useBitcoinBroadcastTransaction, useCryptoCurrencyMarketDataMeanAverage, @@ -40,7 +40,7 @@ import { useCurrentNativeSegwitUtxos } from '@app/query/bitcoin/address/utxos-by import { useSendFormNavigate } from '../../hooks/use-send-form-navigate'; -const symbol: CryptoCurrencies = 'BTC'; +const symbol: CryptoCurrency = 'BTC'; function useBtcSendFormConfirmationState() { const location = useLocation(); diff --git a/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx index d0baf285dcc..ce21ac4e949 100644 --- a/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx +++ b/src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx @@ -4,7 +4,7 @@ import { SendCryptoAssetSelectors } from '@tests/selectors/send.selectors'; import { Form, Formik } from 'formik'; import { Box } from 'leather-styles/jsx'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { useCryptoCurrencyMarketDataMeanAverage } from '@leather.io/query'; import { BtcAvatarIcon, Button, Callout, Link } from '@leather.io/ui'; import { formatMoney } from '@leather.io/utils'; @@ -21,7 +21,7 @@ import { useSendFormRouteState } from '../../hooks/use-send-form-route-state'; import { createDefaultInitialFormValues, defaultSendFormFormikProps } from '../../send-form.utils'; import { useBtcSendForm } from './use-btc-send-form'; -const symbol: CryptoCurrencies = 'BTC'; +const symbol: CryptoCurrency = 'BTC'; export function BtcSendForm() { const routeState = useSendFormRouteState(); diff --git a/src/app/pages/send/send-crypto-asset-form/form/stacks/stacks-send-form-confirmation.tsx b/src/app/pages/send/send-crypto-asset-form/form/stacks/stacks-send-form-confirmation.tsx index 8455c3e6a59..005abca4351 100644 --- a/src/app/pages/send/send-crypto-asset-form/form/stacks/stacks-send-form-confirmation.tsx +++ b/src/app/pages/send/send-crypto-asset-form/form/stacks/stacks-send-form-confirmation.tsx @@ -3,7 +3,7 @@ import { Outlet, useParams } from 'react-router-dom'; import { deserializeTransaction } from '@stacks/transactions'; import { Box, Stack } from 'leather-styles/jsx'; -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { InfoCircleIcon } from '@leather.io/ui'; import { useLocationStateWithCache } from '@app/common/hooks/use-location-state'; @@ -29,14 +29,14 @@ export function StacksSendFormConfirmation() { const { symbol = 'STX' } = useParams(); const { stacksBroadcastTransaction, isBroadcasting } = useStacksBroadcastTransaction({ - token: symbol.toUpperCase() as CryptoCurrencies, + token: symbol.toUpperCase() as CryptoCurrency, decimals, }); const stacksDeserializedTransaction = deserializeTransaction(tx); const { formReviewTxSummary } = useStacksTransactionSummary( - symbol.toUpperCase() as CryptoCurrencies + symbol.toUpperCase() as CryptoCurrency ); const { txValue, diff --git a/src/app/pages/send/send-crypto-asset-form/form/stx/stx-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/stx/stx-send-form.tsx index 2b80e54abd5..6c5014560f0 100644 --- a/src/app/pages/send/send-crypto-asset-form/form/stx/stx-send-form.tsx +++ b/src/app/pages/send/send-crypto-asset-form/form/stx/stx-send-form.tsx @@ -1,4 +1,4 @@ -import type { CryptoCurrencies } from '@leather.io/models'; +import type { CryptoCurrency } from '@leather.io/models'; import { useCryptoCurrencyMarketDataMeanAverage } from '@leather.io/query'; import { StxAvatarIcon } from '@leather.io/ui'; @@ -12,7 +12,7 @@ import { SendMaxButton } from '../../components/send-max-button'; import { StacksCommonSendForm } from '../stacks/stacks-common-send-form'; import { useStxSendForm } from './use-stx-send-form'; -const symbol = 'STX' satisfies CryptoCurrencies; +const symbol = 'STX' satisfies CryptoCurrency; export function StxSendForm() { const stxMarketData = useCryptoCurrencyMarketDataMeanAverage(symbol); From 57167dcd9a271cedefeacfeca5180f7b92dcca30 Mon Sep 17 00:00:00 2001 From: Fara Woolf Date: Tue, 17 Sep 2024 10:23:07 -0400 Subject: [PATCH 2/2] fix: security audit failures --- package.json | 2 ++ pnpm-lock.yaml | 48 +++++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index f209c512a77..e112d2b2cba 100644 --- a/package.json +++ b/package.json @@ -361,7 +361,9 @@ }, "resolutions": { "axios": "1.7.4", + "body-parser": "1.20.3", "braces": "3.0.3", + "dset": "3.1.4", "fast-xml-parser": "4.4.1", "nanoid": "3.3.4", "socket.io-parser": "4.2.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f4ea865ecfe..5366f0b4405 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,9 @@ settings: overrides: axios: 1.7.4 + body-parser: 1.20.3 braces: 3.0.3 + dset: 3.1.4 fast-xml-parser: 4.4.1 nanoid: 3.3.4 socket.io-parser: 4.2.4 @@ -671,10 +673,10 @@ importers: version: 1.1.2 web-ext: specifier: 7.8.0 - version: 7.8.0(body-parser@1.20.2) + version: 7.8.0(body-parser@1.20.3) web-ext-submit: specifier: 7.8.0 - version: 7.8.0(body-parser@1.20.2) + version: 7.8.0(body-parser@1.20.3) webpack: specifier: 5.94.0 version: 5.94.0(@swc/core@1.7.18)(esbuild@0.23.1)(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.1)(webpack@5.94.0)) @@ -6655,7 +6657,7 @@ packages: addons-scanner-utils@9.3.0: resolution: {integrity: sha512-YZWzNpP+em650XlZNH7NbTUcHJXqC0ihLEgwn17GGTqervyChqQffd9sm/QXNur0dmj7Ks1mD77iTg9XcJw64A==} peerDependencies: - body-parser: 1.20.2 + body-parser: 1.20.3 express: 4.18.2 node-fetch: 2.6.11 safe-compare: 1.1.4 @@ -7139,8 +7141,8 @@ packages: bn.js@5.2.1: resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==} - body-parser@1.20.2: - resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} + body-parser@1.20.3: + resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} bonjour-service@1.2.1: @@ -8482,8 +8484,8 @@ packages: resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==} engines: {node: '>=10'} - dset@3.1.3: - resolution: {integrity: sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==} + dset@3.1.4: + resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==} engines: {node: '>=4'} dtrace-provider@0.8.8: @@ -20096,7 +20098,7 @@ snapshots: '@emotion/react': 11.13.3(@types/react@18.3.3)(react@18.3.1) '@redux-devtools/app': 6.1.0(@emotion/react@11.13.3(@types/react@18.3.3)(react@18.3.1))(@reduxjs/toolkit@2.2.3(react-redux@9.1.0(@types/react@18.3.3)(react-native@0.74.1(@babel/core@7.25.2)(@babel/preset-env@7.25.4(@babel/core@7.25.2))(@types/react@18.3.3)(encoding@0.1.13)(react@18.2.0))(react@18.3.1)(redux@5.0.1))(react@18.3.1))(@types/react-dom@18.3.0)(@types/react@18.3.3)(@types/styled-components@5.1.34)(react-dom@18.3.1(react@18.3.1))(react-native@0.74.1(@babel/core@7.25.2)(@babel/preset-env@7.25.4(@babel/core@7.25.2))(@types/react@18.3.3)(encoding@0.1.13)(react@18.2.0))(react@18.3.1)(styled-components@5.3.11(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react-is@18.3.1)(react@18.3.1)) '@types/react': 18.3.3 - body-parser: 1.20.2 + body-parser: 1.20.3 chalk: 5.3.0 cors: 2.8.5 cross-spawn: 7.0.3 @@ -20477,7 +20479,7 @@ snapshots: dependencies: '@lukeed/uuid': 2.0.1 '@segment/analytics-generic-utils': 1.2.0 - dset: 3.1.3 + dset: 3.1.4 tslib: 2.7.0 '@segment/analytics-generic-utils@1.2.0': @@ -20492,7 +20494,7 @@ snapshots: '@segment/analytics.js-video-plugins': 0.2.1 '@segment/facade': 3.4.10 '@segment/tsub': 2.0.0 - dset: 3.1.3 + dset: 3.1.4 js-cookie: 3.0.1 node-fetch: 2.7.0(encoding@0.1.13) tslib: 2.7.0 @@ -20527,7 +20529,7 @@ snapshots: dependencies: '@stdlib/math-base-special-ldexp': 0.0.5 dlv: 1.1.3 - dset: 3.1.3 + dset: 3.1.4 tiny-hashes: 1.0.1 transitivePeerDependencies: - supports-color @@ -23462,12 +23464,12 @@ snapshots: acorn@8.12.1: {} - addons-linter@6.13.0(body-parser@1.20.2)(node-fetch@3.3.1): + addons-linter@6.13.0(body-parser@1.20.3)(node-fetch@3.3.1): dependencies: '@fluent/syntax': 0.19.0 '@mdn/browser-compat-data': 5.3.14 addons-moz-compare: 1.3.0 - addons-scanner-utils: 9.3.0(body-parser@1.20.2)(node-fetch@3.3.1) + addons-scanner-utils: 9.3.0(body-parser@1.20.3)(node-fetch@3.3.1) ajv: 8.12.0 chalk: 4.1.2 cheerio: 1.0.0-rc.12 @@ -23505,7 +23507,7 @@ snapshots: addons-moz-compare@1.3.0: {} - addons-scanner-utils@9.3.0(body-parser@1.20.2)(node-fetch@3.3.1): + addons-scanner-utils@9.3.0(body-parser@1.20.3)(node-fetch@3.3.1): dependencies: '@types/yauzl': 2.10.0 common-tags: 1.8.2 @@ -23514,7 +23516,7 @@ snapshots: upath: 2.0.1 yauzl: 2.10.0 optionalDependencies: - body-parser: 1.20.2 + body-parser: 1.20.3 node-fetch: 3.3.1 address@1.2.2: {} @@ -24044,7 +24046,7 @@ snapshots: bn.js@5.2.1: {} - body-parser@1.20.2: + body-parser@1.20.3: dependencies: bytes: 3.1.2 content-type: 1.0.5 @@ -24054,7 +24056,7 @@ snapshots: http-errors: 2.0.0 iconv-lite: 0.4.24 on-finished: 2.4.1 - qs: 6.11.0 + qs: 6.13.0 raw-body: 2.5.2 type-is: 1.6.18 unpipe: 1.0.0 @@ -25569,7 +25571,7 @@ snapshots: dotenv@8.6.0: {} - dset@3.1.3: {} + dset@3.1.4: {} dtrace-provider@0.8.8: dependencies: @@ -26327,7 +26329,7 @@ snapshots: dependencies: accepts: 1.3.8 array-flatten: 1.1.1 - body-parser: 1.20.2 + body-parser: 1.20.3 content-disposition: 0.5.4 content-type: 1.0.5 cookie: 0.6.0 @@ -33401,9 +33403,9 @@ snapshots: dependencies: defaults: 1.0.4 - web-ext-submit@7.8.0(body-parser@1.20.2): + web-ext-submit@7.8.0(body-parser@1.20.3): dependencies: - web-ext: 7.8.0(body-parser@1.20.2) + web-ext: 7.8.0(body-parser@1.20.3) transitivePeerDependencies: - body-parser - bufferutil @@ -33412,11 +33414,11 @@ snapshots: - supports-color - utf-8-validate - web-ext@7.8.0(body-parser@1.20.2): + web-ext@7.8.0(body-parser@1.20.3): dependencies: '@babel/runtime': 7.21.0 '@devicefarmer/adbkit': 3.2.3 - addons-linter: 6.13.0(body-parser@1.20.2)(node-fetch@3.3.1) + addons-linter: 6.13.0(body-parser@1.20.3)(node-fetch@3.3.1) bunyan: 1.8.15 camelcase: 7.0.1 chrome-launcher: 0.15.1