@cryptorubic/web3 0.12.7-alpha-rub-67.0 → 0.12.7-alpha-rub-121.1

package/README.md

@@ -1 +1 @@
-# web3
+# web3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.12.7-alpha-rub-67.0",
+    "version": "0.12.7-alpha-rub-121.1",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

package/src/lib/adapter/adapters/models/tonapi-models.d.ts

@@ -72,13 +72,13 @@ export interface TonApiTokenInfoForWalletResp {
             [k: string]: string;
         };
     };
-    wallet_address: {
+    wallet_address?: {
         /** address of user's contract for this token */
         address: string;
         is_scam: boolean;
         is_wallet: boolean;
     };
-    jetton: {
+    jetton?: {
         /** address of token(jetton) contract. Similaer to ERC20 contract address in EVM */
         address: string;
         name: string;

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

@@ -10,7 +10,7 @@ const web3_pure_1 = require("../../utils/web3-pure");
 class TonAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(httpClient, config, logger) {
         super(core_1.BLOCKCHAIN_NAME.TON, logger);
-        this.tonApi = new ton_api_service_1.TonApiService(httpClient, config.tonApiConfig);
+        this.tonApi = new ton_api_service_1.TonApiService(httpClient, config.tonApiConfig, logger);
         this.tonClient = new ton_1.TonClient(config.tonClientConfig);
     }
     async callForTokensInfo(tokenAddresses) {

package/src/lib/adapter/adapters/utils/ton-api.service.d.ts

@@ -1,14 +1,15 @@
 import { TonApiAccountInfoResp, TonApiAllNonNullableTokenInfoForWalletResp, TonApiParseAddressResp, TonApiTokenInfoForWalletResp, TonApiTokenInfoResp, TonApiTxDataByBocResp } from '../models/tonapi-models';
 import { TonCenterBlockInfo } from '../models/toncenter-types';
-import { HttpClient } from '@cryptorubic/core';
+import { HttpClient, ICustomLogger } from '@cryptorubic/core';
 import { TonApiConfig } from '../models/ton-api-config';
 import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
 export declare class TonApiService {
     private readonly httpClient;
+    private readonly logger?;
     private readonly tonApiUrl;
     private readonly apiKey;
     private readonly tonCenterV3Url;
-    constructor(httpClient: HttpClient, params: TonApiConfig);
+    constructor(httpClient: HttpClient, params: TonApiConfig, logger?: ICustomLogger | undefined);
     /**
      * @param walletAddress in any format: raw or friendly
      */

package/src/lib/adapter/adapters/utils/ton-api.service.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonApiService = void 0;
 class TonApiService {
-    constructor(httpClient, params) {
+    constructor(httpClient, params, logger) {
         this.httpClient = httpClient;
+        this.logger = logger;
         this.apiKey = params.tonApiKey;
         this.tonApiUrl = params?.tonApiUrl || 'https://tonapi.io';
         this.tonCenterV3Url = params.tonCenterV3Url || 'https://toncenter.com/api/v3';
@@ -148,16 +149,23 @@ class TonApiService {
      * @returns balance, decimals, name, symbol, walletJettonAddress, jettonAddress
      */
     async fetchTokenInfoForWallet(walletAddress, tokenAddress) {
-        const res = await this.httpClient.get(`${this.tonApiUrl}/v2/accounts/${walletAddress}/jettons/${tokenAddress}`, {
-            headers: {
-                apiKey: this.apiKey,
-                referer: 'https://app.rubic.exchange'
+        try {
+            const res = await this.httpClient.get(`${this.tonApiUrl}/v2/accounts/${walletAddress}/jettons/${tokenAddress}`, {
+                headers: {
+                    apiKey: this.apiKey,
+                    referer: 'https://app.rubic.exchange'
+                }
+            });
+            if ('error' in res) {
+                this.logger?.customError('[TonApiService] ERROR IN fetchTokenInfoForWallet', res.error);
+                return { balance: '0' };
             }
-        });
-        if ('error' in res) {
-            throw new Error(`[TonApiService] Error in fetchTokenInfoForWallet - ${res.error}`);
+            return res;
+        }
+        catch (err) {
+            this.logger?.customError('[TonApiService] ERROR IN fetchTokenInfoForWallet', err);
+            return { balance: '0' };
         }
-        return res;
     }
     async fetchAllNonNullableTokensInfoForWallet(walletAddress) {
         const res = await this.httpClient.get(`${this.tonApiUrl}/v2/accounts/${walletAddress}/jettons`, {

package/src/lib/utils/constants/web3-pure-store.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.web3PureStore = void 0;
 const core_1 = require("@cryptorubic/core");
-const evm_web3_pure_1 = require("../web3-types/evm-web3-pure");
-const tron_web3_pure_1 = require("../web3-types/tron-web3-pure");
 const bitcoin_web3_pure_1 = require("../web3-types/bitcoin-web3-pure");
-const changenow_api_blockchain_1 = require("./changenow-api-blockchain");
+const common_web3_pure_1 = require("../web3-types/common-web3-pure");
+const evm_web3_pure_1 = require("../web3-types/evm-web3-pure");
 const icp_web3_pure_1 = require("../web3-types/icp-web3-pure");
+const near_web3_pure_1 = require("../web3-types/near-web3-pure");
 const solana_web3_pure_1 = require("../web3-types/solana-web3-pure");
-const common_web3_pure_1 = require("../web3-types/common-web3-pure");
-const ton_web3_pure_1 = require("../web3-types/ton-web3-pure");
 const sui_web3_pure_1 = require("../web3-types/sui-web3-pure");
+const ton_web3_pure_1 = require("../web3-types/ton-web3-pure");
+const tron_web3_pure_1 = require("../web3-types/tron-web3-pure");
+const changenow_api_blockchain_1 = require("./changenow-api-blockchain");
 exports.web3PureStore = {
     [core_1.CHAIN_TYPE.EVM]: new evm_web3_pure_1.EvmWeb3Pure(),
     [core_1.CHAIN_TYPE.SUI]: new sui_web3_pure_1.SuiWeb3Pure(),
@@ -21,6 +22,7 @@ exports.web3PureStore = {
     [core_1.CHAIN_TYPE.BITCOIN_DIAMOND]: new bitcoin_web3_pure_1.BitcoinWeb3Pure(),
     [core_1.CHAIN_TYPE.BITCOIN_GOLD]: new bitcoin_web3_pure_1.BitcoinWeb3Pure(),
     [core_1.CHAIN_TYPE.BSV]: new bitcoin_web3_pure_1.BitcoinWeb3Pure(),
+    [core_1.CHAIN_TYPE.NEAR]: new near_web3_pure_1.NearWeb3Pure(),
     // Common Web3
     [core_1.CHAIN_TYPE.RIPPLE]: new common_web3_pure_1.CommonWeb3Pure({
         cnApiKey: changenow_api_blockchain_1.changenowApiBlockchain.RIPPLE,
@@ -46,10 +48,6 @@ exports.web3PureStore = {
         cnApiKey: changenow_api_blockchain_1.changenowApiBlockchain.MONERO,
         regex: /^[48][a-zA-Z|\d]{94}([a-zA-Z|\d]{11})?$/
     }),
-    [core_1.CHAIN_TYPE.NEAR]: new common_web3_pure_1.CommonWeb3Pure({
-        cnApiKey: changenow_api_blockchain_1.changenowApiBlockchain.NEAR,
-        regex: /(^[a-z0-9_-]{2,64}\.near$)|(^[0-9a-f]{64}$)/
-    }),
     [core_1.CHAIN_TYPE.ALGORAND]: new common_web3_pure_1.CommonWeb3Pure({
         cnApiKey: changenow_api_blockchain_1.changenowApiBlockchain.ALGORAND,
         regex: /^[A-Z0-9]{58}/

package/src/lib/utils/web3-types/near-web3-pure.d.ts

@@ -0,0 +1,6 @@
+import { CommonWeb3Pure } from './common-web3-pure';
+export declare class NearWeb3Pure extends CommonWeb3Pure {
+    readonly nativeTokenAddress = "near";
+    constructor();
+    isAddressCorrect(address: string): Promise<boolean>;
+}

package/src/lib/utils/web3-types/near-web3-pure.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NearWeb3Pure = void 0;
+const changenow_api_blockchain_1 = require("../constants/changenow-api-blockchain");
+const common_web3_pure_1 = require("./common-web3-pure");
+class NearWeb3Pure extends common_web3_pure_1.CommonWeb3Pure {
+    constructor() {
+        super({
+            cnApiKey: changenow_api_blockchain_1.changenowApiBlockchain.NEAR,
+            regex: /(^(?=.{2,64}$)([a-z0-9][a-z0-9\-_]*(?<![-_])\.)*[a-z0-9][a-z0-9\-_]*(?<![-_])(\.near)$)|(^[0-9a-f]{64}$)/
+        });
+        this.nativeTokenAddress = 'near';
+    }
+    async isAddressCorrect(address) {
+        if (this.isNativeAddress(address)) {
+            return true;
+        }
+        if (this.regEx) {
+            return this.regEx.test(address);
+        }
+        throw new Error(`Validation function is not implemented for ${this.constructor.name}`);
+    }
+}
+exports.NearWeb3Pure = NearWeb3Pure;