From 72fcd08fac8a31381b92a5e3040d88621c80f296 Mon Sep 17 00:00:00 2001 From: sirpy Date: Tue, 9 Jul 2024 15:13:48 +0300 Subject: [PATCH 1/5] add: all fixes --- packages/app/package.json | 14 +- packages/app/src/App.tsx | 2 +- .../app/src/components/DonateComponent.tsx | 53 +- .../components/DonorsList/DonorsListItem.tsx | 2 - packages/app/src/components/RoundedButton.tsx | 9 +- .../TransactionList/TransactionListItem.tsx | 5 +- .../src/components/modals/ThankYouModal.tsx | 11 +- .../apollo/useCreateCoinGeckoApolloClient.ts | 94 + packages/app/src/hooks/index.ts | 2 +- .../src/hooks/useApproveSwapTokenCallback.ts | 3 +- .../useContractCalls/useContractCalls.tsx | 15 + .../hooks/useContractCalls/useDeleteFlow.ts | 2 +- .../hooks/useContractCalls/useSupportFlow.ts | 3 +- .../useSupportFlowWithSwap.ts | 24 +- .../useContractCalls/useSupportSingleBatch.ts | 11 +- .../useSupportSingleTransferAndCall.ts | 11 +- .../useSupportSingleWithSwap.ts | 80 + packages/app/src/hooks/useEthers.ts | 46 + packages/app/src/hooks/useEthersSigner.ts | 23 - packages/app/src/hooks/useFetchFullName.ts | 4 +- packages/app/src/hooks/useFlowingBalance.tsx | 25 +- packages/app/src/hooks/useGetTokenPrice.tsx | 72 +- packages/app/src/hooks/useSwapRoute.tsx | 29 +- packages/app/src/lib/calculateFlowRate.ts | 8 +- .../app/src/lib/calculateGoodDollarAmounts.ts | 9 +- .../app/src/lib/calculateRawTotalDonation.ts | 10 +- packages/app/src/lib/formatFiatCurrency.ts | 2 +- packages/app/src/models/constants.ts | 6 +- packages/app/src/models/transforms.ts | 12 +- packages/app/web/main.tsx | 2 + packages/app/web/shim.ts | 4 + yarn.lock | 2031 ++++++++++------- 32 files changed, 1649 insertions(+), 975 deletions(-) create mode 100644 packages/app/src/hooks/apollo/useCreateCoinGeckoApolloClient.ts create mode 100644 packages/app/src/hooks/useContractCalls/useSupportSingleWithSwap.ts create mode 100644 packages/app/src/hooks/useEthers.ts delete mode 100644 packages/app/src/hooks/useEthersSigner.ts create mode 100644 packages/app/web/shim.ts diff --git a/packages/app/package.json b/packages/app/package.json index 2e709f35..f6d90d81 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -16,7 +16,7 @@ "preview:web": "vite preview -c web/vite.config.ts" }, "dependencies": { - "@apollo/client": "^3.7.14", + "@apollo/client": "^3.10.8", "@celo-tools/celo-ethers-wrapper": "^0.4.0", "@ethersproject/shims": "^5.7.0", "@gooddollar/good-design": "^0.1.31", @@ -28,10 +28,10 @@ "@react-native-firebase/analytics": "16.7.0", "@react-native-firebase/app": "16.7.0", "@superfluid-finance/sdk-core": "^0.3.2", - "@uniswap/router-sdk": "^1.7.1", - "@uniswap/sdk-core": "^4.0.7", - "@uniswap/smart-order-router": "^3.20.0", - "@uniswap/v3-sdk": "^3.10.0", + "@uniswap/router-sdk": "^1.9.3", + "@uniswap/sdk-core": "^5.3.1", + "@uniswap/smart-order-router": "^3.35.12", + "@uniswap/v3-sdk": "^3.13.1", "@usedapp/core": "^1.2.10", "@wagmi/core": "^1.4.5", "@walletconnect/modal-react-native": "^1.0.0-rc.9", @@ -46,7 +46,7 @@ "decimal.js": "^10.4.3", "ethers": "^5.6.2", "fast-text-encoding": "^1.0.6", - "graphql": "^16.6.0", + "graphql": "^16.9.0", "lodash": "^4.17.21", "mixpanel-react-native": "^2.3.1", "mobile-device-detect": "^0.4.3", @@ -54,7 +54,7 @@ "moment-duration-format": "^2.3.2", "native-base": "^3.4.28", "node-libs-react-native": "^1.2.1", - "qs": "^6.11.2", + "qs": "^6.12.2", "react": "18", "react-dom": "18", "react-native": "^0.71.11", diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx index f7b4a54a..1f82ef45 100644 --- a/packages/app/src/App.tsx +++ b/packages/app/src/App.tsx @@ -28,7 +28,7 @@ import { MongoDbApolloProvider } from './components/providers/MongoDbApolloProvi function App(): JSX.Element { const { publicClient, webSocketPublicClient } = configureChains( [celo, mainnet], - [infuraProvider({ apiKey: '88284fbbacd3472ca3361d1317a48fa5' }), publicProvider()] + [publicProvider(), infuraProvider({ apiKey: '88284fbbacd3472ca3361d1317a48fa5' })] ); const connectors = [ diff --git a/packages/app/src/components/DonateComponent.tsx b/packages/app/src/components/DonateComponent.tsx index 1375ac8b..37fd0482 100644 --- a/packages/app/src/components/DonateComponent.tsx +++ b/packages/app/src/components/DonateComponent.tsx @@ -52,22 +52,18 @@ function DonateComponent({ collective }: DonateComponentProps) { } const [currency, setCurrency] = useState('G$'); - const [frequency, setFrequency] = useState(Frequency.OneTime); - const [duration, setDuration] = useState(1); + const [frequency, setFrequency] = useState(Frequency.Monthly); + const [duration, setDuration] = useState(12); const [decimalDonationAmount, setDecimalDonationAmount] = useState(0); const tokenList = useTokenList(); - const isOneTime = frequency === Frequency.OneTime; const currencyOptions: { value: string; label: string }[] = useMemo(() => { let options = Object.keys(tokenList).map((key) => ({ value: key, label: key, })); - if (isOneTime) { - options = [options.find((option) => option.value === 'G$')!]; - } return options; - }, [tokenList, isOneTime]); + }, [tokenList]); const { path: swapPath, @@ -85,7 +81,7 @@ function DonateComponent({ collective }: DonateComponentProps) { ); const approvalNotReady = handleApproveToken === undefined && currency !== 'G$'; - const { supportFlowWithSwap, supportFlow, supportSingleTransferAndCall } = useContractCalls( + const { supportFlowWithSwap, supportFlow, supportSingleTransferAndCall, supportSingleWithSwap } = useContractCalls( collectiveId, currency, decimalDonationAmount, @@ -101,7 +97,11 @@ function DonateComponent({ collective }: DonateComponentProps) { const handleDonate = useCallback(async () => { if (frequency === Frequency.OneTime) { - return await supportSingleTransferAndCall(); + if (currency === 'G$') { + return await supportSingleTransferAndCall(); + } else { + return await supportSingleWithSwap(); + } } else if (currency === 'G$') { return await supportFlow(); } @@ -140,6 +140,7 @@ function DonateComponent({ collective }: DonateComponentProps) { supportFlow, supportFlowWithSwap, supportSingleTransferAndCall, + supportSingleWithSwap, ]); const currencyDecimals = useToken(currency).decimals; @@ -151,7 +152,7 @@ function DonateComponent({ collective }: DonateComponentProps) { const isNonZeroDonation = totalDecimalDonation.gt(0); const isInsufficientBalance = isNonZeroDonation && (!donorCurrencyBalance || totalDecimalDonation.gt(donorCurrencyBalance)); - const isInsufficientLiquidity = isNonZeroDonation && currency !== 'G$' && swapRouteStatus !== SwapRouteState.READY; + const isInsufficientLiquidity = isNonZeroDonation && currency !== 'G$' && swapRouteStatus === SwapRouteState.NO_ROUTE; const isUnacceptablePriceImpact = isNonZeroDonation && currency !== 'G$' && priceImpact ? priceImpact > acceptablePriceImpact : false; @@ -184,16 +185,12 @@ function DonateComponent({ collective }: DonateComponentProps) { const onChangeCurrency = (value: string) => setCurrency(value); const onChangeAmount = (value: string) => setDecimalDonationAmount(formatDecimalStringInput(value)); - const onChangeFrequency = useCallback( - (value: string) => { - if (currency !== 'G$' && value === Frequency.OneTime) { - setCurrency('G$'); - setDecimalDonationAmount(0); - } - setFrequency(value as Frequency); - }, - [currency] - ); + const onChangeFrequency = useCallback((value: string) => { + if (value === Frequency.OneTime) { + setDuration(1); + } + setFrequency(value as Frequency); + }, []); const onChangeDuration = (value: string) => setDuration(Number(value)); const onCloseErrorModal = () => setErrorMessage(undefined); @@ -245,7 +242,7 @@ function DonateComponent({ collective }: DonateComponentProps) { {isDesktopResolution && ( - + Donation Currency: You can donate using any cryptocurrency. @@ -446,7 +443,10 @@ function DonateComponent({ collective }: DonateComponentProps) { Price impace warning! Due to low liquidity between your chosen currency and GoodDollar, - your donation amount will reduce by 36% + + {' '} + your donation amount will reduce by {priceImpact?.toFixed(2)}%{' '} + when swapped. @@ -485,7 +485,9 @@ function DonateComponent({ collective }: DonateComponentProps) { fontSize={18} seeType={false} onPress={handleDonate} + isLoading={swapRouteStatus === SwapRouteState.LOADING} disabled={ + (currency !== 'G$' && swapRouteStatus !== SwapRouteState.READY) || address === undefined || chain?.id === undefined || !(chain.id in SupportedNetwork) || @@ -497,7 +499,12 @@ function DonateComponent({ collective }: DonateComponentProps) { - + ); } diff --git a/packages/app/src/components/DonorsList/DonorsListItem.tsx b/packages/app/src/components/DonorsList/DonorsListItem.tsx index d7eda602..6bfa974a 100644 --- a/packages/app/src/components/DonorsList/DonorsListItem.tsx +++ b/packages/app/src/components/DonorsList/DonorsListItem.tsx @@ -3,9 +3,7 @@ import { Colors } from '../../utils/colors'; import { InterRegular, InterSemiBold } from '../../utils/webFonts'; import { DonorCollective } from '../../models/models'; import useCrossNavigate from '../../routes/useCrossNavigate'; -import Decimal from 'decimal.js'; import { formatAddress } from '../../lib/formatAddress'; -import { ethers } from 'ethers'; import { useEnsName } from 'wagmi'; import { useFlowingBalance } from '../../hooks/useFlowingBalance'; diff --git a/packages/app/src/components/RoundedButton.tsx b/packages/app/src/components/RoundedButton.tsx index 55fbf9f7..eb1b8707 100644 --- a/packages/app/src/components/RoundedButton.tsx +++ b/packages/app/src/components/RoundedButton.tsx @@ -1,6 +1,7 @@ -import { Image, Text, TouchableOpacity, View, StyleSheet } from 'react-native'; +import { Image, Text, TouchableOpacity, View, StyleSheet, ActivityIndicator } from 'react-native'; import { InterSemiBold } from '../utils/webFonts'; import { ForwardIcon } from '../assets'; +import { Colors } from '../utils/colors'; interface RoundedButtonProps { title: string; @@ -11,6 +12,7 @@ interface RoundedButtonProps { onPress?: () => void; maxWidth?: number | string; disabled?: boolean; + isLoading?: boolean; } function RoundedButton({ @@ -22,6 +24,7 @@ function RoundedButton({ onPress, maxWidth, disabled, + isLoading, }: RoundedButtonProps) { const dynamicTextStyle = { color: color, @@ -34,7 +37,9 @@ function RoundedButton({ disabled={disabled} style={[styles.button, { backgroundColor, maxWidth: maxWidth ?? 'auto' }]} onPress={onPress}> - {title} + {isLoading && } + + {!isLoading && {title}} ); } diff --git a/packages/app/src/components/TransactionList/TransactionListItem.tsx b/packages/app/src/components/TransactionList/TransactionListItem.tsx index 67ec717b..ab18f8c8 100644 --- a/packages/app/src/components/TransactionList/TransactionListItem.tsx +++ b/packages/app/src/components/TransactionList/TransactionListItem.tsx @@ -1,10 +1,9 @@ import { Image, Text, View } from 'react-native'; import { Colors } from '../../utils/colors'; import { ReceiveIcon, SendIcon } from '../../assets'; -import Decimal from 'decimal.js'; -import { ethers } from 'ethers'; import { Link } from 'native-base'; import { styles } from './styles'; +import { formatEther } from 'viem'; interface TransactionListItemProps { userIdentifier: string; @@ -15,7 +14,7 @@ interface TransactionListItemProps { } function TransactionListItem({ userIdentifier, isDonation, amount, txHash, rawNetworkFee }: TransactionListItemProps) { - const formattedFee: string = new Decimal(ethers.utils.formatEther(rawNetworkFee ?? 0)).toString(); + const formattedFee: string = formatEther(BigInt(rawNetworkFee ?? 0)).toString(); const formattedHash = txHash.slice(0, 40) + '...'; return ( diff --git a/packages/app/src/components/modals/ThankYouModal.tsx b/packages/app/src/components/modals/ThankYouModal.tsx index d1cb977a..644a54e1 100644 --- a/packages/app/src/components/modals/ThankYouModal.tsx +++ b/packages/app/src/components/modals/ThankYouModal.tsx @@ -9,9 +9,10 @@ interface ThankYouModalProps { openModal: boolean; address?: `0x${string}`; collective: IpfsCollective; + isStream: boolean; } -const ThankYouModal = ({ openModal, address, collective }: ThankYouModalProps) => { +const ThankYouModal = ({ openModal, address, collective, isStream }: ThankYouModalProps) => { const { navigate } = useCrossNavigate(); const onClick = () => navigate(`/profile/${address}`); @@ -21,9 +22,11 @@ const ThankYouModal = ({ openModal, address, collective }: ThankYouModalProps) = THANK YOU! {`You have just donated to ${collective.name} GoodCollective!`} - - {`To stop your donation, visit the ${collective.name} GoodCollective page.`} - + {isStream && ( + + {`To stop your donation, visit the ${collective.name} GoodCollective page.`} + + )} woman GO TO PROFILE diff --git a/packages/app/src/hooks/apollo/useCreateCoinGeckoApolloClient.ts b/packages/app/src/hooks/apollo/useCreateCoinGeckoApolloClient.ts new file mode 100644 index 00000000..a8623062 --- /dev/null +++ b/packages/app/src/hooks/apollo/useCreateCoinGeckoApolloClient.ts @@ -0,0 +1,94 @@ +import { useEffect, useState } from 'react'; +import { RestLink } from 'apollo-link-rest'; +import { InvalidationPolicyCache, RenewalPolicy } from '@nerdwallet/apollo-cache-policies'; +import { ApolloClient, ApolloError, from, NormalizedCacheObject, TypedDocumentNode } from '@apollo/client'; +import { DocumentNode } from 'graphql/language'; +import { AsyncStorageWrapper, persistCache } from 'apollo3-cache-persist'; +import AsyncStorage from '@react-native-async-storage/async-storage'; + +import { errorLink, retryLink } from '../../utils/apolloLinkUtils'; + +// use apolloclient for caching not to hit rate limits +export const useCreateCoinGeckoApolloClient = (): ApolloClient | undefined => { + const [apolloClient, setApolloClient] = useState | undefined>(); + + useEffect(() => { + async function initApollo() { + const cache = new InvalidationPolicyCache({ + invalidationPolicies: { + timeToLive: 60 * 1000, // 1 minute + renewalPolicy: RenewalPolicy.AccessAndWrite, + types: { + currency: { + timeToLive: 60 * 1000, + }, + }, + }, + }); + + await persistCache({ + cache, + storage: new AsyncStorageWrapper(AsyncStorage), + }); + + const restLink = new RestLink({ + uri: `https://api.coingecko.com/api/v3/simple`, + endpoints: { + byAddress: 'https://api.coingecko.com/api/v3/simple/token_price/celo', + bySymbol: 'https://api.coingecko.com/api/v3/simple/price', + }, + responseTransformer: async (response) => { + const results = await response.json(); + return Object.entries(results).map(([key, value]) => ({ address: key, ...(value as object) })); + }, + }); + + try { + const client = new ApolloClient({ + cache, + link: from([errorLink, retryLink, restLink]), + defaultOptions: { + watchQuery: { + fetchPolicy: 'cache-and-network', + }, + query: { + fetchPolicy: 'cache-first', + }, + }, + }); + setApolloClient(client); + } catch (error) { + console.error(error); + } finally { + return; + } + } + + initApollo().catch(console.error); + }, []); + + return apolloClient; +}; + +export function useCoinGeckoQuery = Record>( + query: DocumentNode | TypedDocumentNode, + options?: Record +): { data?: any; loading: boolean; error?: ApolloError } { + const client = useCreateCoinGeckoApolloClient(); + + const [data, setData] = useState(); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(); + + useEffect(() => { + if (client && !options?.disabled) { + client.query({ query, ...options }).then((result) => { + setData(result.data); + setLoading(result.loading); + setError(result.error); + }); + } + }, [client, options, query]); + + return { data, loading, error }; +} diff --git a/packages/app/src/hooks/index.ts b/packages/app/src/hooks/index.ts index 1539871c..47681548 100644 --- a/packages/app/src/hooks/index.ts +++ b/packages/app/src/hooks/index.ts @@ -5,4 +5,4 @@ export * from './useStewardById'; export * from './useContractCalls'; export * from './useGetTokenPrice'; export * from './useIsStewardVerified'; -export * from './useEthersSigner'; +export * from './useEthers'; diff --git a/packages/app/src/hooks/useApproveSwapTokenCallback.ts b/packages/app/src/hooks/useApproveSwapTokenCallback.ts index 3d0a4e15..99b6b129 100644 --- a/packages/app/src/hooks/useApproveSwapTokenCallback.ts +++ b/packages/app/src/hooks/useApproveSwapTokenCallback.ts @@ -1,7 +1,6 @@ import { useAccount, useContractRead, useContractWrite, useNetwork, usePrepareContractWrite } from 'wagmi'; import { useMemo } from 'react'; import { calculateRawTotalDonation } from '../lib/calculateRawTotalDonation'; -import Decimal from 'decimal.js'; import { ERC20 } from '../abi/ERC20'; import { useToken } from './useTokenList'; @@ -23,7 +22,7 @@ export function useApproveSwapTokenCallback( const tokenIn = useToken(currencyIn); const rawAmountIn = useMemo( - () => BigInt(calculateRawTotalDonation(decimalAmountIn, duration, tokenIn.decimals).toFixed(0, Decimal.ROUND_DOWN)), + () => BigInt(calculateRawTotalDonation(decimalAmountIn, duration, tokenIn.decimals)), [decimalAmountIn, duration, tokenIn.decimals] ); diff --git a/packages/app/src/hooks/useContractCalls/useContractCalls.tsx b/packages/app/src/hooks/useContractCalls/useContractCalls.tsx index be1c71e3..62db3a6f 100644 --- a/packages/app/src/hooks/useContractCalls/useContractCalls.tsx +++ b/packages/app/src/hooks/useContractCalls/useContractCalls.tsx @@ -3,6 +3,7 @@ import { useSupportFlow } from './useSupportFlow'; import { useSupportFlowWithSwap } from './useSupportFlowWithSwap'; import { useSupportSingleTransferAndCall } from './useSupportSingleTransferAndCall'; import { useSupportSingleBatch } from './useSupportSingleBatch'; +import { useSupportSingleWithSwap } from './useSupportSingleWithSwap'; import { useToken } from '../useTokenList'; interface ContractCalls { @@ -10,6 +11,7 @@ interface ContractCalls { supportFlow: () => Promise; supportSingleTransferAndCall: () => Promise; supportSingleBatch: () => Promise; + supportSingleWithSwap: () => Promise; } export const useContractCalls = ( @@ -70,10 +72,23 @@ export const useContractCalls = ( toggleIsDonationComplete ); + const supportSingleWithSwap = useSupportSingleWithSwap( + collective, + tokenIn, + decimalAmountIn, + onError, + toggleCompleteDonationModal, + toggleThankYouModal, + toggleIsDonationComplete, + minReturnFromSwap, + swapPath + ); + return { supportFlow, supportFlowWithSwap, supportSingleTransferAndCall, supportSingleBatch, + supportSingleWithSwap, }; }; diff --git a/packages/app/src/hooks/useContractCalls/useDeleteFlow.ts b/packages/app/src/hooks/useContractCalls/useDeleteFlow.ts index 649d6a08..11c1d18a 100644 --- a/packages/app/src/hooks/useContractCalls/useDeleteFlow.ts +++ b/packages/app/src/hooks/useContractCalls/useDeleteFlow.ts @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import { SupportedNetwork, SupportedNetworkNames } from '../../models/constants'; import { GoodCollectiveSDK } from '@gooddollar/goodcollective-sdk'; import { useAccount, useNetwork } from 'wagmi'; -import { useEthersSigner } from '../useEthersSigner'; +import { useEthersSigner } from '../useEthers'; import useCrossNavigate from '../../routes/useCrossNavigate'; import Decimal from 'decimal.js'; import { printAndParseSupportError, validateConnection } from './util'; diff --git a/packages/app/src/hooks/useContractCalls/useSupportFlow.ts b/packages/app/src/hooks/useContractCalls/useSupportFlow.ts index c0306638..1a847c21 100644 --- a/packages/app/src/hooks/useContractCalls/useSupportFlow.ts +++ b/packages/app/src/hooks/useContractCalls/useSupportFlow.ts @@ -3,8 +3,7 @@ import { Frequency, SupportedNetwork, SupportedNetworkNames } from '../../models import { calculateFlowRate } from '../../lib/calculateFlowRate'; import { GoodCollectiveSDK } from '@gooddollar/goodcollective-sdk'; import { useAccount, useNetwork } from 'wagmi'; -import { useEthersSigner } from '../useEthersSigner'; -import useCrossNavigate from '../../routes/useCrossNavigate'; +import { useEthersSigner } from '../useEthers'; import { printAndParseSupportError, validateConnection } from './util'; export function useSupportFlow( diff --git a/packages/app/src/hooks/useContractCalls/useSupportFlowWithSwap.ts b/packages/app/src/hooks/useContractCalls/useSupportFlowWithSwap.ts index 14118f8e..5163e885 100644 --- a/packages/app/src/hooks/useContractCalls/useSupportFlowWithSwap.ts +++ b/packages/app/src/hooks/useContractCalls/useSupportFlowWithSwap.ts @@ -2,13 +2,13 @@ import { useCallback } from 'react'; import { Frequency, SupportedNetwork, SupportedNetworkNames } from '../../models/constants'; import { calculateFlowRate } from '../../lib/calculateFlowRate'; import { calculateRawTotalDonation } from '../../lib/calculateRawTotalDonation'; -import Decimal from 'decimal.js'; import { GoodCollectiveSDK } from '@gooddollar/goodcollective-sdk'; import { useAccount, useNetwork } from 'wagmi'; -import { useEthersSigner } from '../useEthersSigner'; -import useCrossNavigate from '../../routes/useCrossNavigate'; +import { useEthersSigner } from '../useEthers'; import { Token } from '@uniswap/sdk-core'; import { printAndParseSupportError, validateConnection } from './util'; +import { formatUnits } from 'viem'; +import { useToken } from '../useTokenList'; export function useSupportFlowWithSwap( collective: string, @@ -23,6 +23,8 @@ export function useSupportFlowWithSwap( minReturnFromSwap?: string, swapPath?: string ) { + const g$ = useToken('G$'); + const { address: maybeAddress } = useAccount(); const { chain } = useNetwork(); const maybeSigner = useEthersSigner({ chainId: chain?.id }); @@ -40,7 +42,12 @@ export function useSupportFlowWithSwap( return; } - const flowRate = calculateFlowRate(decimalAmountIn, duration, frequency, tokenIn.decimals); + const flowRate = calculateFlowRate( + Number(formatUnits(BigInt(minReturnFromSwap), g$.decimals)), + duration, + frequency, + tokenIn.decimals + ); if (!flowRate) { onError('Failed to calculate flow rate.'); return; @@ -50,14 +57,12 @@ export function useSupportFlowWithSwap( const network = SupportedNetworkNames[chainId as SupportedNetwork]; // swap values - const amountIn = calculateRawTotalDonation(decimalAmountIn, duration, tokenIn.decimals).toFixed( - 0, - Decimal.ROUND_DOWN - ); + const amountIn = calculateRawTotalDonation(decimalAmountIn, duration, tokenIn.decimals); try { const sdk = new GoodCollectiveSDK(chainIdString, signer.provider, { network }); toggleCompleteDonationModal(true); + const tx = await sdk.supportFlowWithSwap(signer, collective, flowRate, { amount: amountIn, minReturn: minReturnFromSwap, @@ -82,11 +87,12 @@ export function useSupportFlowWithSwap( maybeSigner, minReturnFromSwap, swapPath, - decimalAmountIn, + g$.decimals, duration, frequency, tokenIn.decimals, tokenIn.address, + decimalAmountIn, onError, toggleCompleteDonationModal, collective, diff --git a/packages/app/src/hooks/useContractCalls/useSupportSingleBatch.ts b/packages/app/src/hooks/useContractCalls/useSupportSingleBatch.ts index 7ef3a602..181a2b27 100644 --- a/packages/app/src/hooks/useContractCalls/useSupportSingleBatch.ts +++ b/packages/app/src/hooks/useContractCalls/useSupportSingleBatch.ts @@ -1,11 +1,9 @@ import { useCallback } from 'react'; import { SupportedNetwork, SupportedNetworkNames } from '../../models/constants'; import { calculateRawTotalDonation } from '../../lib/calculateRawTotalDonation'; -import Decimal from 'decimal.js'; import { GoodCollectiveSDK } from '@gooddollar/goodcollective-sdk'; import { useAccount, useNetwork } from 'wagmi'; -import { useEthersSigner } from '../useEthersSigner'; -import useCrossNavigate from '../../routes/useCrossNavigate'; +import { useEthersSigner } from '../useEthers'; import { printAndParseSupportError, validateConnection } from './util'; export function useSupportSingleBatch( @@ -32,15 +30,12 @@ export function useSupportSingleBatch( const chainIdString = chainId.toString() as `${SupportedNetwork}`; const network = SupportedNetworkNames[chainId as SupportedNetwork]; - const donationAmount = calculateRawTotalDonation(decimalAmountIn, 1, currencyDecimals).toFixed( - 0, - Decimal.ROUND_DOWN - ); + const donationAmount = calculateRawTotalDonation(decimalAmountIn, 1, currencyDecimals); try { const sdk = new GoodCollectiveSDK(chainIdString, signer.provider, { network }); toggleCompleteDonationModal(true); - const tx = await sdk.supportSingleBatch(signer, collective, donationAmount); + const tx = await sdk.supportSingleBatch(signer, collective, donationAmount.toString()); toggleCompleteDonationModal(false); toggleThankYouModal(true); await tx.wait(); diff --git a/packages/app/src/hooks/useContractCalls/useSupportSingleTransferAndCall.ts b/packages/app/src/hooks/useContractCalls/useSupportSingleTransferAndCall.ts index 028aae41..ac9d6255 100644 --- a/packages/app/src/hooks/useContractCalls/useSupportSingleTransferAndCall.ts +++ b/packages/app/src/hooks/useContractCalls/useSupportSingleTransferAndCall.ts @@ -1,11 +1,9 @@ import { useCallback } from 'react'; import { SupportedNetwork, SupportedNetworkNames } from '../../models/constants'; import { calculateRawTotalDonation } from '../../lib/calculateRawTotalDonation'; -import Decimal from 'decimal.js'; import { GoodCollectiveSDK } from '@gooddollar/goodcollective-sdk'; import { useAccount, useNetwork } from 'wagmi'; -import { useEthersSigner } from '../useEthersSigner'; -import useCrossNavigate from '../../routes/useCrossNavigate'; +import { useEthersSigner } from '../useEthers'; import { printAndParseSupportError, validateConnection } from './util'; export function useSupportSingleTransferAndCall( @@ -32,15 +30,12 @@ export function useSupportSingleTransferAndCall( const chainIdString = chainId.toString() as `${SupportedNetwork}`; const network = SupportedNetworkNames[chainId as SupportedNetwork]; - const donationAmount = calculateRawTotalDonation(decimalAmountIn, 1, currencyDecimals).toFixed( - 0, - Decimal.ROUND_DOWN - ); + const donationAmount = calculateRawTotalDonation(decimalAmountIn, 1, currencyDecimals); try { const sdk = new GoodCollectiveSDK(chainIdString, signer.provider, { network }); toggleCompleteDonationModal(true); - const tx = await sdk.supportSingleTransferAndCall(signer, collective, donationAmount); + const tx = await sdk.supportSingleTransferAndCall(signer, collective, donationAmount.toString()); toggleCompleteDonationModal(false); toggleThankYouModal(true); await tx.wait(); diff --git a/packages/app/src/hooks/useContractCalls/useSupportSingleWithSwap.ts b/packages/app/src/hooks/useContractCalls/useSupportSingleWithSwap.ts new file mode 100644 index 00000000..2021bfa5 --- /dev/null +++ b/packages/app/src/hooks/useContractCalls/useSupportSingleWithSwap.ts @@ -0,0 +1,80 @@ +import { useCallback } from 'react'; +import { calculateRawTotalDonation } from '../../lib/calculateRawTotalDonation'; +import { GoodCollectiveSDK } from '@gooddollar/goodcollective-sdk'; +import { useAccount, useNetwork } from 'wagmi'; +import { useEthersSigner } from '../useEthers'; +import { Token } from '@uniswap/sdk-core'; +import { printAndParseSupportError, validateConnection } from './util'; +import { SupportedNetwork, SupportedNetworkNames } from '../../models/constants'; + +export function useSupportSingleWithSwap( + collective: string, + tokenIn: Token, + decimalAmountIn: number, + onError: (error: string) => void, + toggleCompleteDonationModal: (value: boolean) => void, + toggleThankYouModal: (value: boolean) => void, + toggleIsDonationComplete: (value: boolean) => void, + minReturnFromSwap?: string, + swapPath?: string +) { + const { address: maybeAddress } = useAccount(); + const { chain } = useNetwork(); + const maybeSigner = useEthersSigner({ chainId: chain?.id }); + + return useCallback(async () => { + const validation = validateConnection(maybeAddress, chain?.id, maybeSigner); + if (typeof validation === 'string') { + onError(validation); + return; + } + const { chainId, signer } = validation; + + if (!minReturnFromSwap || !swapPath) { + onError('Swap route not ready.'); + return; + } + + const chainIdString = chainId.toString() as `${SupportedNetwork}`; + const network = SupportedNetworkNames[chainId as SupportedNetwork]; + + // swap values + const amountIn = calculateRawTotalDonation(decimalAmountIn, 1, tokenIn.decimals); + + try { + const sdk = new GoodCollectiveSDK(chainIdString, signer.provider, { network }); + toggleCompleteDonationModal(true); + const tx = await sdk.supportSingleWithSwap(signer, collective, { + amount: amountIn, + minReturn: minReturnFromSwap, + path: swapPath, + swapFrom: tokenIn.address, + deadline: Math.floor(Date.now() / 1000 + 1800).toString(), + }); + toggleCompleteDonationModal(false); + toggleThankYouModal(true); + await tx.wait(); + toggleIsDonationComplete(true); + return; + } catch (error) { + toggleCompleteDonationModal(false); + toggleThankYouModal(false); + const message = printAndParseSupportError(error); + onError(message); + } + }, [ + maybeAddress, + chain?.id, + maybeSigner, + minReturnFromSwap, + swapPath, + decimalAmountIn, + tokenIn.decimals, + tokenIn.address, + onError, + toggleCompleteDonationModal, + collective, + toggleThankYouModal, + toggleIsDonationComplete, + ]); +} diff --git a/packages/app/src/hooks/useEthers.ts b/packages/app/src/hooks/useEthers.ts new file mode 100644 index 00000000..81a6e15b --- /dev/null +++ b/packages/app/src/hooks/useEthers.ts @@ -0,0 +1,46 @@ +import { useMemo } from 'react'; +import { usePublicClient, useWalletClient, type WalletClient } from 'wagmi'; +import { providers } from 'ethers'; +import { Chain, Client, Transport } from 'viem'; + +export function walletClientToSigner(walletClient: WalletClient) { + const { account, chain, transport } = walletClient; + if (!chain || !account) { + return undefined; + } + const network = { + chainId: chain.id, + name: chain.name, + ensAddress: chain.contracts?.ensRegistry?.address, + }; + const provider = new providers.Web3Provider(transport as any, network); + return provider.getSigner(account.address); +} + +export function clientToProvider(client: Client) { + const { chain, transport } = client; + const network = { + chainId: chain.id, + name: chain.name, + ensAddress: chain.contracts?.ensRegistry?.address, + }; + if (transport.type === 'fallback') + return new providers.FallbackProvider( + (transport.transports as ReturnType[]).map( + ({ value }) => new providers.JsonRpcProvider(value?.url, network) + ) + ); + return new providers.JsonRpcProvider(transport.url, network); +} + +/** Hook to convert a viem Wallet Client to an ethers.js Signer. */ +export function useEthersSigner({ chainId }: { chainId?: number } = {}) { + const { data: walletClient } = useWalletClient({ chainId }); + return useMemo(() => (walletClient ? walletClientToSigner(walletClient) : undefined), [walletClient]); +} + +export function useEthersProvider({ chainId }: { chainId?: number } = {}) { + const publicClient = usePublicClient({ chainId }); + console.log({ chainId, publicClient }); + return useMemo(() => (publicClient ? clientToProvider(publicClient) : undefined), [publicClient]); +} diff --git a/packages/app/src/hooks/useEthersSigner.ts b/packages/app/src/hooks/useEthersSigner.ts deleted file mode 100644 index 441da56d..00000000 --- a/packages/app/src/hooks/useEthersSigner.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { useMemo } from 'react'; -import { useWalletClient, type WalletClient } from 'wagmi'; -import { providers } from 'ethers'; - -export function walletClientToSigner(walletClient: WalletClient) { - const { account, chain, transport } = walletClient; - if (!chain || !account) { - return undefined; - } - const network = { - chainId: chain.id, - name: chain.name, - ensAddress: chain.contracts?.ensRegistry?.address, - }; - const provider = new providers.Web3Provider(transport as any, network); - return provider.getSigner(account.address); -} - -/** Hook to convert a viem Wallet Client to an ethers.js Signer. */ -export function useEthersSigner({ chainId }: { chainId?: number } = {}) { - const { data: walletClient } = useWalletClient({ chainId }); - return useMemo(() => (walletClient ? walletClientToSigner(walletClient) : undefined), [walletClient]); -} diff --git a/packages/app/src/hooks/useFetchFullName.ts b/packages/app/src/hooks/useFetchFullName.ts index df1140c7..53347898 100644 --- a/packages/app/src/hooks/useFetchFullName.ts +++ b/packages/app/src/hooks/useFetchFullName.ts @@ -1,7 +1,7 @@ -import { ethers } from 'ethers'; import { useMemo } from 'react'; import { gql } from '@apollo/client'; import { useMongoDbQuery } from './apollo/useMongoDbQuery'; +import { keccak256 } from 'viem'; interface UserProfile { fullName?: { display?: string }; @@ -41,7 +41,7 @@ export function useFetchFullName(address?: string): string | undefined { export function useFetchFullNames(addresses: string[]): any { const addressToHashMapping = useMemo(() => { return addresses.reduce((acc: any, address) => { - const hash = ethers.utils.keccak256(address); + const hash = keccak256(address as '0x{string}'); acc[hash] = address; return acc; }, {}); diff --git a/packages/app/src/hooks/useFlowingBalance.tsx b/packages/app/src/hooks/useFlowingBalance.tsx index 57bf0865..fecf66bd 100644 --- a/packages/app/src/hooks/useFlowingBalance.tsx +++ b/packages/app/src/hooks/useFlowingBalance.tsx @@ -1,10 +1,9 @@ import { useEffect, useMemo, useState } from 'react'; -import { BigNumberish, ethers } from 'ethers'; +import { BigNumberish } from 'ethers'; import { DonorCollective } from '../models/models'; import { calculateGoodDollarAmounts, CalculatedAmounts } from '../lib/calculateGoodDollarAmounts'; // based on https://github.com/superfluid-finance/superfluid-console/blob/master/src/components/Amount/FlowingBalance.tsx - const ANIMATION_MINIMUM_STEP_TIME = 75; export function useFlowingBalance( @@ -76,21 +75,18 @@ export function useSumOfFlowingBalances( flowRates: string[], tokenPrice: number | undefined ): CalculatedAmounts { - const balance = useMemo( - () => balances.reduce((a, b) => a.add(ethers.BigNumber.from(b)), ethers.BigNumber.from(0)), - [balances] - ); + const balance = useMemo(() => balances.reduce((a, b) => a + BigInt(b), BigInt(0)), [balances]); const [weiValue, setWeiValue] = useState(balance); useEffect(() => setWeiValue(balance), [balance]); - const flowRateBigNumbers = useMemo(() => flowRates.map((flowRate) => ethers.BigNumber.from(flowRate)), [flowRates]); + const flowRateBigNumbers = useMemo(() => flowRates.map((flowRate) => BigInt(flowRate)), [flowRates]); const balanceTimestampsMs = useMemo( - () => balanceTimestamps.map((balanceTimestamp) => ethers.BigNumber.from(balanceTimestamp).mul(1000)), + () => balanceTimestamps.map((balanceTimestamp) => BigInt(balanceTimestamp) * BigInt(1000)), [balanceTimestamps] ); useEffect(() => { - const balanceBigNumber = ethers.BigNumber.from(balance); + const balanceBigNumber = BigInt(balance); let stopAnimation = false; let lastAnimationTimestamp = 0; @@ -101,16 +97,17 @@ export function useSumOfFlowingBalances( } if (currentAnimationTimestamp - lastAnimationTimestamp > ANIMATION_MINIMUM_STEP_TIME) { - const currentTimestampBigNumber = ethers.BigNumber.from( + const currentTimestampBigNumber = BigInt( new Date().valueOf() // Milliseconds elapsed since UTC epoch, disregards timezone. ); const update = balanceTimestampsMs - .map((balanceTimestampMs, i) => - currentTimestampBigNumber.sub(balanceTimestampMs).mul(flowRateBigNumbers[i]).div(1000) + .map( + (balanceTimestampMs, i) => + ((currentTimestampBigNumber - balanceTimestampMs) * flowRateBigNumbers[i]) / BigInt(1000) ) - .reduce((a, b) => a.add(b), ethers.BigNumber.from(0)); - setWeiValue(balanceBigNumber.add(update)); + .reduce((a, b) => a + b, BigInt(0)); + setWeiValue(balanceBigNumber + update); lastAnimationTimestamp = currentAnimationTimestamp; } diff --git a/packages/app/src/hooks/useGetTokenPrice.tsx b/packages/app/src/hooks/useGetTokenPrice.tsx index f57e1d68..baa83591 100644 --- a/packages/app/src/hooks/useGetTokenPrice.tsx +++ b/packages/app/src/hooks/useGetTokenPrice.tsx @@ -1,52 +1,34 @@ -import axios from 'axios'; -import { useEffect, useState } from 'react'; -import { coingeckoTokenMapping } from '../models/constants'; import { useToken } from './useTokenList'; -import { Token } from '@uniswap/sdk-core'; +import { useCoinGeckoQuery } from './apollo/useCreateCoinGeckoApolloClient'; +import { gql } from '@apollo/client'; -export const useGetTokenPrice = (currency: string): { price?: number; isLoading: boolean } => { - const [price, setPrice] = useState(undefined); - const [isLoading, setIsLoading] = useState(true); +const priceQuery = gql` + query TokenPrice($tokenAddress: string) { + priceSearch(contract_addresses: $tokenAddress, vs_currencies: usd) + @rest(type: "TokenPrice", path: "/?{args}", endpoint: "byAddress") { + id + usd + } + } +`; +const altPriceQuery = gql` + query TokenPrice($symbol: string) { + priceSearch(ids: $symbol, vs_currencies: usd) @rest(type: "TokenPrice", path: "/?{args}", endpoint: "bySymbol") { + id + usd + } + } +`; +export const useGetTokenPrice = (currency: string): { price?: number; isLoading: boolean } => { const token = useToken(currency); - useEffect(() => { - setIsLoading(true); - getTokenPrice(currency, token).then((res: number | undefined) => { - setPrice(res); - }); - setIsLoading(false); - }, [currency, token]); - - return { price, isLoading }; -}; - -const getTokenPrice = async (currency: string, token: Token): Promise => { - let tokenAddress = coingeckoTokenMapping[currency] ?? token.address; - const priceByContractUrl = `https://api.coingecko.com/api/v3/simple/token_price/celo?contract_addresses=${tokenAddress}&vs_currencies=usd`; - const priceByContract: number | undefined = await axios - .get(priceByContractUrl) - .then((res) => { - return res.data[tokenAddress.toLowerCase()]?.usd; - }) - .catch((err) => { - console.error(err); - return undefined; - }); - - if (priceByContract !== undefined) { - return priceByContract; - } + const response = useCoinGeckoQuery(priceQuery, { variables: { tokenAddress: token.address } }); + const fallbackResponse = useCoinGeckoQuery(altPriceQuery, { + disabled: !!(response.loading || response.data), + variables: { symbol: currency }, + }); - // fallback - const priceBySymbolUrl = `https://api.coingecko.com/api/v3/simple/price?ids=${currency}&vs_currencies=usd`; - return await axios - .get(priceBySymbolUrl) - .then((res) => { - return res.data[currency.toLowerCase()]?.usd; - }) - .catch((err) => { - console.error(err); - return undefined; - }); + const finalResponse = response.data ? response : fallbackResponse; + return { price: Number(finalResponse.data?.priceSearch?.[0]?.usd), isLoading: finalResponse.loading }; }; diff --git a/packages/app/src/hooks/useSwapRoute.tsx b/packages/app/src/hooks/useSwapRoute.tsx index e488a6c7..bab8f9e0 100644 --- a/packages/app/src/hooks/useSwapRoute.tsx +++ b/packages/app/src/hooks/useSwapRoute.tsx @@ -2,7 +2,7 @@ import { AlphaRouter, SwapRoute, SwapType, V3Route } from '@uniswap/smart-order- import { CurrencyAmount, Percent, TradeType } from '@uniswap/sdk-core'; import { useAccount, useNetwork } from 'wagmi'; import { GDToken, SupportedNetwork } from '../models/constants'; -import { useEthersSigner } from './useEthersSigner'; +import { useEthersProvider } from './useEthers'; import { calculateRawTotalDonation } from '../lib/calculateRawTotalDonation'; import Decimal from 'decimal.js'; import { useEffect, useState } from 'react'; @@ -32,25 +32,31 @@ export function useSwapRoute( } { const { address } = useAccount(); const { chain } = useNetwork(); - const signer = useEthersSigner({ chainId: chain?.id }); - + const provider = useEthersProvider({ chainId: chain?.id }); const tokenIn = useToken(currencyIn); - const [route, setRoute] = useState(undefined); + const [route, setRoute] = useState(undefined); useEffect(() => { - if (!address || !chain?.id || chain.id !== SupportedNetwork.CELO || !signer?.provider || tokenIn.symbol === 'G$') { - setRoute(undefined); + if ( + decimalAmountIn === 0 || + !address || + !chain?.id || + chain.id !== SupportedNetwork.CELO || + !provider || + tokenIn.symbol === 'G$' + ) { return; } + setRoute('loading'); const router = new AlphaRouter({ chainId: chain.id as number, - provider: signer.provider, + provider: provider, }); const rawAmountIn = calculateRawTotalDonation(decimalAmountIn, duration, tokenIn.decimals); - const inputAmount = CurrencyAmount.fromRawAmount(tokenIn, rawAmountIn.toFixed(0, Decimal.ROUND_DOWN)); + const inputAmount = CurrencyAmount.fromRawAmount(tokenIn, rawAmountIn.toString()); router .route( @@ -74,9 +80,12 @@ export function useSwapRoute( console.error(e); setRoute(undefined); }); - }, [address, chain?.id, signer?.provider, tokenIn, decimalAmountIn, duration, slippageTolerance]); + }, [address, chain?.id, provider, tokenIn, decimalAmountIn, duration, slippageTolerance]); - if (!route || !route.methodParameters) { + if (route === 'loading') { + return { status: SwapRouteState.LOADING }; + } + if (!route) { return { status: SwapRouteState.NO_ROUTE }; } else { // This typecast is safe because Uniswap v2 is not deployed on Celo diff --git a/packages/app/src/lib/calculateFlowRate.ts b/packages/app/src/lib/calculateFlowRate.ts index b2b17627..3157bf54 100644 --- a/packages/app/src/lib/calculateFlowRate.ts +++ b/packages/app/src/lib/calculateFlowRate.ts @@ -1,6 +1,6 @@ import { Frequency } from '../models/constants'; -import Decimal from 'decimal.js'; import { totalDurationInSeconds } from './totalDurationInSeconds'; +import { calculateRawTotalDonation } from './calculateRawTotalDonation'; export const calculateFlowRate = ( decimalAmount: number, @@ -11,7 +11,7 @@ export const calculateFlowRate = ( if (frequency === Frequency.OneTime) { return undefined; } - const rawAmount = new Decimal(decimalAmount * duration).times(10 ** currencyDecimals); - const totalMilliseconds = totalDurationInSeconds(duration, frequency); - return rawAmount.div(totalMilliseconds).toFixed(0, Decimal.ROUND_DOWN); + const rawAmount = calculateRawTotalDonation(decimalAmount, duration, currencyDecimals); + const totalSeconds = totalDurationInSeconds(duration, frequency); + return (rawAmount / BigInt(totalSeconds)).toString(); }; diff --git a/packages/app/src/lib/calculateGoodDollarAmounts.ts b/packages/app/src/lib/calculateGoodDollarAmounts.ts index d9f69d41..829b7fa5 100644 --- a/packages/app/src/lib/calculateGoodDollarAmounts.ts +++ b/packages/app/src/lib/calculateGoodDollarAmounts.ts @@ -1,6 +1,6 @@ import Decimal from 'decimal.js'; -import { ethers } from 'ethers'; import { formatNumberWithCommas } from './formatFiatCurrency'; +import { formatEther } from 'viem'; export type CalculatedAmounts = { decimal?: Decimal; formatted?: string; usdValue?: number }; @@ -13,8 +13,8 @@ export function calculateGoodDollarAmounts(onChainAmount?: string, tokenPrice?: usdValue: undefined, }; } - const decimalAmount = new Decimal(ethers.utils.formatEther(onChainAmount)); - const formattedAmount: string = formatNumberWithCommas(decimalAmount.toFixed(2, Decimal.ROUND_DOWN)); + const decimalAmount = new Decimal(formatEther(BigInt(onChainAmount))); + const formattedAmount: string = formatNumberWithCommas(formatEther(BigInt(onChainAmount))); const usdValue = tokenPrice ? parseFloat(decimalAmount.mul(tokenPrice).toFixed(2)) : undefined; return { decimal: decimalAmount, @@ -24,6 +24,5 @@ export function calculateGoodDollarAmounts(onChainAmount?: string, tokenPrice?: } export function formatGoodDollarAmount(onChainAmount: string): string { - const decimalAmount = new Decimal(ethers.utils.formatEther(onChainAmount)).toFixed(2, Decimal.ROUND_DOWN); - return formatNumberWithCommas(decimalAmount); + return formatNumberWithCommas(formatEther(BigInt(onChainAmount))); } diff --git a/packages/app/src/lib/calculateRawTotalDonation.ts b/packages/app/src/lib/calculateRawTotalDonation.ts index ac1747d9..85be0025 100644 --- a/packages/app/src/lib/calculateRawTotalDonation.ts +++ b/packages/app/src/lib/calculateRawTotalDonation.ts @@ -1,9 +1,5 @@ -import Decimal from 'decimal.js'; +import { parseUnits } from 'viem'; -export const calculateRawTotalDonation = ( - decimalAmount: number, - duration: number, - currencyDecimals: number -): Decimal => { - return new Decimal(decimalAmount * duration).times(10 ** currencyDecimals); +export const calculateRawTotalDonation = (decimalAmount: number, duration: number, currencyDecimals: number) => { + return parseUnits((decimalAmount * duration).toString(), currencyDecimals); }; diff --git a/packages/app/src/lib/formatFiatCurrency.ts b/packages/app/src/lib/formatFiatCurrency.ts index aff00125..6521c366 100644 --- a/packages/app/src/lib/formatFiatCurrency.ts +++ b/packages/app/src/lib/formatFiatCurrency.ts @@ -18,7 +18,7 @@ export const formatNumberWithCommas = (num: string): string => { style: 'currency', currency: 'USD', minimumFractionDigits: 2, - maximumFractionDigits: 2, + maximumFractionDigits: 4, }) .format(number) .substring(1); diff --git a/packages/app/src/models/constants.ts b/packages/app/src/models/constants.ts index 7245897e..f99e4341 100644 --- a/packages/app/src/models/constants.ts +++ b/packages/app/src/models/constants.ts @@ -1,5 +1,6 @@ import { Token } from '@uniswap/sdk-core'; import GdContracts from '@gooddollar/goodprotocol/releases/deployment.json'; +import env from '../lib/env'; // 5% export const acceptablePriceImpact = 5; @@ -9,7 +10,7 @@ export enum SupportedNetwork { } export const SupportedNetworkNames: Record = { - [SupportedNetwork.CELO]: 'celo', + [SupportedNetwork.CELO]: env.REACT_APP_NETWORK || 'celo', }; // Uniswap V3 Router on Celo @@ -25,10 +26,7 @@ export const coingeckoTokenMapping: Record = { export enum Frequency { OneTime = 'One-Time', - Daily = 'Daily', - Weekly = 'Weekly', Monthly = 'Monthly', - Yearly = 'Yearly', } // constructed from Frequency diff --git a/packages/app/src/models/transforms.ts b/packages/app/src/models/transforms.ts index e2083deb..b921f2ae 100644 --- a/packages/app/src/models/transforms.ts +++ b/packages/app/src/models/transforms.ts @@ -76,20 +76,20 @@ export function subgraphCollectiveToModel(subgraphCollective: SubgraphCollective export function ipfsSubgraphCollectiveToModel(subgraphCollective: { id: string; - ipfs: SubgraphIpfsCollective; + ipfs?: SubgraphIpfsCollective; }): IpfsCollective { return { - id: subgraphCollective.ipfs.id, + id: subgraphCollective.ipfs?.id || '', collective: subgraphCollective.id, - name: subgraphCollective.ipfs.name, - description: subgraphCollective.ipfs.description, + name: subgraphCollective.ipfs?.name || '', + description: subgraphCollective.ipfs?.description || '', email: subgraphCollective.ipfs?.email, twitter: subgraphCollective.ipfs?.twitter, instagram: subgraphCollective.ipfs?.instagram, website: subgraphCollective.ipfs?.website, infoLabel: subgraphCollective.ipfs?.infoLabel, - headerImage: subgraphCollective.ipfs.headerImage, - logo: subgraphCollective.ipfs.logo, + headerImage: subgraphCollective.ipfs?.headerImage || '', + logo: subgraphCollective.ipfs?.logo || '', threads: subgraphCollective.ipfs?.threads, images: subgraphCollective.ipfs?.images, }; diff --git a/packages/app/web/main.tsx b/packages/app/web/main.tsx index 67ced090..aeb7d89e 100644 --- a/packages/app/web/main.tsx +++ b/packages/app/web/main.tsx @@ -1,6 +1,8 @@ +import './shim'; import React from 'react'; import { createRoot } from 'react-dom/client'; import App from '../src/App'; + // import { configureChains, createConfig, WagmiConfig } from 'wagmi'; // import { celo } from 'wagmi/chains'; // import { publicProvider } from 'wagmi/providers/public'; diff --git a/packages/app/web/shim.ts b/packages/app/web/shim.ts new file mode 100644 index 00000000..fe88bb1c --- /dev/null +++ b/packages/app/web/shim.ts @@ -0,0 +1,4 @@ +// fix uniswap sdk issue +globalThis.Browser = { + T: () => {}, +}; diff --git a/yarn.lock b/yarn.lock index 1cf7d82d..e838309f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -163,25 +163,26 @@ __metadata: languageName: node linkType: hard -"@apollo/client@npm:^3.7.14": - version: 3.8.7 - resolution: "@apollo/client@npm:3.8.7" +"@apollo/client@npm:^3.10.8": + version: 3.10.8 + resolution: "@apollo/client@npm:3.10.8" dependencies: "@graphql-typed-document-node/core": ^3.1.1 - "@wry/context": ^0.7.3 + "@wry/caches": ^1.0.0 "@wry/equality": ^0.5.6 - "@wry/trie": ^0.4.3 + "@wry/trie": ^0.5.0 graphql-tag: ^2.12.6 hoist-non-react-statics: ^3.3.2 - optimism: ^0.17.5 + optimism: ^0.18.0 prop-types: ^15.7.2 + rehackt: ^0.1.0 response-iterator: ^0.2.6 symbol-observable: ^4.0.0 ts-invariant: ^0.10.3 tslib: ^2.3.0 zen-observable-ts: ^1.2.5 peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 + graphql: ^15.0.0 || ^16.0.0 graphql-ws: ^5.5.5 react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -195,14 +196,7 @@ __metadata: optional: true subscriptions-transport-ws: optional: true - checksum: b4343d7f64481d6e4ee9f3ff461cfdab669728104b7540a4fff885232335fed55920e76de823ee4f2fa711aa72afbbf1cfe29601eacabb3577dc1f3ee82046d4 - languageName: node - linkType: hard - -"@assemblyscript/loader@npm:^0.9.4": - version: 0.9.4 - resolution: "@assemblyscript/loader@npm:0.9.4" - checksum: 2af3d1eec181c1817e3fb95b8d900cf1e7f19933a02315569d3d4f2f3d6514673acb784b2a1a8a148436fb8a983b580bfb993c1d520c55a8fd84678b200b2ec6 + checksum: 965e95389bdbde8aa5f542f11860fd930438f635560c766c716f186d5a9d6c5f0bfb31088cf28150c4f3969191030f1bbc0254418738a5737568108e96ffd815 languageName: node linkType: hard @@ -2656,6 +2650,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/aix-ppc64@npm:0.21.5" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-arm64@npm:0.18.20" @@ -2670,6 +2671,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm64@npm:0.21.5" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/android-arm@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-arm@npm:0.18.20" @@ -2684,6 +2692,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm@npm:0.21.5" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@esbuild/android-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-x64@npm:0.18.20" @@ -2698,6 +2713,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-x64@npm:0.21.5" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + "@esbuild/darwin-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/darwin-arm64@npm:0.18.20" @@ -2712,6 +2734,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-arm64@npm:0.21.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/darwin-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/darwin-x64@npm:0.18.20" @@ -2726,6 +2755,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-x64@npm:0.21.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@esbuild/freebsd-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/freebsd-arm64@npm:0.18.20" @@ -2740,6 +2776,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-arm64@npm:0.21.5" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/freebsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/freebsd-x64@npm:0.18.20" @@ -2754,6 +2797,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-x64@npm:0.21.5" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/linux-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-arm64@npm:0.18.20" @@ -2768,6 +2818,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm64@npm:0.21.5" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/linux-arm@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-arm@npm:0.18.20" @@ -2782,6 +2839,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm@npm:0.21.5" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@esbuild/linux-ia32@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-ia32@npm:0.18.20" @@ -2796,6 +2860,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ia32@npm:0.21.5" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/linux-loong64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-loong64@npm:0.18.20" @@ -2810,6 +2881,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-loong64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-loong64@npm:0.21.5" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@esbuild/linux-mips64el@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-mips64el@npm:0.18.20" @@ -2824,6 +2902,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-mips64el@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-mips64el@npm:0.21.5" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + "@esbuild/linux-ppc64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-ppc64@npm:0.18.20" @@ -2838,6 +2923,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ppc64@npm:0.21.5" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/linux-riscv64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-riscv64@npm:0.18.20" @@ -2852,6 +2944,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-riscv64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-riscv64@npm:0.21.5" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + "@esbuild/linux-s390x@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-s390x@npm:0.18.20" @@ -2866,6 +2965,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-s390x@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-s390x@npm:0.21.5" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + "@esbuild/linux-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-x64@npm:0.18.20" @@ -2880,6 +2986,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-x64@npm:0.21.5" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@esbuild/netbsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/netbsd-x64@npm:0.18.20" @@ -2894,6 +3007,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/netbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/netbsd-x64@npm:0.21.5" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/openbsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/openbsd-x64@npm:0.18.20" @@ -2908,6 +3028,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/openbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/openbsd-x64@npm:0.21.5" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/sunos-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/sunos-x64@npm:0.18.20" @@ -2922,6 +3049,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/sunos-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/sunos-x64@npm:0.21.5" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + "@esbuild/win32-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-arm64@npm:0.18.20" @@ -2936,6 +3070,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-arm64@npm:0.21.5" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/win32-ia32@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-ia32@npm:0.18.20" @@ -2950,6 +3091,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-ia32@npm:0.21.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/win32-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-x64@npm:0.18.20" @@ -2964,6 +3112,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-x64@npm:0.21.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@eslint-community/eslint-utils@npm:^4.2.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" @@ -3006,6 +3161,81 @@ __metadata: languageName: node linkType: hard +"@eth-optimism/contracts@npm:0.6.0": + version: 0.6.0 + resolution: "@eth-optimism/contracts@npm:0.6.0" + dependencies: + "@eth-optimism/core-utils": 0.12.0 + "@ethersproject/abstract-provider": ^5.7.0 + "@ethersproject/abstract-signer": ^5.7.0 + peerDependencies: + ethers: ^5 + checksum: 52e9a6cc6ad9bf3ab085d3be501fa4c89e48865baa8aee01aff39c2b007b69600304c7e8f8f4e00d67396e48a0dbfe3a260437efd3a4d7216424cece52639870 + languageName: node + linkType: hard + +"@eth-optimism/core-utils@npm:0.12.0": + version: 0.12.0 + resolution: "@eth-optimism/core-utils@npm:0.12.0" + dependencies: + "@ethersproject/abi": ^5.7.0 + "@ethersproject/abstract-provider": ^5.7.0 + "@ethersproject/address": ^5.7.0 + "@ethersproject/bignumber": ^5.7.0 + "@ethersproject/bytes": ^5.7.0 + "@ethersproject/constants": ^5.7.0 + "@ethersproject/contracts": ^5.7.0 + "@ethersproject/hash": ^5.7.0 + "@ethersproject/keccak256": ^5.7.0 + "@ethersproject/properties": ^5.7.0 + "@ethersproject/providers": ^5.7.0 + "@ethersproject/rlp": ^5.7.0 + "@ethersproject/transactions": ^5.7.0 + "@ethersproject/web": ^5.7.0 + bufio: ^1.0.7 + chai: ^4.3.4 + checksum: 1c820107c44bdbb46becb1b00fd0dabb44f3ac8f54e6da7872a5a134411fad26f53b193225da55e79d6a8d7f0d01cc16a123db5d41ebaf02ca78360249a4b52a + languageName: node + linkType: hard + +"@eth-optimism/core-utils@npm:^0.13.2": + version: 0.13.2 + resolution: "@eth-optimism/core-utils@npm:0.13.2" + dependencies: + "@ethersproject/abi": ^5.7.0 + "@ethersproject/abstract-provider": ^5.7.0 + "@ethersproject/address": ^5.7.0 + "@ethersproject/bignumber": ^5.7.0 + "@ethersproject/bytes": ^5.7.0 + "@ethersproject/constants": ^5.7.0 + "@ethersproject/contracts": ^5.7.0 + "@ethersproject/keccak256": ^5.7.0 + "@ethersproject/properties": ^5.7.0 + "@ethersproject/rlp": ^5.7.0 + "@ethersproject/web": ^5.7.1 + chai: ^4.3.10 + ethers: ^5.7.2 + node-fetch: ^2.6.7 + checksum: 4603b4a43b06d4b8117bdfa8175709a7ff8c708d7b439c16997c590fed976ee3b2989362b47aad4ffdbce0c1f9b8f86140d308e55fa553d2daaae1ba054ae927 + languageName: node + linkType: hard + +"@eth-optimism/sdk@npm:^3.2.2": + version: 3.3.2 + resolution: "@eth-optimism/sdk@npm:3.3.2" + dependencies: + "@eth-optimism/contracts": 0.6.0 + "@eth-optimism/core-utils": ^0.13.2 + lodash: ^4.17.21 + merkletreejs: ^0.3.11 + rlp: ^2.2.7 + semver: ^7.6.0 + peerDependencies: + ethers: ^5 + checksum: d24707c9540a5e9c7f4a123e7dd085ebd4cfa861ffce3fb124bd3c7c92da5d7c92ddf488582cfc3cda17bde010cfda5812c183750ae9cd0ebae913328eae47c2 + languageName: node + linkType: hard + "@ethereum-waffle/chai@npm:^3.4.4": version: 3.4.4 resolution: "@ethereum-waffle/chai@npm:3.4.4" @@ -3213,7 +3443,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.0.12, @ethersproject/abi@npm:^5.0.9, @ethersproject/abi@npm:^5.1.2, @ethersproject/abi@npm:^5.5.0, @ethersproject/abi@npm:^5.6.3, @ethersproject/abi@npm:^5.7.0": +"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.0.9, @ethersproject/abi@npm:^5.1.2, @ethersproject/abi@npm:^5.5.0, @ethersproject/abi@npm:^5.6.3, @ethersproject/abi@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/abi@npm:5.7.0" dependencies: @@ -3299,7 +3529,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/address@npm:5.7.0, @ethersproject/address@npm:>=5.0.0-beta.128, @ethersproject/address@npm:^5.0.0, @ethersproject/address@npm:^5.0.2, @ethersproject/address@npm:^5.0.4, @ethersproject/address@npm:^5.5.0, @ethersproject/address@npm:^5.7.0": +"@ethersproject/address@npm:5.7.0, @ethersproject/address@npm:>=5.0.0-beta.128, @ethersproject/address@npm:^5.0.2, @ethersproject/address@npm:^5.0.4, @ethersproject/address@npm:^5.5.0, @ethersproject/address@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/address@npm:5.7.0" dependencies: @@ -3842,7 +4072,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/solidity@npm:5.7.0, @ethersproject/solidity@npm:^5.0.0, @ethersproject/solidity@npm:^5.0.9, @ethersproject/solidity@npm:^5.7.0": +"@ethersproject/solidity@npm:5.7.0, @ethersproject/solidity@npm:^5.0.9, @ethersproject/solidity@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/solidity@npm:5.7.0" dependencies: @@ -3993,7 +4223,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/web@npm:5.7.1, @ethersproject/web@npm:^5.5.0, @ethersproject/web@npm:^5.7.0": +"@ethersproject/web@npm:5.7.1, @ethersproject/web@npm:^5.5.0, @ethersproject/web@npm:^5.7.0, @ethersproject/web@npm:^5.7.1": version: 5.7.1 resolution: "@ethersproject/web@npm:5.7.1" dependencies: @@ -4300,7 +4530,7 @@ __metadata: version: 0.0.0-use.local resolution: "@gooddollar/goodcollective-app@workspace:packages/app" dependencies: - "@apollo/client": ^3.7.14 + "@apollo/client": ^3.10.8 "@babel/core": ^7.20.0 "@babel/preset-env": ^7.20.0 "@babel/runtime": ^7.20.0 @@ -4327,10 +4557,10 @@ __metadata: "@types/react-dom": ^18.2.5 "@types/react-native": ^0.72.2 "@types/react-test-renderer": ^18.0.0 - "@uniswap/router-sdk": ^1.7.1 - "@uniswap/sdk-core": ^4.0.7 - "@uniswap/smart-order-router": ^3.20.0 - "@uniswap/v3-sdk": ^3.10.0 + "@uniswap/router-sdk": ^1.9.3 + "@uniswap/sdk-core": ^5.3.1 + "@uniswap/smart-order-router": ^3.35.12 + "@uniswap/v3-sdk": ^3.13.1 "@usedapp/core": ^1.2.10 "@vitejs/plugin-react": ^4.1.1 "@wagmi/core": ^1.4.5 @@ -4349,7 +4579,7 @@ __metadata: eslint-plugin-react-refresh: ^0.4.1 ethers: 5.7.2 fast-text-encoding: ^1.0.6 - graphql: ^16.6.0 + graphql: ^16.9.0 jest: ^29.2.1 lodash: ^4.17.21 metro-react-native-babel-preset: 0.73.9 @@ -4360,7 +4590,7 @@ __metadata: native-base: ^3.4.28 node-libs-react-native: ^1.2.1 prettier: ^2.4.1 - qs: ^6.11.2 + qs: ^6.12.2 react: 18 react-dom: 18 react-native: ^0.71.11 @@ -4440,15 +4670,16 @@ __metadata: "@types/eslint": ^8.40.2 "@typescript-eslint/eslint-plugin": ^5.60.0 "@typescript-eslint/parser": ^5.60.0 + "@web3-storage/w3up-client": ^15.0.0 dotenv: ^16.3.1 eslint: ^8.43.0 eslint-config-prettier: ^8.8.0 ethereum-multicall: ^2.24.0 ethers: 5 graphql: ^16.7.1 - nft.storage: ^7.1.1 prettier: ^2.8.8 ts-node: ^10.9.2 + tsx: ^4.16.2 typescript: 5 vite: ^4.3.9 vitest: ^0.32.2 @@ -4457,6 +4688,16 @@ __metadata: languageName: unknown linkType: soft +"@gooddollar/goodcollective-subgraph@workspace:packages/subgraph": + version: 0.0.0-use.local + resolution: "@gooddollar/goodcollective-subgraph@workspace:packages/subgraph" + dependencies: + "@graphprotocol/graph-cli": ^0.67.2 + "@graphprotocol/graph-ts": ^0.32.0 + mustache: ^4.2.0 + languageName: unknown + linkType: soft + "@gooddollar/goodcollective@workspace:.": version: 0.0.0-use.local resolution: "@gooddollar/goodcollective@workspace:." @@ -4583,8 +4824,8 @@ __metadata: linkType: hard "@graphprotocol/graph-cli@npm:^0.67.2": - version: 0.67.2 - resolution: "@graphprotocol/graph-cli@npm:0.67.2" + version: 0.67.4 + resolution: "@graphprotocol/graph-cli@npm:0.67.4" dependencies: "@float-capital/float-subgraph-uncrashable": ^0.0.0-alpha.4 "@oclif/core": 2.8.6 @@ -4615,7 +4856,7 @@ __metadata: yaml: 1.10.2 bin: graph: bin/run - checksum: 6e0e81e3058dd2932071046199ac7adcdda3732a2c9bb8b5f768e87b138457a7a5b7b65b38646788b11f2a70931cceeeff40035605c5546543cb67babc93f9d1 + checksum: 48149e370a767e02b95d9166fa3eee3c385b1680e4170a8d79b670f0f06752de6b0f8d5ccd51acc70b0f79ca609ceabc1d6211aa7166360e66a6da7fb47d95ba languageName: node linkType: hard @@ -4715,28 +4956,19 @@ __metadata: languageName: node linkType: hard -"@ipld/car@npm:^3.0.1, @ipld/car@npm:^3.2.3": - version: 3.2.4 - resolution: "@ipld/car@npm:3.2.4" +"@ipld/car@npm:^5.1.0, @ipld/car@npm:^5.1.1, @ipld/car@npm:^5.2.2": + version: 5.3.2 + resolution: "@ipld/car@npm:5.3.2" dependencies: - "@ipld/dag-cbor": ^7.0.0 - multiformats: ^9.5.4 + "@ipld/dag-cbor": ^9.0.7 + cborg: ^4.0.5 + multiformats: ^13.0.0 varint: ^6.0.0 - checksum: f47ccf4c0bc21f7887eaafb58d6d9200b44bc0a3b847a452df5c5d1c07b79f3ea4e3aead7f7fca793cb5fea81e287d464c93bba9dd7e451e9f6ce692290b61b6 + checksum: a688a1fe854b463495ccd1a71b7a65fcf503055e4eb5a554ebfaf01eb703a7bacc3bd20a3f7843d6801061fbe62a6beabf7526a602a751b96e89c77c7117e34a languageName: node linkType: hard -"@ipld/dag-cbor@npm:^6.0.13, @ipld/dag-cbor@npm:^6.0.3": - version: 6.0.15 - resolution: "@ipld/dag-cbor@npm:6.0.15" - dependencies: - cborg: ^1.5.4 - multiformats: ^9.5.4 - checksum: c4ac8d7d271b9dd093c43495b1f24c3cdb7f10487aac529c2010c53a3320439ac9b17f53f02177e022735a1aae3d921f359c7020f765b72f94799ec3ff8e7207 - languageName: node - linkType: hard - -"@ipld/dag-cbor@npm:^7.0.0, @ipld/dag-cbor@npm:^7.0.1, @ipld/dag-cbor@npm:^7.0.2": +"@ipld/dag-cbor@npm:^7.0.0, @ipld/dag-cbor@npm:^7.0.1": version: 7.0.3 resolution: "@ipld/dag-cbor@npm:7.0.3" dependencies: @@ -4756,6 +4988,26 @@ __metadata: languageName: node linkType: hard +"@ipld/dag-cbor@npm:^9.0.3, @ipld/dag-cbor@npm:^9.0.5, @ipld/dag-cbor@npm:^9.0.6, @ipld/dag-cbor@npm:^9.0.7": + version: 9.2.1 + resolution: "@ipld/dag-cbor@npm:9.2.1" + dependencies: + cborg: ^4.0.0 + multiformats: ^13.1.0 + checksum: 79a8995626da8ffb1099e448e064ab579ca2c87fc7d079612ab1d9e71b39a1f8897a975eafd32cbfc302ca21d7ccad668ed341681d78ca714ef860b7a1b73e2a + languageName: node + linkType: hard + +"@ipld/dag-json@npm:^10.0.0": + version: 10.2.2 + resolution: "@ipld/dag-json@npm:10.2.2" + dependencies: + cborg: ^4.0.0 + multiformats: ^13.1.0 + checksum: 363882841c086e940c5e8606f1ea5d20c1e93c04344111bcc13bae302e9d953b703768c7d18e062029ead0a9f6e56008eacb03954d3b403964aa68d1d41a09f5 + languageName: node + linkType: hard + "@ipld/dag-json@npm:^8.0.1": version: 8.0.11 resolution: "@ipld/dag-json@npm:8.0.11" @@ -4766,7 +5018,7 @@ __metadata: languageName: node linkType: hard -"@ipld/dag-pb@npm:^2.0.2, @ipld/dag-pb@npm:^2.1.3": +"@ipld/dag-pb@npm:^2.1.3": version: 2.1.18 resolution: "@ipld/dag-pb@npm:2.1.18" dependencies: @@ -4775,6 +5027,41 @@ __metadata: languageName: node linkType: hard +"@ipld/dag-pb@npm:^4.0.0": + version: 4.1.2 + resolution: "@ipld/dag-pb@npm:4.1.2" + dependencies: + multiformats: ^13.1.0 + checksum: dab4f1b1db852bde2a4507ff3ddf2110fd17e08e953355377708e07c27f53197673dac19a55e545de5b73fab6214701b7292b83f76c9848eb1cd642cbfc21bd3 + languageName: node + linkType: hard + +"@ipld/dag-ucan@npm:^3.4.0": + version: 3.4.0 + resolution: "@ipld/dag-ucan@npm:3.4.0" + dependencies: + "@ipld/dag-cbor": ^9.0.0 + "@ipld/dag-json": ^10.0.0 + multiformats: ^11.0.0 + checksum: 4b712b663c8dc90384125a4ac734901dac077693b8fe4a123283b39dec83f374f5d9d7cefd87c15cd3a87ba915572dc499911e620ca11b55333a844c906da3fb + languageName: node + linkType: hard + +"@ipld/unixfs@npm:^2.1.1": + version: 2.2.0 + resolution: "@ipld/unixfs@npm:2.2.0" + dependencies: + "@ipld/dag-pb": ^4.0.0 + "@multiformats/murmur3": ^2.1.3 + "@perma/map": ^1.0.2 + actor: ^2.3.1 + multiformats: ^11.0.1 + protobufjs: ^7.1.2 + rabin-rs: ^2.1.0 + checksum: 021b697984143a4dae3d79e91ab92a0497f9dcf0a0e9ebb38c605ce4fbcae8fe95037a38a3be74bea0f16c1099cdf5eea278c311929e9a38f8bd057d99c7ab1f + languageName: node + linkType: hard + "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -5522,13 +5809,13 @@ __metadata: languageName: node linkType: hard -"@multiformats/murmur3@npm:^1.0.3": - version: 1.1.3 - resolution: "@multiformats/murmur3@npm:1.1.3" +"@multiformats/murmur3@npm:^2.1.0, @multiformats/murmur3@npm:^2.1.3": + version: 2.1.8 + resolution: "@multiformats/murmur3@npm:2.1.8" dependencies: - multiformats: ^9.5.4 + multiformats: ^13.0.0 murmurhash3js-revisited: ^3.0.0 - checksum: e3b07547da4a75348e2e103c6750db33b0caecd33b30751496cc2ca89cb7c654408c17300ca8f9fea79792f900f577b25aba49852feffe52894c79c177e40152 + checksum: 82841c87d4915c6a9540414c85931f1e17a848c9ff8ed51317e8bacddc9d9bfc2a7766699ccefcb9f0c8d7918584843f94d56b027619ee8c30dd09af26bfed8c languageName: node linkType: hard @@ -5580,6 +5867,13 @@ __metadata: languageName: node linkType: hard +"@noble/ed25519@npm:^1.7.3": + version: 1.7.3 + resolution: "@noble/ed25519@npm:1.7.3" + checksum: 45169927d51de513e47bbeebff3a603433c4ac7579e1b8c5034c380a0afedbe85e6959be3d69584a7a5ed6828d638f8f28879003b9bb2fb5f22d8aa2d88fd5fe + languageName: node + linkType: hard + "@noble/hashes@npm:1.1.5, @noble/hashes@npm:~1.1.1": version: 1.1.5 resolution: "@noble/hashes@npm:1.1.5" @@ -5608,6 +5902,13 @@ __metadata: languageName: node linkType: hard +"@noble/hashes@npm:^1.3.2, @noble/hashes@npm:~1.4.0": + version: 1.4.0 + resolution: "@noble/hashes@npm:1.4.0" + checksum: 8ba816ae26c90764b8c42493eea383716396096c5f7ba6bea559993194f49d80a73c081f315f4c367e51bd2d5891700bcdfa816b421d24ab45b41cb03e4f3342 + languageName: node + linkType: hard + "@noble/secp256k1@npm:1.7.1, @noble/secp256k1@npm:^1.6.3, @noble/secp256k1@npm:~1.7.0": version: 1.7.1 resolution: "@noble/secp256k1@npm:1.7.1" @@ -6361,6 +6662,16 @@ __metadata: languageName: node linkType: hard +"@perma/map@npm:^1.0.2": + version: 1.0.3 + resolution: "@perma/map@npm:1.0.3" + dependencies: + "@multiformats/murmur3": ^2.1.0 + murmurhash3js-revisited: ^3.0.0 + checksum: 97ede1438c153cc878f55b9252a0cfc882c10df7772d8b973f1c5f7be967787327baead46e76d82853ea891ee29d45b34b025d52020ff670ba4d04e1d3571fe5 + languageName: node + linkType: hard + "@pkgjs/parseargs@npm:^0.11.0": version: 0.11.0 resolution: "@pkgjs/parseargs@npm:0.11.0" @@ -8523,16 +8834,6 @@ __metadata: languageName: unknown linkType: soft -"@scaffold-eth/subgraph@workspace:packages/subgraph": - version: 0.0.0-use.local - resolution: "@scaffold-eth/subgraph@workspace:packages/subgraph" - dependencies: - "@graphprotocol/graph-cli": ^0.67.2 - "@graphprotocol/graph-ts": ^0.32.0 - mustache: ^4.2.0 - languageName: unknown - linkType: soft - "@scarf/scarf@npm:^1.1.1": version: 1.3.0 resolution: "@scarf/scarf@npm:1.3.0" @@ -8547,6 +8848,13 @@ __metadata: languageName: node linkType: hard +"@scure/base@npm:~1.1.6": + version: 1.1.7 + resolution: "@scure/base@npm:1.1.7" + checksum: d9084be9a2f27971df1684af9e40bb750e86f549345e1bb3227fb61673c0c83569c92c1cb0a4ddccb32650b39d3cd3c145603b926ba751c9bc60c27317549b20 + languageName: node + linkType: hard + "@scure/bip32@npm:1.1.5": version: 1.1.5 resolution: "@scure/bip32@npm:1.1.5" @@ -8610,6 +8918,16 @@ __metadata: languageName: node linkType: hard +"@scure/bip39@npm:^1.2.1": + version: 1.3.0 + resolution: "@scure/bip39@npm:1.3.0" + dependencies: + "@noble/hashes": ~1.4.0 + "@scure/base": ~1.1.6 + checksum: dbb0b27df753eb6c6380010b25cc9a9ea31f9cb08864fc51e69e5880ff7e2b8f85b72caea1f1f28af165e83b72c48dd38617e43fc632779d025b50ba32ea759e + languageName: node + linkType: hard + "@sentry/browser@npm:7.16.0": version: 7.16.0 resolution: "@sentry/browser@npm:7.16.0" @@ -10342,6 +10660,15 @@ __metadata: languageName: node linkType: hard +"@types/brotli@npm:^1.3.4": + version: 1.3.4 + resolution: "@types/brotli@npm:1.3.4" + dependencies: + "@types/node": "*" + checksum: 4ff49c2cefb40d6e745e5b4e110c12587fc8f25a6c71220b10f60406ff9905dbf21d796180d1bfbdb266d98b73d8947a734597560c56b9d70432963d7301ffa5 + languageName: node + linkType: hard + "@types/bs58check@npm:^2.1.0": version: 2.1.2 resolution: "@types/bs58check@npm:2.1.2" @@ -10562,13 +10889,6 @@ __metadata: languageName: node linkType: hard -"@types/minimist@npm:^1.2.0": - version: 1.2.5 - resolution: "@types/minimist@npm:1.2.5" - checksum: 477047b606005058ab0263c4f58097136268007f320003c348794f74adedc3166ffc47c80ec3e94687787f2ab7f4e72c468223946e79892cf0fd9e25e9970a90 - languageName: node - linkType: hard - "@types/mkdirp@npm:^0.5.2": version: 0.5.2 resolution: "@types/mkdirp@npm:0.5.2" @@ -10667,13 +10987,6 @@ __metadata: languageName: node linkType: hard -"@types/normalize-package-data@npm:^2.4.0": - version: 2.4.4 - resolution: "@types/normalize-package-data@npm:2.4.4" - checksum: 65dff72b543997b7be8b0265eca7ace0e34b75c3e5fee31de11179d08fa7124a7a5587265d53d0409532ecb7f7fba662c2012807963e1f9b059653ec2c83ee05 - languageName: node - linkType: hard - "@types/parse-json@npm:^4.0.0": version: 4.0.2 resolution: "@types/parse-json@npm:4.0.2" @@ -10785,10 +11098,10 @@ __metadata: languageName: node linkType: hard -"@types/retry@npm:0.12.0": - version: 0.12.0 - resolution: "@types/retry@npm:0.12.0" - checksum: 61a072c7639f6e8126588bf1eb1ce8835f2cb9c2aba795c4491cf6310e013267b0c8488039857c261c387e9728c1b43205099223f160bb6a76b4374f741b5603 +"@types/retry@npm:0.12.1": + version: 0.12.1 + resolution: "@types/retry@npm:0.12.1" + checksum: 5f46b2556053655f78262bb33040dc58417c900457cc63ff37d6c35349814471453ef511af0cec76a540c601296cd2b22f64bab1ab649c0dacc0223765ba876c languageName: node linkType: hard @@ -11019,6 +11332,77 @@ __metadata: languageName: node linkType: hard +"@ucanto/client@npm:^9.0.1": + version: 9.0.1 + resolution: "@ucanto/client@npm:9.0.1" + dependencies: + "@ucanto/core": ^10.0.0 + "@ucanto/interface": ^10.0.0 + checksum: 6016e95a25f687d2321a9e945464fba64d6700acdedcf4b5c319a035f38b274f3f874f99e3aac15981c654eb469cb2f843539b1f068f541be4994f6c95ee44e9 + languageName: node + linkType: hard + +"@ucanto/core@npm:^10.0.0, @ucanto/core@npm:^10.0.1": + version: 10.0.1 + resolution: "@ucanto/core@npm:10.0.1" + dependencies: + "@ipld/car": ^5.1.0 + "@ipld/dag-cbor": ^9.0.0 + "@ipld/dag-ucan": ^3.4.0 + "@ucanto/interface": ^10.0.1 + multiformats: ^11.0.2 + checksum: f64ed89748732f205cdff522b0f2905a8ac8544c9b6d5d651362c869ae25d71bbdd249096af5eef79ce922bd2f7222964451c4d42dc9065d814a0e39c3a397d3 + languageName: node + linkType: hard + +"@ucanto/interface@npm:^10.0.0, @ucanto/interface@npm:^10.0.1": + version: 10.0.1 + resolution: "@ucanto/interface@npm:10.0.1" + dependencies: + "@ipld/dag-ucan": ^3.4.0 + multiformats: ^11.0.2 + checksum: 1f424979f7bf984da746d34f73fe6666f54f83ed1348a5286937d513ec79bc0ef56f0a9a2ae8dae5e6732fd3f272e22150c97ff52ae1a9bf27ddee0f2aebaa63 + languageName: node + linkType: hard + +"@ucanto/principal@npm:^9.0.1": + version: 9.0.1 + resolution: "@ucanto/principal@npm:9.0.1" + dependencies: + "@ipld/dag-ucan": ^3.4.0 + "@noble/curves": ^1.2.0 + "@noble/ed25519": ^1.7.3 + "@noble/hashes": ^1.3.2 + "@ucanto/interface": ^10.0.0 + multiformats: ^11.0.2 + one-webcrypto: ^1.0.3 + checksum: 8db192214d7f46852aa8d2338b1fd0b2519a3313ad25fc7eb70348ac3ee28450cfbecb2186d5988cfb8551c1e31b286bde20a6bd8bc20d13ec4c882a234aa64a + languageName: node + linkType: hard + +"@ucanto/transport@npm:^9.1.1": + version: 9.1.1 + resolution: "@ucanto/transport@npm:9.1.1" + dependencies: + "@ucanto/core": ^10.0.0 + "@ucanto/interface": ^10.0.0 + checksum: 0377d7ea89b2f2241ba5abf9deefd92265069ccb0964f6c7c279f81c20b11a59f31cfda33aa83b3f23b58630942f0ad087a839ebc436bb14cbd15b0f345ca8e6 + languageName: node + linkType: hard + +"@ucanto/validator@npm:^9.0.2": + version: 9.0.2 + resolution: "@ucanto/validator@npm:9.0.2" + dependencies: + "@ipld/car": ^5.1.0 + "@ipld/dag-cbor": ^9.0.0 + "@ucanto/core": ^10.0.0 + "@ucanto/interface": ^10.0.0 + multiformats: ^11.0.2 + checksum: e7414dd92b4a6c3d7c26cd53abbc1ae044fed5621466e513b270d8f02274b30398e94ed2eec04d48c6d47899686befb4e0ae2f82b59025aa3d1f2dfeac5aa43e + languageName: node + linkType: hard + "@ungap/structured-clone@npm:^1.2.0": version: 1.2.0 resolution: "@ungap/structured-clone@npm:1.2.0" @@ -11033,10 +11417,10 @@ __metadata: languageName: node linkType: hard -"@uniswap/default-token-list@npm:^11.2.0": - version: 11.9.0 - resolution: "@uniswap/default-token-list@npm:11.9.0" - checksum: cef20b765604450cb05f9076f16109e050efe20901c2e584ade965a70bbeab368df08df9a823d5fb147e60dccffe82774a04baf3508b27f2d2ac2e1a8c8df4c2 +"@uniswap/default-token-list@npm:^11.13.0": + version: 11.19.0 + resolution: "@uniswap/default-token-list@npm:11.19.0" + checksum: c626834a6b859b19798bb10497a92705e780e9f5fe07087fb464901deb1bb71b8daf2957c8be11791046056d2ae187951991a3e363fb081ee10d806c55c9696e languageName: node linkType: hard @@ -11047,26 +11431,26 @@ __metadata: languageName: node linkType: hard -"@uniswap/permit2-sdk@npm:^1.2.0": - version: 1.2.0 - resolution: "@uniswap/permit2-sdk@npm:1.2.0" +"@uniswap/permit2-sdk@npm:^1.3.0": + version: 1.3.0 + resolution: "@uniswap/permit2-sdk@npm:1.3.0" dependencies: - ethers: ^5.3.1 - tiny-invariant: ^1.3.1 - checksum: 524519c4f5492a721de9215f4c74c18af4a8a4f676273ccc9c01512fe36c8e8ac51dd3474b19021522b76ef2edd25d9c871b0eb051e22b6564e37cd2b9422920 + ethers: ^5.7.0 + tiny-invariant: ^1.1.0 + checksum: 828a63c52673a5b4eefa769c0ecc2da667fe5573a3c447d0fea3809b46e7a71376a48917d959f253abba01e9faa442a503dd65649687a6bf7b385ee9f6d41afd languageName: node linkType: hard -"@uniswap/router-sdk@npm:^1.6.0, @uniswap/router-sdk@npm:^1.7.1": - version: 1.7.1 - resolution: "@uniswap/router-sdk@npm:1.7.1" +"@uniswap/router-sdk@npm:^1.9.2, @uniswap/router-sdk@npm:^1.9.3": + version: 1.9.3 + resolution: "@uniswap/router-sdk@npm:1.9.3" dependencies: "@ethersproject/abi": ^5.5.0 - "@uniswap/sdk-core": ^4.0.7 - "@uniswap/swap-router-contracts": ^1.1.0 - "@uniswap/v2-sdk": ^3.2.0 - "@uniswap/v3-sdk": ^3.10.0 - checksum: 9d93a454da8badad038afe10563fb7556d74b99cd23b2aff10faf58f927e284bc0be21bbb3a569b90f339057bb3ecc698aea85a38c42960632978eca1669bb0f + "@uniswap/sdk-core": ^5.3.1 + "@uniswap/swap-router-contracts": ^1.3.0 + "@uniswap/v2-sdk": ^4.3.2 + "@uniswap/v3-sdk": ^3.11.2 + checksum: 92922d43432908b9159e0f9cd1c9bb9658ceb89fb1e8e5ef4fc0350b4309cbd3767586135887333bb8d586c5ed304d2c2910b86bf276485421d2be025101485f languageName: node linkType: hard @@ -11084,37 +11468,43 @@ __metadata: languageName: node linkType: hard -"@uniswap/sdk-core@npm:^4, @uniswap/sdk-core@npm:^4.0.0, @uniswap/sdk-core@npm:^4.0.7": - version: 4.0.9 - resolution: "@uniswap/sdk-core@npm:4.0.9" +"@uniswap/sdk-core@npm:^5.3.0, @uniswap/sdk-core@npm:^5.3.1": + version: 5.3.1 + resolution: "@uniswap/sdk-core@npm:5.3.1" dependencies: "@ethersproject/address": ^5.0.2 + "@ethersproject/bytes": ^5.7.0 + "@ethersproject/keccak256": 5.7.0 + "@ethersproject/strings": 5.7.0 big.js: ^5.2.2 decimal.js-light: ^2.5.0 jsbi: ^3.1.4 tiny-invariant: ^1.1.0 toformat: ^2.0.0 - checksum: f4ed31d995ddd04579061ecc9d613c88da400c50a8be820142fb7cce958532b828ec1992d0c0a5115f839a3cd5e4722cbd853578fa0a28a46aabbd60c3a54ef7 + checksum: fcf33b2dc07f740070a79468f9c7d0badd668a8126b512c5cfa71d5f7a406fe0d25b5d6994745b8c2f112a0f416c76cd5cc7e1b3198039813c3a09539f6fe345 languageName: node linkType: hard -"@uniswap/smart-order-router@npm:^3.20.0": - version: 3.20.0 - resolution: "@uniswap/smart-order-router@npm:3.20.0" +"@uniswap/smart-order-router@npm:^3.35.12": + version: 3.35.12 + resolution: "@uniswap/smart-order-router@npm:3.35.12" dependencies: - "@uniswap/default-token-list": ^11.2.0 - "@uniswap/permit2-sdk": ^1.2.0 - "@uniswap/router-sdk": ^1.6.0 - "@uniswap/sdk-core": ^4.0.7 - "@uniswap/swap-router-contracts": ^1.3.0 + "@eth-optimism/sdk": ^3.2.2 + "@types/brotli": ^1.3.4 + "@uniswap/default-token-list": ^11.13.0 + "@uniswap/permit2-sdk": ^1.3.0 + "@uniswap/router-sdk": ^1.9.2 + "@uniswap/sdk-core": ^5.3.0 + "@uniswap/swap-router-contracts": ^1.3.1 "@uniswap/token-lists": ^1.0.0-beta.31 - "@uniswap/universal-router": ^1.0.1 - "@uniswap/universal-router-sdk": ^1.5.8 - "@uniswap/v2-sdk": ^3.2.3 - "@uniswap/v3-sdk": ^3.10.0 + "@uniswap/universal-router": ^1.6.0 + "@uniswap/universal-router-sdk": ^2.2.0 + "@uniswap/v2-sdk": ^4.3.2 + "@uniswap/v3-sdk": ^3.13.0 async-retry: ^1.3.1 await-timeout: ^1.1.1 axios: ^0.21.1 + brotli: ^1.3.3 bunyan: ^1.8.15 bunyan-blackhole: ^1.1.1 ethers: ^5.7.2 @@ -11126,11 +11516,11 @@ __metadata: stats-lite: ^2.2.0 peerDependencies: jsbi: ^3.2.0 - checksum: 714082c5ac4f6ffe17e7a6255cf89692e229d875e3db91ad461e3f6d137200710afc27e464ff7f7e98ff398f79ba05a08f6b165340489f12460f043a06bccd98 + checksum: d13f225840c6078111b2eee3e0e6ffe5a9babc5dbe6708d6d67ac6cb8da2661437d33773d8bdad97db01b7b804699b9ed8525874c591ca21a8b09618819bb293 languageName: node linkType: hard -"@uniswap/swap-router-contracts@npm:^1.1.0, @uniswap/swap-router-contracts@npm:^1.2.1, @uniswap/swap-router-contracts@npm:^1.3.0, @uniswap/swap-router-contracts@npm:^1.3.1": +"@uniswap/swap-router-contracts@npm:^1.3.0, @uniswap/swap-router-contracts@npm:^1.3.1": version: 1.3.1 resolution: "@uniswap/swap-router-contracts@npm:1.3.1" dependencies: @@ -11151,41 +11541,30 @@ __metadata: languageName: node linkType: hard -"@uniswap/universal-router-sdk@npm:^1.5.8": - version: 1.5.8 - resolution: "@uniswap/universal-router-sdk@npm:1.5.8" - dependencies: - "@uniswap/permit2-sdk": ^1.2.0 - "@uniswap/router-sdk": ^1.6.0 - "@uniswap/sdk-core": ^4.0.0 - "@uniswap/universal-router": 1.4.3 - "@uniswap/v2-sdk": ^3.2.0 - "@uniswap/v3-sdk": ^3.10.0 +"@uniswap/universal-router-sdk@npm:^2.2.0": + version: 2.2.2 + resolution: "@uniswap/universal-router-sdk@npm:2.2.2" + dependencies: + "@uniswap/permit2-sdk": ^1.3.0 + "@uniswap/router-sdk": ^1.9.3 + "@uniswap/sdk-core": ^5.3.1 + "@uniswap/universal-router": 1.6.0 + "@uniswap/v2-sdk": ^4.4.1 + "@uniswap/v3-sdk": ^3.13.1 bignumber.js: ^9.0.2 - ethers: ^5.3.1 - checksum: c6a4dd4c087405d02f3dadf9ae5a32636e3c7f363d3c2cbac2313cbcb2851a3e2d949427251b423882cc529f8deb6ff93586db6987e141c8460a911c6a0995f3 - languageName: node - linkType: hard - -"@uniswap/universal-router@npm:1.4.3": - version: 1.4.3 - resolution: "@uniswap/universal-router@npm:1.4.3" - dependencies: - "@openzeppelin/contracts": 4.7.0 - "@uniswap/v2-core": 1.0.1 - "@uniswap/v3-core": 1.0.0 - checksum: f5b86a1c7c083f28ff7d64770437a3a9474c2b923b78652c2b43e1ee8f5514c40479ce0d210ce31338e8d4fdc4c9c728c7e2d1a1959a24deb31e8649b3df0a37 + ethers: ^5.7.0 + checksum: 2399ed43d178bf773cbda610c38009c9377a936bc14a33bd296afb52ea4228e76ceeffb2ca064f07663fc8467ba68a0574098b30fc88ee9d3f8be6b205ae16b0 languageName: node linkType: hard -"@uniswap/universal-router@npm:^1.0.1": - version: 1.5.1 - resolution: "@uniswap/universal-router@npm:1.5.1" +"@uniswap/universal-router@npm:1.6.0, @uniswap/universal-router@npm:^1.6.0": + version: 1.6.0 + resolution: "@uniswap/universal-router@npm:1.6.0" dependencies: "@openzeppelin/contracts": 4.7.0 "@uniswap/v2-core": 1.0.1 "@uniswap/v3-core": 1.0.0 - checksum: e5b05c7b8d544fce33b8b944aee2e6638b52b3b31b83205bf648109a24bc84cf2f3ac43b8e0416463a22c8d9c587bc285bf04712012e7d1a14f2bd803fd71e1c + checksum: c91e4a248f983378f806b2d7b1e2c9cdac5996d7ab46c323c35147f6f8e32a67ca330916ac0692275525236b557b5d39230fadf88ab2af7ba7c814cd81ed903b languageName: node linkType: hard @@ -11196,16 +11575,16 @@ __metadata: languageName: node linkType: hard -"@uniswap/v2-sdk@npm:^3.2.0, @uniswap/v2-sdk@npm:^3.2.3": - version: 3.2.3 - resolution: "@uniswap/v2-sdk@npm:3.2.3" +"@uniswap/v2-sdk@npm:^4.3.2, @uniswap/v2-sdk@npm:^4.4.1": + version: 4.4.1 + resolution: "@uniswap/v2-sdk@npm:4.4.1" dependencies: - "@ethersproject/address": ^5.0.0 - "@ethersproject/solidity": ^5.0.0 - "@uniswap/sdk-core": ^4.0.7 + "@ethersproject/address": ^5.0.2 + "@ethersproject/solidity": ^5.0.9 + "@uniswap/sdk-core": ^5.3.1 tiny-invariant: ^1.1.0 tiny-warning: ^1.0.3 - checksum: 0e1838673508654b8270c54d9ee97c010e9a2463065e623aa78f96ade47f424627a9858fb39587331fb4e9b016d5113b821a475450018f1f62e8e4ab166e2893 + checksum: 4f80f7927002c8a3accbec8fc855f53efcf753bb95cf01c566b9147d0ecb39ebf63829148eee91f710f9b9f7d968e4d882efcb7715764a15136658da0ecd3f13 languageName: node linkType: hard @@ -11236,19 +11615,19 @@ __metadata: languageName: node linkType: hard -"@uniswap/v3-sdk@npm:^3.10.0": - version: 3.10.0 - resolution: "@uniswap/v3-sdk@npm:3.10.0" +"@uniswap/v3-sdk@npm:^3.11.2, @uniswap/v3-sdk@npm:^3.13.0, @uniswap/v3-sdk@npm:^3.13.1": + version: 3.13.1 + resolution: "@uniswap/v3-sdk@npm:3.13.1" dependencies: - "@ethersproject/abi": ^5.0.12 + "@ethersproject/abi": ^5.5.0 "@ethersproject/solidity": ^5.0.9 - "@uniswap/sdk-core": ^4 - "@uniswap/swap-router-contracts": ^1.2.1 + "@uniswap/sdk-core": ^5.3.1 + "@uniswap/swap-router-contracts": ^1.3.0 "@uniswap/v3-periphery": ^1.1.1 "@uniswap/v3-staker": 1.0.0 tiny-invariant: ^1.1.0 tiny-warning: ^1.0.3 - checksum: 664d40550aa5c88b21bce3dc209746bc61490e4afaa5686d12d6a5839e26211ae5093d82eeff3e3ec80df5df3eb1d40f9a7510b61a389e2779a9b1e5eca9ed25 + checksum: 8f22e9b8138161541c32704763c4e708f0b8229bdc5560e5de6be6e4eef0262db6276644597815ad4a226b1d63928fd3e55f5eb1d47bceb4e7119c81498ae22c languageName: node linkType: hard @@ -12519,68 +12898,6 @@ __metadata: languageName: node linkType: hard -"@web-std/blob@npm:^3.0.1, @web-std/blob@npm:^3.0.3": - version: 3.0.5 - resolution: "@web-std/blob@npm:3.0.5" - dependencies: - "@web-std/stream": 1.0.0 - web-encoding: 1.1.5 - checksum: 898b92285b96aae959546a49b9a0a308f4d4745eb1b7d740ae08955bbd2e32879abc9a68762d918d688c4d8a6e8dc34bebeb996b3bd7942dacf6a11d1f877435 - languageName: node - linkType: hard - -"@web-std/fetch@npm:^4.1.2": - version: 4.2.1 - resolution: "@web-std/fetch@npm:4.2.1" - dependencies: - "@web-std/blob": ^3.0.3 - "@web-std/file": ^3.0.2 - "@web-std/form-data": ^3.0.2 - "@web-std/stream": ^1.0.1 - "@web3-storage/multipart-parser": ^1.0.0 - abort-controller: ^3.0.0 - data-uri-to-buffer: ^3.0.1 - mrmime: ^1.0.0 - checksum: e926301432d051ae7a23b241855119a0685478eb4ec830b7c9ae6d07db4dcc16da088992fc18da68268187a911fc6f0c5314d6c2ad9aa5f6c2564cf1f4e15ed5 - languageName: node - linkType: hard - -"@web-std/file@npm:^3.0.0, @web-std/file@npm:^3.0.2": - version: 3.0.3 - resolution: "@web-std/file@npm:3.0.3" - dependencies: - "@web-std/blob": ^3.0.3 - checksum: 0f9e86288c34cb1771f291075dee8e57cded07c55694c0b94ac1e0fadca87a7db7974b1ae1fe86caaefa03e703d3e86722ac654e60925215a5a69e1a0c987d97 - languageName: node - linkType: hard - -"@web-std/form-data@npm:^3.0.0, @web-std/form-data@npm:^3.0.2": - version: 3.1.0 - resolution: "@web-std/form-data@npm:3.1.0" - dependencies: - web-encoding: 1.1.5 - checksum: c52e18159be74c93b463238a2551947954697d0b32c4a3feeb9d570635574ceaea242fe138f42a49885e426ea398b0e3ad7cd1300ef58a74bd9515ad83bf4868 - languageName: node - linkType: hard - -"@web-std/stream@npm:1.0.0": - version: 1.0.0 - resolution: "@web-std/stream@npm:1.0.0" - dependencies: - web-streams-polyfill: ^3.1.1 - checksum: 247cc704b5dc18c3e7dac70c02efbbca83357fc237a0b8b2011814a246e6710a0dd403770b756d763ef545c7a118524e405b76cb7c7ac00afea0250171fdd68c - languageName: node - linkType: hard - -"@web-std/stream@npm:^1.0.1": - version: 1.0.3 - resolution: "@web-std/stream@npm:1.0.3" - dependencies: - web-streams-polyfill: ^3.1.1 - checksum: 480ef4373c7da42247fd7b58f5da17db230a397ca8d78f365076db2383104169b55407732a384334b8327cd541e532f619a31b3a9a807a5b3851e1e5fa6707a5 - languageName: node - linkType: hard - "@web3-onboard/coinbase@npm:^2.2.4": version: 2.2.6 resolution: "@web3-onboard/coinbase@npm:2.2.6" @@ -12670,10 +12987,161 @@ __metadata: languageName: node linkType: hard -"@web3-storage/multipart-parser@npm:^1.0.0": - version: 1.0.0 - resolution: "@web3-storage/multipart-parser@npm:1.0.0" - checksum: d8bbb5b9b0a5c07b4119c33c64ef4b7cc8d74ca4de2dd783f608f2653f81ef298bf04136b7cdb7ce97306d5fe2217572b5655236b70e1b625ed18d4a21a81913 +"@web3-storage/access@npm:^20.0.0": + version: 20.0.0 + resolution: "@web3-storage/access@npm:20.0.0" + dependencies: + "@ipld/car": ^5.1.1 + "@ipld/dag-ucan": ^3.4.0 + "@scure/bip39": ^1.2.1 + "@ucanto/client": ^9.0.1 + "@ucanto/core": ^10.0.1 + "@ucanto/interface": ^10.0.1 + "@ucanto/principal": ^9.0.1 + "@ucanto/transport": ^9.1.1 + "@ucanto/validator": ^9.0.2 + "@web3-storage/capabilities": ^17.1.1 + "@web3-storage/did-mailto": ^2.1.0 + bigint-mod-arith: ^3.1.2 + conf: 11.0.2 + multiformats: ^12.1.2 + one-webcrypto: "git+https://github.com/web3-storage/one-webcrypto.git" + p-defer: ^4.0.0 + type-fest: ^4.9.0 + uint8arrays: ^4.0.6 + checksum: ce1e527c46edbc9b51b625f0cf37930588233dbefbd9c853bb5d4d34597582f969a2ce9450e926042838da14665bf64422a4f87962cf1d71176f29fee0a2641e + languageName: node + linkType: hard + +"@web3-storage/blob-index@npm:^1.0.3": + version: 1.0.3 + resolution: "@web3-storage/blob-index@npm:1.0.3" + dependencies: + "@ipld/dag-cbor": ^9.0.6 + "@ucanto/core": ^10.0.1 + "@ucanto/interface": ^10.0.1 + "@web3-storage/capabilities": ^17.1.1 + carstream: ^2.1.0 + multiformats: ^13.0.1 + uint8arrays: ^5.0.3 + checksum: d13a182cd166f5d91ff05eaa70b037170060ba2206c2ced3efca56249386d3f233091632536cc3296de2eda39946da1c6719abf543634aedba001612d6da1c4e + languageName: node + linkType: hard + +"@web3-storage/capabilities@npm:^16.0.0": + version: 16.0.0 + resolution: "@web3-storage/capabilities@npm:16.0.0" + dependencies: + "@ucanto/core": ^10.0.1 + "@ucanto/interface": ^10.0.1 + "@ucanto/principal": ^9.0.1 + "@ucanto/transport": ^9.1.1 + "@ucanto/validator": ^9.0.2 + "@web3-storage/data-segment": ^3.2.0 + uint8arrays: ^5.0.3 + checksum: ed81f2fb7a44498e02d8b88a91e286e757c707cac7c68c4003b9910dd1b7d268dbef8e237bb7dc7377ee7f16f65c3c9de2fa40002c953a31c06585a5fbbfab28 + languageName: node + linkType: hard + +"@web3-storage/capabilities@npm:^17.1.1, @web3-storage/capabilities@npm:^17.2.0": + version: 17.2.0 + resolution: "@web3-storage/capabilities@npm:17.2.0" + dependencies: + "@ucanto/core": ^10.0.1 + "@ucanto/interface": ^10.0.1 + "@ucanto/principal": ^9.0.1 + "@ucanto/transport": ^9.1.1 + "@ucanto/validator": ^9.0.2 + "@web3-storage/data-segment": ^3.2.0 + uint8arrays: ^5.0.3 + checksum: 92466c1b78d3bc2bdf9775cb6aed19313655a5ec286171ee5c2a29562afc742cbca56de36caddb0060de8fd30165a2727bc5398eb4fa712cc672bd5c6a61b5d9 + languageName: node + linkType: hard + +"@web3-storage/data-segment@npm:^3.2.0": + version: 3.2.0 + resolution: "@web3-storage/data-segment@npm:3.2.0" + dependencies: + "@ipld/dag-cbor": ^9.0.5 + multiformats: ^11.0.2 + sync-multihash-sha2: ^1.0.0 + checksum: f37df468dc2da9a8215982c11dbc36800f35ebed3842a93247728651ccfaca2f7e1b1cb63b9d7cf1e9891189678482dae84fc030a17fa3512434a33dfca0fe3c + languageName: node + linkType: hard + +"@web3-storage/data-segment@npm:^5.1.0": + version: 5.1.0 + resolution: "@web3-storage/data-segment@npm:5.1.0" + dependencies: + "@ipld/dag-cbor": ^9.0.5 + multiformats: ^11.0.2 + sync-multihash-sha2: ^1.0.0 + checksum: 061b596d8fa1e0adb3343b6cf8d93b0330dd37a2a10afc47b394d6e2f560fb2bbac39ccddc1d3e9011324d00bbe6a681175dc71e528eb0a2ddb718882de48a75 + languageName: node + linkType: hard + +"@web3-storage/did-mailto@npm:^2.1.0": + version: 2.1.0 + resolution: "@web3-storage/did-mailto@npm:2.1.0" + checksum: c7fb6214978e8540d890edc0077c531bc62d1d247cc14afcd11615508f46269b7c2b1e56ff799caf9065a1a31bfef6f13e2123b0b539c536d1043824b993f0f4 + languageName: node + linkType: hard + +"@web3-storage/filecoin-client@npm:^3.3.3": + version: 3.3.3 + resolution: "@web3-storage/filecoin-client@npm:3.3.3" + dependencies: + "@ipld/dag-ucan": ^3.4.0 + "@ucanto/client": ^9.0.1 + "@ucanto/core": ^10.0.1 + "@ucanto/interface": ^10.0.1 + "@ucanto/transport": ^9.1.1 + "@web3-storage/capabilities": ^16.0.0 + checksum: dd7b9db57d10ac0ae6d25661c0ed01d1953fc98e6eca29c388a31d756ca27875df01665e0970f0b380f58525fffb73b2f5d8067298cbc2dba821c155a7e1c1ab + languageName: node + linkType: hard + +"@web3-storage/upload-client@npm:^16.1.1": + version: 16.1.1 + resolution: "@web3-storage/upload-client@npm:16.1.1" + dependencies: + "@ipld/car": ^5.2.2 + "@ipld/dag-cbor": ^9.0.6 + "@ipld/dag-ucan": ^3.4.0 + "@ipld/unixfs": ^2.1.1 + "@ucanto/client": ^9.0.1 + "@ucanto/core": ^10.0.1 + "@ucanto/interface": ^10.0.1 + "@ucanto/transport": ^9.1.1 + "@web3-storage/blob-index": ^1.0.3 + "@web3-storage/capabilities": ^17.2.0 + "@web3-storage/data-segment": ^5.1.0 + "@web3-storage/filecoin-client": ^3.3.3 + ipfs-utils: ^9.0.14 + multiformats: ^12.1.2 + p-retry: ^5.1.2 + varint: ^6.0.0 + checksum: bd701465829e6a5491a002093e1478baa953fff90edf71fd9c64f2afc4386e69644eab241fb470da991fad2983f856530471872c9d79bd5aaab8aeb105ab22e5 + languageName: node + linkType: hard + +"@web3-storage/w3up-client@npm:^15.0.0": + version: 15.0.0 + resolution: "@web3-storage/w3up-client@npm:15.0.0" + dependencies: + "@ipld/dag-ucan": ^3.4.0 + "@ucanto/client": ^9.0.1 + "@ucanto/core": ^10.0.1 + "@ucanto/interface": ^10.0.1 + "@ucanto/principal": ^9.0.1 + "@ucanto/transport": ^9.1.1 + "@web3-storage/access": ^20.0.0 + "@web3-storage/blob-index": ^1.0.3 + "@web3-storage/capabilities": ^17.2.0 + "@web3-storage/did-mailto": ^2.1.0 + "@web3-storage/filecoin-client": ^3.3.3 + "@web3-storage/upload-client": ^16.1.1 + checksum: 35e2c17f061eadf6193bedd266cb763570dd22ad88eef7fc99a0ff8a16a3474eec9428116ab0de71a83bcca397e49ccdbe21becd00232ec60f367b30a084d326 languageName: node linkType: hard @@ -12885,7 +13353,16 @@ __metadata: languageName: node linkType: hard -"@wry/context@npm:^0.7.0, @wry/context@npm:^0.7.3": +"@wry/caches@npm:^1.0.0": + version: 1.0.1 + resolution: "@wry/caches@npm:1.0.1" + dependencies: + tslib: ^2.3.0 + checksum: 9e89aa8e9e08577b2e4acbe805f406b141ae49c2ac4a2e22acf21fbee68339fa0550e0dee28cf2158799f35bb812326e80212e49e2afd169f39f02ad56ae4ef4 + languageName: node + linkType: hard + +"@wry/context@npm:^0.7.0": version: 0.7.4 resolution: "@wry/context@npm:0.7.4" dependencies: @@ -12921,6 +13398,15 @@ __metadata: languageName: node linkType: hard +"@wry/trie@npm:^0.5.0": + version: 0.5.0 + resolution: "@wry/trie@npm:0.5.0" + dependencies: + tslib: ^2.3.0 + checksum: 92aeea34152bd8485184236fe328d3d05fc98ee3b431d82ee60cf3584dbf68155419c3d65d0ff3731b204ee79c149440a9b7672784a545afddc8d4342fbf21c9 + languageName: node + linkType: hard + "@xmldom/xmldom@npm:^0.8.8": version: 0.8.10 resolution: "@xmldom/xmldom@npm:0.8.10" @@ -12942,13 +13428,6 @@ __metadata: languageName: node linkType: hard -"@zxing/text-encoding@npm:0.9.0": - version: 0.9.0 - resolution: "@zxing/text-encoding@npm:0.9.0" - checksum: c23b12aee7639382e4949961304a1294776afaffa40f579e09ffecd0e5e68cf26ef3edd75009de46da8a536e571448755ca68b3e2ea707d53793c0edb2e2c34a - languageName: node - linkType: hard - "JSONStream@npm:1.3.2": version: 1.3.2 resolution: "JSONStream@npm:1.3.2" @@ -13182,6 +13661,13 @@ __metadata: languageName: node linkType: hard +"actor@npm:^2.3.1": + version: 2.3.1 + resolution: "actor@npm:2.3.1" + checksum: dbca7224d97f060297b097a6ee7f275d221dc198326a3a3b63919d604ffdb89a27ca5a284bc5f75cd3e4622db926b3abc303dd3238893b4be2072012331132b9 + languageName: node + linkType: hard + "address@npm:^1.0.1": version: 1.2.2 resolution: "address@npm:1.2.2" @@ -13297,6 +13783,18 @@ __metadata: languageName: node linkType: hard +"ajv@npm:^8.12.0": + version: 8.16.0 + resolution: "ajv@npm:8.16.0" + dependencies: + fast-deep-equal: ^3.1.3 + json-schema-traverse: ^1.0.0 + require-from-string: ^2.0.2 + uri-js: ^4.4.1 + checksum: bdf3d4c9f1d11e220850051ef4cd89346e951cfb933d6d41be36d45053c1092af1523ee6c62525cce567355caf0a4f4c19a08a93851649c1fa32b4a39b7c4858 + languageName: node + linkType: hard + "amazon-cognito-identity-js@npm:^6.0.1": version: 6.3.7 resolution: "amazon-cognito-identity-js@npm:6.3.7" @@ -13829,13 +14327,6 @@ __metadata: languageName: node linkType: hard -"arrify@npm:^1.0.1": - version: 1.0.1 - resolution: "arrify@npm:1.0.1" - checksum: 745075dd4a4624ff0225c331dacb99be501a515d39bcb7c84d24660314a6ec28e68131b137e6f7e16318170842ce97538cd298fc4cd6b2cc798e0b957f2747e7 - languageName: node - linkType: hard - "asap@npm:~2.0.3, asap@npm:~2.0.6": version: 2.0.6 resolution: "asap@npm:2.0.6" @@ -14127,6 +14618,16 @@ __metadata: languageName: node linkType: hard +"atomically@npm:^2.0.0": + version: 2.0.3 + resolution: "atomically@npm:2.0.3" + dependencies: + stubborn-fs: ^1.2.5 + when-exit: ^2.1.1 + checksum: 4ee528fe35b4bc84cd626f6414cd2b51f04f94c2f6e8ab5c97d056779ef507bdd1e2671056957a031e6b487571fcc0a8627e8660645e6d61c84e561ae71cc8b6 + languageName: node + linkType: hard + "auto-bind@npm:^4.0.0": version: 4.0.0 resolution: "auto-bind@npm:4.0.0" @@ -15182,7 +15683,7 @@ __metadata: languageName: node linkType: hard -"bigint-mod-arith@npm:^3.1.0": +"bigint-mod-arith@npm:^3.1.0, bigint-mod-arith@npm:^3.1.2": version: 3.3.1 resolution: "bigint-mod-arith@npm:3.3.1" checksum: 23f2fc67611cf99ce9c3b6f386cb50a363a467204f088f8fbda76def4642aaf0c41aced1f46521b1a52d25b492c9558d4cef1b807e16fbf9535700a4e8909c32 @@ -15316,17 +15817,6 @@ __metadata: languageName: node linkType: hard -"bl@npm:^5.0.0": - version: 5.1.0 - resolution: "bl@npm:5.1.0" - dependencies: - buffer: ^6.0.3 - inherits: ^2.0.4 - readable-stream: ^3.4.0 - checksum: a7a438ee0bc540e80b8eb68cc1ad759a9c87df06874a99411d701d01cc0b36f30cd20050512ac3e77090138890960e07bfee724f3ee6619bb39a569f5cc3b1bc - languageName: node - linkType: hard - "blakejs@npm:^1.1.0, blakejs@npm:^1.2.1": version: 1.2.1 resolution: "blakejs@npm:1.2.1" @@ -15350,22 +15840,6 @@ __metadata: languageName: node linkType: hard -"blockstore-core@npm:^1.0.2": - version: 1.0.5 - resolution: "blockstore-core@npm:1.0.5" - dependencies: - err-code: ^3.0.1 - interface-blockstore: ^2.0.2 - interface-store: ^2.0.1 - it-all: ^1.0.4 - it-drain: ^1.0.4 - it-filter: ^1.0.2 - it-take: ^1.0.1 - multiformats: ^9.4.7 - checksum: 164e067c132a7e29e665794a84a1e71d7b959898c7b247ae4446fdbc6a23b08eca35c560a667ff5a53bf034b07acae5b9c0f90c872a22cb2f41729cb4a67fad7 - languageName: node - linkType: hard - "bluebird@npm:^3.5.0, bluebird@npm:^3.5.2": version: 3.7.2 resolution: "bluebird@npm:3.7.2" @@ -15549,6 +16023,15 @@ __metadata: languageName: node linkType: hard +"brotli@npm:^1.3.3": + version: 1.3.3 + resolution: "brotli@npm:1.3.3" + dependencies: + base64-js: ^1.1.2 + checksum: 2c97329f4ccb8e4332cedd2f63b85c2e15ffb305b1cbf046df86201434caf93cb7992ca73c0f7053b6a1417f595069ec7783c26e01510cefc10035a0f466e594 + languageName: node + linkType: hard + "browser-level@npm:^1.0.1": version: 1.0.1 resolution: "browser-level@npm:1.0.1" @@ -15577,7 +16060,7 @@ __metadata: languageName: node linkType: hard -"browser-readablestream-to-it@npm:^1.0.0, browser-readablestream-to-it@npm:^1.0.1, browser-readablestream-to-it@npm:^1.0.2, browser-readablestream-to-it@npm:^1.0.3": +"browser-readablestream-to-it@npm:^1.0.0, browser-readablestream-to-it@npm:^1.0.1, browser-readablestream-to-it@npm:^1.0.3": version: 1.0.3 resolution: "browser-readablestream-to-it@npm:1.0.3" checksum: 07895bbc54cdeea62c8e9b7e32d374ec5c340ed1d0bc0c6cd6f1e0561ad931b160a3988426c763672ddf38ac1f75e45b9d8ae267b43f387183edafcad625f30a @@ -15866,6 +16349,13 @@ __metadata: languageName: node linkType: hard +"buffer-reverse@npm:^1.0.1": + version: 1.0.1 + resolution: "buffer-reverse@npm:1.0.1" + checksum: e350872a89b17af0a7e1bd7a73239a535164f3f010b0800add44f2e52bd0511548dc5b96c20309effba969868c385023d2d02a0add6155f6a76da7b3073b77bd + languageName: node + linkType: hard + "buffer-to-arraybuffer@npm:^0.0.5": version: 0.0.5 resolution: "buffer-to-arraybuffer@npm:0.0.5" @@ -15930,6 +16420,13 @@ __metadata: languageName: node linkType: hard +"bufio@npm:^1.0.7": + version: 1.2.1 + resolution: "bufio@npm:1.2.1" + checksum: b6e1216f4a5877617a3580b83807d8b96c794c015bc2d5eb9e70e152dc79fe923517472bd96df3d5b8feb59a0e25e2aa3cd8a70b8f90905b92d86f2e5719ed68 + languageName: node + linkType: hard + "builtin-status-codes@npm:^3.0.0": version: 3.0.0 resolution: "builtin-status-codes@npm:3.0.0" @@ -16153,6 +16650,19 @@ __metadata: languageName: node linkType: hard +"call-bind@npm:^1.0.7": + version: 1.0.7 + resolution: "call-bind@npm:1.0.7" + dependencies: + 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 + checksum: 295c0c62b90dd6522e6db3b0ab1ce26bdf9e7404215bda13cfee25b626b5ff1a7761324d58d38b1ef1607fc65aca2d06e44d2e18d0dfc6c14b465b00d8660029 + languageName: node + linkType: hard + "caller-callsite@npm:^2.0.0": version: 2.0.0 resolution: "caller-callsite@npm:2.0.0" @@ -16195,17 +16705,6 @@ __metadata: languageName: node linkType: hard -"camelcase-keys@npm:^6.2.2": - version: 6.2.2 - resolution: "camelcase-keys@npm:6.2.2" - dependencies: - camelcase: ^5.3.1 - map-obj: ^4.0.0 - quick-lru: ^4.0.1 - checksum: 43c9af1adf840471e54c68ab3e5fe8a62719a6b7dbf4e2e86886b7b0ff96112c945736342b837bd2529ec9d1c7d1934e5653318478d98e0cf22c475c04658e2a - languageName: node - linkType: hard - "camelcase@npm:5.0.0": version: 5.0.0 resolution: "camelcase@npm:5.0.0" @@ -16269,18 +16768,6 @@ __metadata: languageName: node linkType: hard -"carbites@npm:^1.0.6": - version: 1.0.6 - resolution: "carbites@npm:1.0.6" - dependencies: - "@ipld/car": ^3.0.1 - "@ipld/dag-cbor": ^6.0.3 - "@ipld/dag-pb": ^2.0.2 - multiformats: ^9.0.4 - checksum: f8631c97a177f6efbb8fc70684b117cd2900e9f3cf830718ed7babeae2fa3a06b6768484b9852a85c7d454f19117fd3bf7a8c92adaa318d9a4c8b975b65a231c - languageName: node - linkType: hard - "cardinal@npm:^2.1.1": version: 2.1.1 resolution: "cardinal@npm:2.1.1" @@ -16293,6 +16780,17 @@ __metadata: languageName: node linkType: hard +"carstream@npm:^2.1.0": + version: 2.2.0 + resolution: "carstream@npm:2.2.0" + dependencies: + "@ipld/dag-cbor": ^9.0.3 + multiformats: ^13.0.1 + uint8arraylist: ^2.4.3 + checksum: 9b782aaea4f5f96aa3d423abde92f76ee936b437d4745734aeb9e9a7937c9e54067b5be0bda31e624dae4e3d9142ceddc993d0b7bc6114e5189c8dcd0a0869d5 + languageName: node + linkType: hard + "cartonne@npm:^2.1.1": version: 2.2.0 resolution: "cartonne@npm:2.2.0" @@ -16372,6 +16870,15 @@ __metadata: languageName: node linkType: hard +"cborg@npm:^4.0.5": + version: 4.2.2 + resolution: "cborg@npm:4.2.2" + bin: + cborg: lib/bin.js + checksum: 765758bdbaeb1773145571aa0622796911e7e697d095d4cabfa16a9c88c64e9f9386369c5320fa854ac6bba6e4183bb06ea5fd8e78b64e1d79d720faf79758e5 + languageName: node + linkType: hard + "chai-as-promised@npm:^7.1.1": version: 7.1.1 resolution: "chai-as-promised@npm:7.1.1" @@ -16398,6 +16905,21 @@ __metadata: languageName: node linkType: hard +"chai@npm:^4.3.10, chai@npm:^4.3.4": + version: 4.4.1 + resolution: "chai@npm:4.4.1" + dependencies: + assertion-error: ^1.1.0 + check-error: ^1.0.3 + deep-eql: ^4.1.3 + get-func-name: ^2.0.2 + loupe: ^2.3.6 + pathval: ^1.1.1 + type-detect: ^4.0.8 + checksum: 9ab84f36eb8e0b280c56c6c21ca4da5933132cd8a0c89c384f1497f77953640db0bc151edd47f81748240a9fab57b78f7d925edfeedc8e8fc98016d71f40c36e + languageName: node + linkType: hard + "chalk@npm:3.0.0": version: 3.0.0 resolution: "chalk@npm:3.0.0" @@ -17263,6 +17785,22 @@ __metadata: languageName: node linkType: hard +"conf@npm:11.0.2": + version: 11.0.2 + resolution: "conf@npm:11.0.2" + dependencies: + ajv: ^8.12.0 + ajv-formats: ^2.1.1 + atomically: ^2.0.0 + debounce-fn: ^5.1.2 + dot-prop: ^7.2.0 + env-paths: ^3.0.0 + json-schema-typed: ^8.0.1 + semver: ^7.3.8 + checksum: 4b4ff645bfd6e25f7595f909906f711dd3ebeb3e462d2ee8d27430991c0757d783968a8f36367d7db1401b022f9a7cebeaf43da816b80753dbad8cca12118215 + languageName: node + linkType: hard + "conf@npm:^10.1.2": version: 10.2.0 resolution: "conf@npm:10.2.0" @@ -17750,6 +18288,13 @@ __metadata: languageName: node linkType: hard +"crypto-js@npm:^4.2.0": + version: 4.2.0 + resolution: "crypto-js@npm:4.2.0" + checksum: f051666dbc077c8324777f44fbd3aaea2986f198fe85092535130d17026c7c2ccf2d23ee5b29b36f7a4a07312db2fae23c9094b644cc35f7858b1b4fcaf27774 + languageName: node + linkType: hard + "css-in-js-utils@npm:^3.1.0": version: 3.1.0 resolution: "css-in-js-utils@npm:3.1.0" @@ -17852,13 +18397,6 @@ __metadata: languageName: node linkType: hard -"data-uri-to-buffer@npm:^3.0.1": - version: 3.0.1 - resolution: "data-uri-to-buffer@npm:3.0.1" - checksum: c59c3009686a78c071806b72f4810856ec28222f0f4e252aa495ec027ed9732298ceea99c50328cf59b151dd34cbc3ad6150bbb43e41fc56fa19f48c99e9fc30 - languageName: node - linkType: hard - "data-uri-to-buffer@npm:^4.0.0": version: 4.0.1 resolution: "data-uri-to-buffer@npm:4.0.1" @@ -17889,6 +18427,15 @@ __metadata: languageName: node linkType: hard +"debounce-fn@npm:^5.1.2": + version: 5.1.2 + resolution: "debounce-fn@npm:5.1.2" + dependencies: + mimic-fn: ^4.0.0 + checksum: d0d1e84bae3b96c1ba108430700b1b6f775275029d731b0a050ae6af0984933bfeec6d35cc7058f3f929bde627017a0fc16feda5dc4eb940f03be60d8b3704db + languageName: node + linkType: hard + "debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.8, debug@npm:^2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9" @@ -17946,17 +18493,7 @@ __metadata: languageName: node linkType: hard -"decamelize-keys@npm:^1.1.0": - version: 1.1.1 - resolution: "decamelize-keys@npm:1.1.1" - dependencies: - decamelize: ^1.1.0 - map-obj: ^1.0.0 - checksum: fc645fe20b7bda2680bbf9481a3477257a7f9304b1691036092b97ab04c0ab53e3bf9fcc2d2ae382536568e402ec41fb11e1d4c3836a9abe2d813dd9ef4311e0 - languageName: node - linkType: hard - -"decamelize@npm:^1.1.0, decamelize@npm:^1.1.1, decamelize@npm:^1.2.0": +"decamelize@npm:^1.1.1, decamelize@npm:^1.2.0": version: 1.2.0 resolution: "decamelize@npm:1.2.0" checksum: ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa @@ -18125,6 +18662,17 @@ __metadata: languageName: node linkType: hard +"define-data-property@npm:^1.1.4": + version: 1.1.4 + resolution: "define-data-property@npm:1.1.4" + dependencies: + es-define-property: ^1.0.0 + es-errors: ^1.3.0 + gopd: ^1.0.1 + checksum: 8068ee6cab694d409ac25936eb861eea704b7763f7f342adbdfe337fc27c78d7ae0eff2364b2917b58c508d723c7a074326d068eef2e45c4edcd85cf94d0313b + languageName: node + linkType: hard + "define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": version: 1.2.1 resolution: "define-properties@npm:1.2.1" @@ -18668,6 +19216,15 @@ __metadata: languageName: node linkType: hard +"dot-prop@npm:^7.2.0": + version: 7.2.0 + resolution: "dot-prop@npm:7.2.0" + dependencies: + type-fest: ^2.11.2 + checksum: 08e4ff14f7305ffb5fda7e4c88f3cdbeb3cd97bd27efa4f47503869a2ee7f96938b4c21b0a2abf9c37d891a1bdb3994a09d219b0dcfd6130da4eaeb44c6f067e + languageName: node + linkType: hard + "dotenv@npm:^14.2.0": version: 14.3.2 resolution: "dotenv@npm:14.3.2" @@ -19018,6 +19575,13 @@ __metadata: languageName: node linkType: hard +"env-paths@npm:^3.0.0": + version: 3.0.0 + resolution: "env-paths@npm:3.0.0" + checksum: b2b0a0d0d9931a13d279c22ed94d78648a1cc5f408f05d47ff3e0c1616f0aa0c38fb33deec5e5be50497225d500607d57f9c8652c4d39c2f2b7608cd45768128 + languageName: node + linkType: hard + "envinfo@npm:^7.7.2": version: 7.11.0 resolution: "envinfo@npm:7.11.0" @@ -19134,6 +19698,22 @@ __metadata: languageName: node linkType: hard +"es-define-property@npm:^1.0.0": + version: 1.0.0 + resolution: "es-define-property@npm:1.0.0" + dependencies: + get-intrinsic: ^1.2.4 + checksum: f66ece0a887b6dca71848fa71f70461357c0e4e7249696f81bad0a1f347eed7b31262af4a29f5d726dc026426f085483b6b90301855e647aa8e21936f07293c6 + languageName: node + linkType: hard + +"es-errors@npm:^1.3.0": + version: 1.3.0 + resolution: "es-errors@npm:1.3.0" + checksum: ec1414527a0ccacd7f15f4a3bc66e215f04f595ba23ca75cdae0927af099b5ec865f9f4d33e9d7e86f512f252876ac77d4281a7871531a50678132429b1271b5 + languageName: node + linkType: hard + "es-iterator-helpers@npm:^1.0.12": version: 1.0.15 resolution: "es-iterator-helpers@npm:1.0.15" @@ -19619,6 +20199,86 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:~0.21.5": + version: 0.21.5 + resolution: "esbuild@npm:0.21.5" + dependencies: + "@esbuild/aix-ppc64": 0.21.5 + "@esbuild/android-arm": 0.21.5 + "@esbuild/android-arm64": 0.21.5 + "@esbuild/android-x64": 0.21.5 + "@esbuild/darwin-arm64": 0.21.5 + "@esbuild/darwin-x64": 0.21.5 + "@esbuild/freebsd-arm64": 0.21.5 + "@esbuild/freebsd-x64": 0.21.5 + "@esbuild/linux-arm": 0.21.5 + "@esbuild/linux-arm64": 0.21.5 + "@esbuild/linux-ia32": 0.21.5 + "@esbuild/linux-loong64": 0.21.5 + "@esbuild/linux-mips64el": 0.21.5 + "@esbuild/linux-ppc64": 0.21.5 + "@esbuild/linux-riscv64": 0.21.5 + "@esbuild/linux-s390x": 0.21.5 + "@esbuild/linux-x64": 0.21.5 + "@esbuild/netbsd-x64": 0.21.5 + "@esbuild/openbsd-x64": 0.21.5 + "@esbuild/sunos-x64": 0.21.5 + "@esbuild/win32-arm64": 0.21.5 + "@esbuild/win32-ia32": 0.21.5 + "@esbuild/win32-x64": 0.21.5 + dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true + "@esbuild/linux-loong64": + optional: true + "@esbuild/linux-mips64el": + optional: true + "@esbuild/linux-ppc64": + optional: true + "@esbuild/linux-riscv64": + optional: true + "@esbuild/linux-s390x": + optional: true + "@esbuild/linux-x64": + optional: true + "@esbuild/netbsd-x64": + optional: true + "@esbuild/openbsd-x64": + optional: true + "@esbuild/sunos-x64": + optional: true + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": + optional: true + bin: + esbuild: bin/esbuild + checksum: 2911c7b50b23a9df59a7d6d4cdd3a4f85855787f374dce751148dbb13305e0ce7e880dde1608c2ab7a927fc6cec3587b80995f7fc87a64b455f8b70b55fd8ec1 + languageName: node + linkType: hard + "escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" @@ -20578,7 +21238,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:5, ethers@npm:5.7.2, ethers@npm:^5.*, ethers@npm:^5.0.0, ethers@npm:^5.0.1, ethers@npm:^5.0.13, ethers@npm:^5.0.15, ethers@npm:^5.0.2, ethers@npm:^5.3.1, ethers@npm:^5.5.2, ethers@npm:^5.5.4, ethers@npm:^5.7.0, ethers@npm:^5.7.1, ethers@npm:^5.7.2, ethers@npm:~5.7.0": +"ethers@npm:5, ethers@npm:5.7.2, ethers@npm:^5.*, ethers@npm:^5.0.0, ethers@npm:^5.0.1, ethers@npm:^5.0.13, ethers@npm:^5.0.15, ethers@npm:^5.0.2, ethers@npm:^5.5.2, ethers@npm:^5.5.4, ethers@npm:^5.7.0, ethers@npm:^5.7.1, ethers@npm:^5.7.2, ethers@npm:~5.7.0": version: 5.7.2 resolution: "ethers@npm:5.7.2" dependencies: @@ -21899,7 +22559,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": +"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: @@ -21919,7 +22579,7 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@^2.1.2#~builtin, fsevents@patch:fsevents@^2.3.2#~builtin, fsevents@patch:fsevents@~2.3.2#~builtin": +"fsevents@patch:fsevents@^2.1.2#~builtin, fsevents@patch:fsevents@^2.3.2#~builtin, fsevents@patch:fsevents@~2.3.2#~builtin, fsevents@patch:fsevents@~2.3.3#~builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=df0bf1" dependencies: @@ -22118,6 +22778,19 @@ __metadata: languageName: node linkType: hard +"get-intrinsic@npm:^1.2.4": + version: 1.2.4 + resolution: "get-intrinsic@npm:1.2.4" + dependencies: + es-errors: ^1.3.0 + function-bind: ^1.1.2 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + hasown: ^2.0.0 + checksum: 414e3cdf2c203d1b9d7d33111df746a4512a1aa622770b361dadddf8ed0b5aeb26c560f49ca077e24bfafb0acb55ca908d1f709216ccba33ffc548ec8a79a951 + languageName: node + linkType: hard + "get-iterator@npm:^1.0.2": version: 1.0.2 resolution: "get-iterator@npm:1.0.2" @@ -22174,6 +22847,15 @@ __metadata: languageName: node linkType: hard +"get-tsconfig@npm:^4.7.5": + version: 4.7.5 + resolution: "get-tsconfig@npm:4.7.5" + dependencies: + resolve-pkg-maps: ^1.0.0 + checksum: e5b271fae2b4cd1869bbfc58db56983026cc4a08fdba988725a6edd55d04101507de154722503a22ee35920898ff9bdcba71f99d93b17df35dddb8e8a2ad91be + languageName: node + linkType: hard + "get-value@npm:^2.0.3, get-value@npm:^2.0.6": version: 2.0.6 resolution: "get-value@npm:2.0.6" @@ -22694,13 +23376,10 @@ __metadata: languageName: node linkType: hard -"hamt-sharding@npm:^2.0.0": - version: 2.0.1 - resolution: "hamt-sharding@npm:2.0.1" - dependencies: - sparse-array: ^1.3.1 - uint8arrays: ^3.0.0 - checksum: c3032fc1447abbda9ef5eda52edfb2df542a74eabcc01b1a38a05f5185c6847163311f383c64602dc4e8d086c5e545a40767b4cfc6e7d4de2a3e58bb85e5c8e5 +"graphql@npm:^16.9.0": + version: 16.9.0 + resolution: "graphql@npm:16.9.0" + checksum: 8cb3d54100e9227310383ce7f791ca48d12f15ed9f2021f23f8735f1121aafe4e5e611a853081dd935ce221724ea1ae4638faef5d2921fb1ad7c26b5f46611e9 languageName: node linkType: hard @@ -22739,13 +23418,6 @@ __metadata: languageName: node linkType: hard -"hard-rejection@npm:^2.1.0": - version: 2.1.0 - resolution: "hard-rejection@npm:2.1.0" - checksum: 7baaf80a0c7fff4ca79687b4060113f1529589852152fa935e6787a2bc96211e784ad4588fb3048136ff8ffc9dfcf3ae385314a5b24db32de20bea0d1597f9dc - languageName: node - linkType: hard - "hardhat-abi-exporter@npm:^2.10.1": version: 2.10.1 resolution: "hardhat-abi-exporter@npm:2.10.1" @@ -22950,6 +23622,15 @@ __metadata: languageName: node linkType: hard +"has-property-descriptors@npm:^1.0.2": + version: 1.0.2 + resolution: "has-property-descriptors@npm:1.0.2" + dependencies: + es-define-property: ^1.0.0 + checksum: fcbb246ea2838058be39887935231c6d5788babed499d0e9d0cc5737494c48aba4fe17ba1449e0d0fbbb1e36175442faa37f9c427ae357d6ccb1d895fbcd3de3 + languageName: node + linkType: hard + "has-proto@npm:^1.0.1": version: 1.0.1 resolution: "has-proto@npm:1.0.1" @@ -23191,15 +23872,6 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^4.0.1": - version: 4.1.0 - resolution: "hosted-git-info@npm:4.1.0" - dependencies: - lru-cache: ^6.0.0 - checksum: c3f87b3c2f7eb8c2748c8f49c0c2517c9a95f35d26f4bf54b2a8cba05d2e668f3753548b6ea366b18ec8dadb4e12066e19fa382a01496b0ffa0497eb23cbe461 - languageName: node - linkType: hard - "html-escaper@npm:^2.0.0": version: 2.0.2 resolution: "html-escaper@npm:2.0.2" @@ -23436,13 +24108,6 @@ __metadata: languageName: node linkType: hard -"idb-keyval@npm:^6.0.3": - version: 6.2.1 - resolution: "idb-keyval@npm:6.2.1" - checksum: 7c0836f832096086e99258167740181132a71dd2694c8b8454a4f5ec69114ba6d70983115153306f0b6de1c8d3bad04f67eed3dff8f50c96815b9985d6d78470 - languageName: node - linkType: hard - "idna-uts46-hx@npm:^2.3.1": version: 2.3.1 resolution: "idna-uts46-hx@npm:2.3.1" @@ -23661,16 +24326,6 @@ __metadata: languageName: node linkType: hard -"interface-blockstore@npm:^2.0.2, interface-blockstore@npm:^2.0.3": - version: 2.0.3 - resolution: "interface-blockstore@npm:2.0.3" - dependencies: - interface-store: ^2.0.2 - multiformats: ^9.0.4 - checksum: 01248c06fd88ba2cf3c264868dd1363e20266b914c51a0b52ad2303f7c00cc9a52ce1d1830b073cc7293edf195110e4d84ac5d34781bdab5f763f91eeba10898 - languageName: node - linkType: hard - "interface-datastore@npm:^6.0.2": version: 6.1.1 resolution: "interface-datastore@npm:6.1.1" @@ -23682,7 +24337,7 @@ __metadata: languageName: node linkType: hard -"interface-store@npm:^2.0.1, interface-store@npm:^2.0.2": +"interface-store@npm:^2.0.2": version: 2.0.2 resolution: "interface-store@npm:2.0.2" checksum: 0e80adb1de9ff57687cfa1b08499702b72cacf33a7e0320ac7781989f3685d73f2a84996358f540250229afa19c7acebf03085087762f718035622ea6a1a5b8a @@ -23784,49 +24439,6 @@ __metadata: languageName: node linkType: hard -"ipfs-car@npm:^0.6.2": - version: 0.6.2 - resolution: "ipfs-car@npm:0.6.2" - dependencies: - "@ipld/car": ^3.2.3 - "@web-std/blob": ^3.0.1 - bl: ^5.0.0 - blockstore-core: ^1.0.2 - browser-readablestream-to-it: ^1.0.2 - idb-keyval: ^6.0.3 - interface-blockstore: ^2.0.2 - ipfs-core-types: ^0.8.3 - ipfs-core-utils: ^0.12.1 - ipfs-unixfs-exporter: ^7.0.4 - ipfs-unixfs-importer: ^9.0.4 - ipfs-utils: ^9.0.2 - it-all: ^1.0.5 - it-last: ^1.0.5 - it-pipe: ^1.1.0 - meow: ^9.0.0 - move-file: ^2.1.0 - multiformats: ^9.6.3 - stream-to-it: ^0.2.3 - streaming-iterables: ^6.0.0 - uint8arrays: ^3.0.0 - bin: - ipfs-car: dist/cjs/cli/cli.js - 🚘: dist/cjs/cli/cli.js - checksum: c95818a879931088ffdd50ba2db9afe25843dd0bb1340161fb19101e903ff29ecda5008881083318114630d78b27da0ba80c6f37d00eec103dd92b4c9586a707 - languageName: node - linkType: hard - -"ipfs-core-types@npm:^0.8.3, ipfs-core-types@npm:^0.8.4": - version: 0.8.4 - resolution: "ipfs-core-types@npm:0.8.4" - dependencies: - interface-datastore: ^6.0.2 - multiaddr: ^10.0.0 - multiformats: ^9.4.13 - checksum: 0bf10eb1a469404b4af302356d16c8fb517fb7df15a4d02d3a3930b8fd7d78133220aaf3357b6066e6961187270af611f00483762c4383d24f91884c412c2099 - languageName: node - linkType: hard - "ipfs-core-types@npm:^0.9.0": version: 0.9.0 resolution: "ipfs-core-types@npm:0.9.0" @@ -23838,34 +24450,6 @@ __metadata: languageName: node linkType: hard -"ipfs-core-utils@npm:^0.12.1": - version: 0.12.2 - resolution: "ipfs-core-utils@npm:0.12.2" - dependencies: - any-signal: ^2.1.2 - blob-to-it: ^1.0.1 - browser-readablestream-to-it: ^1.0.1 - debug: ^4.1.1 - err-code: ^3.0.1 - ipfs-core-types: ^0.8.4 - ipfs-unixfs: ^6.0.3 - ipfs-utils: ^9.0.2 - it-all: ^1.0.4 - it-map: ^1.0.4 - it-peekable: ^1.0.2 - it-to-stream: ^1.0.0 - merge-options: ^3.0.4 - multiaddr: ^10.0.0 - multiaddr-to-uri: ^8.0.0 - multiformats: ^9.4.13 - nanoid: ^3.1.23 - parse-duration: ^1.0.0 - timeout-abort-controller: ^1.1.1 - uint8arrays: ^3.0.0 - checksum: 27aca8bd75f2c89580cd458cc791e2fa6d6f6ee51a0a491c24fa9c50b9bbee4f9eb0c080466cdc8683bfb51935661a7858768bbd656618dc51eb22deafa9f270 - languageName: node - linkType: hard - "ipfs-core-utils@npm:^0.13.0": version: 0.13.0 resolution: "ipfs-core-utils@npm:0.13.0" @@ -23921,48 +24505,7 @@ __metadata: languageName: node linkType: hard -"ipfs-unixfs-exporter@npm:^7.0.4": - version: 7.0.11 - resolution: "ipfs-unixfs-exporter@npm:7.0.11" - dependencies: - "@ipld/dag-cbor": ^7.0.2 - "@ipld/dag-pb": ^2.0.2 - "@multiformats/murmur3": ^1.0.3 - err-code: ^3.0.1 - hamt-sharding: ^2.0.0 - interface-blockstore: ^2.0.3 - ipfs-unixfs: ^6.0.0 - it-last: ^1.0.5 - multiformats: ^9.4.2 - uint8arrays: ^3.0.0 - checksum: b419addc600e61bf5952615f7749f866689922a5bb1a083e90b68c95bf227bf1ab0398acb326e868cb828df30589eacec91035470955bb3cdcfb10df2f6d8a1f - languageName: node - linkType: hard - -"ipfs-unixfs-importer@npm:^9.0.4": - version: 9.0.10 - resolution: "ipfs-unixfs-importer@npm:9.0.10" - dependencies: - "@ipld/dag-pb": ^2.0.2 - "@multiformats/murmur3": ^1.0.3 - bl: ^5.0.0 - err-code: ^3.0.1 - hamt-sharding: ^2.0.0 - interface-blockstore: ^2.0.3 - ipfs-unixfs: ^6.0.0 - it-all: ^1.0.5 - it-batch: ^1.0.8 - it-first: ^1.0.6 - it-parallel-batch: ^1.0.9 - merge-options: ^3.0.4 - multiformats: ^9.4.2 - rabin-wasm: ^0.1.4 - uint8arrays: ^3.0.0 - checksum: 062e0a7d6f21fc3020959ae33947531cec652e058bd94e418f7bccb56884ac8f997f929c6ca044a1b2c21bb5f3842d37ae69ed118e3495c2af68d06d6df4a8f9 - languageName: node - linkType: hard - -"ipfs-unixfs@npm:^6.0.0, ipfs-unixfs@npm:^6.0.3": +"ipfs-unixfs@npm:^6.0.3": version: 6.0.9 resolution: "ipfs-unixfs@npm:6.0.9" dependencies: @@ -23972,7 +24515,7 @@ __metadata: languageName: node linkType: hard -"ipfs-utils@npm:^9.0.2": +"ipfs-utils@npm:^9.0.14, ipfs-utils@npm:^9.0.2": version: 9.0.14 resolution: "ipfs-utils@npm:9.0.14" dependencies: @@ -24102,7 +24645,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0": +"is-core-module@npm:^2.13.0": version: 2.13.1 resolution: "is-core-module@npm:2.13.1" dependencies: @@ -24382,13 +24925,6 @@ __metadata: languageName: node linkType: hard -"is-plain-obj@npm:^1.1.0": - version: 1.1.0 - resolution: "is-plain-obj@npm:1.1.0" - checksum: 0ee04807797aad50859652a7467481816cbb57e5cc97d813a7dcd8915da8195dc68c436010bf39d195226cde6a2d352f4b815f16f26b7bf486a5754290629931 - languageName: node - linkType: hard - "is-plain-obj@npm:^2.1.0": version: 2.1.0 resolution: "is-plain-obj@npm:2.1.0" @@ -24777,34 +25313,13 @@ __metadata: languageName: node linkType: hard -"it-all@npm:^1.0.4, it-all@npm:^1.0.5": +"it-all@npm:^1.0.4": version: 1.0.6 resolution: "it-all@npm:1.0.6" checksum: 7ca9a528c08ebe2fc8a3c93a41409219d18325ed31fedb9834ebac2822f0b2a96d7abcb6cbfa092114ab4d5f08951e694c7a2c3929ce4b5300769e710ae665db languageName: node linkType: hard -"it-batch@npm:^1.0.8, it-batch@npm:^1.0.9": - version: 1.0.9 - resolution: "it-batch@npm:1.0.9" - checksum: b1db82fa51db579bd880f84ad48eba8b4dfca5aec38a5779faa58849aec6b83a2f8b6514bccb6ce9fd49782953b1b399d7b568f35cfb6df54f8a376801d5106e - languageName: node - linkType: hard - -"it-drain@npm:^1.0.4": - version: 1.0.5 - resolution: "it-drain@npm:1.0.5" - checksum: 568a07e54302e2f933f61260e8e43b0d14f753470dd03d26e87e568cdde0ba6a7fd939cc10f223142e8007bb7c6b668c9207c64bd1c9b07105f06cb61fc8673e - languageName: node - linkType: hard - -"it-filter@npm:^1.0.2": - version: 1.0.3 - resolution: "it-filter@npm:1.0.3" - checksum: 4eb39fdc9e3a09eb030a0a0e7eb295eb0dbc261a428da9c8062f565c158b1ea2939ffd92c0b13ec48055278f93f1d7b719174b9f067f0ceefbf8fd58bd4e937d - languageName: node - linkType: hard - "it-first@npm:^1.0.6, it-first@npm:^1.0.7": version: 1.0.7 resolution: "it-first@npm:1.0.7" @@ -24822,7 +25337,7 @@ __metadata: languageName: node linkType: hard -"it-last@npm:^1.0.4, it-last@npm:^1.0.5": +"it-last@npm:^1.0.4": version: 1.0.6 resolution: "it-last@npm:1.0.6" checksum: bc7b68ddd6cae902f0095d0c7ccb0078abdfa41fbf55862a9df9e30ae74be08282b5b3d21f40e6103af0d202144974e216d3c44f3e8f93c2c3f890322b02fcfa @@ -24836,15 +25351,6 @@ __metadata: languageName: node linkType: hard -"it-parallel-batch@npm:^1.0.9": - version: 1.0.11 - resolution: "it-parallel-batch@npm:1.0.11" - dependencies: - it-batch: ^1.0.9 - checksum: 4c4ad170e95f584c70a83ed39b582d1c574c24830242afbbcc948c151b6a0a7c9cff7067680b8b850662a2b52850c40e3b3ed765cf2027f92e01ce3e0f15bce3 - languageName: node - linkType: hard - "it-peekable@npm:^1.0.2": version: 1.0.3 resolution: "it-peekable@npm:1.0.3" @@ -24852,20 +25358,6 @@ __metadata: languageName: node linkType: hard -"it-pipe@npm:^1.1.0": - version: 1.1.0 - resolution: "it-pipe@npm:1.1.0" - checksum: d653078f1543851f55070e38426dbbebad1303e9adde5238e4192b8b38ac7e4a1dcc149ccf3e4269759d1cbdd00be98b346fc8db81117c81017f09577f050e8e - languageName: node - linkType: hard - -"it-take@npm:^1.0.1": - version: 1.0.2 - resolution: "it-take@npm:1.0.2" - checksum: f669358761eea8ed295976aab50374ae6cf0fa0a31b3fe98bfcef17c80fbe23bb36e3b53b9bf6ca08cb90380203e49a8f5965593636255ca8e4a9bbd8026f43c - languageName: node - linkType: hard - "it-to-stream@npm:^1.0.0": version: 1.0.0 resolution: "it-to-stream@npm:1.0.0" @@ -26083,7 +26575,7 @@ __metadata: languageName: node linkType: hard -"kind-of@npm:^6.0.0, kind-of@npm:^6.0.1, kind-of@npm:^6.0.2, kind-of@npm:^6.0.3": +"kind-of@npm:^6.0.0, kind-of@npm:^6.0.1, kind-of@npm:^6.0.2": version: 6.0.3 resolution: "kind-of@npm:6.0.3" checksum: 3ab01e7b1d440b22fe4c31f23d8d38b4d9b91d9f291df683476576493d5dfd2e03848a8b05813dd0c3f0e835bc63f433007ddeceb71f05cb25c45ae1b19c6d3b @@ -26921,7 +27413,7 @@ __metadata: languageName: node linkType: hard -"long@npm:^5.2.0": +"long@npm:^5.0.0, long@npm:^5.2.0": version: 5.2.3 resolution: "long@npm:5.2.3" checksum: 885ede7c3de4facccbd2cacc6168bae3a02c3e836159ea4252c87b6e34d40af819824b2d4edce330bfb5c4d6e8ce3ec5864bdcf9473fa1f53a4f8225860e5897 @@ -27149,20 +27641,6 @@ __metadata: languageName: node linkType: hard -"map-obj@npm:^1.0.0": - version: 1.0.1 - resolution: "map-obj@npm:1.0.1" - checksum: 9949e7baec2a336e63b8d4dc71018c117c3ce6e39d2451ccbfd3b8350c547c4f6af331a4cbe1c83193d7c6b786082b6256bde843db90cb7da2a21e8fcc28afed - languageName: node - linkType: hard - -"map-obj@npm:^4.0.0": - version: 4.3.0 - resolution: "map-obj@npm:4.3.0" - checksum: fbc554934d1a27a1910e842bc87b177b1a556609dd803747c85ece420692380827c6ae94a95cce4407c054fa0964be3bf8226f7f2cb2e9eeee432c7c1985684e - languageName: node - linkType: hard - "map-visit@npm:^1.0.0": version: 1.0.0 resolution: "map-visit@npm:1.0.0" @@ -27294,26 +27772,6 @@ __metadata: languageName: node linkType: hard -"meow@npm:^9.0.0": - version: 9.0.0 - resolution: "meow@npm:9.0.0" - dependencies: - "@types/minimist": ^1.2.0 - camelcase-keys: ^6.2.2 - decamelize: ^1.2.0 - decamelize-keys: ^1.1.0 - hard-rejection: ^2.1.0 - minimist-options: 4.1.0 - normalize-package-data: ^3.0.0 - read-pkg-up: ^7.0.1 - redent: ^3.0.0 - trim-newlines: ^3.0.0 - type-fest: ^0.18.0 - yargs-parser: ^20.2.3 - checksum: 99799c47247f4daeee178e3124f6ef6f84bde2ba3f37652865d5d8f8b8adcf9eedfc551dd043e2455cd8206545fd848e269c0c5ab6b594680a0ad4d3617c9639 - languageName: node - linkType: hard - "merge-descriptors@npm:1.0.1": version: 1.0.1 resolution: "merge-descriptors@npm:1.0.1" @@ -27390,6 +27848,19 @@ __metadata: languageName: node linkType: hard +"merkletreejs@npm:^0.3.11": + version: 0.3.11 + resolution: "merkletreejs@npm:0.3.11" + dependencies: + bignumber.js: ^9.0.1 + buffer-reverse: ^1.0.1 + crypto-js: ^4.2.0 + treeify: ^1.1.0 + web3-utils: ^1.3.4 + checksum: 93edb8ec66aa6c9f59aa0902e675590e3791692893bb3e8c1018f758367ded1bf7d6b1057ccde3729b283ca946a316838a631a922960b76889b3be528c43ef4e + languageName: node + linkType: hard + "methods@npm:~1.1.2": version: 1.1.2 resolution: "methods@npm:1.1.2" @@ -28367,13 +28838,6 @@ __metadata: languageName: node linkType: hard -"min-indent@npm:^1.0.0": - version: 1.0.1 - resolution: "min-indent@npm:1.0.1" - checksum: bfc6dd03c5eaf623a4963ebd94d087f6f4bbbfd8c41329a7f09706b0cb66969c4ddd336abeb587bc44bc6f08e13bf90f0b374f9d71f9f01e04adc2cd6f083ef1 - languageName: node - linkType: hard - "minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1": version: 1.0.1 resolution: "minimalistic-assert@npm:1.0.1" @@ -28442,17 +28906,6 @@ __metadata: languageName: node linkType: hard -"minimist-options@npm:4.1.0": - version: 4.1.0 - resolution: "minimist-options@npm:4.1.0" - dependencies: - arrify: ^1.0.1 - is-plain-obj: ^1.1.0 - kind-of: ^6.0.3 - checksum: 8c040b3068811e79de1140ca2b708d3e203c8003eb9a414c1ab3cd467fc5f17c9ca02a5aef23bedc51a7f8bfbe77f87e9a7e31ec81fba304cda675b019496f4e - languageName: node - linkType: hard - "minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7, minimist@npm:~1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" @@ -28797,15 +29250,6 @@ __metadata: languageName: node linkType: hard -"move-file@npm:^2.1.0": - version: 2.1.0 - resolution: "move-file@npm:2.1.0" - dependencies: - path-exists: ^4.0.0 - checksum: 2b92bbe047a302b593fcb2c0bf1131bb090ec80b3264569fc80d782c8ff829eecc13573943fa4d804c9747dec612ef2d1e84a5cfcf29cbc64a69ffcbb7ea09b3 - languageName: node - linkType: hard - "mri@npm:1.2.0, mri@npm:^1.1.0": version: 1.2.0 resolution: "mri@npm:1.2.0" @@ -28813,13 +29257,6 @@ __metadata: languageName: node linkType: hard -"mrmime@npm:^1.0.0": - version: 1.0.1 - resolution: "mrmime@npm:1.0.1" - checksum: cc979da44bbbffebaa8eaf7a45117e851f2d4cb46a3ada6ceb78130466a04c15a0de9a9ce1c8b8ba6f6e1b8618866b1352992bf1757d241c0ddca558b9f28a77 - languageName: node - linkType: hard - "ms@npm:2.0.0": version: 2.0.0 resolution: "ms@npm:2.0.0" @@ -28919,7 +29356,7 @@ __metadata: languageName: node linkType: hard -"multiformats@npm:9.9.0, multiformats@npm:^9.0.4, multiformats@npm:^9.4.10, multiformats@npm:^9.4.13, multiformats@npm:^9.4.2, multiformats@npm:^9.4.5, multiformats@npm:^9.4.7, multiformats@npm:^9.5.1, multiformats@npm:^9.5.2, multiformats@npm:^9.5.4, multiformats@npm:^9.6.2, multiformats@npm:^9.6.3, multiformats@npm:^9.6.4, multiformats@npm:^9.6.5": +"multiformats@npm:9.9.0, multiformats@npm:^9.4.10, multiformats@npm:^9.4.13, multiformats@npm:^9.4.2, multiformats@npm:^9.4.5, multiformats@npm:^9.5.1, multiformats@npm:^9.5.2, multiformats@npm:^9.5.4, multiformats@npm:^9.6.2, multiformats@npm:^9.6.5": version: 9.9.0 resolution: "multiformats@npm:9.9.0" checksum: d3e8c1be400c09a014f557ea02251a2710dbc9fca5aa32cc702ff29f636c5471e17979f30bdcb0a9cbb556f162a8591dc2e1219c24fc21394a56115b820bb84e @@ -28933,13 +29370,20 @@ __metadata: languageName: node linkType: hard -"multiformats@npm:^12.0.1": +"multiformats@npm:^12.0.1, multiformats@npm:^12.1.2": version: 12.1.3 resolution: "multiformats@npm:12.1.3" checksum: 1060488612f8e6729c600f47a8741b91aa6e7b807ce165eca3c8cf07ab7465d2d9b212415a9c18886938b9e35b30ea7b9ae19b5ab5122589c65063440643e6bb languageName: node linkType: hard +"multiformats@npm:^13.0.0, multiformats@npm:^13.0.1, multiformats@npm:^13.1.0": + version: 13.1.3 + resolution: "multiformats@npm:13.1.3" + checksum: afa163e9053061f9226ae7d70b80c89bc67ce7eb23eb4e07bef3bf1aff2b6d5ef982ae8f08c74fbb473066c889ac4d43da62cebf9c0628f21b1276eb1d57c5d0 + languageName: node + linkType: hard + "multihashes-sync@npm:^1.1.1": version: 1.1.3 resolution: "multihashes-sync@npm:1.1.3" @@ -29220,27 +29664,6 @@ __metadata: languageName: node linkType: hard -"nft.storage@npm:^7.1.1": - version: 7.1.1 - resolution: "nft.storage@npm:7.1.1" - dependencies: - "@ipld/car": ^3.2.3 - "@ipld/dag-cbor": ^6.0.13 - "@web-std/blob": ^3.0.1 - "@web-std/fetch": ^4.1.2 - "@web-std/file": ^3.0.0 - "@web-std/form-data": ^3.0.0 - carbites: ^1.0.6 - ipfs-car: ^0.6.2 - it-pipe: ^1.1.0 - multiformats: ^9.6.4 - p-retry: ^4.6.1 - streaming-iterables: ^6.0.0 - throttled-queue: ^2.1.2 - checksum: 6f010c9c385381e5a95fd39a4eaa00a8c8b1aefa1e33936305fe98ce3a2b62fd7799daa1088988cba84e84ac4e18c9cdb6efb23e462adb132b02f2a6f3524d26 - languageName: node - linkType: hard - "nice-try@npm:^1.0.4": version: 1.0.5 resolution: "nice-try@npm:1.0.5" @@ -29577,7 +30000,7 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.5.0": +"normalize-package-data@npm:^2.3.2": version: 2.5.0 resolution: "normalize-package-data@npm:2.5.0" dependencies: @@ -29589,18 +30012,6 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^3.0.0": - version: 3.0.3 - resolution: "normalize-package-data@npm:3.0.3" - dependencies: - hosted-git-info: ^4.0.1 - is-core-module: ^2.5.0 - semver: ^7.3.4 - validate-npm-package-license: ^3.0.1 - checksum: bbcee00339e7c26fdbc760f9b66d429258e2ceca41a5df41f5df06cc7652de8d82e8679ff188ca095cad8eff2b6118d7d866af2b68400f74602fbcbce39c160a - languageName: node - linkType: hard - "normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": version: 3.0.0 resolution: "normalize-path@npm:3.0.0" @@ -29974,6 +30385,20 @@ __metadata: languageName: node linkType: hard +"one-webcrypto@git+https://github.com/web3-storage/one-webcrypto.git": + version: 1.0.3 + resolution: "one-webcrypto@https://github.com/web3-storage/one-webcrypto.git#commit=5148cd14d5489a8ac4cd38223870e02db15a2382" + checksum: 57dc46707845446730751f0619120fcadda709c6a669609083845fa6dc2649af0cb4c493e007c3aef3247072dc1b4922cfc1c5a0aef18721054d5a8a6c7f43e3 + languageName: node + linkType: hard + +"one-webcrypto@npm:^1.0.3": + version: 1.0.3 + resolution: "one-webcrypto@npm:1.0.3" + checksum: b7df09a4ef30fc6708a45517a43c26ada7b2642ca319a8bf68d1b156c277d8d198897645a0d5ccf7e67c6b3e9a30578698889aea594bfdd9f1e23130f8889817 + languageName: node + linkType: hard + "onetime@npm:^2.0.0": version: 2.0.1 resolution: "onetime@npm:2.0.1" @@ -30047,14 +30472,15 @@ __metadata: languageName: node linkType: hard -"optimism@npm:^0.17.5": - version: 0.17.5 - resolution: "optimism@npm:0.17.5" +"optimism@npm:^0.18.0": + version: 0.18.0 + resolution: "optimism@npm:0.18.0" dependencies: + "@wry/caches": ^1.0.0 "@wry/context": ^0.7.0 "@wry/trie": ^0.4.3 tslib: ^2.3.0 - checksum: 5990217d989e9857dc523a64cb6e5a9205eae68c7acac78f7dde8fbe50045d0f11ca8068cdbb51b1eae15510d96ad593a99cf98c6f86c41d1b6f90e54956ff11 + checksum: d6ed6a90b05ee886dadfe556c7a30227c66843f51278e51eb843977a6a9368b6c50297fcc63fa514f53d8a5a58f8ddc8049c2356bd4ffac32f8961bcb806254d languageName: node linkType: hard @@ -30206,6 +30632,13 @@ __metadata: languageName: node linkType: hard +"p-defer@npm:^4.0.0": + version: 4.0.1 + resolution: "p-defer@npm:4.0.1" + checksum: a561e7b581b76e6dce8ae763b4980004dbc795781de327d0b760e5341f035b0fa2c14e892a66d6d8122e2e114815a26f5ad154061374df84f88e75405ea4b0bb + languageName: node + linkType: hard + "p-fifo@npm:^1.0.0": version: 1.0.0 resolution: "p-fifo@npm:1.0.0" @@ -30311,13 +30744,13 @@ __metadata: languageName: node linkType: hard -"p-retry@npm:^4.6.1": - version: 4.6.2 - resolution: "p-retry@npm:4.6.2" +"p-retry@npm:^5.1.2": + version: 5.1.2 + resolution: "p-retry@npm:5.1.2" dependencies: - "@types/retry": 0.12.0 + "@types/retry": 0.12.1 retry: ^0.13.1 - checksum: 45c270bfddaffb4a895cea16cb760dcc72bdecb6cb45fef1971fa6ea2e91ddeafddefe01e444ac73e33b1b3d5d29fb0dd18a7effb294262437221ddc03ce0f2e + checksum: f063c08b1adc3cf7c01de01eb2dbda841970229f9f229c5167ebf4e2080d8a38b1f4e6eccefac74bca97cfaf4436d0a0eeb0b551175b26bc8b3116195f61bba8 languageName: node linkType: hard @@ -31337,6 +31770,26 @@ __metadata: languageName: node linkType: hard +"protobufjs@npm:^7.1.2": + version: 7.3.2 + resolution: "protobufjs@npm:7.3.2" + dependencies: + "@protobufjs/aspromise": ^1.1.2 + "@protobufjs/base64": ^1.1.2 + "@protobufjs/codegen": ^2.0.4 + "@protobufjs/eventemitter": ^1.1.0 + "@protobufjs/fetch": ^1.1.0 + "@protobufjs/float": ^1.0.2 + "@protobufjs/inquire": ^1.1.0 + "@protobufjs/path": ^1.1.2 + "@protobufjs/pool": ^1.1.0 + "@protobufjs/utf8": ^1.1.0 + "@types/node": ">=13.7.0" + long: ^5.0.0 + checksum: cfb2a744787f26ee7c82f3e7c4b72cfc000e9bb4c07828ed78eb414db0ea97a340c0cc3264d0e88606592f847b12c0351411f10e9af255b7ba864eec44d7705f + languageName: node + linkType: hard + "proxy-addr@npm:~2.0.7": version: 2.0.7 resolution: "proxy-addr@npm:2.0.7" @@ -31578,6 +32031,15 @@ __metadata: languageName: node linkType: hard +"qs@npm:^6.12.2": + version: 6.12.2 + resolution: "qs@npm:6.12.2" + dependencies: + side-channel: ^1.0.6 + checksum: cb141456f3e518b4212177f5658168acbab60c90735f27f131336f7ae0286b51402911d4a0a786d83d3ba4aa801c032383b4304b28474de00388eb95cf988c8c + languageName: node + linkType: hard + "qs@npm:~6.5.2": version: 6.5.3 resolution: "qs@npm:6.5.3" @@ -31666,13 +32128,6 @@ __metadata: languageName: node linkType: hard -"quick-lru@npm:^4.0.1": - version: 4.0.1 - resolution: "quick-lru@npm:4.0.1" - checksum: bea46e1abfaa07023e047d3cf1716a06172c4947886c053ede5c50321893711577cb6119360f810cc3ffcd70c4d7db4069c3cee876b358ceff8596e062bd1154 - languageName: node - linkType: hard - "quick-lru@npm:^5.1.1": version: 5.1.1 resolution: "quick-lru@npm:5.1.1" @@ -31691,19 +32146,10 @@ __metadata: languageName: node linkType: hard -"rabin-wasm@npm:^0.1.4": - version: 0.1.5 - resolution: "rabin-wasm@npm:0.1.5" - dependencies: - "@assemblyscript/loader": ^0.9.4 - bl: ^5.0.0 - debug: ^4.3.1 - minimist: ^1.2.5 - node-fetch: ^2.6.1 - readable-stream: ^3.6.0 - bin: - rabin-wasm: cli/bin.js - checksum: e6892830c0cae57560d4630e480b624792706183898500cf0c3415a19f7e774d99169a968a73471e5c448f9d3ebc9dbf09a9d36344d7779ececf7928ebb0d7f0 +"rabin-rs@npm:^2.1.0": + version: 2.1.0 + resolution: "rabin-rs@npm:2.1.0" + checksum: eaa21179abd3e65277cadc388f923ea897386a42baa89ad8396d03b46c9448c80b3f4482e6591d590127e61ab8f20492c3c825a8a23d4e4af1302a1d42620103 languageName: node linkType: hard @@ -32446,17 +32892,6 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:^7.0.1": - version: 7.0.1 - resolution: "read-pkg-up@npm:7.0.1" - dependencies: - find-up: ^4.1.0 - read-pkg: ^5.2.0 - type-fest: ^0.8.1 - checksum: e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44 - languageName: node - linkType: hard - "read-pkg@npm:^1.0.0": version: 1.1.0 resolution: "read-pkg@npm:1.1.0" @@ -32468,18 +32903,6 @@ __metadata: languageName: node linkType: hard -"read-pkg@npm:^5.2.0": - version: 5.2.0 - resolution: "read-pkg@npm:5.2.0" - dependencies: - "@types/normalize-package-data": ^2.4.0 - normalize-package-data: ^2.5.0 - parse-json: ^5.0.0 - type-fest: ^0.6.0 - checksum: eb696e60528b29aebe10e499ba93f44991908c57d70f2d26f369e46b8b9afc208ef11b4ba64f67630f31df8b6872129e0a8933c8c53b7b4daf0eace536901222 - languageName: node - linkType: hard - "read-yaml-file@npm:2.1.0": version: 2.1.0 resolution: "read-yaml-file@npm:2.1.0" @@ -32643,16 +33066,6 @@ __metadata: languageName: node linkType: hard -"redent@npm:^3.0.0": - version: 3.0.0 - resolution: "redent@npm:3.0.0" - dependencies: - indent-string: ^4.0.0 - strip-indent: ^3.0.0 - checksum: fa1ef20404a2d399235e83cc80bd55a956642e37dd197b4b612ba7327bf87fa32745aeb4a1634b2bab25467164ab4ed9c15be2c307923dd08b0fe7c52431ae6b - languageName: node - linkType: hard - "redeyed@npm:~2.1.0": version: 2.1.1 resolution: "redeyed@npm:2.1.1" @@ -32815,6 +33228,21 @@ __metadata: languageName: node linkType: hard +"rehackt@npm:^0.1.0": + version: 0.1.0 + resolution: "rehackt@npm:0.1.0" + peerDependencies: + "@types/react": "*" + react: "*" + peerDependenciesMeta: + "@types/react": + optional: true + react: + optional: true + checksum: 2c3bcd72524bf47672640265e79cba785e0e6837b9b385ccb0a3ea7d00f55a439d9aed3e0ae71e991d88e0d4b2b3158457c92e75fff5ebf99cd46e280068ddeb + languageName: node + linkType: hard + "repeat-element@npm:^1.1.2": version: 1.1.4 resolution: "repeat-element@npm:1.1.4" @@ -32966,6 +33394,13 @@ __metadata: languageName: node linkType: hard +"resolve-pkg-maps@npm:^1.0.0": + version: 1.0.0 + resolution: "resolve-pkg-maps@npm:1.0.0" + checksum: 1012afc566b3fdb190a6309cc37ef3b2dcc35dff5fa6683a9d00cd25c3247edfbc4691b91078c97adc82a29b77a2660c30d791d65dab4fc78bfc473f60289977 + languageName: node + linkType: hard + "resolve-url@npm:^0.2.1": version: 0.2.1 resolution: "resolve-url@npm:0.2.1" @@ -33126,13 +33561,6 @@ __metadata: languageName: node linkType: hard -"retimer@npm:^2.0.0": - version: 2.0.0 - resolution: "retimer@npm:2.0.0" - checksum: a59c837e1b364c4ef85c19250a94c09a49c55076ec3c5c51fafa335ee89d2ac2b91b7623548c8edb1345d7515b054986e904f8429e6caefa0595c2c70be8923d - languageName: node - linkType: hard - "retimer@npm:^3.0.0": version: 3.0.0 resolution: "retimer@npm:3.0.0" @@ -33238,7 +33666,7 @@ __metadata: languageName: node linkType: hard -"rlp@npm:^2.0.0, rlp@npm:^2.2.1, rlp@npm:^2.2.2, rlp@npm:^2.2.3, rlp@npm:^2.2.4": +"rlp@npm:^2.0.0, rlp@npm:^2.2.1, rlp@npm:^2.2.2, rlp@npm:^2.2.3, rlp@npm:^2.2.4, rlp@npm:^2.2.7": version: 2.2.7 resolution: "rlp@npm:2.2.7" dependencies: @@ -33628,6 +34056,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.6.0": + version: 7.6.2 + resolution: "semver@npm:7.6.2" + bin: + semver: bin/semver.js + checksum: 40f6a95101e8d854357a644da1b8dd9d93ce786d5c6a77227bc69dbb17bea83d0d1d1d7c4cd5920a6df909f48e8bd8a5909869535007f90278289f2451d0292d + languageName: node + linkType: hard + "semver@npm:~5.4.1": version: 5.4.1 resolution: "semver@npm:5.4.1" @@ -33728,6 +34165,20 @@ __metadata: languageName: node linkType: hard +"set-function-length@npm:^1.2.1": + version: 1.2.2 + resolution: "set-function-length@npm:1.2.2" + 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 + checksum: a8248bdacdf84cb0fab4637774d9fb3c7a8e6089866d04c817583ff48e14149c87044ce683d7f50759a8c50fb87c7a7e173535b06169c87ef76f5fb276dfff72 + languageName: node + linkType: hard + "set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1": version: 2.0.1 resolution: "set-function-name@npm:2.0.1" @@ -33921,6 +34372,18 @@ __metadata: languageName: node linkType: hard +"side-channel@npm:^1.0.6": + version: 1.0.6 + resolution: "side-channel@npm:1.0.6" + dependencies: + call-bind: ^1.0.7 + es-errors: ^1.3.0 + get-intrinsic: ^1.2.4 + object-inspect: ^1.13.1 + checksum: bfc1afc1827d712271453e91b7cd3878ac0efd767495fd4e594c4c2afaa7963b7b510e249572bfd54b0527e66e4a12b61b80c061389e129755f34c493aad9b97 + languageName: node + linkType: hard + "siginfo@npm:^2.0.0": version: 2.0.0 resolution: "siginfo@npm:2.0.0" @@ -34400,13 +34863,6 @@ __metadata: languageName: node linkType: hard -"sparse-array@npm:^1.3.1": - version: 1.3.2 - resolution: "sparse-array@npm:1.3.2" - checksum: 3b41741cfc29c568b09cbc0205fc613c16daebde358d9356b80d53d63e739012617e7e038be3c77a493ec007927784b9e0a0531cb76cf91d4f8cc7029391039b - languageName: node - linkType: hard - "spdx-correct@npm:^3.0.0": version: 3.2.0 resolution: "spdx-correct@npm:3.2.0" @@ -34695,7 +35151,7 @@ __metadata: languageName: node linkType: hard -"stream-to-it@npm:^0.2.2, stream-to-it@npm:^0.2.3": +"stream-to-it@npm:^0.2.2": version: 0.2.4 resolution: "stream-to-it@npm:0.2.4" dependencies: @@ -34725,13 +35181,6 @@ __metadata: languageName: node linkType: hard -"streaming-iterables@npm:^6.0.0": - version: 6.2.0 - resolution: "streaming-iterables@npm:6.2.0" - checksum: 1fb3c6833cbb028bf60f0de9b43e54d5940e4702868ad0016567cac7ecf9675572e05af86c723f5e172b57a2c913fea0289be6f44bea7747b71e4a398b7174da - languageName: node - linkType: hard - "streamsearch@npm:^1.1.0": version: 1.1.0 resolution: "streamsearch@npm:1.1.0" @@ -35011,15 +35460,6 @@ __metadata: languageName: node linkType: hard -"strip-indent@npm:^3.0.0": - version: 3.0.0 - resolution: "strip-indent@npm:3.0.0" - dependencies: - min-indent: ^1.0.0 - checksum: 18f045d57d9d0d90cd16f72b2313d6364fd2cb4bf85b9f593523ad431c8720011a4d5f08b6591c9d580f446e78855c5334a30fb91aa1560f5d9f95ed1b4a0530 - languageName: node - linkType: hard - "strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" @@ -35050,6 +35490,13 @@ __metadata: languageName: node linkType: hard +"stubborn-fs@npm:^1.2.5": + version: 1.2.5 + resolution: "stubborn-fs@npm:1.2.5" + checksum: 28d197afec1ec21ce7ffb06a42f01db19beecdf491694c53393ff5d92ec8a300df9c357e09a16d5cf55747ee2a70bc3c788b9e5577696061ffb9ae279655a600 + languageName: node + linkType: hard + "sturdy-websocket@npm:^0.1.12": version: 0.1.12 resolution: "sturdy-websocket@npm:0.1.12" @@ -35228,6 +35675,15 @@ __metadata: languageName: node linkType: hard +"sync-multihash-sha2@npm:^1.0.0": + version: 1.0.0 + resolution: "sync-multihash-sha2@npm:1.0.0" + dependencies: + "@noble/hashes": ^1.3.1 + checksum: 4cff79eb105be4b91593ce736454979dad6b3fd44b94007180941a652272be35646710302a705742998ff4ffa928cdc12d023cbbc9ef1f656d3fcc20f07451ca + languageName: node + linkType: hard + "sync-request@npm:6.1.0, sync-request@npm:^6.0.0": version: 6.1.0 resolution: "sync-request@npm:6.1.0" @@ -35515,13 +35971,6 @@ __metadata: languageName: node linkType: hard -"throttled-queue@npm:^2.1.2": - version: 2.1.4 - resolution: "throttled-queue@npm:2.1.4" - checksum: 99571cb816e1c2d3df678d6fdb0a73eca9ba1f8aa9026daf89855d4c9444491d70e3aecaaad6c77b1202ab773f78e03b9a91b1e89c4983f17835b783137266c7 - languageName: node - linkType: hard - "through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:^2.0.3": version: 2.0.5 resolution: "through2@npm:2.0.5" @@ -35555,16 +36004,6 @@ __metadata: languageName: node linkType: hard -"timeout-abort-controller@npm:^1.1.1": - version: 1.1.1 - resolution: "timeout-abort-controller@npm:1.1.1" - dependencies: - abort-controller: ^3.0.0 - retimer: ^2.0.0 - checksum: 070c220be4cac532f8cfbffccba3497baf3abe97d4bfc62344dba832b55a2eef1f0e60f33d862a1662e14852c9ef8ae952d1d93f5626d39b6592f29d7d00bd45 - languageName: node - linkType: hard - "timeout-abort-controller@npm:^2.0.0": version: 2.0.0 resolution: "timeout-abort-controller@npm:2.0.0" @@ -35614,7 +36053,7 @@ __metadata: languageName: node linkType: hard -"tiny-invariant@npm:^1.1.0, tiny-invariant@npm:^1.3.1": +"tiny-invariant@npm:^1.1.0": version: 1.3.1 resolution: "tiny-invariant@npm:1.3.1" checksum: 872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c @@ -35854,10 +36293,10 @@ __metadata: languageName: node linkType: hard -"trim-newlines@npm:^3.0.0": - version: 3.0.1 - resolution: "trim-newlines@npm:3.0.1" - checksum: b530f3fadf78e570cf3c761fb74fef655beff6b0f84b29209bac6c9622db75ad1417f4a7b5d54c96605dcd72734ad44526fef9f396807b90839449eb543c6206 +"treeify@npm:^1.1.0": + version: 1.1.0 + resolution: "treeify@npm:1.1.0" + checksum: aa00dded220c1dd052573bd6fc2c52862f09870851a284f0d3650d72bf913ba9b4f6b824f4f1ab81899bae29375f4266b07fe47cbf82343a1efa13cc09ce87af languageName: node linkType: hard @@ -36173,6 +36612,22 @@ __metadata: languageName: node linkType: hard +"tsx@npm:^4.16.2": + version: 4.16.2 + resolution: "tsx@npm:4.16.2" + dependencies: + esbuild: ~0.21.5 + fsevents: ~2.3.3 + get-tsconfig: ^4.7.5 + dependenciesMeta: + fsevents: + optional: true + bin: + tsx: dist/cli.mjs + checksum: bd481097d4614b9d40e7e2c44f7078d9f92b0050e959574a7a88ad8af33327d787f9d76c89689ee19b1275270038705fb9851055ae1a20e15d1c62a34d51a8fd + languageName: node + linkType: hard + "tty-browserify@npm:0.0.0": version: 0.0.0 resolution: "tty-browserify@npm:0.0.0" @@ -36249,13 +36704,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.18.0": - version: 0.18.1 - resolution: "type-fest@npm:0.18.1" - checksum: e96dcee18abe50ec82dab6cbc4751b3a82046da54c52e3b2d035b3c519732c0b3dd7a2fa9df24efd1a38d953d8d4813c50985f215f1957ee5e4f26b0fe0da395 - languageName: node - linkType: hard - "type-fest@npm:^0.20.2": version: 0.20.2 resolution: "type-fest@npm:0.20.2" @@ -36270,13 +36718,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.6.0": - version: 0.6.0 - resolution: "type-fest@npm:0.6.0" - checksum: b2188e6e4b21557f6e92960ec496d28a51d68658018cba8b597bd3ef757721d1db309f120ae987abeeda874511d14b776157ff809f23c6d1ce8f83b9b2b7d60f - languageName: node - linkType: hard - "type-fest@npm:^0.7.1": version: 0.7.1 resolution: "type-fest@npm:0.7.1" @@ -36284,13 +36725,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.8.1": - version: 0.8.1 - resolution: "type-fest@npm:0.8.1" - checksum: d61c4b2eba24009033ae4500d7d818a94fd6d1b481a8111612ee141400d5f1db46f199c014766b9fa9b31a6a7374d96fc748c6d688a78a3ce5a33123839becb7 - languageName: node - linkType: hard - "type-fest@npm:^1.0.2": version: 1.4.0 resolution: "type-fest@npm:1.4.0" @@ -36298,6 +36732,20 @@ __metadata: languageName: node linkType: hard +"type-fest@npm:^2.11.2": + version: 2.19.0 + resolution: "type-fest@npm:2.19.0" + checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278 + languageName: node + linkType: hard + +"type-fest@npm:^4.9.0": + version: 4.21.0 + resolution: "type-fest@npm:4.21.0" + checksum: 32d3536acac388cc32a3c0e31966d36e44124ffd6cb7d6f6c846602ffdeda68b723f5fdcd13d136f9d855b166e5c1d529bcdfac9d5d0ed4e96cff4867710adae + languageName: node + linkType: hard + "type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" @@ -36557,6 +37005,15 @@ __metadata: languageName: node linkType: hard +"uint8arraylist@npm:^2.4.3": + version: 2.4.8 + resolution: "uint8arraylist@npm:2.4.8" + dependencies: + uint8arrays: ^5.0.1 + checksum: 8259124cf5c7acd29edeed346489d898f3eb12f129dadedb1c263ad8d637e1a2f689968934a94c16804e39f6e8765178507be6d7b3c3c6b67147ad7546d34186 + languageName: node + linkType: hard + "uint8arrays@npm:3.1.1, uint8arrays@npm:^3.0.0, uint8arrays@npm:^3.1.0": version: 3.1.1 resolution: "uint8arrays@npm:3.1.1" @@ -36584,6 +37041,24 @@ __metadata: languageName: node linkType: hard +"uint8arrays@npm:^4.0.6": + version: 4.0.10 + resolution: "uint8arrays@npm:4.0.10" + dependencies: + multiformats: ^12.0.1 + checksum: 784677a00f67d18d3aaaf441422b4055576e1ab76dbf276e474b86c91ddb95945ac1cc95a97979ab1f3b3c9a0ebeea74dd803ec6056adbd1ee6ef2f231f00f97 + languageName: node + linkType: hard + +"uint8arrays@npm:^5.0.1, uint8arrays@npm:^5.0.3": + version: 5.1.0 + resolution: "uint8arrays@npm:5.1.0" + dependencies: + multiformats: ^13.0.0 + checksum: 6284d0591183df48cb09627e0c4dfd059eb3576997007ec593cb501a30e7a67fd17c1d6358e45242c0f8b7f6cf54e68412ab3b7473bc00aad5acac323e6861ca + languageName: node + linkType: hard + "ultron@npm:~1.1.0": version: 1.1.1 resolution: "ultron@npm:1.1.1" @@ -36802,7 +37277,7 @@ __metadata: languageName: node linkType: hard -"uri-js@npm:^4.2.2": +"uri-js@npm:^4.2.2, uri-js@npm:^4.4.1": version: 4.4.1 resolution: "uri-js@npm:4.4.1" dependencies: @@ -36931,7 +37406,7 @@ __metadata: languageName: node linkType: hard -"util@npm:^0.12.0, util@npm:^0.12.3, util@npm:^0.12.4, util@npm:^0.12.5, util@npm:~0.12.0": +"util@npm:^0.12.0, util@npm:^0.12.4, util@npm:^0.12.5, util@npm:~0.12.0": version: 0.12.5 resolution: "util@npm:0.12.5" dependencies: @@ -37403,20 +37878,7 @@ __metadata: languageName: node linkType: hard -"web-encoding@npm:1.1.5": - version: 1.1.5 - resolution: "web-encoding@npm:1.1.5" - dependencies: - "@zxing/text-encoding": 0.9.0 - util: ^0.12.3 - dependenciesMeta: - "@zxing/text-encoding": - optional: true - checksum: 2234a2b122f41006ce07859b3c0bf2e18f46144fda2907d5db0b571b76aa5c26977c646100ad9c00d2f8a4f6f2b848bc02147845d8c447ab365ec4eff376338d - languageName: node - linkType: hard - -"web-streams-polyfill@npm:^3.0.3, web-streams-polyfill@npm:^3.1.1, web-streams-polyfill@npm:^3.2.1": +"web-streams-polyfill@npm:^3.0.3, web-streams-polyfill@npm:^3.2.1": version: 3.2.1 resolution: "web-streams-polyfill@npm:3.2.1" checksum: b119c78574b6d65935e35098c2afdcd752b84268e18746606af149e3c424e15621b6f1ff0b42b2676dc012fc4f0d313f964b41a4b5031e525faa03997457da02 @@ -38476,6 +38938,13 @@ __metadata: languageName: node linkType: hard +"when-exit@npm:^2.1.1": + version: 2.1.3 + resolution: "when-exit@npm:2.1.3" + checksum: d4242a15148df89e08e518b4c372580516d45a6ab527f14643a3789c6edb9ccfc788b1d717728c1a33c85dc53badefb511a3ee704ea61c4e86f693f3bf7666f2 + languageName: node + linkType: hard + "which-boxed-primitive@npm:^1.0.2": version: 1.0.2 resolution: "which-boxed-primitive@npm:1.0.2" @@ -39100,7 +39569,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3": +"yargs-parser@npm:^20.2.2": version: 20.2.9 resolution: "yargs-parser@npm:20.2.9" checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3 From a08485710a7972931e9c4a12ffa4a054ae81130f Mon Sep 17 00:00:00 2001 From: sirpy Date: Tue, 9 Jul 2024 15:26:16 +0300 Subject: [PATCH 2/5] add: upgrade to node 20 --- .github/workflows/deploy.yml | 2 +- .github/workflows/preview.yml | 2 +- .github/workflows/pull-request.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8915aaf5..07e9cb1c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: yarn - run: yarn install --immutable - run: yarn vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 4588da12..0de90077 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 cache: yarn - run: yarn install --immutable # build the local mono-repo dependencies diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 97374bec..cf543b9c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - node-version: [18.x] + node-version: [20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: From 3eac3940d8033f602d239eddccf2f684475bf4fc Mon Sep 17 00:00:00 2001 From: sirpy Date: Tue, 9 Jul 2024 17:36:53 +0300 Subject: [PATCH 3/5] fix: ts errors --- .../app/src/hooks/apollo/useCreateMongoDbApolloClient.ts | 4 ++-- packages/app/src/lib/totalDurationInSeconds.ts | 4 ---- packages/app/src/utils/index.tsx | 6 ------ packages/app/web/shim.ts | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/app/src/hooks/apollo/useCreateMongoDbApolloClient.ts b/packages/app/src/hooks/apollo/useCreateMongoDbApolloClient.ts index 58c4730a..05916401 100644 --- a/packages/app/src/hooks/apollo/useCreateMongoDbApolloClient.ts +++ b/packages/app/src/hooks/apollo/useCreateMongoDbApolloClient.ts @@ -46,7 +46,7 @@ export const useCreateMongoDbApolloClient = (): ApolloClient | undefined => const httpLink = new HttpLink({ uri: mongoDbUri, - fetch: async (uri, options) => { + fetch: async (url, options) => { const accessToken = await getValidAccessToken(); if (!options) { options = {}; @@ -55,7 +55,7 @@ export const useCreateMongoDbApolloClient = (): ApolloClient | undefined => options.headers = {}; } (options.headers as Record).Authorization = `Bearer ${accessToken}`; - return fetch(uri, options); + return fetch(url as string, options); }, }); diff --git a/packages/app/src/lib/totalDurationInSeconds.ts b/packages/app/src/lib/totalDurationInSeconds.ts index 24d535fe..7a78695f 100644 --- a/packages/app/src/lib/totalDurationInSeconds.ts +++ b/packages/app/src/lib/totalDurationInSeconds.ts @@ -3,10 +3,6 @@ import { Frequency } from '../models/constants'; export const totalDurationInSeconds = (duration: number, frequency: Frequency): number => { if (frequency === Frequency.OneTime) { return 0; - } else if (frequency === Frequency.Daily) { - return duration * 24 * 60 * 60; - } else if (frequency === Frequency.Weekly) { - return duration * 7 * 24 * 60 * 60; } const now = new Date(); diff --git a/packages/app/src/utils/index.tsx b/packages/app/src/utils/index.tsx index c940e09e..38b9b0f0 100644 --- a/packages/app/src/utils/index.tsx +++ b/packages/app/src/utils/index.tsx @@ -84,13 +84,7 @@ export function getDonateStyles(state: ButtonState): DonateStylesResult { export function getFrequencyPlural(frequency: Frequency) { switch (frequency) { - case 'Daily': - return 'Days'; - case 'Weekly': - return 'Weeks'; case 'Monthly': return 'Months'; - case 'Yearly': - return 'Years'; } } diff --git a/packages/app/web/shim.ts b/packages/app/web/shim.ts index fe88bb1c..4e8c842f 100644 --- a/packages/app/web/shim.ts +++ b/packages/app/web/shim.ts @@ -1,4 +1,4 @@ // fix uniswap sdk issue -globalThis.Browser = { +(globalThis as any).Browser = { T: () => {}, }; From f3042d1906bd7f44f30d1d2610e275e92630e349 Mon Sep 17 00:00:00 2001 From: sirpy Date: Wed, 10 Jul 2024 15:36:08 +0300 Subject: [PATCH 4/5] Update packages/app/src/components/RoundedButton.tsx Co-authored-by: Lewis B --- packages/app/src/components/RoundedButton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/components/RoundedButton.tsx b/packages/app/src/components/RoundedButton.tsx index eb1b8707..9d5008f6 100644 --- a/packages/app/src/components/RoundedButton.tsx +++ b/packages/app/src/components/RoundedButton.tsx @@ -37,7 +37,7 @@ function RoundedButton({ disabled={disabled} style={[styles.button, { backgroundColor, maxWidth: maxWidth ?? 'auto' }]} onPress={onPress}> - {isLoading && } + {isLoading ? () : ({title})} {!isLoading && {title}} From 5e9ce9a807f3553fa72877cadebd10fe8d663a4d Mon Sep 17 00:00:00 2001 From: sirpy Date: Wed, 10 Jul 2024 15:39:34 +0300 Subject: [PATCH 5/5] Update RoundedButton.tsx --- packages/app/src/components/RoundedButton.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/app/src/components/RoundedButton.tsx b/packages/app/src/components/RoundedButton.tsx index 9d5008f6..1baa8f55 100644 --- a/packages/app/src/components/RoundedButton.tsx +++ b/packages/app/src/components/RoundedButton.tsx @@ -38,8 +38,6 @@ function RoundedButton({ style={[styles.button, { backgroundColor, maxWidth: maxWidth ?? 'auto' }]} onPress={onPress}> {isLoading ? () : ({title})} - - {!isLoading && {title}} ); }