Skip to content

Commit

Permalink
Providers migration
Browse files Browse the repository at this point in the history
  • Loading branch information
hide-on-bush-x committed Aug 31, 2023
1 parent 1a74b0c commit 3ea25af
Show file tree
Hide file tree
Showing 4 changed files with 285 additions and 24 deletions.
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -45,7 +45,6 @@
"@wagmi/chains": "^1.6.0",
"@wagmi/core": "~0.10.17",
"@walletconnect/modal": "^2.6.1",
"ethers": "~5.7.2",
"rc-tooltip": "^6.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -55,7 +54,8 @@
"react-use": "^17.4.0",
"reaptcha": "^1.12.1",
"rodal": "^2.0.0",
"wagmi": "~0.12.19"
"viem": "^1.9.2",
"wagmi": "^1.3.11"
},
"devDependencies": {
"@babel/core": "^7.22.1",
Expand Down
Expand Up @@ -13,13 +13,14 @@ import {
} from '@rainbow-me/rainbowkit/wallets';

import type { Chain } from 'wagmi';
import { configureChains, createClient, WagmiConfig } from 'wagmi';
import { configureChains, createConfig, WagmiConfig } from 'wagmi';
import { publicProvider } from 'wagmi/providers/public';
import { jsonRpcProvider } from 'wagmi/providers/jsonRpc';
import type { ReactNode } from 'react';
import React, { createContext, useContext, useMemo } from 'react';

import { NetworkName, SupportedNetworks } from '@masa-finance/masa-sdk';

import { getRainbowkitChains, MasaNetworks } from './utils';

type ConfiguredRainbowKitProviderValue = Record<string, never>;
Expand Down Expand Up @@ -92,7 +93,7 @@ export const ConfiguredRainbowKitProvider = ({
forceNetwork,
}: ConfiguredRainbowKitProviderProps) => {
const rainbowkitChains = getRainbowkitChains(chainsToUse);
const { chains, provider, webSocketProvider } = configureChains(
const { chains, publicClient, webSocketPublicClient } = configureChains(
rainbowkitChains,
[
// alchemyProvider({ apiKey: process.env.ALCHEMY_ID }),
Expand All @@ -118,17 +119,17 @@ export const ConfiguredRainbowKitProvider = ({
walletConnectors as unknown as WalletList
);

const wagmiClient = createClient({
const wagmiClient = createConfig({
autoConnect: true,
connectors: celoConnectors,
provider,
webSocketProvider,
publicClient,
webSocketPublicClient,
});

const contextValue = useMemo(() => ({}), []);

return (
<WagmiConfig client={wagmiClient}>
<WagmiConfig config={wagmiClient}>
<RainbowKitProvider
modalSize={rainbowKitModalSize}
chains={rainbowkitChains}
Expand Down
13 changes: 7 additions & 6 deletions src/refactor/wallet-client/wagmi-rainbowkit-provider.tsx
Expand Up @@ -4,7 +4,8 @@ import {
WalletList,
} from '@rainbow-me/rainbowkit';

import { Chain, configureChains, createClient, WagmiConfig } from 'wagmi';
import { Chain, configureChains, createConfig, WagmiConfig } from 'wagmi';

import { publicProvider } from 'wagmi/providers/public';
import { jsonRpcProvider } from 'wagmi/providers/jsonRpc';
import type { ReactNode } from 'react';
Expand Down Expand Up @@ -32,7 +33,7 @@ export const WagmiRainbowkitProvider = ({
[allowedNetworkNames, forceChain]
);

const { chains, provider, webSocketProvider } = configureChains(
const { chains, publicClient, webSocketPublicClient } = configureChains(
rainbowkitChains,
[
// alchemyProvider({ apiKey: process.env.ALCHEMY_ID }),
Expand Down Expand Up @@ -62,15 +63,15 @@ export const WagmiRainbowkitProvider = ({
walletConnectors as unknown as WalletList
);

const wagmiClient = createClient({
const wagmiClient = createConfig({
autoConnect: true,
connectors: celoConnectors,
provider,
webSocketProvider,
publicClient,
webSocketPublicClient,
});

return (
<WagmiConfig client={wagmiClient}>
<WagmiConfig config={wagmiClient}>
<RainbowKitProvider
modalSize={rainbowkitConfig?.modalSize}
chains={rainbowkitChains}
Expand Down

0 comments on commit 3ea25af

Please sign in to comment.