@cryptorubic/web3 0.8.16-alpha.1 → 0.8.17-alpha.solana.1

package/package.json

@@ -1,17 +1,17 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.8.16-alpha.1",
+    "version": "0.8.17-alpha.solana.1",
     "dependencies": {
         "tslib": "^2.3.0",
         "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.8.16-alpha.1",
+        "@cryptorubic/core": "0.8.17-alpha.solana.1",
         "viem": "^2.19.1",
         "web3-utils": "^4.3.1",
         "@ton/ton": "^15.1.0",
         "@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.1",
+        "@cryptorubic/tron-types": "0.8.17-alpha.solana.1",
         "bitcoin-address-validation": "^2.2.3",
         "axios": "0.27.2",
         "crc-32": "^1.2.2",

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

@@ -2,10 +2,11 @@ import { Abi, MulticallResponse, MulticallParameters } from 'viem';
 import { AbstractAdapter } from './abstract-adapter';
 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';
 import { SolanaRawInstruction } from './models/solana-web3-types';
+import { SolanaTxConfig } from '../../utils/models/solana-transaction-config';
 export declare const NATIVE_SOLANA_MINT_ADDRESS = "So11111111111111111111111111111111111111111";
+export declare const DEFAULT_CU_LIMIT = 600000;
 export declare class SolanaAdapter extends AbstractAdapter<Connection, Connection, SolanaBlockchainName> {
     private readonly httpClient;
     constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger);
@@ -14,7 +15,7 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, Connectio
     write<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;
     multicallByContract<T>(_contracts: MulticallParameters, _allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
     multicallByAddress<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[][], _allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
-    simulateTransaction(_config: EvmTransactionConfig, _from: string): Promise<void>;
+    simulateTransaction(config: SolanaTxConfig, timeout?: number): Promise<string>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
     getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
     /**

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaAdapter = exports.NATIVE_SOLANA_MINT_ADDRESS = void 0;
+exports.SolanaAdapter = exports.DEFAULT_CU_LIMIT = exports.NATIVE_SOLANA_MINT_ADDRESS = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const abstract_adapter_1 = require("./abstract-adapter");
 const web3_js_1 = require("@solana/web3.js");
@@ -11,6 +11,7 @@ const solana_tokens_service_1 = require("./utils/solana-tokens-service");
 const bs58_1 = require("bs58");
 const utils_1 = require("ethers/lib/utils");
 exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
+exports.DEFAULT_CU_LIMIT = 600000;
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpcList, httpClient, logger) {
         super(core_1.BLOCKCHAIN_NAME.SOLANA, logger);
@@ -38,7 +39,28 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     async multicallByAddress(_address, _abi, _method, _methodArgs = [], _allowErrors = true) {
         throw new Error('Method multicall is not supported');
     }
-    async simulateTransaction(_config, _from) { }
+    async simulateTransaction(config, timeout = 15000) {
+        try {
+            const bufferData = config.data.startsWith('0x') ? Buffer.from(config.data.slice(2), 'hex') : Buffer.from(config.data, 'base64');
+            const { blockhash } = await this.public.getLatestBlockhash();
+            const tx = web3_js_1.VersionedTransaction.deserialize(bufferData);
+            tx.message.recentBlockhash = blockhash;
+            const simulation = this.public.simulateTransaction(tx, {
+                commitment: 'finalized',
+                replaceRecentBlockhash: false,
+                sigVerify: true,
+                accounts: { encoding: 'base64', addresses: [...Object.values(config.accounts)] }
+            });
+            const resp = await Promise.race([
+                simulation,
+                new Promise((_, reject) => setTimeout(() => reject('Timeout'), timeout))
+            ]);
+            return new bignumber_js_1.default(resp.value.unitsConsumed || exports.DEFAULT_CU_LIMIT).toFixed(0);
+        }
+        catch (err) {
+            throw err;
+        }
+    }
     async checkEnoughBalance(token, walletAddress) {
         const balance = await this.getBalance(walletAddress, token.address);
         return balance.gte(token.tokenAmount);

package/src/lib/utils/models/solana-transaction-config.d.ts

@@ -0,0 +1,11 @@
+type Base64String = `AQA${string}`;
+export interface SolanaTxConfig {
+    data: Base64String;
+    accounts: {
+        walletAddress?: string;
+        fromATA?: string;
+        toATA?: string;
+    };
+    estimateConsumedUnits?: boolean;
+}
+export {};

package/src/lib/utils/models/solana-transaction-config.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });