@cryptorubic/web3 0.8.16-alpha-usdt-zero-bridge.0 → 0.8.16-alpha-usdt-zero-bridge.1

package/package.json

@@ -1,27 +1,25 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.8.16-alpha-usdt-zero-bridge.0",
+    "version": "0.8.16-alpha-usdt-zero-bridge.1",
     "dependencies": {
-        "tslib": "^2.3.0",
-        "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.8.16-alpha-usdt-zero-bridge.0",
-        "viem": "^2.19.1",
-        "web3-utils": "^4.3.1",
-        "@ton/ton": "^15.1.0",
+        "@ethersproject/bignumber": "^5.8.0",
+        "@mysten/sui": "^1.24.0",
+        "@solana/spl-token": "*",
         "@solana/web3.js": "1.95.3",
         "@solflare-wallet/utl-sdk": "^1.4.0",
-        "@ethersproject/bignumber": "^5.7.0",
-        "@cryptorubic/tron-types": "0.8.16-alpha-usdt-zero-bridge.0",
+        "@suiet/wallet-sdk": "^0.3.3",
+        "@ton/ton": "^15.1.0",
+        "axios": "*",
+        "bignumber.js": "9.1.2",
         "bitcoin-address-validation": "^2.2.3",
-        "axios": "0.27.2",
+        "bs58": "^6.0.0",
         "crc-32": "^1.2.2",
+        "js-base64": "^3.7.8",
         "tronweb": "^6.0.0-beta.4",
-        "@solana/spl-token": "0.2.0",
-        "@mysten/sui": "^1.24.0",
-        "@suiet/wallet-sdk": "^0.3.3",
-        "bs58": "^6.0.0",
-        "ethers": "5.7.2"
+        "tslib": "*",
+        "viem": "^2.33.1"
     },
+    "peerDependencies": {},
     "type": "commonjs",
     "main": "./src/index.js",
     "typings": "./src/index.d.ts",
@@ -31,5 +29,12 @@
     "author": {
         "name": "Sleta Dmitrii"
     },
+    "exports": {
+        "./package.json": "./package.json",
+        ".": {
+            "types": "./src/index.d.ts",
+            "default": "./src/index.js"
+        }
+    },
     "types": "./src/index.d.ts"
 }

package/src/lib/adapter/adapters/constants/tron-multicall-abi.d.ts

@@ -1,2 +1,2 @@
-import { AbiItem } from 'web3-utils';
+import { AbiItem } from '../../../utils/models/abi-types';
 export declare const TRON_MULTICALL_ABI: AbiItem[];

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

@@ -2,7 +2,7 @@ import { BlockchainName, TokenAmount } from '@cryptorubic/core';
 import { AllowanceInfo } from './common-types';
 import { AbstractAdapter } from '../abstract-adapter';
 import { EvmTransactionConfig } from '../../../utils/models/evm-transaction-config';
