@cryptorubic/web3 0.9.0-alpha.0 → 0.9.0

package/package.json

@@ -1,25 +1,25 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.9.0-alpha.0",
+    "version": "0.9.0",
     "dependencies": {
-        "tslib": "^2.3.0",
-        "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.9.0-alpha.0",
-        "viem": "^2.19.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.9.0-alpha.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",
-        "web3-utils": "4.3.3"
+        "tslib": "*",
+        "viem": "^2.33.1"
     },
+    "peerDependencies": {},
     "type": "commonjs",
     "main": "./src/index.js",
     "typings": "./src/index.d.ts",
@@ -29,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/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/solana-adapter.d.ts

@@ -1,6 +1,6 @@
 import { Abi, MulticallResponse, MulticallParameters } from 'viem';
 import { AbstractAdapter } from './abstract-adapter';
-import { AddressLookupTableAccount, Connection, PublicKey, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
+import { AddressLookupTableAccount, Connection, Keypair, PublicKey, 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';
@@ -28,4 +28,8 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, Connectio
     parseLUTAddresses(lookupTableAddresses: string[]): Promise<AddressLookupTableAccount[]>;
     createVersionedTransaction(instructions: TransactionInstruction[], walletAddress: string, addressLookupTableAccounts?: AddressLookupTableAccount[]): Promise<VersionedTransaction>;
     getAtaAddress(walletAddress: string, tokenAddress: string): Promise<PublicKey>;
+    getKeypairFromSecret(pk?: string): Keypair | null;
+    getTxWithPayer(tx: VersionedTransaction, feePayer: string): Promise<VersionedTransaction>;
+    deserializeTransaction(data: string): VersionedTransaction;
+    serializeTransactionToBase58(tx: VersionedTransaction): string;
 }

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

@@ -8,6 +8,8 @@ const core_1 = require("@cryptorubic/core");
 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 js_base64_1 = require("js-base64");
 exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpcList, httpClient, logger) {
@@ -124,5 +126,42 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     getAtaAddress(walletAddress, tokenAddress) {
         return (0, spl_token_1.getAssociatedTokenAddress)(new web3_js_1.PublicKey(tokenAddress), new web3_js_1.PublicKey(walletAddress));
     }
+    getKeypairFromSecret(pk) {
+        if (!pk) {
+            return null;
+        }
+        const array = pk.split(',').map((s) => parseInt(s, 10));
+        const secretKey = Uint8Array.from(array);
+        return web3_js_1.Keypair.fromSecretKey(secretKey);
+    }
+    async getTxWithPayer(tx, feePayer) {
+        const altAccounts = [];
+        for (const lookup of tx.message.addressTableLookups) {
+            const { value } = await this.public.getAddressLookupTable(lookup.accountKey);
+            if (value) {
+                altAccounts.push(value);
+            }
+            else {
+                throw new Error(`ALT not found: ${lookup.accountKey.toBase58()}`);
+            }
+        }
+        const decompiled = web3_js_1.TransactionMessage.decompile(tx.message, {
+            addressLookupTableAccounts: altAccounts
+        });
+        const { blockhash } = await this.public.getLatestBlockhash();
+        const newMsg = new web3_js_1.TransactionMessage({
+            instructions: decompiled.instructions,
+            payerKey: new web3_js_1.PublicKey(feePayer),
+            recentBlockhash: blockhash
+        }).compileToV0Message(altAccounts);
+        return new web3_js_1.VersionedTransaction(newMsg);
+    }
+    deserializeTransaction(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());
+    }
 }
 exports.SolanaAdapter = SolanaAdapter;

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/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;