@reown/appkit-common-react-native 2.0.0-alpha.2 → 2.0.0-alpha.4

package/src/adapters/BlockchainAdapter.ts

@@ -4,16 +4,17 @@ import type {
   AdapterType,
   AppKitNetwork,
   BlockchainAdapterConfig,
+  BlockchainAdapterInitParams,
   CaipAddress,
   ChainNamespace,
   GetBalanceParams,
   GetBalanceResponse,
   Provider,
   WalletConnector
-} from '../utils/TypeUtil';
+} from '../types';
+import { NetworkUtil } from '../utils/NetworkUtil';
 
 export abstract class BlockchainAdapter extends EventEmitter {
-  public projectId: string;
   public connector?: WalletConnector;
   public supportedNamespace: ChainNamespace;
   public adapterType: AdapterType;
@@ -26,15 +27,25 @@ export abstract class BlockchainAdapter extends EventEmitter {
     return super.emit(event, payload);
   }
 
-  constructor({ projectId, supportedNamespace, adapterType }: BlockchainAdapterConfig) {
+  // Typed on method
+  override on<K extends keyof AdapterEvents>(event: K, listener: AdapterEvents[K]): this {
+    return super.on(event, listener);
+  }
+
+  // Typed off method for consistency
+  override off<K extends keyof AdapterEvents>(event: K, listener: AdapterEvents[K]): this {
+    return super.off(event, listener);
+  }
+
+  constructor({ supportedNamespace, adapterType }: BlockchainAdapterConfig) {
     super();
-    this.projectId = projectId;
     this.supportedNamespace = supportedNamespace;
     this.adapterType = adapterType;
   }
 
-  setConnector(connector: WalletConnector) {
+  init({ connector }: BlockchainAdapterInitParams) {
     this.connector = connector;
+
     this.subscribeToEvents();
   }
 
@@ -45,7 +56,7 @@ export abstract class BlockchainAdapter extends EventEmitter {
   getProvider(): Provider {
     if (!this.connector) throw new Error('No active connector');
 
-    return this.connector.getProvider();
+    return this.connector.getProvider(this.getSupportedNamespace());
   }
 
   subscribeToEvents(): void {
@@ -68,19 +79,27 @@ export abstract class BlockchainAdapter extends EventEmitter {
 
   onAccountsChanged(accounts: string[]): void {
     const _accounts = this.getAccounts();
-    const shouldEmit = _accounts?.some(account => {
-      const accountAddress = account.split(':')[2];
-
-      return accountAddress !== undefined && accounts.includes(accountAddress);
-    });
-
-    if (shouldEmit) {
-      this.emit('accountsChanged', { accounts });
+    const updatedAccounts =
+      _accounts
+        ?.filter(account => {
+          const accountAddress = NetworkUtil.getPlainAddress(account);
+
+          return accountAddress !== undefined && accounts.includes(accountAddress);
+        })
+        ?.sort((a, b) => {
+          const aIndex = accounts.indexOf(NetworkUtil.getPlainAddress(a) ?? '');
+          const bIndex = accounts.indexOf(NetworkUtil.getPlainAddress(b) ?? '');
+
+          return aIndex - bIndex;
+        }) ?? [];
+
+    if (updatedAccounts.length > 0) {
+      this.emit('accountsChanged', { accounts: updatedAccounts });
     }
   }
 
   onDisconnect(): void {
-    this.emit('disconnect', { namespace: this.getSupportedNamespace() });
+    this.emit('disconnect', undefined);
 
     const provider = this.connector?.getProvider();
     if (provider) {

package/src/adapters/EvmAdapter.ts

@@ -1,6 +1,6 @@
 import { BlockchainAdapter } from './BlockchainAdapter';
 import { NumberUtil } from '../utils/NumberUtil';
-import type { AppKitNetwork } from '../utils/TypeUtil';
+import type { AppKitNetwork } from '../types';
 
 // Type definitions for writeContract
 export interface WriteContractData {
@@ -71,18 +71,6 @@ function encodeERC20Function(method: string, params: any[]): string {
 }
 
 export abstract class EVMAdapter extends BlockchainAdapter {
-  override subscribeToEvents(): void {
-    super.subscribeToEvents();
-    const provider = this.getProvider();
-    if (!provider) return;
-
-    // provider.on('reown_updateEmail', (info: any) => {
-    //   // this.emit('updateEmail', email);
-    //   //TODO: check this
-    //   // console.log('reown_updateEmail', info);
-    // });
-  }
-
   async signMessage(address: string, message: string, chain?: string): Promise<string> {
     const provider = this.getProvider();
 

package/src/adapters/__tests__/EvmAdapter.test.ts

@@ -1,5 +1,5 @@
 import { EVMAdapter } from '../EvmAdapter';
-import type { AppKitNetwork, CaipAddress } from '../../utils/TypeUtil';
+import type { AppKitNetwork, CaipAddress } from '../../types';
 
 const network: AppKitNetwork = {
   id: 1,
@@ -25,7 +25,7 @@ class MockEVMAdapter extends EVMAdapter {
   private mockProvider: any;
 
   constructor() {
-    super({ projectId: 'test', supportedNamespace: 'eip155', adapterType: 'ethers' });
+    super({ supportedNamespace: 'eip155', adapterType: 'ethers' });
     this.mockProvider = {
       request: jest.fn(),
       on: jest.fn(),

package/src/index.ts

@@ -13,4 +13,5 @@ export { bitcoin, bitcoinTestnet } from './networks/bitcoin';
 export { BlockchainAdapter } from './adapters/BlockchainAdapter';
 export { EVMAdapter } from './adapters/EvmAdapter';
 export { SolanaBaseAdapter } from './adapters/SolanaBaseAdapter';
-export * from './utils/TypeUtil';
+
+export * from './types';

package/src/networks/bitcoin.ts

@@ -1,4 +1,4 @@
-import type { AppKitNetwork } from '../utils/TypeUtil';
+import type { AppKitNetwork } from '../types';
 
 export const bitcoin: AppKitNetwork = {
   id: '000000000019d6689c085ae165831e93',

package/src/networks/solana.ts

@@ -1,4 +1,4 @@
-import type { AppKitNetwork } from '../utils/TypeUtil';
+import type { AppKitNetwork } from '../types';
 
 export const solana: AppKitNetwork = {
   id: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',

package/src/types/api/blockchain-api.ts

@@ -0,0 +1,213 @@
+import type { CaipAddress, CaipNetworkId, BaseError, RequestCache } from '../common';
+import type { Transaction } from '../blockchain/transaction';
+import type { SwapToken } from '../swap';
+
+export interface BlockchainApiIdentityRequest {
+  address: `0x${string}`;
+}
+
+export interface BlockchainApiIdentityResponse {
+  avatar: string;
+  name: string;
+}
+
+export interface BlockchainApiBalance {
+  name: string;
+  symbol: string;
+  chainId: string;
+  address?: CaipAddress;
+  value?: number;
+  price: number;
+  quantity: {
+    decimals: string;
+    numeric: string;
+  };
+  iconUrl: string;
+}
+
+export interface BlockchainApiBalanceResponse {
+  balances: BlockchainApiBalance[];
+}
+
+export interface BlockchainApiTransactionsRequest {
+  account: string;
+  projectId: string;
+  cursor?: string;
+  signal?: AbortSignal;
+  cache?: RequestCache;
+  chainId: CaipNetworkId;
+}
+
+export interface BlockchainApiTransactionsResponse {
+  data: Transaction[];
+  next: string | null;
+}
+
+export interface BlockchainApiSwapAllowanceResponse {
+  allowance: string;
+}
+
+export interface BlockchainApiGenerateSwapCalldataRequest {
+  projectId: string;
+  userAddress: CaipAddress;
+  from: CaipAddress;
+  to: CaipAddress;
+  amount: string;
+  eip155?: {
+    slippage: string;
+    permit?: string;
+  };
+}
+
+export interface BlockchainApiGenerateSwapCalldataResponse {
+  tx: {
+    from: CaipAddress;
+    to: CaipAddress;
+    data: `0x${string}`;
+    amount: string;
+    eip155: {
+      gas: string;
+      gasPrice: string;
+    };
+  };
+}
+
+export interface BlockchainApiGenerateApproveCalldataRequest {
+  projectId: string;
+  userAddress: CaipAddress;
+  from: CaipAddress;
+  to: CaipAddress;
+  amount?: number;
+}
+
+export interface BlockchainApiGenerateApproveCalldataResponse {
+  tx: {
+    from: CaipAddress;
+    to: CaipAddress;
+    data: `0x${string}`;
+    value: string;
+    eip155: {
+      gas: number;
+      gasPrice: string;
+    };
+  };
+}
+
+export interface BlockchainApiTokenPriceRequest {
+  projectId: string;
+  currency?: 'usd' | 'eur' | 'gbp' | 'aud' | 'cad' | 'inr' | 'jpy' | 'btc' | 'eth';
+  addresses: CaipAddress[];
+}
+
+export interface BlockchainApiTokenPriceResponse {
+  fungibles: {
+    name: string;
+    symbol: string;
+    iconUrl: string;
+    price: number;
+  }[];
+}
+
+export interface BlockchainApiSwapAllowanceRequest {
+  projectId: string;
+  tokenAddress: CaipAddress;
+  userAddress: CaipAddress;
+}
+
+export interface BlockchainApiGasPriceRequest {
+  projectId: string;
+  chainId: CaipNetworkId;
+}
+
+export interface BlockchainApiGasPriceResponse {
+  standard: string;
+  fast: string;
+  instant: string;
+}
+
+export interface BlockchainApiEnsError extends BaseError {
+  status: string;
+  reasons: { name: string; description: string }[];
+}
+
+export type ReownName = `${string}.reown.id` | `${string}.wcn.id`;
+
+export interface BlockchainApiLookupEnsName {
+  name: ReownName;
+  registered: number;
+  updated: number;
+  addresses: Record<
+    string,
+    {
+      address: string;
+      created: string;
+    }
+  >;
+  attributes: {
+    avatar?: string;
+    bio?: string;
+  }[];
+}
+
+export interface BlockchainApiSwapQuoteRequest {
+  projectId: string;
+  chainId?: CaipNetworkId;
+  amount: string;
+  userAddress: CaipAddress;
+  from: CaipAddress;
+  to: CaipAddress;
+  gasPrice: string;
+}
+
+export interface BlockchainApiSwapQuoteResponse {
+  quotes: {
+    id: string | null;
+    fromAmount: string;
+    fromAccount: string;
+    toAmount: string;
+    toAccount: string;
+  }[];
+}
+
+export interface BlockchainApiSwapTokensRequest {
+  projectId: string;
+  chainId: CaipNetworkId;
+}
+
+export interface BlockchainApiOnRampQuotesRequest {
+  countryCode: string;
+  paymentMethodType?: string;
+  destinationCurrencyCode: string;
+  sourceAmount: number;
+  sourceCurrencyCode: string;
+  walletAddress: string;
+  excludeProviders?: string[];
+}
+
+export interface BlockchainApiSwapTokensResponse {
+  tokens: SwapToken[];
+}
+
+export interface BlockchainApiOnRampWidgetRequest {
+  countryCode: string;
+  destinationCurrencyCode: string;
+  paymentMethodType: string;
+  serviceProvider: string;
+  sourceAmount: number;
+  sourceCurrencyCode: string;
+  walletAddress: string;
+  redirectUrl?: string;
+}
+
+export type BlockchainApiOnRampWidgetResponse = {
+  widgetUrl: string;
+};
+
+export class BlockchainOnRampError extends Error {
+  code: string;
+  constructor(code: string, message: string) {
+    super(message);
+    this.code = code;
+    this.message = message;
+  }
+}