@reown/appkit-core-react-native 2.0.0-alpha.0 → 2.0.0-alpha.2

package/src/controllers/BlockchainApiController.ts

@@ -32,13 +32,14 @@ import type {
   OnRampQuote,
   BlockchainApiOnRampWidgetRequest,
   BlockchainApiOnRampQuotesRequest,
-  OnRampFiatLimit
+  OnRampFiatLimit,
+  OnRampCountryDefaults
 } from '../utils/TypeUtil';
 import { OptionsController } from './OptionsController';
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 import { ApiUtil } from '../utils/ApiUtil';
-import type { CaipNetworkId } from '@reown/appkit-common-react-native';
-import { ConnectionsController } from './ConnectionsController';
+import type { CaipAddress, CaipNetworkId } from '@reown/appkit-common-react-native';
+
 import { SnackController } from './SnackController';
 
 // -- Helpers ------------------------------------------- //
@@ -56,7 +57,11 @@ const getHeaders = () => {
   };
 };
 
+export const EXCLUDED_ONRAMP_PROVIDERS = ['BINANCECONNECT', 'COINBASEPAY'];
+
 // -- Types --------------------------------------------- //
+type WithCaipNetworkId = { caipNetworkId: CaipNetworkId };
+
 export interface BlockchainApiControllerState {
   clientId: string | null;
   api: FetchUtil;
@@ -99,14 +104,8 @@ export const BlockchainApiController = {
     return supportedChains;
   },
 
-  async fetchIdentity({ address }: BlockchainApiIdentityRequest) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
-
-    if (!isSupported) {
-      return { avatar: '', name: '' };
-    }
+  async fetchIdentity(params: BlockchainApiIdentityRequest) {
+    const { address } = params;
 
     return state.api.get<BlockchainApiIdentityResponse>({
       path: `/v1/identity/${address}`,
@@ -117,17 +116,9 @@ export const BlockchainApiController = {
     });
   },
 
-  async fetchTransactions({
-    account,
-    projectId,
-    cursor,
-    onramp,
-    signal,
-    cache,
-    chainId
-  }: BlockchainApiTransactionsRequest) {
-    const _chainId = chainId ?? ConnectionsController.state.activeCaipNetworkId;
-    const isSupported = await BlockchainApiController.isNetworkSupported(_chainId);
+  async fetchTransactions(params: BlockchainApiTransactionsRequest) {
+    const { account, projectId, cursor, onramp, signal, cache, chainId } = params;
+    const isSupported = await BlockchainApiController.isNetworkSupported(chainId);
 
     if (!isSupported) {
       return { data: [], next: undefined };
@@ -140,7 +131,7 @@ export const BlockchainApiController = {
         projectId,
         cursor,
         onramp,
-        chainId: _chainId
+        chainId
       },
       signal,
       cache
@@ -149,10 +140,9 @@ export const BlockchainApiController = {
     return response;
   },
 
-  async fetchTokenPrice({ projectId, addresses }: BlockchainApiTokenPriceRequest) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
+  async fetchTokenPrice(params: BlockchainApiTokenPriceRequest & WithCaipNetworkId) {
+    const { projectId, addresses, caipNetworkId } = params;
+    const isSupported = await BlockchainApiController.isNetworkSupported(caipNetworkId);
 
     if (!isSupported) {
       return { fungibles: [] };
@@ -171,14 +161,11 @@ export const BlockchainApiController = {
     return response;
   },
 
-  async fetchSwapAllowance({
-    projectId,
-    tokenAddress,
-    userAddress
-  }: BlockchainApiSwapAllowanceRequest) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
+  async fetchSwapAllowance(params: BlockchainApiSwapAllowanceRequest) {
+    const { projectId, tokenAddress, userAddress } = params;
+    const [namespace, chain] = userAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
+    const isSupported = await BlockchainApiController.isNetworkSupported(networkId);
 
     if (!isSupported) {
       return { allowance: '0' };
@@ -195,10 +182,9 @@ export const BlockchainApiController = {
     });
   },
 
-  async fetchGasPrice({ projectId, chainId }: BlockchainApiGasPriceRequest) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
+  async fetchGasPrice(params: BlockchainApiGasPriceRequest) {
+    const { projectId, chainId } = params;
+    const isSupported = await BlockchainApiController.isNetworkSupported(chainId);
 
     if (!isSupported) {
       throw new Error('Network not supported for Gas Price');
@@ -214,17 +200,11 @@ export const BlockchainApiController = {
     });
   },
 
-  async fetchSwapQuote({
-    projectId,
-    amount,
-    userAddress,
-    from,
-    to,
-    gasPrice
-  }: BlockchainApiSwapQuoteRequest) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
+  async fetchSwapQuote(params: BlockchainApiSwapQuoteRequest) {
+    const { projectId, amount, userAddress, from, to, gasPrice } = params;
+    const [namespace, chain] = userAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
+    const isSupported = await BlockchainApiController.isNetworkSupported(networkId);
 
     if (!isSupported) {
       return { quotes: [] };
@@ -244,10 +224,9 @@ export const BlockchainApiController = {
     });
   },
 
-  async fetchSwapTokens({ projectId, chainId }: BlockchainApiSwapTokensRequest) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
+  async fetchSwapTokens(params: BlockchainApiSwapTokensRequest) {
+    const { projectId, chainId } = params;
+    const isSupported = await BlockchainApiController.isNetworkSupported(chainId);
 
     if (!isSupported) {
       return { tokens: [] };
@@ -263,16 +242,11 @@ export const BlockchainApiController = {
     });
   },
 
-  async generateSwapCalldata({
-    amount,
-    from,
-    projectId,
-    to,
-    userAddress
-  }: BlockchainApiGenerateSwapCalldataRequest) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
+  async generateSwapCalldata(params: BlockchainApiGenerateSwapCalldataRequest) {
+    const { amount, from, projectId, to, userAddress } = params;
+    const [namespace, chain] = userAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
+    const isSupported = await BlockchainApiController.isNetworkSupported(networkId);
 
     if (!isSupported) {
       throw new Error('Network not supported for Swaps');
@@ -294,15 +268,11 @@ export const BlockchainApiController = {
     });
   },
 
-  async generateApproveCalldata({
-    from,
-    projectId,
-    to,
-    userAddress
-  }: BlockchainApiGenerateApproveCalldataRequest) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
+  async generateApproveCalldata(params: BlockchainApiGenerateApproveCalldataRequest) {
+    const { from, projectId, to, userAddress } = params;
+    const [namespace, chain] = userAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
+    const isSupported = await BlockchainApiController.isNetworkSupported(networkId);
 
     if (!isSupported) {
       throw new Error('Network not supported for Swaps');
@@ -320,10 +290,15 @@ export const BlockchainApiController = {
     });
   },
 
-  async getBalance(address: string, chainId?: string, forceUpdate?: string) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(
-      ConnectionsController.state.activeCaipNetworkId
-    );
+  async getBalance(address?: CaipAddress, forceUpdate?: CaipAddress[]) {
+    const [namespace, chain, plainAddress] = address?.split(':') ?? [];
+
+    if (!namespace || !chain || !plainAddress) {
+      throw new Error('Invalid address');
+    }
+
+    const isSupported = await BlockchainApiController.isNetworkSupported(`${namespace}:${chain}`);
+
     if (!isSupported) {
       SnackController.showError('Token Balance Unavailable');
 
@@ -331,13 +306,13 @@ export const BlockchainApiController = {
     }
 
     return state.api.get<BlockchainApiBalanceResponse>({
-      path: `/v1/account/${address}/balance`,
+      path: `/v1/account/${plainAddress}/balance`,
       headers: getHeaders(),
       params: {
         currency: 'usd',
         projectId: OptionsController.state.projectId,
-        chainId,
-        forceUpdate
+        chainId: `${namespace}:${chain}`,
+        forceUpdate: forceUpdate?.join(',')
       }
     });
   },
@@ -353,17 +328,6 @@ export const BlockchainApiController = {
     });
   },
 
-  async fetchOnRampCountries() {
-    return await state.api.get<OnRampCountry[]>({
-      path: '/v1/onramp/providers/properties',
-      headers: getHeaders(),
-      params: {
-        projectId: OptionsController.state.projectId,
-        type: 'countries'
-      }
-    });
-  },
-
   async fetchOnRampServiceProviders() {
     return await state.api.get<OnRampServiceProvider[]>({
       path: '/v1/onramp/providers',
@@ -374,48 +338,39 @@ export const BlockchainApiController = {
     });
   },
 
+  async fetchOnRampCountries() {
+    return await this.fetchProperties<OnRampCountry[]>('countries');
+  },
+
   async fetchOnRampPaymentMethods(params: { countries?: string }) {
-    return await state.api.get<OnRampPaymentMethod[]>({
-      path: '/v1/onramp/providers/properties',
-      headers: getHeaders(),
-      params: {
-        projectId: OptionsController.state.projectId,
-        type: 'payment-methods',
-        ...params
-      }
-    });
+    return await this.fetchProperties<OnRampPaymentMethod[]>('payment-methods', params);
   },
 
   async fetchOnRampCryptoCurrencies(params: { countries?: string }) {
-    return await state.api.get<OnRampCryptoCurrency[]>({
-      path: '/v1/onramp/providers/properties',
-      headers: getHeaders(),
-      params: {
-        projectId: OptionsController.state.projectId,
-        type: 'crypto-currencies',
-        ...params
-      }
-    });
+    return await this.fetchProperties<OnRampCryptoCurrency[]>('crypto-currencies', params);
   },
 
   async fetchOnRampFiatCurrencies() {
-    return await state.api.get<OnRampFiatCurrency[]>({
-      path: '/v1/onramp/providers/properties',
-      headers: getHeaders(),
-      params: {
-        projectId: OptionsController.state.projectId,
-        type: 'fiat-currencies'
-      }
-    });
+    return await this.fetchProperties<OnRampFiatCurrency[]>('fiat-currencies');
   },
 
   async fetchOnRampFiatLimits() {
-    return await state.api.get<OnRampFiatLimit[]>({
+    return await this.fetchProperties<OnRampFiatLimit[]>('fiat-purchases-limits');
+  },
+
+  async fetchOnRampCountriesDefaults() {
+    return await this.fetchProperties<OnRampCountryDefaults[]>('countries-defaults');
+  },
+
+  async fetchProperties<T>(type: string, params?: Record<string, string>) {
+    return await state.api.get<T>({
       path: '/v1/onramp/providers/properties',
       headers: getHeaders(),
       params: {
         projectId: OptionsController.state.projectId,
-        type: 'fiat-purchases-limits'
+        type,
+        excludeProviders: EXCLUDED_ONRAMP_PROVIDERS.join(','),
+        ...params
       }
     });
   },

package/src/controllers/ConnectionController.ts

@@ -1,31 +1,22 @@
 import { proxy, ref } from 'valtio';
 import { subscribeKey as subKey } from 'valtio/utils';
-import type { SocialProvider } from '@reown/appkit-common-react-native';
+import type { SocialProvider, WalletDeepLink } from '@reown/appkit-common-react-native';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { StorageUtil } from '../utils/StorageUtil';
 import type {
-  Connector,
   EstimateGasTransactionArgs,
   SendTransactionArgs,
   WcWallet,
   WriteContractArgs
 } from '../utils/TypeUtil';
-import { ConnectorController } from './ConnectorController';
 
 // -- Types --------------------------------------------- //
-export interface ConnectExternalOptions {
-  id: Connector['id'];
-  type: Connector['type'];
-  provider?: Connector['provider'];
-  info?: Connector['info'];
-}
 
 export interface ConnectionControllerClient {
   connectWalletConnect: (
     onUri: (uri: string) => void,
     walletUniversalLink?: string
   ) => Promise<void>;
-  connectExternal?: (options: ConnectExternalOptions) => Promise<void>;
   signMessage: (message: string) => Promise<string>;
   sendTransaction: (args: SendTransactionArgs) => Promise<`0x${string}` | null>;
   parseUnits: (value: string, decimals: number) => bigint;
@@ -42,16 +33,12 @@ export interface ConnectionControllerState {
   wcUri?: string;
   wcPromise?: Promise<void>;
   wcPairingExpiry?: number;
-  wcLinking?: {
-    href: string;
-    name: string;
-  };
+  wcLinking?: WalletDeepLink;
   wcError?: boolean;
   pressedWallet?: WcWallet;
   recentWallets?: WcWallet[];
-  selectedSocialProvider?: SocialProvider;
-  connectedWalletImageUrl?: string;
-  connectedSocialProvider?: SocialProvider;
+  connectedWalletImageUrl?: string; //TODO: remove this
+  connectedSocialProvider?: SocialProvider; // TODO: remove this
 }
 
 type StateKey = keyof ConnectionControllerState;
@@ -91,11 +78,6 @@ export const ConnectionController = {
     }, walletUniversalLink);
   },
 
-  async connectExternal(options: ConnectExternalOptions) {
-    await this._getClient().connectExternal?.(options);
-    ConnectorController.setConnectedConnector(options.type);
-  },
-
   async signMessage(message: string) {
     return this._getClient().signMessage(message);
   },
@@ -133,10 +115,6 @@ export const ConnectionController = {
     state.recentWallets = wallets;
   },
 
-  setSelectedSocialProvider(provider: ConnectionControllerState['selectedSocialProvider']) {
-    state.selectedSocialProvider = provider;
-  },
-
   async setConnectedWalletImageUrl(url: ConnectionControllerState['connectedWalletImageUrl']) {
     state.connectedWalletImageUrl = url;
 
@@ -194,9 +172,8 @@ export const ConnectionController = {
   resetWcConnection() {
     this.clearUri();
     state.pressedWallet = undefined;
-    state.selectedSocialProvider = undefined;
     ConnectionController.setConnectedWalletImageUrl(undefined);
-    ConnectorController.setConnectedConnector(undefined);
+    // ConnectorController.setConnectedConnector(undefined);
     StorageUtil.removeWalletConnectDeepLink();
   },