@cryptorubic/web3 1.0.0-alpha.no-sdk.9 → 1.0.0-alpha.no-sdk.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.0.0-alpha.no-sdk.9",
+    "version": "1.0.0-alpha.no-sdk.10",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

package/src/lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter.d.ts

@@ -14,7 +14,7 @@ export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet
     readonly client: BitcoinAdapterClient;
     constructor(httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
-    getBalance(userAddress: string): Promise<BigNumber>;
+    getBalance(userAddress: string, _tokenAddress?: string): Promise<BigNumber>;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends Web3PrimitiveType>(contractAbi: Abi, contractsData: {
         contractAddress: string;

package/src/lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter.js

@@ -14,7 +14,7 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     callContractMethod() {
         throw new Error('Method not implemented.');
     }
-    async getBalance(userAddress) {
+    async getBalance(userAddress, _tokenAddress) {
         const url = `https://api.blockcypher.com/v1/btc/main/addrs/${userAddress}/balance`;
         const response = await this.httpClient.get(url);
         return new bignumber_js_1.default(response.final_balance);

package/src/lib/adapter/adapters/adapter-evm/evm-adapter.js

@@ -258,14 +258,15 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
      * @returns wei amount
      */
     async getBalance(walletAddress, tokenAddress) {
-        if (!tokenAddress) {
-            const nativeBalance = await this.public.getBalance({
-                address: walletAddress
-            });
-            return new bignumber_js_1.default(nativeBalance.toString());
+        const isToken = tokenAddress && !web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.EVM, tokenAddress);
+        if (isToken) {
+            const tokenBalance = await this.client.read(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'balanceOf', [walletAddress]);
+            return new bignumber_js_1.default(tokenBalance);
         }
-        const tokenBalance = await this.client.read(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'balanceOf', [walletAddress]);
-        return new bignumber_js_1.default(tokenBalance);
+        const nativeBalance = await this.public.getBalance({
+            address: walletAddress
+        });
+        return new bignumber_js_1.default(nativeBalance.toString());
     }
     async getTransactionCount(walletAddress) {
         const transactionCount = await this.public?.getTransactionCount({

package/src/lib/adapter/adapters/adapter-solana/solana-adapter.d.ts

@@ -28,7 +28,7 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, SolanaWeb
     private createConection;
     simulateTransaction(_config: object, _from: string): Promise<void>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
-    getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
+    getBalance(userAddress: string, tokenAddress?: string): Promise<BigNumber>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SolanaBlockchainName>[]>;
     parseRawInstruction(rawInstruction: SolanaRawInstruction[], dataFormat: BufferEncoding): TransactionInstruction[];
     parseLUTAddresses(lookupTableAddresses: string[]): Promise<AddressLookupTableAccount[]>;

package/src/lib/adapter/adapters/adapter-sui/sui-adapter.d.ts

@@ -22,6 +22,6 @@ export declare class SuiAdapter extends AbstractAdapter<SuiClient, WalletAdapter
     simulateTransaction(_config: object, _from: string): Promise<void>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SuiBlockchainName>[]>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
-    getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
+    getBalance(userAddress: string, tokenAddress?: string): Promise<BigNumber>;
     compareSuiAddress(addressA: string, addressB: string): boolean;
 }

package/src/lib/adapter/adapters/common/abstract-adapter.d.ts

@@ -13,6 +13,12 @@ export declare abstract class AbstractAdapter<P, W, B extends BlockchainName, Se
     protected set public(value: P | null);
     get public(): P;
     protected constructor(blockchain: B, logger?: ICustomLogger);
+    /**
+     * Gets account native or token balance in wei.
+     * @param userAddress Wallet address, whose balance you want to find out.
+     * @param tokenAddress Address of the smart-contract corresponding to the token,
+     */
+    abstract getBalance(userAddress: string, tokenAddress?: string): Promise<BigNumber>;
     abstract getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     abstract checkEnoughBalance(token: TokenAmount, walletAddress: string): Promise<boolean>;
     abstract callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<BlockchainName>[]>;