@cryptorubic/web3 0.8.9-alpha-rub-70.0 → 0.8.10-alpha-squid-solana.1

package/package.json

@@ -1,17 +1,17 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.8.9-alpha-rub-70.0",
+    "version": "0.8.10-alpha-squid-solana.1",
     "dependencies": {
         "tslib": "^2.3.0",
         "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.8.9-alpha-rub-70.0",
+        "@cryptorubic/core": "0.8.10-alpha-squid-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.9-alpha-rub-70.0",
+        "@cryptorubic/tron-types": "0.8.10-alpha-squid-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

@@ -1,6 +1,6 @@
 import { Abi, MulticallResponse, MulticallParameters } from 'viem';
 import { AbstractAdapter } from './abstract-adapter';
-import { AddressLookupTableAccount, Connection, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
+import { AddressLookupTableAccount, Connection, 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';
@@ -27,4 +27,8 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, Connectio
     parseRawInstruction(rawInstruction: SolanaRawInstruction[], dataFormat: BufferEncoding): TransactionInstruction[];
     parseLUTAddresses(lookupTableAddresses: string[]): Promise<AddressLookupTableAccount[]>;
     createVersionedTransaction(instructions: TransactionInstruction[], walletAddress: string, addressLookupTableAccounts?: AddressLookupTableAccount[]): Promise<VersionedTransaction>;
+    createTransferData(fromToken: PriceTokenAmount, walletAddress: string, receiver: string, convertToVersionedTx: boolean): Promise<Transaction | VersionedTransaction>;
+    createNativeTransfer(fromAddress: PublicKey, toAddress: PublicKey, fromWeiAmount: string): Transaction;
+    createTokenTransfer(fromAddress: PublicKey, toAddress: PublicKey, fromTokenAddress: string, fromWeiAmount: string): Promise<Transaction>;
+    getLatestBlockhash(): Promise<string>;
 }

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

@@ -113,7 +113,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),
@@ -121,5 +121,49 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         }).compileToV0Message(addressLookupTableAccounts);
         return new web3_js_1.VersionedTransaction(message);
     }
+    async createTransferData(fromToken, walletAddress, receiver, convertToVersionedTx) {
+        const fromAddress = new web3_js_1.PublicKey(walletAddress);
+        const toAddress = new web3_js_1.PublicKey(receiver);
+        this.logger?.customLog('111111111111111', [fromAddress, toAddress]);
+        const transaction = fromToken.isNative
+            ? this.createNativeTransfer(fromAddress, toAddress, fromToken.stringWeiAmount)
+            : await this.createTokenTransfer(fromAddress, toAddress, fromToken.address, fromToken.stringWeiAmount);
+        this.logger?.customLog('22222222222222222');
+        if (convertToVersionedTx) {
+            const blockhash = await this.getLatestBlockhash();
+            const message = new web3_js_1.TransactionMessage({
+                payerKey: transaction.feePayer,
+                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) {
+        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)
+        ]);
+        const transaction = new web3_js_1.Transaction();
+        const receiverAccountInfo = 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;