@cryptorubic/web3 1.6.4-alpha-rub-2694.0 → 1.7.0-alpha.clearswap.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.6.4-alpha-rub-2694.0",
+    "version": "1.7.0-alpha.clearswap.1",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

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

@@ -362,8 +362,8 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             });
             const gasfulViemOptions = {
                 ...gaslessParams,
-                ...(0, options_1.getViemGasOptions)(options),
-                gas: gas.toString()
+                gas: gas.toString(),
+                gasPriceOptions: (0, options_1.getGasOptions)(options)
             };
             const receipt = await this.signer.executeContractMethod(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'approve', [spenderAddress, BigInt(rawValue.toFixed(0))], gasfulViemOptions);
             return receipt.transactionHash;

package/src/lib/adapter/adapters/adapter-evm/signer/evm-adapter-signer.js

@@ -79,8 +79,8 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
                 : gas;
             const gasfulParams = {
                 ...gaslessParams,
-                ...(0, options_1.getGasOptions)(params.txOptions),
-                gas: calculatedGas.toString()
+                gas: calculatedGas.toString(),
+                gasPriceOptions: (0, options_1.getGasOptions)(params.txOptions)
             };
             const gasfulViemParams = {
                 ...gaslessParams,
@@ -91,8 +91,7 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
             const sendParams = {
                 ...gasfulParams,
                 ...(params.txOptions.onTransactionHash && {
-                    onTransactionHash: params.txOptions.onTransactionHash,
-                    gasPriceOptions: params.txOptions?.gasPriceOptions
+                    onTransactionHash: params.txOptions.onTransactionHash
                 })
             };
             const receipt = await this.sendTransaction({ txOptions: sendParams });

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

@@ -4,6 +4,7 @@ import { ClientAdaptersFactoryParams } from '../../../models/create-factory-para
 import { SolanaSendTxParams } from '../models/solana-send-tx-params';
 import { Connection } from '@solana/web3.js';
 import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-signer';
+import { SolanaTransferTxParams } from '../../models/transfer-tx-params';
 export declare class SolanaAdapterSigner extends AbstractAdapterSigner<SolanaWeb3, SolanaSendTxParams, string> {
     private readonly publicRef;
     get publicClient(): Connection;
@@ -13,5 +14,6 @@ export declare class SolanaAdapterSigner extends AbstractAdapterSigner<SolanaWeb
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
     sendTransaction(params: SolanaSendTxParams): Promise<string>;
+    transfer(params: SolanaTransferTxParams): Promise<string>;
     private waitForTxConfirmation;
 }

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

@@ -9,6 +9,7 @@ const user_reject_error_1 = require("../../../../errors/blockchain/user-reject.e
 const errors_1 = require("../../utils/errors");
 const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
 const tx_reverted_in_chain_error_1 = require("../../../../errors/common/tx-reverted-in-chain.error");
+const spl_token_1 = require("@solana/spl-token");
 class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     get publicClient() {
         if (!this.publicRef.public) {
@@ -70,6 +71,31 @@ class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigne
             throw (0, errors_1.parseError)(err);
         }
     }
+    async transfer(params) {
+        const tokenPK = new web3_js_1.PublicKey(params.tokenAddress);
+        const senderPK = new web3_js_1.PublicKey(this.walletAddress);
+        const receiverPK = new web3_js_1.PublicKey(params.receiver);
+        const senderATA = await (0, spl_token_1.getAssociatedTokenAddress)(tokenPK, senderPK, true);
+        const receiverATA = await (0, spl_token_1.getAssociatedTokenAddress)(tokenPK, receiverPK, true);
+        const receiverAtaInfo = await this.publicClient.getAccountInfo(receiverATA).catch(() => null);
+        const instructions = [];
+        if (!receiverAtaInfo) {
+            instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(senderPK, // payer
+            receiverATA, // ATA address
+            receiverPK, // owner
+            tokenPK // mint
+            ));
+        }
+        instructions.push((0, spl_token_1.createTransferInstruction)(senderATA, receiverATA, senderPK, BigInt(params.tokenWeiAmount), [], spl_token_1.TOKEN_PROGRAM_ID));
+        const transaction = new web3_js_1.Transaction().add(...instructions);
+        const signedTx = await this.wallet.signTransaction(transaction);
+        signedTx.feePayer = new web3_js_1.PublicKey(this.walletAddress);
+        signedTx.recentBlockhash = (await this.publicClient.getLatestBlockhash()).blockhash;
+        const signature = await this.publicClient.sendRawTransaction(signedTx.serialize(), { maxRetries: 3, skipPreflight: false });
+        params.txOptions.onTransactionHash?.(signature);
+        await this.waitForTxConfirmation(signature);
+        return signature;
+    }
     async waitForTxConfirmation(signature) {
         const deadline = Date.now() + 3 * 60 * 1000;
         let fetchedTx = null;

package/src/lib/adapter/adapters/adapter-tron/signer/tron-adapter-signer.d.ts

@@ -4,7 +4,7 @@ import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
 import { TronSendTxParams } from '../models/tron-send-tx-params';
 import { TronParameters } from '../../../../utils/models/tron-parameters';
-import { TronTransferTxParams } from '../models/tron-transfer-tx-params';
+import { TronTransferTxParams } from '../../models/transfer-tx-params';
 export declare class TronAdapterSigner extends AbstractAdapterSigner<TronWeb, TronSendTxParams, string> {
     private readonly publicRef;
     get publicClient(): TronWeb;

package/src/lib/adapter/adapters/models/transfer-tx-params.d.ts

@@ -0,0 +1,13 @@
+import { SolanaTransactionOptions } from '../adapter-solana/models/solana-send-tx-params';
+import { TronTransactionOptions } from '../adapter-tron/models/tron-send-tx-params';
+export interface TransferTxParams {
+    receiver: string;
+    tokenWeiAmount: string;
+    tokenAddress: string;
+}
+export interface TronTransferTxParams extends TransferTxParams {
+    txOptions: TronTransactionOptions;
+}
+export interface SolanaTransferTxParams extends TransferTxParams {
+    txOptions: SolanaTransactionOptions;
+}

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

@@ -4,7 +4,7 @@ export interface SolanaWeb3 {
         toBytes(): Uint8Array;
     };
     isConnected: boolean;
-    signTransaction(transaction: Transaction | VersionedTransaction): Promise<Transaction | VersionedTransaction>;
+    signTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<T>;
     signAllTransactions(transactions: Transaction[]): Promise<Transaction[]>;
     signMessage(message: Uint8Array, encoding: string): Promise<{
         signature: Uint8Array;

package/src/lib/adapter/adapters/adapter-tron/models/tron-transfer-tx-params.d.ts

@@ -1,7 +0,0 @@
-import { TronTransactionOptions } from './tron-send-tx-params';
-export interface TronTransferTxParams {
-    receiver: string;
-    tokenWeiAmount: string;
-    tokenAddress: string;
-    txOptions: TronTransactionOptions;
-}