@cryptorubic/web3 0.9.0-alpha-exolix.0 → 0.9.0-alpha-exolix.1

package/package.json

@@ -1,24 +1,25 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.9.0-alpha-exolix.0",
+    "version": "0.9.0-alpha-exolix.1",
     "dependencies": {
         "tslib": "^2.3.0",
         "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.9.0-alpha-exolix.0",
+        "@cryptorubic/core": "0.9.0-alpha-exolix.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.9.0-alpha-exolix.0",
+        "@cryptorubic/tron-types": "0.9.0-alpha-exolix.1",
         "bitcoin-address-validation": "^2.2.3",
         "axios": "0.27.2",
         "crc-32": "^1.2.2",
         "tronweb": "^6.0.0-beta.4",
         "@solana/spl-token": "0.2.0",
         "@mysten/sui": "^1.24.0",
-        "@suiet/wallet-sdk": "^0.3.3"
+        "@suiet/wallet-sdk": "^0.3.3",
+        "bs58": "^6.0.0"
     },
     "type": "commonjs",
     "main": "./src/index.js",

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, 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';
@@ -27,4 +27,9 @@ 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>;
+    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 utils_1 = require("ethers/lib/utils");
 exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpcList, httpClient, logger) {
@@ -121,5 +123,45 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         }).compileToV0Message(addressLookupTableAccounts);
         return new web3_js_1.VersionedTransaction(message);
     }
+    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') : utils_1.base64.decode(data);
+        return web3_js_1.VersionedTransaction.deserialize(decodedData);
+    }
+    serializeTransactionToBase58(tx) {
+        return bs58_1.default.encode(tx.serialize());
+    }
 }
 exports.SolanaAdapter = SolanaAdapter;