@cryptorubic/web3 0.8.5-alpha.2 → 0.8.6-alpha-relay-solana.0

package/package.json

@@ -1,17 +1,17 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.8.5-alpha.2",
+    "version": "0.8.6-alpha-relay-solana.0",
     "dependencies": {
         "tslib": "^2.3.0",
         "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.8.5-alpha.2",
+        "@cryptorubic/core": "0.8.6-alpha-relay-solana.0",
         "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.5-alpha.2",
+        "@cryptorubic/tron-types": "0.8.6-alpha-relay-solana.0",
         "bitcoin-address-validation": "^2.2.3",
         "axios": "0.27.2",
         "crc-32": "^1.2.2",

package/src/lib/adapter/adapters/models/solana-web3-types.d.ts

@@ -49,3 +49,12 @@ export type ReturnValue = Promise<{
         }>;
     }>>;
 }>;
+export interface SolanaRawInstruction {
+    data: string;
+    keys: {
+        isSigner: boolean;
+        isWritable: boolean;
+        pubkey: string;
+    }[];
+    programId: string;
+}

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

@@ -1,9 +1,10 @@
 import { Abi, MulticallResponse, MulticallParameters } from 'viem';
 import { AbstractAdapter } from './abstract-adapter';
-import { Connection } from '@solana/web3.js';
+import { Connection, 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';
 export declare const NATIVE_SOLANA_MINT_ADDRESS = "So11111111111111111111111111111111111111111";
 export declare class SolanaAdapter extends AbstractAdapter<Connection, Connection, SolanaBlockchainName> {
     private readonly httpClient;
@@ -23,4 +24,6 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, Connectio
      */
     getTokensBalances(address: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SolanaBlockchainName>[]>;
+    parseRawInstruction(rawInstruction: SolanaRawInstruction[], dataFormat: BufferEncoding): TransactionInstruction[];
+    createVersionedTransaction(instructions: TransactionInstruction[], walletAddress: string, addressLookupTableAddresses?: string[]): Promise<VersionedTransaction>;
 }

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

@@ -70,32 +70,6 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
             return new bignumber_js_1.default(tokenWithBalance || NaN);
         });
     }
-    // public async callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SolanaBlockchainName>[]> {
-    //     const nativeToken = nativeTokensList[BLOCKCHAIN_NAME.SOLANA] as Token<SolanaBlockchainName>;
-    //     const nativeTokenIndex = tokenAddresses.findIndex((address) => Web3Pure.isNativeAddress(CHAIN_TYPE.SOLANA, address));
-    //     const filteredTokenAddresses = tokenAddresses.filter((_, index) => index !== nativeTokenIndex);
-    //     // only native token in tokenAddresses
-    //     if (!filteredTokenAddresses.length) {
-    //         return [nativeToken];
-    //     }
-    //     const mints = filteredTokenAddresses.map((address) => new PublicKey(address));
-    //     const tokenSdk = new TokenSdk();
-    //     const tokensMint = await tokenSdk.fetchMints(mints);
-    //     const tokens = tokensMint.map((token) => {
-    //         return new Token({
-    //             address: token.address.toString(),
-    //             blockchain: BLOCKCHAIN_NAME.SOLANA,
-    //             decimals: token.decimals!,
-    //             name: token.name,
-    //             symbol: token.symbol
-    //         });
-    //     });
-    //     if (nativeTokenIndex === -1) {
-    //         return tokens;
-    //     }
-    //     tokens.splice(nativeTokenIndex, 0, nativeToken);
-    //     return tokens;
-    // }
     async callForTokensInfo(tokenAddresses) {
         const nativeToken = core_1.nativeTokensList[core_1.BLOCKCHAIN_NAME.SOLANA];
         const nativeTokenIndex = tokenAddresses.findIndex((address) => web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.SOLANA, address));
@@ -121,5 +95,32 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         tokens.splice(nativeTokenIndex, 0, nativeToken);
         return tokens;
     }
+    parseRawInstruction(rawInstruction, dataFormat) {
+        return rawInstruction.map((instruction) => {
+            return new web3_js_1.TransactionInstruction({
+                keys: instruction.keys.map((key) => ({
+                    pubkey: new web3_js_1.PublicKey(key.pubkey),
+                    isWritable: key.isWritable,
+                    isSigner: key.isSigner
+                })),
+                data: Buffer.from(instruction.data, dataFormat),
+                programId: new web3_js_1.PublicKey(instruction.programId)
+            });
+        });
+    }
+    async createVersionedTransaction(instructions, walletAddress, addressLookupTableAddresses) {
+        const { blockhash } = await this.public.getLatestBlockhash();
+        let addressLookupTableAccounts = [];
+        if (addressLookupTableAddresses) {
+            const res = await Promise.all(addressLookupTableAddresses.map((address) => this.public.getAddressLookupTable(new web3_js_1.PublicKey(address)).then((v) => v.value)));
+            addressLookupTableAccounts = res.filter((v) => !!v);
+        }
+        const message = new web3_js_1.TransactionMessage({
+            instructions,
+            payerKey: new web3_js_1.PublicKey(walletAddress),
+            recentBlockhash: blockhash
+        }).compileToV0Message(addressLookupTableAccounts);
+        return new web3_js_1.VersionedTransaction(message);
+    }
 }
 exports.SolanaAdapter = SolanaAdapter;

package/src/lib/adapter/adapters/utils/solana-tokens-service.js

@@ -109,12 +109,6 @@ class SolanaTokensService {
         const notFetchedTokensList = this.initialMints.filter((mint) => !fetchedTokensMap.get(mint.toString()));
         return notFetchedTokensList;
     }
-    // private getNotFetchedTokensList(tokensList: SolanaToken[]): PublicKey[] {
-    //     const notFetchedTokensList = this.initialMints.filter((mint) =>
-    //         tokensList.every((token) => !compareAddresses(token.address, mint.toString()))
-    //     );
-    //     return notFetchedTokensList;
-    // }
     async getTokensList(tokenAddresses) {
         try {
             const queryParams = tokenAddresses.length > 1 ? { addresses: tokenAddresses.join(',') } : { query: tokenAddresses[0] };