diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx index 761fbdca..f5abfee6 100644 --- a/src/provider/masa-context-provider.tsx +++ b/src/provider/masa-context-provider.tsx @@ -68,10 +68,6 @@ export interface MasaContextProviderProps extends MasaShape { // signer?: Signer; // chainsToUse?: Array; // walletsToUse?: string[]; - // contractAddressOverrides?: { - // SoulNameAddress: string; - // SoulStoreAddress: string; - // }; soulNameStyle?: string; } @@ -96,7 +92,7 @@ export const MasaContextProvider = ({ fullScreenGallery, // api url override // apiUrl, - // contractAddressOverrides, + useRainbowKitWalletConnect = false, soulNameStyle, }: MasaContextProviderProps): JSX.Element => { diff --git a/src/provider/masa-provider.tsx b/src/provider/masa-provider.tsx index e9591cdd..500cc5b2 100644 --- a/src/provider/masa-provider.tsx +++ b/src/provider/masa-provider.tsx @@ -16,11 +16,16 @@ export const MasaProvider = ({ chainsToUse, walletsToUse, rainbowKitModalSize, + contractAddressOverrides, ...args }: MasaContextProviderProps & { chainsToUse?: Array; walletsToUse?: ('metamask' | 'valora' | 'walletconnect')[]; rainbowKitModalSize?: 'compact' | 'wide'; + contractAddressOverrides?: { + SoulNameAddress: string; + SoulStoreAddress: string; + }; }): JSX.Element => { const { forceNetwork, environmentName, company, verbose } = args; return ( @@ -49,6 +54,7 @@ export const MasaProvider = ({ 'basegoerli', 'unknown', ], + contractAddressOverrides, masaConfig: { networkName: 'ethereum', environment: environmentName ?? 'dev', diff --git a/src/refactor/config.ts b/src/refactor/config.ts index 1a8cc494..5e5f5592 100644 --- a/src/refactor/config.ts +++ b/src/refactor/config.ts @@ -3,6 +3,7 @@ import type { MasaArgs, NetworkName, } from '@masa-finance/masa-sdk'; +import type { WagmiConfigProps } from 'wagmi'; export interface ArweaveConfig { port?: string; @@ -18,8 +19,11 @@ export interface MasaReactConfig { arweaveConfig?: ArweaveConfig; forceChain?: NetworkName; verbose?: boolean; - wagmiConfig?: unknown; - + wagmiConfig?: WagmiConfigProps; + contractAddressOverrides?: { + SoulNameAddress: string; + SoulStoreAddress: string; + }; rainbowkitConfig?: { modalSize: 'compact' | 'wide'; }; @@ -62,4 +66,4 @@ export const mergeConfigWithDefault = (config: Partial) => ...defaultConfig.masaConfig, ...config.masaConfig, }, - } as MasaReactConfig); + }) as MasaReactConfig; diff --git a/src/refactor/masa-client/use-masa-client.ts b/src/refactor/masa-client/use-masa-client.ts index 23929ebb..65914cb0 100644 --- a/src/refactor/masa-client/use-masa-client.ts +++ b/src/refactor/masa-client/use-masa-client.ts @@ -6,18 +6,13 @@ import { useMasaSDK } from './use-masa-sdk'; import { useNetwork } from '../wallet-client/network'; export const useMasaClient = () => { - const { masaConfig } = useConfig(); + const { masaConfig, contractAddressOverrides } = useConfig(); const { signer, isDisconnected, address } = useWallet(); const { activeChainId, currentNetwork, activeNetwork } = useNetwork(); - - const networkName = activeNetwork === "homestead" - ? 'ethereum' - : currentNetwork?.networkName; - - - + const networkName = + activeNetwork === 'homestead' ? 'ethereum' : currentNetwork?.networkName; const masa = useMasaSDK( { @@ -25,8 +20,9 @@ export const useMasaClient = () => { signer: isDisconnected ? undefined : signer, ...masaConfig, environmentName: masaConfig.environment, + contractAddressOverrides, // NOTE: mismatch of homestead (wagmi) vs ethereum (masa) - networkName + networkName, }, [ address,