From 9223328033e381392d77b51a6e6b86ee4cdfff00 Mon Sep 17 00:00:00 2001 From: Gancho Radkov <43912948+ganchoradkov@users.noreply.github.com> Date: Fri, 11 Oct 2024 12:11:50 +0300 Subject: [PATCH] refactor:`@reown/walletkit` (#710) * refactor: replaces `@walletconnect/web3wallet` with `@reown/walletkit` * refactor: package name --- advanced/wallets/react-wallet-v2/package.json | 2 +- .../react-wallet-v2/src/components/Modal.tsx | 3 - .../components/MultibridgeRequestModal.tsx | 4 +- .../src/hooks/useInitialization.ts | 6 +- .../hooks/useWalletConnectEventsManager.ts | 35 ++-- .../react-wallet-v2/src/lib/NearLib.ts | 6 +- .../react-wallet-v2/src/pages/_app.tsx | 6 +- .../react-wallet-v2/src/pages/pairings.tsx | 6 +- .../react-wallet-v2/src/pages/session.tsx | 16 +- .../react-wallet-v2/src/pages/settings.tsx | 4 +- .../src/pages/walletconnect.tsx | 12 +- .../wallets/react-wallet-v2/src/pages/wc.tsx | 6 +- .../react-wallet-v2/src/store/ModalStore.ts | 4 +- .../src/utils/EIP7715RequestHandlerUtils.ts | 4 +- .../src/utils/WalletConnectUtil.ts | 18 +- .../src/views/AuthRequestModal.tsx | 94 ---------- .../src/views/SessionAuthenticateModal.tsx | 38 ++-- .../views/SessionGrantPermissionsModal.tsx | 34 ++-- .../src/views/SessionProposalModal.tsx | 8 +- .../src/views/SessionSendCallsModal.tsx | 6 +- .../src/views/SessionSendTransactionModal.tsx | 6 +- .../src/views/SessionSignCosmosModal.tsx | 6 +- .../src/views/SessionSignKadenaModal.tsx | 6 +- .../src/views/SessionSignModal.tsx | 6 +- .../src/views/SessionSignMultiversxModal.tsx | 6 +- .../src/views/SessionSignNearModal.tsx | 6 +- .../src/views/SessionSignPolkadotModal.tsx | 6 +- .../src/views/SessionSignSolanaModal.tsx | 6 +- .../src/views/SessionSignTezosModal.tsx | 6 +- .../src/views/SessionSignTronModal.tsx | 6 +- .../src/views/SessionSignTypedDataModal.tsx | 6 +- advanced/wallets/react-wallet-v2/yarn.lock | 173 +++--------------- 32 files changed, 157 insertions(+), 394 deletions(-) delete mode 100644 advanced/wallets/react-wallet-v2/src/views/AuthRequestModal.tsx diff --git a/advanced/wallets/react-wallet-v2/package.json b/advanced/wallets/react-wallet-v2/package.json index 8b04acdd4..bf802dc42 100644 --- a/advanced/wallets/react-wallet-v2/package.json +++ b/advanced/wallets/react-wallet-v2/package.json @@ -33,7 +33,7 @@ "@taquito/signer": "^15.1.0", "@taquito/taquito": "^15.1.0", "@types/semver": "^7.5.8", - "@walletconnect/web3wallet": "1.15.1", + "@reown/walletkit": "1.0.0", "@zerodev/ecdsa-validator": "5.3.0", "@zerodev/presets": "5.3.0", "@zerodev/sdk": "5.3.1", diff --git a/advanced/wallets/react-wallet-v2/src/components/Modal.tsx b/advanced/wallets/react-wallet-v2/src/components/Modal.tsx index 8048a20a5..f8fba7876 100644 --- a/advanced/wallets/react-wallet-v2/src/components/Modal.tsx +++ b/advanced/wallets/react-wallet-v2/src/components/Modal.tsx @@ -16,7 +16,6 @@ import SessionSendCallsModal from '@/views/SessionSendCallsModal' import { Modal as NextModal } from '@nextui-org/react' import { useSnapshot } from 'valtio' import { useCallback, useMemo } from 'react' -import AuthRequestModal from '@/views/AuthRequestModal' import LoadingModal from '@/views/LoadingModal' import SessionAuthenticateModal from '@/views/SessionAuthenticateModal' import SessionGrantPermissionsModal from '@/views/SessionGrantPermissionsModal' @@ -62,8 +61,6 @@ export default function Modal() { return case 'SessionSignKadenaModal': return - case 'AuthRequestModal': - return case 'LoadingModal': return case 'SessionAuthenticateModal': diff --git a/advanced/wallets/react-wallet-v2/src/components/MultibridgeRequestModal.tsx b/advanced/wallets/react-wallet-v2/src/components/MultibridgeRequestModal.tsx index 03ce79ba7..92bbfec3a 100644 --- a/advanced/wallets/react-wallet-v2/src/components/MultibridgeRequestModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/components/MultibridgeRequestModal.tsx @@ -2,7 +2,7 @@ import { LoaderProps } from '@/components/ModalFooter' import RequestMethodCard from '@/components/RequestMethodCard' import { Avatar, Col, Container, Divider, Row, Text } from '@nextui-org/react' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from './RequestModal' import ModalStore from '@/store/ModalStore' import { useCallback, useState } from 'react' @@ -92,7 +92,7 @@ export default function MultibridgeRequestModal({ } ms` ) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/hooks/useInitialization.ts b/advanced/wallets/react-wallet-v2/src/hooks/useInitialization.ts index ee318d3ad..f0f56ea3a 100644 --- a/advanced/wallets/react-wallet-v2/src/hooks/useInitialization.ts +++ b/advanced/wallets/react-wallet-v2/src/hooks/useInitialization.ts @@ -7,7 +7,7 @@ import { createOrRestoreNearWallet } from '@/utils/NearWalletUtil' import { createOrRestoreMultiversxWallet } from '@/utils/MultiversxWalletUtil' import { createOrRestoreTronWallet } from '@/utils/TronWalletUtil' import { createOrRestoreTezosWallet } from '@/utils/TezosWalletUtil' -import { createWeb3Wallet, web3wallet } from '@/utils/WalletConnectUtil' +import { createWalletKit, walletkit } from '@/utils/WalletConnectUtil' import { createOrRestoreKadenaWallet } from '@/utils/KadenaWalletUtil' import { useCallback, useEffect, useRef, useState } from 'react' import { useSnapshot } from 'valtio' @@ -42,7 +42,7 @@ export default function useInitialization() { SettingsStore.setTronAddress(tronAddresses[0]) SettingsStore.setTezosAddress(tezosAddresses[0]) SettingsStore.setKadenaAddress(kadenaAddresses[0]) - await createWeb3Wallet(relayerRegionURL) + await createWalletKit(relayerRegionURL) setInitialized(true) } catch (err: unknown) { console.error('Initialization failed', err) @@ -54,7 +54,7 @@ export default function useInitialization() { // restart transport if relayer region changes const onRelayerRegionChange = useCallback(() => { try { - web3wallet?.core?.relayer.restartTransport(relayerRegionURL) + walletkit?.core?.relayer.restartTransport(relayerRegionURL) prevRelayerURLValue.current = relayerRegionURL } catch (err: unknown) { alert(err) diff --git a/advanced/wallets/react-wallet-v2/src/hooks/useWalletConnectEventsManager.ts b/advanced/wallets/react-wallet-v2/src/hooks/useWalletConnectEventsManager.ts index 1d286012b..4cf2d9665 100644 --- a/advanced/wallets/react-wallet-v2/src/hooks/useWalletConnectEventsManager.ts +++ b/advanced/wallets/react-wallet-v2/src/hooks/useWalletConnectEventsManager.ts @@ -1,4 +1,3 @@ -import { Web3WalletTypes } from '@walletconnect/web3wallet' import { COSMOS_SIGNING_METHODS } from '@/data/COSMOSData' import { EIP155_SIGNING_METHODS } from '@/data/EIP155Data' import { EIP5792_METHODS } from '@/data/EIP5792Data' @@ -8,7 +7,7 @@ import { MULTIVERSX_SIGNING_METHODS } from '@/data/MultiversxData' import { TRON_SIGNING_METHODS } from '@/data/TronData' import ModalStore from '@/store/ModalStore' import SettingsStore from '@/store/SettingsStore' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import { SignClientTypes } from '@walletconnect/types' import { useCallback, useEffect, useMemo } from 'react' import { NEAR_SIGNING_METHODS } from '@/data/NEARData' @@ -35,12 +34,6 @@ export default function useWalletConnectEventsManager(initialized: boolean) { }, [] ) - /****************************************************************************** - * 2. Open Auth modal for confirmation / rejection - *****************************************************************************/ - const onAuthRequest = useCallback((request: Web3WalletTypes.AuthRequest) => { - ModalStore.open('AuthRequestModal', { request }) - }, []) /****************************************************************************** * 3. Open request handling modal based on method that was used @@ -49,7 +42,7 @@ export default function useWalletConnectEventsManager(initialized: boolean) { async (requestEvent: SignClientTypes.EventArguments['session_request']) => { const { topic, params, verifyContext, id } = requestEvent const { request } = params - const requestSession = web3wallet.engine.signClient.session.get(topic) + const requestSession = walletkit.engine.signClient.session.get(topic) // set the verify context so it can be displayed in the projectInfoCard SettingsStore.setCurrentRequestVerifyContext(verifyContext) switch (request.method) { @@ -72,13 +65,13 @@ export default function useWalletConnectEventsManager(initialized: boolean) { case EIP5792_METHODS.WALLET_GET_CAPABILITIES: case EIP5792_METHODS.WALLET_GET_CALLS_STATUS: - return await web3wallet.respondSessionRequest({ + return await walletkit.respondSessionRequest({ topic, response: await approveEIP5792Request(requestEvent) }) case EIP5792_METHODS.WALLET_SHOW_CALLS_STATUS: - return await web3wallet.respondSessionRequest({ + return await walletkit.respondSessionRequest({ topic, response: formatJsonRpcError(id, "Wallet currently don't show call status.") }) @@ -91,7 +84,7 @@ export default function useWalletConnectEventsManager(initialized: boolean) { * if EOA, we can submit call one by one, but need to have a data structure * to return bundle id, for all the calls, */ - return await web3wallet.respondSessionRequest({ + return await walletkit.respondSessionRequest({ topic, response: formatJsonRpcError(id, "Wallet currently don't support batch call for EOA") }) @@ -131,7 +124,7 @@ export default function useWalletConnectEventsManager(initialized: boolean) { return ModalStore.open('SessionSignMultiversxModal', { requestEvent, requestSession }) case NEAR_SIGNING_METHODS.NEAR_GET_ACCOUNTS: - return web3wallet.respondSessionRequest({ + return walletkit.respondSessionRequest({ topic, response: await approveNearRequest(requestEvent) }) @@ -166,21 +159,19 @@ export default function useWalletConnectEventsManager(initialized: boolean) { * Set up WalletConnect event listeners *****************************************************************************/ useEffect(() => { - if (initialized && web3wallet) { + if (initialized && walletkit) { //sign - web3wallet.on('session_proposal', onSessionProposal) - web3wallet.on('session_request', onSessionRequest) - // auth - web3wallet.on('auth_request', onAuthRequest) + walletkit.on('session_proposal', onSessionProposal) + walletkit.on('session_request', onSessionRequest) // TODOs - web3wallet.engine.signClient.events.on('session_ping', data => console.log('ping', data)) - web3wallet.on('session_delete', data => { + walletkit.engine.signClient.events.on('session_ping', data => console.log('ping', data)) + walletkit.on('session_delete', data => { console.log('session_delete event received', data) refreshSessionsList() }) - web3wallet.on('session_authenticate', onSessionAuthenticate) + walletkit.on('session_authenticate', onSessionAuthenticate) // load sessions on init refreshSessionsList() } - }, [initialized, onAuthRequest, onSessionAuthenticate, onSessionProposal, onSessionRequest]) + }, [initialized, onSessionAuthenticate, onSessionProposal, onSessionRequest]) } diff --git a/advanced/wallets/react-wallet-v2/src/lib/NearLib.ts b/advanced/wallets/react-wallet-v2/src/lib/NearLib.ts index 897a98348..e735c5f60 100644 --- a/advanced/wallets/react-wallet-v2/src/lib/NearLib.ts +++ b/advanced/wallets/react-wallet-v2/src/lib/NearLib.ts @@ -7,7 +7,7 @@ import { } from 'near-api-js' import { AccessKeyView } from 'near-api-js/lib/providers/provider' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import { NEAR_TEST_CHAINS, TNearChain } from '@/data/NEARData' import { Schema, serialize } from 'borsh' @@ -184,7 +184,7 @@ export class NearWallet { } private isAccountsValid(topic: string, accounts: Array<{ accountId: string }>) { - const session = web3wallet.engine.signClient.session.get(topic) + const session = walletkit.engine.signClient.session.get(topic) const validAccountIds = session.namespaces.near.accounts.map(accountId => { return accountId.split(':')[2] }) @@ -243,7 +243,7 @@ export class NearWallet { } async getAccounts({ topic }: GetAccountsParams): Promise> { - const session = web3wallet.engine.signClient.session.get(topic) + const session = walletkit.engine.signClient.session.get(topic) return Promise.all( session.namespaces.near.accounts.map(async account => { const accountId = account.split(':')[2] diff --git a/advanced/wallets/react-wallet-v2/src/pages/_app.tsx b/advanced/wallets/react-wallet-v2/src/pages/_app.tsx index 8cf397609..3851a9d63 100644 --- a/advanced/wallets/react-wallet-v2/src/pages/_app.tsx +++ b/advanced/wallets/react-wallet-v2/src/pages/_app.tsx @@ -6,7 +6,7 @@ import Layout from '@/components/Layout' import Modal from '@/components/Modal' import useInitialization from '@/hooks/useInitialization' import useWalletConnectEventsManager from '@/hooks/useWalletConnectEventsManager' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import { RELAYER_EVENTS } from '@walletconnect/core' import { AppProps } from 'next/app' import '../../public/main.css' @@ -20,11 +20,11 @@ export default function App({ Component, pageProps }: AppProps) { useWalletConnectEventsManager(initialized) useEffect(() => { if (!initialized) return - web3wallet?.core.relayer.on(RELAYER_EVENTS.connect, () => { + walletkit?.core.relayer.on(RELAYER_EVENTS.connect, () => { styledToast('Network connection is restored!', 'success') }) - web3wallet?.core.relayer.on(RELAYER_EVENTS.disconnect, () => { + walletkit?.core.relayer.on(RELAYER_EVENTS.disconnect, () => { styledToast('Network connection lost.', 'error') }) }, [initialized]) diff --git a/advanced/wallets/react-wallet-v2/src/pages/pairings.tsx b/advanced/wallets/react-wallet-v2/src/pages/pairings.tsx index 85521797a..11429efd6 100644 --- a/advanced/wallets/react-wallet-v2/src/pages/pairings.tsx +++ b/advanced/wallets/react-wallet-v2/src/pages/pairings.tsx @@ -1,15 +1,15 @@ import PageHeader from '@/components/PageHeader' import PairingCard from '@/components/PairingCard' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import { Text } from '@nextui-org/react' import { getSdkError } from '@walletconnect/utils' import { Fragment, useState } from 'react' export default function PairingsPage() { - const [pairings, setPairings] = useState(web3wallet.core.pairing.getPairings()) + const [pairings, setPairings] = useState(walletkit.core.pairing.getPairings()) async function onDelete(topic: string) { - await web3wallet.disconnectSession({ topic, reason: getSdkError('USER_DISCONNECTED') }) + await walletkit.disconnectSession({ topic, reason: getSdkError('USER_DISCONNECTED') }) const newPairings = pairings.filter(pairing => pairing.topic !== topic) setPairings(newPairings) } diff --git a/advanced/wallets/react-wallet-v2/src/pages/session.tsx b/advanced/wallets/react-wallet-v2/src/pages/session.tsx index 9c970efeb..c4b38bd94 100644 --- a/advanced/wallets/react-wallet-v2/src/pages/session.tsx +++ b/advanced/wallets/react-wallet-v2/src/pages/session.tsx @@ -3,7 +3,7 @@ import PageHeader from '@/components/PageHeader' import ProjectInfoCard from '@/components/ProjectInfoCard' import SessionChainCard from '@/components/SessionChainCard' import { styledToast } from '@/utils/HelperUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import { Button, Col, Divider, Loading, Row, Text } from '@nextui-org/react' import { getSdkError } from '@walletconnect/utils' import { useRouter } from 'next/router' @@ -29,7 +29,7 @@ export default function SessionPage() { }, [query]) const session = useMemo( - () => web3wallet.engine.signClient.session.values.find(s => s.topic === topic), + () => walletkit.engine.signClient.session.values.find(s => s.topic === topic), [topic] ) const namespaces = useMemo(() => session?.namespaces, [session]) @@ -38,7 +38,7 @@ export default function SessionPage() { const expiryDate = useMemo(() => new Date(session?.expiry! * 1000), [session]) const getPendingRequests = useCallback(() => { if (!session) return - const allPending = web3wallet.getPendingSessionRequests() + const allPending = walletkit.getPendingSessionRequests() const requestsForSession = allPending?.filter(r => r.topic === session.topic) setPendingRequests(requestsForSession) }, [session]) @@ -55,7 +55,7 @@ export default function SessionPage() { const onDeleteSession = useCallback(async () => { setDeleteLoading(true) try { - await web3wallet.disconnectSession({ topic, reason: getSdkError('USER_DISCONNECTED') }) + await walletkit.disconnectSession({ topic, reason: getSdkError('USER_DISCONNECTED') }) replace('/sessions') } catch (e) { styledToast((e as Error).message, 'error') @@ -65,7 +65,7 @@ export default function SessionPage() { const onSessionPing = useCallback(async () => { setPingLoading(true) - await web3wallet.engine.signClient.ping({ topic }) + await walletkit.engine.signClient.ping({ topic }) setPingLoading(false) }, [topic]) @@ -74,7 +74,7 @@ export default function SessionPage() { try { const namespace = Object.keys(session?.namespaces!)[0] const chainId = session?.namespaces[namespace].chains?.[0] - await web3wallet.emitSessionEvent({ + await walletkit.emitSessionEvent({ topic, event: { name: 'chainChanged', data: 'Hello World' }, chainId: chainId! // chainId: 'eip155:1' @@ -88,11 +88,11 @@ export default function SessionPage() { const onSessionUpdate = useCallback(async () => { setUpdateLoading(true) try { - const session = web3wallet.engine.signClient.session.get(topic) + const session = walletkit.engine.signClient.session.get(topic) const baseAddress = '0x70012948c348CBF00806A3C79E3c5DAdFaAa347' const namespaceKeyToUpdate = Object.keys(session?.namespaces)[0] const namespaceToUpdate = session?.namespaces[namespaceKeyToUpdate] - await web3wallet.updateSession({ + await walletkit.updateSession({ topic, namespaces: { ...session?.namespaces, diff --git a/advanced/wallets/react-wallet-v2/src/pages/settings.tsx b/advanced/wallets/react-wallet-v2/src/pages/settings.tsx index a580064d8..cbe3efd8d 100644 --- a/advanced/wallets/react-wallet-v2/src/pages/settings.tsx +++ b/advanced/wallets/react-wallet-v2/src/pages/settings.tsx @@ -40,8 +40,8 @@ export default function SettingsPage() { Packages - @walletconnect/web3wallet - {packageJSON.dependencies['@walletconnect/web3wallet']} + @reown/walletkit + {packageJSON.dependencies['@reown/walletkit']} diff --git a/advanced/wallets/react-wallet-v2/src/pages/walletconnect.tsx b/advanced/wallets/react-wallet-v2/src/pages/walletconnect.tsx index b2029d5df..712981d99 100644 --- a/advanced/wallets/react-wallet-v2/src/pages/walletconnect.tsx +++ b/advanced/wallets/react-wallet-v2/src/pages/walletconnect.tsx @@ -1,7 +1,7 @@ import { parseUri } from '@walletconnect/utils' import PageHeader from '@/components/PageHeader' import QrReader from '@/components/QrReader' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import { Button, Input, Loading, Text } from '@nextui-org/react' import { Fragment, useEffect, useState } from 'react' import { styledToast } from '@/utils/HelperUtil' @@ -19,16 +19,16 @@ export default function WalletConnectPage(params: { deepLink?: string }) { if (pairingTopic === topic) { styledToast('Pairing expired. Please try again with new Connection URI', 'error') ModalStore.close() - web3wallet.core.pairing.events.removeListener('pairing_expire', pairingExpiredListener) + walletkit.core.pairing.events.removeListener('pairing_expire', pairingExpiredListener) } } - web3wallet.once('session_proposal', () => { - web3wallet.core.pairing.events.removeListener('pairing_expire', pairingExpiredListener) + walletkit.once('session_proposal', () => { + walletkit.core.pairing.events.removeListener('pairing_expire', pairingExpiredListener) }) try { setLoading(true) - web3wallet.core.pairing.events.on('pairing_expire', pairingExpiredListener) - await web3wallet.pair({ uri }) + walletkit.core.pairing.events.on('pairing_expire', pairingExpiredListener) + await walletkit.pair({ uri }) } catch (error) { styledToast((error as Error).message, 'error') ModalStore.close() diff --git a/advanced/wallets/react-wallet-v2/src/pages/wc.tsx b/advanced/wallets/react-wallet-v2/src/pages/wc.tsx index 287efaa00..82a271720 100644 --- a/advanced/wallets/react-wallet-v2/src/pages/wc.tsx +++ b/advanced/wallets/react-wallet-v2/src/pages/wc.tsx @@ -5,7 +5,7 @@ import WalletConnectPage from './walletconnect' import ModalStore from '@/store/ModalStore' import { useSnapshot } from 'valtio' import SettingsStore from '@/store/SettingsStore' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' export default function DeepLinkPairingPage() { const state = useSnapshot(ModalStore.state) @@ -58,6 +58,6 @@ export default function DeepLinkPairingPage() { } export function refreshSessionsList() { - if (!web3wallet) return - SettingsStore.setSessions(Object.values(web3wallet.getActiveSessions())) + if (!walletkit) return + SettingsStore.setSessions(Object.values(walletkit.getActiveSessions())) } diff --git a/advanced/wallets/react-wallet-v2/src/store/ModalStore.ts b/advanced/wallets/react-wallet-v2/src/store/ModalStore.ts index 841b404d2..909c34a35 100644 --- a/advanced/wallets/react-wallet-v2/src/store/ModalStore.ts +++ b/advanced/wallets/react-wallet-v2/src/store/ModalStore.ts @@ -1,5 +1,5 @@ import { SessionTypes, SignClientTypes } from '@walletconnect/types' -import { Web3WalletTypes } from '@walletconnect/web3wallet' +import { WalletKitTypes } from '@reown/walletkit' import { proxy } from 'valtio' /** @@ -9,7 +9,6 @@ interface ModalData { proposal?: SignClientTypes.EventArguments['session_proposal'] requestEvent?: SignClientTypes.EventArguments['session_request'] requestSession?: SessionTypes.Struct - request?: Web3WalletTypes.AuthRequest loadingMessage?: string authRequest?: SignClientTypes.EventArguments['session_authenticate'] } @@ -32,7 +31,6 @@ interface State { | 'SessionSignTronModal' | 'SessionSignTezosModal' | 'SessionSignKadenaModal' - | 'AuthRequestModal' | 'SessionAuthenticateModal' | 'LoadingModal' data?: ModalData diff --git a/advanced/wallets/react-wallet-v2/src/utils/EIP7715RequestHandlerUtils.ts b/advanced/wallets/react-wallet-v2/src/utils/EIP7715RequestHandlerUtils.ts index accef33e0..74db36a85 100644 --- a/advanced/wallets/react-wallet-v2/src/utils/EIP7715RequestHandlerUtils.ts +++ b/advanced/wallets/react-wallet-v2/src/utils/EIP7715RequestHandlerUtils.ts @@ -8,7 +8,7 @@ import { WalletGrantPermissionsResponse } from '@/data/EIP7715Data' import { SafeSmartAccountLib } from '@/lib/smart-accounts/SafeSmartAccountLib' -import { web3wallet } from './WalletConnectUtil' +import { walletkit } from './WalletConnectUtil' import { smartAccountWallets } from './SmartAccountUtil' import { KernelSmartAccountLib } from '@/lib/smart-accounts/KernelSmartAccountLib' type RequestEventArgs = Omit @@ -43,7 +43,7 @@ function getSmartAccountLibFromSession(requestSession: SessionTypes.Struct, chai export async function approveEIP7715Request(requestEvent: RequestEventArgs) { const { params, id, topic } = requestEvent - const requestSession = web3wallet.engine.signClient.session.get(topic) + const requestSession = walletkit.engine.signClient.session.get(topic) const { chainId, request } = params SettingsStore.setActiveChainId(chainId) switch (request.method) { diff --git a/advanced/wallets/react-wallet-v2/src/utils/WalletConnectUtil.ts b/advanced/wallets/react-wallet-v2/src/utils/WalletConnectUtil.ts index 51f69b6a0..2f053cb38 100644 --- a/advanced/wallets/react-wallet-v2/src/utils/WalletConnectUtil.ts +++ b/advanced/wallets/react-wallet-v2/src/utils/WalletConnectUtil.ts @@ -1,14 +1,14 @@ -import { Web3Wallet, IWeb3Wallet } from '@walletconnect/web3wallet' +import { WalletKit, IWalletKit } from '@reown/walletkit' import { Core } from '@walletconnect/core' -export let web3wallet: IWeb3Wallet +export let walletkit: IWalletKit -export async function createWeb3Wallet(relayerRegionURL: string) { +export async function createWalletKit(relayerRegionURL: string) { const core = new Core({ projectId: process.env.NEXT_PUBLIC_PROJECT_ID, relayUrl: relayerRegionURL ?? process.env.NEXT_PUBLIC_RELAY_URL, logger: 'trace' }) - web3wallet = await Web3Wallet.init({ + walletkit = await WalletKit.init({ core, metadata: { name: 'React Wallet Example', @@ -19,7 +19,7 @@ export async function createWeb3Wallet(relayerRegionURL: string) { }) try { - const clientId = await web3wallet.engine.signClient.core.crypto.getClientId() + const clientId = await walletkit.engine.signClient.core.crypto.getClientId() console.log('WalletConnect ClientID: ', clientId) localStorage.setItem('WALLETCONNECT_CLIENT_ID', clientId) } catch (error) { @@ -30,11 +30,11 @@ export async function createWeb3Wallet(relayerRegionURL: string) { export async function updateSignClientChainId(chainId: string, address: string) { console.log('chainId', chainId, address) // get most recent session - const sessions = web3wallet.getActiveSessions() + const sessions = walletkit.getActiveSessions() if (!sessions) return const namespace = chainId.split(':')[0] Object.values(sessions).forEach(async session => { - await web3wallet.updateSession({ + await walletkit.updateSession({ topic: session.topic, namespaces: { ...session.namespaces, @@ -72,7 +72,7 @@ export async function updateSignClientChainId(chainId: string, address: string) }, chainId } - await web3wallet.emitSessionEvent(chainChanged) - await web3wallet.emitSessionEvent(accountsChanged) + await walletkit.emitSessionEvent(chainChanged) + await walletkit.emitSessionEvent(accountsChanged) }) } diff --git a/advanced/wallets/react-wallet-v2/src/views/AuthRequestModal.tsx b/advanced/wallets/react-wallet-v2/src/views/AuthRequestModal.tsx deleted file mode 100644 index 6ac47d71e..000000000 --- a/advanced/wallets/react-wallet-v2/src/views/AuthRequestModal.tsx +++ /dev/null @@ -1,94 +0,0 @@ -/* eslint-disable react-hooks/rules-of-hooks */ -import { useCallback, useState } from 'react' -import { useSnapshot } from 'valtio' -import { Col, Row, Text, Code } from '@nextui-org/react' -import { getSdkError } from '@walletconnect/utils' - -import ModalStore from '@/store/ModalStore' -import SettingsStore from '@/store/SettingsStore' -import { eip155Addresses, eip155Wallets } from '@/utils/EIP155WalletUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' -import RequestModal from '../components/RequestModal' -import { styledToast } from '@/utils/HelperUtil' - -export default function AuthRequestModal() { - const { account } = useSnapshot(SettingsStore.state) - const [isLoadingApprove, setIsLoadingApprove] = useState(false) - const [isLoadingReject, setIsLoadingReject] = useState(false) - console.log('modal data', ModalStore.state.data, account) - // Get request and wallet data from store - const request = ModalStore.state.data?.request - // Ensure request and wallet are defined - if (!request) { - return Missing request data - } - - const address = eip155Addresses[account] - const iss = `did:pkh:eip155:1:${address}` - - // Get required request data - const { params } = request - - const message = web3wallet.formatMessage(params.cacaoPayload, iss) - - // Handle approve action (logic varies based on request method) - const onApprove = useCallback(async () => { - try { - if (request) { - setIsLoadingApprove(true) - const signature = await eip155Wallets[address].signMessage(message) - await web3wallet.respondAuthRequest( - { - id: request.id, - signature: { - s: signature, - t: 'eip191' - } - }, - iss - ) - } - } catch (e) { - styledToast((e as Error).message, 'error') - } finally { - setIsLoadingApprove(false) - ModalStore.close() - } - }, [request, address, message, iss]) - - // Handle reject action - const onReject = useCallback(async () => { - if (request) { - setIsLoadingReject(true) - await web3wallet.respondAuthRequest( - { - id: request.id, - error: getSdkError('USER_REJECTED') - }, - iss - ) - setIsLoadingReject(false) - ModalStore.close() - } - }, [request, iss]) - - return ( - - - - Message - - {message} - - - - - ) -} diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionAuthenticateModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionAuthenticateModal.tsx index 134e2d585..a2788856a 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionAuthenticateModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionAuthenticateModal.tsx @@ -1,16 +1,12 @@ -import { Fragment, useCallback, useEffect, useMemo, useState } from 'react' +import { useCallback, useEffect, useMemo, useState } from 'react' import { useSnapshot } from 'valtio' -import { Col, Divider, Row, Text, Code, Checkbox, Grid } from '@nextui-org/react' +import { Col, Row, Text, Code, Checkbox, Grid } from '@nextui-org/react' import { buildAuthObject, getSdkError, populateAuthPayload } from '@walletconnect/utils' -import ModalFooter from '@/components/ModalFooter' -import ProjectInfoCard from '@/components/ProjectInfoCard' -import RequestModalContainer from '@/components/RequestModalContainer' -import VerifyInfobox from '@/components/VerifyInfobox' import ModalStore from '@/store/ModalStore' import SettingsStore from '@/store/SettingsStore' import { eip155Addresses, eip155Wallets } from '@/utils/EIP155WalletUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { EIP155_CHAINS, EIP155_SIGNING_METHODS } from '@/data/EIP155Data' import { styledToast } from '@/utils/HelperUtil' @@ -31,17 +27,14 @@ export default function SessionAuthenticateModal() { const address = eip155Addresses[account] // eslint-disable-next-line react-hooks/rules-of-hooks - const getMessageToSign = useCallback( - (authPayload, iss) => { - const message = web3wallet.engine.signClient.formatAuthMessage({ - request: authPayload, - iss - }) - console.log('message', message) - return message - }, - [address] - ) + const getMessageToSign = useCallback((authPayload, iss) => { + const message = walletkit.engine.signClient.formatAuthMessage({ + request: authPayload, + iss + }) + console.log('message', message) + return message + }, []) useEffect(() => { if (!authRequest?.params?.authPayload) return @@ -75,7 +68,7 @@ export default function SessionAuthenticateModal() { const messagesToSign: any[] = [] newAuthPayload.chains.forEach((chain: string) => { const iss = `${chain}:${address}` - const message = web3wallet.engine.signClient.formatAuthMessage({ + const message = walletkit.engine.signClient.formatAuthMessage({ request: newAuthPayload, iss }) @@ -107,12 +100,11 @@ export default function SessionAuthenticateModal() { ) signedAuths.push(signedCacao) } - - await web3wallet.engine.signClient.approveSessionAuthenticate({ + await walletkit.engine.signClient.approveSessionAuthenticate({ id: messages[0].id, auths: signedAuths }) - SettingsStore.setSessions(Object.values(web3wallet.getActiveSessions())) + SettingsStore.setSessions(Object.values(walletkit.getActiveSessions())) } } catch (e) { styledToast((e as Error).message, 'error') @@ -124,7 +116,7 @@ export default function SessionAuthenticateModal() { // Handle reject action const onReject = useCallback(async () => { if (authRequest?.params?.authPayload) { - await web3wallet.engine.signClient.rejectSessionAuthenticate({ + await walletkit.engine.signClient.rejectSessionAuthenticate({ id: authRequest.id, reason: getSdkError('USER_REJECTED') }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionGrantPermissionsModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionGrantPermissionsModal.tsx index 2746e0fd4..1bfc5415f 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionGrantPermissionsModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionGrantPermissionsModal.tsx @@ -5,7 +5,7 @@ import RequesDetailsCard from '@/components/RequestDetalilsCard' import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { styledToast } from '@/utils/HelperUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { useCallback, useState } from 'react' import PermissionDetailsCard from '@/components/PermissionDetailsCard' @@ -39,25 +39,25 @@ export default function SessionGrantPermissionsModal() { console.log({ grantPermissionsRequestParams }) // Handle approve action (logic varies based on request method) const onApprove = useCallback(async () => { - try { - if (requestEvent) { - setIsLoadingApprove(true) - const response = await approveEIP7715Request(requestEvent) - await web3wallet.respondSessionRequest({ + if (requestEvent) { + setIsLoadingApprove(true) + const response = await approveEIP7715Request(requestEvent) + try { + await walletkit.respondSessionRequest({ + topic, + response + }) + } catch (e) { + styledToast((e as Error).message, 'error') + const response = createErrorResponse(requestEvent, (e as Error).message) + await walletkit.respondSessionRequest({ topic, response }) + } finally { + setIsLoadingApprove(false) + ModalStore.close() } - } catch (e) { - styledToast((e as Error).message, 'error') - const response = createErrorResponse(requestEvent, (e as Error).message) - await web3wallet.respondSessionRequest({ - topic, - response - }) - } finally { - setIsLoadingApprove(false) - ModalStore.close() } }, [requestEvent, topic]) @@ -67,7 +67,7 @@ export default function SessionGrantPermissionsModal() { setIsLoadingReject(true) const response = rejectEIP7715Request(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionProposalModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionProposalModal.tsx index 050ae1837..0686dda94 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionProposalModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionProposalModal.tsx @@ -15,7 +15,7 @@ import { solanaAddresses } from '@/utils/SolanaWalletUtil' import { nearAddresses } from '@/utils/NearWalletUtil' import { kadenaAddresses } from '@/utils/KadenaWalletUtil' import { styledToast } from '@/utils/HelperUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import { EIP155_CHAINS, EIP155_SIGNING_METHODS } from '@/data/EIP155Data' import { COSMOS_MAINNET_CHAINS, COSMOS_SIGNING_METHODS } from '@/data/COSMOSData' import { KADENA_CHAINS, KADENA_SIGNING_METHODS } from '@/data/KadenaData' @@ -287,12 +287,12 @@ export default function SessionProposalModal() { const capabilities = getWalletCapabilities(reorderedEip155Accounts) const sessionProperties = { capabilities: JSON.stringify(capabilities) } - await web3wallet.approveSession({ + await walletkit.approveSession({ id: proposal.id, namespaces, sessionProperties }) - SettingsStore.setSessions(Object.values(web3wallet.getActiveSessions())) + SettingsStore.setSessions(Object.values(walletkit.getActiveSessions())) } } catch (e) { styledToast((e as Error).message, 'error') @@ -309,7 +309,7 @@ export default function SessionProposalModal() { try { setIsLoadingReject(true) await new Promise(resolve => setTimeout(resolve, 1000)) - await web3wallet.rejectSession({ + await walletkit.rejectSession({ id: proposal.id, reason: getSdkError('USER_REJECTED_METHODS') }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSendCallsModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSendCallsModal.tsx index 2c4b4b665..8e3e1247e 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSendCallsModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSendCallsModal.tsx @@ -5,7 +5,7 @@ import RequesDetailsCard from '@/components/RequestDetalilsCard' import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { styledToast } from '@/utils/HelperUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { approveEIP5792Request, rejectEIP5792Request } from '@/utils/EIP5792RequestHandlerUtils' @@ -30,7 +30,7 @@ export default function SessionSendCallsModal() { setIsLoadingApprove(true) console.log('Calls approved.') const response = await approveEIP5792Request(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -49,7 +49,7 @@ export default function SessionSendCallsModal() { setIsLoadingReject(true) const response = rejectEIP5792Request(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSendTransactionModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSendTransactionModal.tsx index fe65bde35..279ed5393 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSendTransactionModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSendTransactionModal.tsx @@ -7,7 +7,7 @@ import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { approveEIP155Request, rejectEIP155Request } from '@/utils/EIP155RequestHandlerUtil' import { styledToast } from '@/utils/HelperUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '@/components/RequestModal' import { BridgingRequest, @@ -110,7 +110,7 @@ export default function SessionSendTransactionModal() { if (requestEvent && topic) { setIsLoadingApprove(true) const response = await approveEIP155Request(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -129,7 +129,7 @@ export default function SessionSendTransactionModal() { setIsLoadingReject(true) const response = rejectEIP155Request(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignCosmosModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignCosmosModal.tsx index d27d3dc88..f8927b1f1 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignCosmosModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignCosmosModal.tsx @@ -8,7 +8,7 @@ import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { approveCosmosRequest, rejectCosmosRequest } from '@/utils/CosmosRequestHandler' import { styledToast } from '@/utils/HelperUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' export default function SessionSignCosmosModal() { @@ -33,7 +33,7 @@ export default function SessionSignCosmosModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveCosmosRequest(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -52,7 +52,7 @@ export default function SessionSignCosmosModal() { setIsLoadingReject(true) const response = rejectCosmosRequest(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignKadenaModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignKadenaModal.tsx index 036dd0f3a..e876d17e8 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignKadenaModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignKadenaModal.tsx @@ -6,7 +6,7 @@ import RequestDetailsCard from '@/components/RequestDetalilsCard' import ModalStore from '@/store/ModalStore' import { convertHexToUtf8, styledToast } from '@/utils/HelperUtil' import { approveKadenaRequest, rejectKadenaRequest } from '@/utils/KadenaRequestHandlerUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { useCallback, useState } from 'react' @@ -35,7 +35,7 @@ export default function SessionSignKadenaModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveKadenaRequest(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -56,7 +56,7 @@ export default function SessionSignKadenaModal() { setIsLoadingReject(true) const response = rejectKadenaRequest(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignModal.tsx index a98c3cbe4..bd033cc13 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignModal.tsx @@ -6,7 +6,7 @@ import RequesDetailsCard from '@/components/RequestDetalilsCard' import ModalStore from '@/store/ModalStore' import { approveEIP155Request, rejectEIP155Request } from '@/utils/EIP155RequestHandlerUtil' import { getSignParamsMessage, styledToast } from '@/utils/HelperUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' export default function SessionSignModal() { // Get request and wallet data from store @@ -33,7 +33,7 @@ export default function SessionSignModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveEIP155Request(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -52,7 +52,7 @@ export default function SessionSignModal() { setIsLoadingReject(true) const response = rejectEIP155Request(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignMultiversxModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignMultiversxModal.tsx index 93195e30b..40a9aecac 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignMultiversxModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignMultiversxModal.tsx @@ -11,7 +11,7 @@ import { approveMultiversxRequest, rejectMultiversxRequest } from '@/utils/MultiversxRequestHandlerUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' export default function SessionSignMultiversxModal() { @@ -36,7 +36,7 @@ export default function SessionSignMultiversxModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveMultiversxRequest(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -55,7 +55,7 @@ export default function SessionSignMultiversxModal() { setIsLoadingReject(true) const response = rejectMultiversxRequest(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignNearModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignNearModal.tsx index 1d16f6865..a30c37daf 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignNearModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignNearModal.tsx @@ -7,7 +7,7 @@ import RequestDetailsCard from '@/components/RequestDetalilsCard' import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { approveNearRequest, rejectNearRequest } from '@/utils/NearRequestHandlerUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import { NEAR_SIGNING_METHODS } from '@/data/NEARData' import { styledToast } from '@/utils/HelperUtil' import RequestModal from '../components/RequestModal' @@ -146,7 +146,7 @@ export default function SessionSignNearModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveNearRequest(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -165,7 +165,7 @@ export default function SessionSignNearModal() { setIsLoadingReject(true) const response = rejectNearRequest(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignPolkadotModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignPolkadotModal.tsx index 63dbdc131..6f3b25479 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignPolkadotModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignPolkadotModal.tsx @@ -7,7 +7,7 @@ import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { styledToast } from '@/utils/HelperUtil' import { approvePolkadotRequest, rejectPolkadotRequest } from '@/utils/PolkadotRequestHandlerUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { useCallback, useState } from 'react' @@ -33,7 +33,7 @@ export default function SessionSignPolkadotModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approvePolkadotRequest(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -52,7 +52,7 @@ export default function SessionSignPolkadotModal() { setIsLoadingReject(true) const response = rejectPolkadotRequest(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignSolanaModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignSolanaModal.tsx index b55047377..ee4cc75b8 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignSolanaModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignSolanaModal.tsx @@ -7,7 +7,7 @@ import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { styledToast } from '@/utils/HelperUtil' import { approveSolanaRequest, rejectSolanaRequest } from '@/utils/SolanaRequestHandlerUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { useCallback, useState } from 'react' @@ -33,7 +33,7 @@ export default function SessionSignSolanaModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveSolanaRequest(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -52,7 +52,7 @@ export default function SessionSignSolanaModal() { setIsLoadingReject(true) const response = rejectSolanaRequest(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignTezosModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignTezosModal.tsx index f645f1ba8..0f6b5322b 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignTezosModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignTezosModal.tsx @@ -7,7 +7,7 @@ import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { styledToast } from '@/utils/HelperUtil' import { approveTezosRequest, rejectTezosRequest } from '@/utils/TezosRequestHandlerUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { useCallback, useState } from 'react' @@ -33,7 +33,7 @@ export default function SessionSignTezosModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveTezosRequest(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -52,7 +52,7 @@ export default function SessionSignTezosModal() { setIsLoadingReject(true) const response = rejectTezosRequest(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignTronModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignTronModal.tsx index 392e053c2..ab18bd0ab 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignTronModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignTronModal.tsx @@ -7,7 +7,7 @@ import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { styledToast } from '@/utils/HelperUtil' import { approveTronRequest, rejectTronRequest } from '@/utils/TronRequestHandlerUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { useCallback, useState } from 'react' @@ -33,7 +33,7 @@ export default function SessionSignTronModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveTronRequest(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -52,7 +52,7 @@ export default function SessionSignTronModal() { setIsLoadingReject(true) const response = rejectTronRequest(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/src/views/SessionSignTypedDataModal.tsx b/advanced/wallets/react-wallet-v2/src/views/SessionSignTypedDataModal.tsx index d42e80d2d..44a9ba1cc 100644 --- a/advanced/wallets/react-wallet-v2/src/views/SessionSignTypedDataModal.tsx +++ b/advanced/wallets/react-wallet-v2/src/views/SessionSignTypedDataModal.tsx @@ -7,7 +7,7 @@ import RequestMethodCard from '@/components/RequestMethodCard' import ModalStore from '@/store/ModalStore' import { approveEIP155Request, rejectEIP155Request } from '@/utils/EIP155RequestHandlerUtil' import { getSignTypedDataParamsData, styledToast } from '@/utils/HelperUtil' -import { web3wallet } from '@/utils/WalletConnectUtil' +import { walletkit } from '@/utils/WalletConnectUtil' import RequestModal from '../components/RequestModal' import { useCallback, useState } from 'react' import PermissionDetailsCard from '@/components/PermissionDetailsCard' @@ -44,7 +44,7 @@ export default function SessionSignTypedDataModal() { if (requestEvent) { setIsLoadingApprove(true) const response = await approveEIP155Request(requestEvent) - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) @@ -63,7 +63,7 @@ export default function SessionSignTypedDataModal() { setIsLoadingReject(true) const response = rejectEIP155Request(requestEvent) try { - await web3wallet.respondSessionRequest({ + await walletkit.respondSessionRequest({ topic, response }) diff --git a/advanced/wallets/react-wallet-v2/yarn.lock b/advanced/wallets/react-wallet-v2/yarn.lock index 37fe3bc4f..e97235148 100644 --- a/advanced/wallets/react-wallet-v2/yarn.lock +++ b/advanced/wallets/react-wallet-v2/yarn.lock @@ -2077,6 +2077,19 @@ "@react-types/grid" "^3.2.6" "@react-types/shared" "^3.23.1" +"@reown/walletkit@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@reown/walletkit/-/walletkit-1.0.0.tgz#ad930f2d95b612a7ec5ded47a19ea72660830dd0" + integrity sha512-n0RM2G1Qa7dSI+MiJX6m/HZpcAEyUrZXnogUUoSz2vV5cj0EkVturvJqh2/IpSkwLiCZlPdBO7F7yTgVDSYUbw== + dependencies: + "@walletconnect/core" "2.16.1" + "@walletconnect/jsonrpc-provider" "1.0.14" + "@walletconnect/jsonrpc-utils" "1.0.8" + "@walletconnect/logger" "2.1.2" + "@walletconnect/sign-client" "2.16.1" + "@walletconnect/types" "2.16.1" + "@walletconnect/utils" "2.16.1" + "@rhinestone/module-sdk@0.1.18": version "0.1.18" resolved "https://registry.yarnpkg.com/@rhinestone/module-sdk/-/module-sdk-0.1.18.tgz#24bdf5235ccdbf7a595955cf002941243dead862" @@ -2308,7 +2321,7 @@ "@stablelib/constant-time" "^1.0.1" "@stablelib/wipe" "^1.0.1" -"@stablelib/sha256@1.0.1", "@stablelib/sha256@^1.0.1": +"@stablelib/sha256@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@stablelib/sha256/-/sha256-1.0.1.tgz#77b6675b67f9b0ea081d2e31bda4866297a3ae4f" integrity sha512-GIIH3e6KH+91FqGV42Kcj71Uefd/QEe7Dy42sBTeqppXV95ggCcxLTk39bEr+lZfJmp+ghsR07J++ORkRELsBQ== @@ -2641,25 +2654,6 @@ version "0.3.1" resolved "https://codeload.github.com/ecadlabs/axios-fetch-adapter/tar.gz/167684f522e90343b9f3439d9a43ac571e2396f6" -"@walletconnect/auth-client@2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@walletconnect/auth-client/-/auth-client-2.1.2.tgz#cee304fb0cdca76f6bf4aafac96ef9301862a7e8" - integrity sha512-ubJLn+vGb8sTdBFX6xAh4kjR5idrtS3RBngQWaJJJpEPBQmxMb8pM2q0FIRs8Is4K6jKy+uEhusMV+7ZBmTzjw== - dependencies: - "@ethersproject/hash" "^5.7.0" - "@ethersproject/transactions" "^5.7.0" - "@stablelib/random" "^1.0.2" - "@stablelib/sha256" "^1.0.1" - "@walletconnect/core" "^2.10.1" - "@walletconnect/events" "^1.0.1" - "@walletconnect/heartbeat" "^1.2.1" - "@walletconnect/jsonrpc-utils" "^1.0.8" - "@walletconnect/logger" "^2.0.1" - "@walletconnect/time" "^1.0.2" - "@walletconnect/utils" "^2.10.1" - events "^3.3.0" - isomorphic-unfetch "^3.1.0" - "@walletconnect/core@2.16.1": version "2.16.1" resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.16.1.tgz#019b181387792e0d284e75074b961b48193d9b6a" @@ -2682,28 +2676,6 @@ lodash.isequal "4.5.0" uint8arrays "3.1.0" -"@walletconnect/core@^2.10.1": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.6.tgz#786b0d2e2045c210c917e29bfa0498bbc210be20" - integrity sha512-Z4vh4ZdfcoQjgPEOxeuF9HUZCVLtV3MgRbS/awLIj/omDrFnOwlBhxi5Syr4Y8muVGC0ocRetQYHae0/gX5crQ== - dependencies: - "@walletconnect/heartbeat" "1.2.1" - "@walletconnect/jsonrpc-provider" "1.0.13" - "@walletconnect/jsonrpc-types" "1.0.3" - "@walletconnect/jsonrpc-utils" "1.0.8" - "@walletconnect/jsonrpc-ws-connection" "1.0.14" - "@walletconnect/keyvaluestorage" "^1.1.1" - "@walletconnect/logger" "^2.0.1" - "@walletconnect/relay-api" "^1.0.9" - "@walletconnect/relay-auth" "^1.0.4" - "@walletconnect/safe-json" "^1.0.2" - "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" - events "^3.3.0" - lodash.isequal "4.5.0" - uint8arrays "^3.1.0" - "@walletconnect/environment@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.1.tgz#1d7f82f0009ab821a2ba5ad5e5a7b8ae3b214cd7" @@ -2719,15 +2691,6 @@ keyvaluestorage-interface "^1.0.0" tslib "1.14.1" -"@walletconnect/heartbeat@1.2.1", "@walletconnect/heartbeat@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.1.tgz#afaa3a53232ae182d7c9cff41c1084472d8f32e9" - integrity sha512-yVzws616xsDLJxuG/28FqtZ5rzrTA4gUjdEMTbWB5Y8V1XHRmqq4efAxCw5ie7WjbXFSUyBHaWlMR+2/CpQC5Q== - dependencies: - "@walletconnect/events" "^1.0.1" - "@walletconnect/time" "^1.0.2" - tslib "1.14.1" - "@walletconnect/heartbeat@1.2.2": version "1.2.2" resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.2.tgz#e8dc5179db7769950c6f9cf59b23516d9b95227d" @@ -2737,15 +2700,6 @@ "@walletconnect/time" "^1.0.2" events "^3.3.0" -"@walletconnect/jsonrpc-provider@1.0.13": - version "1.0.13" - resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.13.tgz#9a74da648d015e1fffc745f0c7d629457f53648b" - integrity sha512-K73EpThqHnSR26gOyNEL+acEex3P7VWZe6KE12ZwKzAt2H4e5gldZHbjsu2QR9cLeJ8AXuO7kEMOIcRv1QEc7g== - dependencies: - "@walletconnect/jsonrpc-utils" "^1.0.8" - "@walletconnect/safe-json" "^1.0.2" - tslib "1.14.1" - "@walletconnect/jsonrpc-provider@1.0.14": version "1.0.14" resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.14.tgz#696f3e3b6d728b361f2e8b853cfc6afbdf2e4e3e" @@ -2755,14 +2709,6 @@ "@walletconnect/safe-json" "^1.0.2" events "^3.3.0" -"@walletconnect/jsonrpc-types@1.0.3", "@walletconnect/jsonrpc-types@^1.0.2", "@walletconnect/jsonrpc-types@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.3.tgz#65e3b77046f1a7fa8347ae02bc1b841abe6f290c" - integrity sha512-iIQ8hboBl3o5ufmJ8cuduGad0CQm3ZlsHtujv9Eu16xq89q+BG7Nh5VLxxUgmtpnrePgFkTwXirCTkwJH1v+Yw== - dependencies: - keyvaluestorage-interface "^1.0.0" - tslib "1.14.1" - "@walletconnect/jsonrpc-types@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.4.tgz#ce1a667d79eadf2a2d9d002c152ceb68739c230c" @@ -2771,6 +2717,14 @@ events "^3.3.0" keyvaluestorage-interface "^1.0.0" +"@walletconnect/jsonrpc-types@^1.0.2", "@walletconnect/jsonrpc-types@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.3.tgz#65e3b77046f1a7fa8347ae02bc1b841abe6f290c" + integrity sha512-iIQ8hboBl3o5ufmJ8cuduGad0CQm3ZlsHtujv9Eu16xq89q+BG7Nh5VLxxUgmtpnrePgFkTwXirCTkwJH1v+Yw== + dependencies: + keyvaluestorage-interface "^1.0.0" + tslib "1.14.1" + "@walletconnect/jsonrpc-utils@1.0.8", "@walletconnect/jsonrpc-utils@^1.0.6", "@walletconnect/jsonrpc-utils@^1.0.8": version "1.0.8" resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.8.tgz#82d0cc6a5d6ff0ecc277cb35f71402c91ad48d72" @@ -2790,7 +2744,7 @@ events "^3.3.0" ws "^7.5.1" -"@walletconnect/keyvaluestorage@1.1.1", "@walletconnect/keyvaluestorage@^1.1.1": +"@walletconnect/keyvaluestorage@1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.1.1.tgz#dd2caddabfbaf80f6b8993a0704d8b83115a1842" integrity sha512-V7ZQq2+mSxAq7MrRqDxanTzu2RcElfK1PfNYiaVnJgJ7Q7G7hTVwF8voIBx92qsRyGHZihrwNPHuZd1aKkd0rA== @@ -2807,14 +2761,6 @@ "@walletconnect/safe-json" "^1.0.2" pino "7.11.0" -"@walletconnect/logger@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@walletconnect/logger/-/logger-2.0.1.tgz#7f489b96e9a1ff6bf3e58f0fbd6d69718bf844a8" - integrity sha512-SsTKdsgWm+oDTBeNE/zHxxr5eJfZmE9/5yp/Ku+zJtcTAjELb3DXueWkDXmE9h8uHIbJzIb5wj5lPdzyrjT6hQ== - dependencies: - pino "7.11.0" - tslib "1.14.1" - "@walletconnect/relay-api@1.0.11": version "1.0.11" resolved "https://registry.yarnpkg.com/@walletconnect/relay-api/-/relay-api-1.0.11.tgz#80ab7ef2e83c6c173be1a59756f95e515fb63224" @@ -2822,15 +2768,7 @@ dependencies: "@walletconnect/jsonrpc-types" "^1.0.2" -"@walletconnect/relay-api@^1.0.9": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@walletconnect/relay-api/-/relay-api-1.0.9.tgz#f8c2c3993dddaa9f33ed42197fc9bfebd790ecaf" - integrity sha512-Q3+rylJOqRkO1D9Su0DPE3mmznbAalYapJ9qmzDgK28mYF9alcP3UwG/og5V7l7CFOqzCLi7B8BvcBUrpDj0Rg== - dependencies: - "@walletconnect/jsonrpc-types" "^1.0.2" - tslib "1.14.1" - -"@walletconnect/relay-auth@1.0.4", "@walletconnect/relay-auth@^1.0.4": +"@walletconnect/relay-auth@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@walletconnect/relay-auth/-/relay-auth-1.0.4.tgz#0b5c55c9aa3b0ef61f526ce679f3ff8a5c4c2c7c" integrity sha512-kKJcS6+WxYq5kshpPaxGHdwf5y98ZwbfuS4EE/NkQzqrDFm5Cj+dP8LofzWvjrrLkZq7Afy7WrQMXdLy8Sx7HQ== @@ -2871,18 +2809,6 @@ dependencies: tslib "1.14.1" -"@walletconnect/types@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.6.tgz#d9920ed4fd0113e0addbda8e7e73a5176a3163fd" - integrity sha512-WgHfiTG1yakmxheaBRiXhUdEmgxwrvsAdOIWaMf/spvrzVKYh6sHI3oyEEky5qj5jjiMiyQBeB57QamzCotbcQ== - dependencies: - "@walletconnect/events" "^1.0.1" - "@walletconnect/heartbeat" "1.2.1" - "@walletconnect/jsonrpc-types" "1.0.3" - "@walletconnect/keyvaluestorage" "^1.1.1" - "@walletconnect/logger" "^2.0.1" - events "^3.3.0" - "@walletconnect/types@2.16.1": version "2.16.1" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.16.1.tgz#6583d458d3f7b1919d482ba516ccb7878ec8c91f" @@ -2895,26 +2821,6 @@ "@walletconnect/logger" "2.1.2" events "3.3.0" -"@walletconnect/utils@2.10.6", "@walletconnect/utils@^2.10.1": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.6.tgz#749b37d14e291e346862e7027ec7548463350226" - integrity sha512-oRsWWhN2+hi3aiDXrQEOfysz6FHQJGXLsNQPVt+WIBJplO6Szmdau9dbleD88u1iiT4GKPqE0R9FOYvvPm1H/w== - dependencies: - "@stablelib/chacha20poly1305" "1.0.1" - "@stablelib/hkdf" "1.0.1" - "@stablelib/random" "^1.0.2" - "@stablelib/sha256" "1.0.1" - "@stablelib/x25519" "^1.0.3" - "@walletconnect/relay-api" "^1.0.9" - "@walletconnect/safe-json" "^1.0.2" - "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" - "@walletconnect/window-getters" "^1.0.1" - "@walletconnect/window-metadata" "^1.0.1" - detect-browser "5.3.0" - query-string "7.1.3" - uint8arrays "^3.1.0" - "@walletconnect/utils@2.16.1": version "2.16.1" resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.16.1.tgz#2099cc2bd16b0edc32022f64aa2c2c323b45d1d4" @@ -2937,20 +2843,6 @@ query-string "7.1.3" uint8arrays "3.1.0" -"@walletconnect/web3wallet@1.15.1": - version "1.15.1" - resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.15.1.tgz#47d041c07e2b12824ade85e53ed50c89536ef37b" - integrity sha512-EgtdZUgtf0diU98x8Q8tiZslE0Z5comnxv3SqmAIgkdhpXDxaM/goo7BC1yC+Wey/IHOOVYg2SW+La2Txk+6hQ== - dependencies: - "@walletconnect/auth-client" "2.1.2" - "@walletconnect/core" "2.16.1" - "@walletconnect/jsonrpc-provider" "1.0.14" - "@walletconnect/jsonrpc-utils" "1.0.8" - "@walletconnect/logger" "2.1.2" - "@walletconnect/sign-client" "2.16.1" - "@walletconnect/types" "2.16.1" - "@walletconnect/utils" "2.16.1" - "@walletconnect/window-getters@1.0.1", "@walletconnect/window-getters@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@walletconnect/window-getters/-/window-getters-1.0.1.tgz#f36d1c72558a7f6b87ecc4451fc8bd44f63cbbdc" @@ -2958,7 +2850,7 @@ dependencies: tslib "1.14.1" -"@walletconnect/window-metadata@1.0.1", "@walletconnect/window-metadata@^1.0.1": +"@walletconnect/window-metadata@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@walletconnect/window-metadata/-/window-metadata-1.0.1.tgz#2124f75447b7e989e4e4e1581d55d25bc75f7be5" integrity sha512-9koTqyGrM2cqFRW517BPY/iEtUDx2r1+Pwwu5m7sJ7ka79wi3EyqhqcICk/yDmv6jAS1rjKgTKXlEhanYjijcA== @@ -5117,14 +5009,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isomorphic-unfetch@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f" - integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q== - dependencies: - node-fetch "^2.6.1" - unfetch "^4.2.0" - isomorphic-ws@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" @@ -6935,7 +6819,7 @@ uint8arrays@3.1.0: dependencies: multiformats "^9.4.2" -uint8arrays@^3.0.0, uint8arrays@^3.1.0: +uint8arrays@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.1.tgz#2d8762acce159ccd9936057572dade9459f65ae0" integrity sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg== @@ -6973,11 +6857,6 @@ unenv@^1.7.4: node-fetch-native "^1.4.1" pathe "^1.1.1" -unfetch@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" - integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA== - unstorage@^1.9.0: version "1.10.1" resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.10.1.tgz#bf8cc00a406e40a6293e893da9807057d95875b0"