Merge branch 'alpha' into beta

src/client/core-api/api-client-caching.ts

@@ -3,6 +3,7 @@ import { ChainSymbol } from "../../chains";
 import { PoolInfoMap, PoolKeyObject } from "../../tokens-info";
 import { ApiClient, TokenInfo } from "./api-client";
 import {
+  CheckAddressResponse,
   GasBalanceResponse,
   PendingInfoResponse,
   ReceiveTransactionCostRequest,
@@ -48,6 +49,10 @@ export class ApiClientCaching implements ApiClient {
     return gasBalancePromise;
   }
 
+  async checkAddress(chainSymbol: ChainSymbol, address: string, tokenAddress?: string): Promise<CheckAddressResponse> {
+    return this.apiClient.checkAddress(chainSymbol, address, tokenAddress);
+  }
+
   async getPendingInfo(): Promise<PendingInfoResponse> {
     const PENDING_INFO_CACHE_KEY = "PENDING_INFO_CACHE_KEY";
     const pendingInfo = this.pendingInfoCache.get(PENDING_INFO_CACHE_KEY);

src/client/core-api/api-client.ts

@@ -9,6 +9,7 @@ import {
 } from "./core-api-mapper";
 import {
   ChainDetailsResponse,
+  CheckAddressResponse,
   GasBalanceResponse,
   PendingInfoResponse,
   PoolInfoResponse,
@@ -25,10 +26,17 @@ export interface TokenInfo {
 
 export interface ApiClient {
   getTokenInfo(): Promise<TokenInfo>;
+
   getPendingInfo(): Promise<PendingInfoResponse>;
+
   getGasBalance(chainSymbol: ChainSymbol, address: string): Promise<GasBalanceResponse>;
+
+  checkAddress(chainSymbol: ChainSymbol, address: string, tokenAddress?: string): Promise<CheckAddressResponse>;
+
   getTransferStatus(chainSymbol: ChainSymbol, txId: string): Promise<TransferStatusResponse>;
+
   getReceiveTransactionCost(args: ReceiveTransactionCostRequest): Promise<ReceiveTransactionCostResponse>;
+
   getPoolInfoMap(pools: PoolKeyObject[] | PoolKeyObject): Promise<PoolInfoMap>;
 }
 
@@ -65,6 +73,17 @@ export class ApiClientImpl implements ApiClient {
     return data;
   }
 
+  async checkAddress(chainSymbol: ChainSymbol, address: string, tokenAddress?: string): Promise<CheckAddressResponse> {
+    if (tokenAddress) {
+      const { data } = await this.api.get<CheckAddressResponse>(`/check/${chainSymbol}/${address}`, {
+        params: { token: tokenAddress, ...this.api.defaults.params },
+      });
+      return data;
+    }
+    const { data } = await this.api.get<CheckAddressResponse>(`/check/${chainSymbol}/${address}`);
+    return data;
+  }
+
   async getTransferStatus(chainSymbol: ChainSymbol, txId: string): Promise<TransferStatusResponse> {
     const { data } = await this.api.get<TransferStatusResponse>(`/chain/${chainSymbol}/${txId}`);
     return data;

src/client/core-api/core-api.model.ts

@@ -18,6 +18,7 @@ export enum AddressStatus {
   FORBIDDEN = "FORBIDDEN",
   UNINITIALIZED = "UNINITIALIZED",
   CONTRACT_ADDRESS = "CONTRACT_ADDRESS",
+  WRONG_ASSOCIATED_ACCOUNT_OWNER = "WRONG_ASSOCIATED_ACCOUNT_OWNER",
 }
 
 export interface TokenDTO {
@@ -87,6 +88,11 @@ export interface GasBalanceResponse {
   status: AddressStatus;
 }
 
+export interface CheckAddressResponse {
+  gasBalance: string | null;
+  status: AddressStatus;
+}
+
 export interface TransferStatusResponse {
   txId: string;
 

src/client/core-api/core-client-pool-info-caching.ts

@@ -3,6 +3,7 @@ import { ChainSymbol } from "../../chains";
 import { ChainDetailsMap, PoolInfo, PoolInfoMap, PoolKeyObject, TokenWithChainDetails } from "../../tokens-info";
 import { mapChainDetailsMapToPoolKeyObjects, mapPoolKeyObjectToPoolKey } from "./core-api-mapper";
 import {
+  CheckAddressResponse,
   GasBalanceResponse,
   PendingInfoResponse,
   ReceiveTransactionCostRequest,
@@ -44,6 +45,10 @@ export class AllbridgeCoreClientPoolInfoCaching implements AllbridgeCoreClient {
     return this.client.getGasBalance(chainSymbol, address);
   }
 
+  checkAddress(chainSymbol: ChainSymbol, address: string, tokenAddress?: string): Promise<CheckAddressResponse> {
+    return this.client.checkAddress(chainSymbol, address, tokenAddress);
+  }
+
   async getPoolInfoByKey(poolKeyObject: PoolKeyObject): Promise<PoolInfo> {
     this.poolInfoCache.putAllIfNotExists((await this.client.getChainDetailsMapAndPoolInfoMap()).poolInfoMap);
     const poolInfo = this.poolInfoCache.get(poolKeyObject);

src/client/core-api/index.ts

@@ -2,6 +2,7 @@ import { ChainSymbol } from "../../chains";
 import { ChainDetailsMap, PoolInfoMap, PoolKeyObject, TokenWithChainDetails } from "../../tokens-info";
 import { ApiClient } from "./api-client";
 import {
+  CheckAddressResponse,
   GasBalanceResponse,
   PendingInfoResponse,
   ReceiveTransactionCostRequest,
@@ -48,6 +49,10 @@ export class AllbridgeCoreClientImpl implements AllbridgeCoreClient {
     return this.apiClient.getGasBalance(chainSymbol, address);
   }
 
+  async checkAddress(chainSymbol: ChainSymbol, address: string, tokenAddress?: string): Promise<CheckAddressResponse> {
+    return this.apiClient.checkAddress(chainSymbol, address, tokenAddress);
+  }
+
   async getChainDetailsMapAndPoolInfoMap(): Promise<{
     chainDetailsMap: ChainDetailsMap;
     poolInfoMap: PoolInfoMap;

src/index.ts

@@ -7,7 +7,9 @@ import {
   BridgeService,
   ChainDetailsMap,
   ChainSymbol,
+  CheckAddressResponse,
   ExtraGasMaxLimitResponse,
+  GasBalanceResponse,
   GasFeeOptions,
   GetNativeTokenBalanceParams,
   GetTokenBalanceParams,
@@ -20,7 +22,6 @@ import {
   SwapAndBridgeCalculationData,
   TokenWithChainDetails,
   TransferStatusResponse,
-  GasBalanceResponse,
 } from "./models";
 import { AllbridgeCoreSdkService, NodeRpcUrlsConfig } from "./services";
 import { DefaultUtils, Utils } from "./utils";
@@ -142,6 +143,15 @@ export class AllbridgeCoreSdk {
     return this.service.getGasBalance(chainSymbol, address);
   }
 
+  /**
+   * Check address and show gas balance
+   * @param chainSymbol
+   * @param address
+   */
+  async checkAddress(chainSymbol: ChainSymbol, address: string, tokenAddress?: string): Promise<CheckAddressResponse> {
+    return this.service.checkAddress(chainSymbol, address, tokenAddress);
+  }
+
   /**
    * Returns information about pending transactions for the same destination chain and the amount of tokens can be received as a result of transfer considering pending transactions.
    * @param amount the amount of tokens that will be sent

src/models/index.ts

@@ -16,6 +16,7 @@ export {
   TransferStatusResponse,
   BridgeTransaction,
   GasBalanceResponse,
+  CheckAddressResponse,
   AddressStatus,
 } from "../client/core-api/core-api.model";
 export { ChainSymbol, ChainType } from "../chains/index";

src/services/index.ts

@@ -4,6 +4,7 @@ import { AllbridgeCoreClientImpl } from "../client/core-api";
 import { ApiClientImpl } from "../client/core-api/api-client";
 import { ApiClientCaching } from "../client/core-api/api-client-caching";
 import {
+  CheckAddressResponse,
   GasBalanceResponse,
   Messenger,
   PendingInfoDTO,
@@ -109,6 +110,10 @@ export class AllbridgeCoreSdkService {
     return this.api.getGasBalance(chainSymbol, address);
   }
 
+  async checkAddress(chainSymbol: ChainSymbol, address: string, tokenAddress?: string): Promise<CheckAddressResponse> {
+    return this.api.checkAddress(chainSymbol, address, tokenAddress);
+  }
+
   async getPendingStatusInfo(
     amount: string,
     amountFormat: AmountFormat,