-import { TronTransactionConfig } from '@cryptorubic/tron-types';
+import { TronTransactionConfig } from '../../../utils/models/tron-transaction-config';
 export interface ApproveAdapter<T> extends AbstractAdapter<any, any, BlockchainName> {
     /**
      * @param fromTokenAddress erc20 address of checked token

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/solana-adapter.d.ts

@@ -1,6 +1,6 @@
 import { Abi, MulticallResponse, MulticallParameters } from 'viem';
 import { AbstractAdapter } from './abstract-adapter';
-import { AddressLookupTableAccount, Connection, Keypair, PublicKey, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
+import { AddressLookupTableAccount, Connection, Keypair, PublicKey, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
 import { HttpClient, ICustomLogger, PriceTokenAmount, SolanaBlockchainName, Token, TokenAmount } from '@cryptorubic/core';
 import { EvmTransactionConfig } from '../../utils/models/evm-transaction-config';
 import BigNumber from 'bignumber.js';
@@ -32,4 +32,8 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, Connectio
     getTxWithPayer(tx: VersionedTransaction, feePayer: string): Promise<VersionedTransaction>;
     deserializeTransaction(data: string): VersionedTransaction;
     serializeTransactionToBase58(tx: VersionedTransaction): string;
+    createTransferData(fromToken: PriceTokenAmount, walletAddress: string, receiver: string, convertToVersionedTx: boolean, allowOwnerOffCurve?: boolean): Promise<Transaction | VersionedTransaction>;
+    createNativeTransfer(fromAddress: PublicKey, toAddress: PublicKey, fromWeiAmount: string): Transaction;
+    createTokenTransfer(fromAddress: PublicKey, toAddress: PublicKey, fromTokenAddress: string, fromWeiAmount: string, allowOwnerOffCurve: boolean): Promise<Transaction>;
+    getLatestBlockhash(): Promise<string>;
 }

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

@@ -9,7 +9,7 @@ const web3_pure_1 = require("../../utils/web3-pure");
 const bignumber_js_1 = require("bignumber.js");
 const solana_tokens_service_1 = require("./utils/solana-tokens-service");
 const bs58_1 = require("bs58");
-const utils_1 = require("ethers/lib/utils");
+const js_base64_1 = require("js-base64");
 exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpcList, httpClient, logger) {
@@ -115,7 +115,7 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         return accounts.filter((v) => !!v);
     }
     async createVersionedTransaction(instructions, walletAddress, addressLookupTableAccounts = []) {
-        const { blockhash } = await this.public.getLatestBlockhash();
+        const blockhash = await this.getLatestBlockhash();
         const message = new web3_js_1.TransactionMessage({
             instructions,
             payerKey: new web3_js_1.PublicKey(walletAddress),
@@ -157,11 +157,53 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         return new web3_js_1.VersionedTransaction(newMsg);
     }
     deserializeTransaction(data) {
-        const decodedData = data.startsWith('0x') ? Buffer.from(data.slice(2), 'hex') : utils_1.base64.decode(data);
+        const decodedData = data.startsWith('0x') ? Buffer.from(data.slice(2), 'hex') : js_base64_1.Base64.toUint8Array(data);
         return web3_js_1.VersionedTransaction.deserialize(decodedData);
     }
     serializeTransactionToBase58(tx) {
         return bs58_1.default.encode(tx.serialize());
     }
+    async createTransferData(fromToken, walletAddress, receiver, convertToVersionedTx, allowOwnerOffCurve = false) {
+        const fromAddress = new web3_js_1.PublicKey(walletAddress);
+        const toAddress = new web3_js_1.PublicKey(receiver);
+        const transaction = fromToken.isNative
+            ? this.createNativeTransfer(fromAddress, toAddress, fromToken.stringWeiAmount)
+            : await this.createTokenTransfer(fromAddress, toAddress, fromToken.address, fromToken.stringWeiAmount, allowOwnerOffCurve);
+        if (convertToVersionedTx) {
+            const blockhash = await this.getLatestBlockhash();
+            const message = new web3_js_1.TransactionMessage({
+                payerKey: fromAddress,
+                recentBlockhash: blockhash,
+                instructions: transaction.instructions
+            }).compileToV0Message();
+            return new web3_js_1.VersionedTransaction(message);
+        }
+        return transaction;
+    }
+    createNativeTransfer(fromAddress, toAddress, fromWeiAmount) {
+        return new web3_js_1.Transaction().add(web3_js_1.SystemProgram.transfer({
+            fromPubkey: fromAddress,
+            toPubkey: toAddress,
+            lamports: BigInt(fromWeiAmount)
+        }));
+    }
+    async createTokenTransfer(fromAddress, toAddress, fromTokenAddress, fromWeiAmount, allowOwnerOffCurve) {
+        const mintTokenAccount = new web3_js_1.PublicKey(fromTokenAddress);
+        const [fromATA, toATA] = await Promise.all([
+            (0, spl_token_1.getAssociatedTokenAddress)(mintTokenAccount, fromAddress),
+            (0, spl_token_1.getAssociatedTokenAddress)(mintTokenAccount, toAddress, allowOwnerOffCurve)
+        ]);
+        const transaction = new web3_js_1.Transaction();
+        const receiverAccountInfo = await this.public.getAccountInfo(toATA);
+        if (!receiverAccountInfo) {
+            transaction.add((0, spl_token_1.createAssociatedTokenAccountInstruction)(fromAddress, toATA, toAddress, mintTokenAccount));
+        }
+        transaction.add((0, spl_token_1.createTransferInstruction)(fromATA, toATA, fromAddress, BigInt(fromWeiAmount)));
+        return transaction;
+    }
+    async getLatestBlockhash() {
+        const { blockhash } = await this.public.getLatestBlockhash();
+        return blockhash;
+    }
 }
 exports.SolanaAdapter = SolanaAdapter;

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/tron-adapter.d.ts

@@ -1,25 +1,26 @@
 import BigNumber from 'bignumber.js';
 import { AbstractAdapter } from './abstract-adapter';
-import { ContractMulticallResponse, MethodData, TronWeb3PrimitiveType } from '@cryptorubic/tron-types';
 import { TronWeb } from 'tronweb';
-import { AbiFragment } from 'tronweb/lib/commonjs/types';
 import { ICustomLogger, PriceTokenAmount, Token, TokenAmount, TronBlockchainName } from '@cryptorubic/core';
 import { TronTransactionConfig } from '../../utils/models/tron-transaction-config';
 import { TronParameters } from '../../utils/models/tron-parameters';
 import { Abi } from 'viem';
 import { ApproveAdapter } from './models/approve-adapter';
 import { AllowanceInfo } from './models/common-types';
+import { ContractMulticallResponse } from '../../utils/models/contract-multicall-response';
+import { TronWeb3PrimitiveType } from '../../utils/models/primitive-types';
+import { MethodData } from '../../utils/models/method-data';
 export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronBlockchainName> implements ApproveAdapter<TronTransactionConfig> {
     private readonly multicallAddress;
     needPreswapAction(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
     constructor(rpcList: string[], logger?: ICustomLogger);
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
-    multicallContractsMethods<Output extends TronWeb3PrimitiveType>(contractAbi: readonly AbiFragment[], contractsData: {
+    multicallContractsMethods<Output extends TronWeb3PrimitiveType>(contractAbi: any, contractsData: {
         contractAddress: string;
         methodsData: MethodData[];
-    }[]): Promise<ContractMulticallResponse<Output>[][]>;
+    }[]): Promise<ContractMulticallResponse<any>[][]>;
     private multicall;
-    read<T>(contractAddress: string, contractAbi: readonly AbiFragment[], methodName: string, methodArguments?: unknown[]): Promise<T>;
+    read<T>(contractAddress: string, contractAbi: any, methodName: string, methodArguments?: unknown[]): Promise<T>;
     private multicallContractsMethodsByOne;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token[]>;

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/adapter/constants/models/solana-web3.d.ts

@@ -4,7 +4,7 @@ export interface SolanaWeb3 {
         toBytes(): Uint8Array;
     };
     isConnected: boolean;
-    signTransaction(transaction: Transaction): Promise<Transaction>;
+    signTransaction(transaction: Transaction): Promise<Transaction | VersionedTransaction>;
     signAllTransactions(transactions: Transaction[]): Promise<Transaction[]>;
     signMessage(message: Uint8Array, encoding: string): Promise<{
         signature: Uint8Array;

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;

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

@@ -2,7 +2,6 @@ import { CommonWeb3Pure } from './common-web3-pure';
 import { TronTransactionConfig } from '../models/tron-transaction-config';
 import { TronParameters } from '../models/tron-parameters';
 import { TronWeb3PrimitiveType, Web3PrimitiveType } from '../models/primitive-types';
-import { FunctionFragment } from 'tronweb/src/types/ABI';
 import { AbiItem } from '../models/abi-types';
 export declare class TronWeb3Pure extends CommonWeb3Pure {
     constructor();
@@ -16,7 +15,7 @@ export declare class TronWeb3Pure extends CommonWeb3Pure {
      * @param methodArguments Parameters to encode.
      * @returns An ABI encoded function call. Means function signature + parameters.
      */
-    static encodeFunctionCall(contractAbi: FunctionFragment[], methodName: string, methodArguments: unknown[]): string;
+    static encodeFunctionCall(contractAbi: any[], methodName: string, methodArguments: unknown[]): string;
     static encodeMethodSignature(methodSignature: string, parameters: TronParameters): string;
     /**
      * Decodes method result using its JSON interface object and given parameters.
@@ -24,7 +23,7 @@ export declare class TronWeb3Pure extends CommonWeb3Pure {
      * @param response Bytes code returned after method call.
      * @returns Parsed method output.
      */
-    static decodeMethodOutput(outputAbi: FunctionFragment[], response: string): Web3PrimitiveType;
+    static decodeMethodOutput(outputAbi: any[], response: string): Web3PrimitiveType;
     private static flattenTypesToString;
     private static flattenTypesToArray;
     private static flattenParameters;