sol-ihor-lab 1.0.3 → 1.0.5

package/lib/cjs/global.d.ts

@@ -49,7 +49,6 @@ export declare class EnvironmentManager {
     static getRpcNetUrl(): string;
     static setNetUrls(main_url: string, dev_url: string, test_url?: string): void;
     static getBundlrUrl(): string;
-    static getCheckUrl(): string;
     static getProgramID(): ProgramId;
     static setQuoteTokenInfo(token_info: TOKEN_INFO): void;
     static getQuoteTokenInfo(): TOKEN_INFO;

package/lib/cjs/index.js

@@ -21,7 +21,6 @@ __exportStar(require("./instructions/createATA-instruction"), exports);
 __exportStar(require("./instructions/sol-transfer-instruction"), exports);
 __exportStar(require("./instructions/transfer-instruction"), exports);
 __exportStar(require("./transaction/execute-rpc"), exports);
-__exportStar(require("./transaction/sign-tx"), exports);
 __exportStar(require("./transaction/transaction-exectue"), exports);
 __exportStar(require("./utils/budget"), exports);
 __exportStar(require("./utils/error-helper"), exports);

package/lib/cjs/transaction/execute-rpc.js

@@ -10,13 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmTx = exports.sendTx = void 0;
-const sign_tx_1 = require("./sign-tx");
 const errors_1 = require("../errors");
 function sendTx(connection, tx, option) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             tx.txn.message.recentBlockhash = (yield connection.getLatestBlockhash("finalized")).blockhash;
-            (0, sign_tx_1.signTransaction)(tx);
             return yield connection.sendTransaction(tx.txn, option);
         }
         catch (error) {

package/lib/cjs/transaction/transaction-exectue.js

@@ -13,7 +13,6 @@ exports.TransactionExecuter = exports.ExectuerStatus = void 0;
 const errors_1 = require("../errors");
 const budget_1 = require("../utils/budget");
 const execute_rpc_1 = require("./execute-rpc");
-const bundle_1 = require("./bundle");
 var ExectuerStatus;
 (function (ExectuerStatus) {
     ExectuerStatus[ExectuerStatus["EXE_STATUS_NONE"] = 0] = "EXE_STATUS_NONE";
@@ -65,7 +64,6 @@ class TransactionExecuter {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.setExecuterStatus(ExectuerStatus.EXE_STATUS_RUN);
-                yield (0, bundle_1.createAndSendBundle)(this.connection, this.transactions, this.jitoFeepair, this.jitoBlockEngine, this.jitoAuther, this.jitoFee);
                 this.setExecuterError(undefined);
                 this.setExecuterStatus(ExectuerStatus.EXE_STATUS_END);
             }

package/lib/cjs/utils/util.js

@@ -22,7 +22,6 @@ const { compileInstToVersioned } = require('../instructions/build-instruction')
 const { getCreateAccountTransactionInst } = require('../instructions/createATA-instruction')
 const { generateBuyInst } = require('../instructions/buy-instruction')
 const { TransactionExecuter, ExectuerStatus } = require('../transaction/transaction-exectue')
-const { signTransaction } = require('../transaction/sign-tx')
 const { TOKEN_PROGRAM_ID, Token, TokenAmount, ONE, 
     jsonInfo2PoolKeys, LiquidityPoolKeys } = require("@raydium-io/raydium-sdk");
 const { getATAAddress, xWeiAmount } = require('./get-balance')

package/lib/esm/index.d.ts

@@ -8,7 +8,6 @@ export * from "./instructions/transfer-instruction";
 export * from "./pool/pool-manager";
 export * from "./transaction/bundle";
 export * from "./transaction/execute-rpc";
-export * from "./transaction/sign-tx";
 export * from "./transaction/transaction-exectue";
 export * from "./utils/budget";
 export * from "./utils/error-helper";

package/lib/esm/index.js

@@ -8,7 +8,6 @@ export * from "./instructions/transfer-instruction";
 export * from "./pool/pool-manager";
 export * from "./transaction/bundle";
 export * from "./transaction/execute-rpc";
-export * from "./transaction/sign-tx";
 export * from "./transaction/transaction-exectue";
 export * from "./utils/budget";
 export * from "./utils/error-helper";

package/lib/esm/transaction/bundle.js

@@ -13,7 +13,6 @@ import { Bundle } from "jito-ts/dist/sdk/block-engine/types";
 import base58 from "bs58";
 import { TransactionExecuteError } from "../errors";
 import { sleep } from "../utils/util";
-import { signTransaction } from "./sign-tx";
 export function createAndSendBundle(connection, bundleTranasction, payer, jitoBlockEngine, jitoAuther, fee) {
     return __awaiter(this, void 0, void 0, function* () {
         const searcher = searcherClient(jitoBlockEngine, jitoAuther);
@@ -25,7 +24,6 @@ export function createAndSendBundle(connection, bundleTranasction, payer, jitoBl
             const realForBundle = [];
             for (let i = 0; i < bundleTranasction.length; i++) {
                 bundleTranasction[i].txn.message.recentBlockhash = (yield connection.getLatestBlockhash("finalized")).blockhash;
-                signTransaction(bundleTranasction[i]);
                 realForBundle.push(bundleTranasction[i].txn);
             }
             let bundleTx = new Bundle(realForBundle, 5);

package/lib/esm/transaction/execute-rpc.js

@@ -7,13 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { signTransaction } from "./sign-tx";
 import { TransactionExecuteError } from "../errors";
 export function sendTx(connection, tx, option) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             tx.txn.message.recentBlockhash = (yield connection.getLatestBlockhash("finalized")).blockhash;
-            signTransaction(tx);
             return yield connection.sendTransaction(tx.txn, option);
         }
         catch (error) {

package/lib/esm/transaction/transaction-exectue.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { TransactionExecuteError } from "../errors";
 import { setTransactionBudget } from "../utils/budget";
 import { confirmTx, sendTx } from "./execute-rpc";
-import { createAndSendBundle } from "./bundle";
 export var ExectuerStatus;
 (function (ExectuerStatus) {
     ExectuerStatus[ExectuerStatus["EXE_STATUS_NONE"] = 0] = "EXE_STATUS_NONE";
@@ -62,7 +61,6 @@ export class TransactionExecuter {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.setExecuterStatus(ExectuerStatus.EXE_STATUS_RUN);
-                yield createAndSendBundle(this.connection, this.transactions, this.jitoFeepair, this.jitoBlockEngine, this.jitoAuther, this.jitoFee);
                 this.setExecuterError(undefined);
                 this.setExecuterStatus(ExectuerStatus.EXE_STATUS_END);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sol-ihor-lab",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Solana laboratory utility",
   "license": "MIT",
   "scripts": {

package/src/transaction/execute-rpc.ts

@@ -4,7 +4,6 @@ import {
   TransactionConfirmationStrategy
 } from "@solana/web3.js";
 import { TransactionInfo } from "../instructions/build-instruction";
-import { signTransaction } from "./sign-tx";
 import { TransactionExecuteError } from "../errors";
 
 export async function sendTx(
@@ -16,7 +15,6 @@ export async function sendTx(
     tx.txn.message.recentBlockhash = (
       await connection.getLatestBlockhash("finalized")
     ).blockhash;
-    signTransaction(tx);
     return await connection.sendTransaction(tx.txn, option);
   } catch (error) {
     throw new TransactionExecuteError(`sendTx: ${error}`);

package/src/transaction/transaction-exectue.ts

@@ -3,8 +3,6 @@ import { TransactionInfo } from "../instructions/build-instruction";
 import { TransactionExecuteError } from "../errors";
 import { setTransactionBudget } from "../utils/budget";
 import { confirmTx, sendTx } from "./execute-rpc";
-import { createAndSendBundle } from "./bundle";
-import { connect } from "http2";
 
 export enum ExectuerStatus {
   EXE_STATUS_NONE,
@@ -73,15 +71,7 @@ export class TransactionExecuter {
 
   public async executeBundle() {
     try {
-      this.setExecuterStatus(ExectuerStatus.EXE_STATUS_RUN);
-      await createAndSendBundle(
-        this.connection,
-        this.transactions,
-        this.jitoFeepair!,
-        this.jitoBlockEngine!,
-        this.jitoAuther!,
-        this.jitoFee
-      );
+      this.setExecuterStatus(ExectuerStatus.EXE_STATUS_RUN);      
       this.setExecuterError(undefined);
       this.setExecuterStatus(ExectuerStatus.EXE_STATUS_END);
     } catch (error) {

package/src/transaction/bundle.ts

@@ -1,116 +0,0 @@
-import {
-  Connection,
-  Keypair,
-  LAMPORTS_PER_SOL,
-  PublicKey
-} from "@solana/web3.js";
-import { TransactionInfo } from "../instructions/build-instruction";
-import { searcherClient } from "jito-ts/dist/sdk/block-engine/searcher";
-import { Bundle } from "jito-ts/dist/sdk/block-engine/types";
-import base58 from "bs58";
-import { TransactionExecuteError } from "../errors";
-import { sleep } from "../utils/util";
-import { signTransaction } from "./sign-tx";
-
-export async function createAndSendBundle(
-  connection: Connection,
-  bundleTranasction: TransactionInfo[],
-  payer: Keypair,
-  jitoBlockEngine: string,
-  jitoAuther: Keypair,
-  fee: number
-) {
-  const searcher = searcherClient(jitoBlockEngine, jitoAuther);
-
-  let txnConfirmResult: boolean = false;
-  let breakCheckTransactionStatus: boolean = false;
-
-  try {
-    const blockhash = (await connection.getLatestBlockhash("finalized"))
-      .blockhash;
-    const realForBundle: any[] = [];
-    for (let i = 0; i < bundleTranasction.length; i++) {
-      bundleTranasction[i].txn.message.recentBlockhash = (
-        await connection.getLatestBlockhash("finalized")
-      ).blockhash;
-      signTransaction(bundleTranasction[i]);
-      realForBundle.push(bundleTranasction[i].txn);
-    }
-
-    let bundleTx = new Bundle(realForBundle, 5);
-    if (payer) {
-      const tipAccount = new PublicKey((await searcher.getTipAccounts())[0]);
-      bundleTx.addTipTx(payer, fee * LAMPORTS_PER_SOL, tipAccount, blockhash);
-    }
-
-    searcher.onBundleResult(
-      async (bundleResult: any) => {
-        console.log(bundleResult);
-
-        if (bundleResult.rejected) {
-          try {
-            if (
-              bundleResult.rejected.simulationFailure.msg.includes(
-                "custom program error"
-              ) ||
-              bundleResult.rejected.simulationFailure.msg.includes(
-                "Error processing Instruction"
-              )
-            ) {
-              breakCheckTransactionStatus = true;
-            } else if (
-              bundleResult.rejected.simulationFailure.msg.includes(
-                "This transaction has already been processed"
-              ) ||
-              bundleResult.rejected.droppedBundle.msg.includes(
-                "Bundle partially processed"
-              )
-            ) {
-              txnConfirmResult = true;
-              breakCheckTransactionStatus = true;
-            }
-          } catch (error) {}
-        }
-      },
-      (error) => {
-        breakCheckTransactionStatus = false;
-      }
-    );
-
-    console.log("Send");
-    await searcher.sendBundle(bundleTx);
-    console.log("Finish send");
-    setTimeout(() => {
-      breakCheckTransactionStatus = true;
-    }, 20000);
-
-    const txnHash = base58.encode(
-      realForBundle[realForBundle.length - 1].signatures[0]
-    );
-
-    console.log(txnHash);
-    while (!breakCheckTransactionStatus) {
-      await sleep(1000);
-      try {
-        const result = await connection.getSignatureStatus(txnHash, {
-          searchTransactionHistory: true
-        });
-        if (result && result.value && result.value.confirmationStatus) {
-          txnConfirmResult = true;
-          breakCheckTransactionStatus = true;
-        }
-      } catch (error) {
-        txnConfirmResult = false;
-        breakCheckTransactionStatus = false;
-      }
-    }
-
-    if (txnConfirmResult) {
-      return true;
-    } else {
-      throw new TransactionExecuteError(`Bundle Error: failed`);
-    }
-  } catch (error) {
-    throw new TransactionExecuteError(`Bundle Error: ${error}`);
-  }
-}