@clonegod/ttd-sol-common 1.0.20 → 1.0.22

package/dist/constants.d.ts

@@ -1,4 +1,5 @@
 export declare const MAX_GAS_FEE: number;
+export declare const ONE_MILLION = 1000000;
 export declare enum COMMITMENT_LEVEL {
     PROCESSED = "processed",
     CONFIRMED = "confirmed",

package/dist/constants.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOCAL_EVENT_NAME = exports.COMMITMENT_LEVEL = exports.MAX_GAS_FEE = void 0;
+exports.LOCAL_EVENT_NAME = exports.COMMITMENT_LEVEL = exports.ONE_MILLION = exports.MAX_GAS_FEE = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.MAX_GAS_FEE = web3_js_1.LAMPORTS_PER_SOL / 1000;
+exports.ONE_MILLION = 1000000;
 var COMMITMENT_LEVEL;
 (function (COMMITMENT_LEVEL) {
     COMMITMENT_LEVEL["PROCESSED"] = "processed";

package/dist/context.d.ts

@@ -1,11 +1,8 @@
 import { Connection } from "@solana/web3.js";
-export declare class _Context {
-    read_connection: Connection;
-    set_read_connection(read_connection: Connection): void;
+import { TradeRuntimeType } from '@clonegod/ttd-common';
+export interface SolanaTradeRuntimeType extends TradeRuntimeType {
+    connection: Connection;
     priority_fee: number;
-    set_priority_fee(priority_fee: any): void;
     cu_price: number;
-    set_cu_price(cu_price: number): void;
     cu_limit: number;
-    set_cu_limit(cu_limit: number): void;
 }

package/dist/context.js

@@ -1,18 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._Context = void 0;
-class _Context {
-    set_read_connection(read_connection) {
-        this.read_connection = read_connection;
-    }
-    set_priority_fee(priority_fee) {
-        this.priority_fee = priority_fee;
-    }
-    set_cu_price(cu_price) {
-        this.cu_price = cu_price;
-    }
-    set_cu_limit(cu_limit) {
-        this.cu_limit = cu_limit;
-    }
-}
-exports._Context = _Context;

package/dist/helius_sdk_v1.4.0/Helius.d.ts

@@ -1,7 +1,7 @@
-import { Webhook, CreateWebhookRequest, EditWebhookRequest, CreateCollectionWebhookRequest, MintlistRequest, MintlistResponse, MintApiRequest, MintApiResponse, MintApiAuthority, DelegateCollectionAuthorityRequest, RevokeCollectionAuthorityRequest, HeliusCluster, HeliusEndpoints } from './types';
+import { Webhook, CreateWebhookRequest, EditWebhookRequest, CreateCollectionWebhookRequest, MintlistRequest, MintlistResponse, MintApiAuthority, HeliusCluster, HeliusEndpoints } from './types';
 import { Connection } from '@solana/web3.js';
 import { RpcClient } from './RpcClient';
-import { _Context } from '../context';
+import { SolanaTradeRuntimeType } from '../context';
 export declare class Helius {
     private apiKey?;
     readonly cluster: HeliusCluster;
@@ -10,7 +10,7 @@ export declare class Helius {
     readonly connection: Connection;
     readonly rpc: RpcClient;
     readonly mintApiAuthority: MintApiAuthority;
-    constructor(apiKey: string, cluster: HeliusCluster, id: string, url: string, _context: _Context);
+    constructor(apiKey: string, cluster: HeliusCluster, id: string, url: string, solana_trade_runtime: SolanaTradeRuntimeType);
     getAllWebhooks(): Promise<Webhook[]>;
     getWebhookByID(webhookID: string): Promise<Webhook>;
     createWebhook(createWebhookRequest: CreateWebhookRequest): Promise<Webhook>;
@@ -20,13 +20,6 @@ export declare class Helius {
     removeAddressesFromWebhook(webhookID: string, addressesToRemove: string[]): Promise<Webhook>;
     createCollectionWebhook(request: CreateCollectionWebhookRequest): Promise<Webhook>;
     getMintlist(request: MintlistRequest): Promise<MintlistResponse>;
-    mintCompressedNft(mintApiRequest: MintApiRequest): Promise<MintApiResponse>;
-    delegateCollectionAuthority(request: DelegateCollectionAuthorityRequest): Promise<string>;
-    revokeCollectionAuthority(request: RevokeCollectionAuthorityRequest): Promise<string>;
     getApiEndpoint(path: string): string;
     private _editWebhook;
-    private handleImageUpload;
-    private uploadImageToArweave;
-    private getCollectionAuthorityRecord;
-    private getCollectionMetadataAccount;
 }

package/dist/helius_sdk_v1.4.0/Helius.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -38,14 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Helius = void 0;
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
-const sdk_1 = __importDefault(require("@irys/sdk"));
-const fs = __importStar(require("fs"));
 const utils_1 = require("./utils");
 const RpcClient_1 = require("./RpcClient");
-const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
 const mintApi_1 = require("./utils/mintApi");
 class Helius {
-    constructor(apiKey, cluster = 'mainnet-beta', id = 'helius-sdk', url = '', _context) {
+    constructor(apiKey, cluster = 'mainnet-beta', id = 'helius-sdk', url = '', solana_trade_runtime) {
         this.cluster = cluster;
         this.endpoints = (0, utils_1.getHeliusEndpoints)(cluster);
         if (apiKey !== '') {
@@ -59,7 +33,7 @@ class Helius {
             throw Error('either `apiKey` or `url` is required');
         }
         this.endpoint = this.connection.rpcEndpoint;
-        this.rpc = new RpcClient_1.RpcClient(_context, this.connection, id);
+        this.rpc = new RpcClient_1.RpcClient(solana_trade_runtime, this.connection, id);
         this.mintApiAuthority = (0, mintApi_1.mintApiAuthority)(cluster);
     }
     getAllWebhooks() {
@@ -274,95 +248,6 @@ class Helius {
             }
         });
     }
-    mintCompressedNft(mintApiRequest) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            yield this.handleImageUpload(mintApiRequest);
-            try {
-                const { data } = yield axios_1.default.post(this.endpoint, {
-                    jsonrpc: '2.0',
-                    id: 'helius-test',
-                    method: 'mintCompressedNft',
-                    params: Object.assign({}, mintApiRequest),
-                });
-                return data;
-            }
-            catch (err) {
-                if (axios_1.default.isAxiosError(err)) {
-                    throw new Error(`error during mintCompressedNft: ${((_a = err.response) === null || _a === void 0 ? void 0 : _a.data.error.message) || err}`);
-                }
-                else {
-                    throw new Error(`error during mintCompressedNft: ${err}`);
-                }
-            }
-        });
-    }
-    delegateCollectionAuthority(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let { collectionMint, updateAuthorityKeypair, newCollectionAuthority, payerKeypair, } = request;
-                payerKeypair = payerKeypair !== null && payerKeypair !== void 0 ? payerKeypair : updateAuthorityKeypair;
-                newCollectionAuthority = newCollectionAuthority !== null && newCollectionAuthority !== void 0 ? newCollectionAuthority : this.mintApiAuthority;
-                const collectionMintPubkey = new web3_js_1.PublicKey(collectionMint);
-                const collectionMetadata = this.getCollectionMetadataAccount(collectionMintPubkey);
-                const newCollectionAuthorityPubkey = new web3_js_1.PublicKey(newCollectionAuthority);
-                const collectionAuthorityRecord = this.getCollectionAuthorityRecord(collectionMintPubkey, newCollectionAuthorityPubkey);
-                const accounts = {
-                    collectionAuthorityRecord,
-                    newCollectionAuthority: newCollectionAuthorityPubkey,
-                    updateAuthority: updateAuthorityKeypair.publicKey,
-                    payer: payerKeypair.publicKey,
-                    metadata: collectionMetadata,
-                    mint: collectionMintPubkey,
-                };
-                const inx = (0, mpl_token_metadata_1.createApproveCollectionAuthorityInstruction)(accounts);
-                const tx = new web3_js_1.Transaction().add(inx);
-                tx.feePayer = payerKeypair.publicKey;
-                const sig = yield (0, web3_js_1.sendAndConfirmTransaction)(this.connection, tx, [payerKeypair, updateAuthorityKeypair], {
-                    commitment: 'confirmed',
-                    skipPreflight: true,
-                });
-                return sig;
-            }
-            catch (e) {
-                console.error('Failed to delegate collection authority: ', e);
-                throw e;
-            }
-        });
-    }
-    revokeCollectionAuthority(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let { collectionMint, revokeAuthorityKeypair, delegatedCollectionAuthority, payerKeypair, } = request;
-                payerKeypair = payerKeypair !== null && payerKeypair !== void 0 ? payerKeypair : revokeAuthorityKeypair;
-                delegatedCollectionAuthority =
-                    delegatedCollectionAuthority !== null && delegatedCollectionAuthority !== void 0 ? delegatedCollectionAuthority : this.mintApiAuthority;
-                const collectionMintPubkey = new web3_js_1.PublicKey(collectionMint);
-                const collectionAuthority = new web3_js_1.PublicKey(delegatedCollectionAuthority);
-                const collectionMetadata = this.getCollectionMetadataAccount(collectionMintPubkey);
-                const collectionAuthorityRecord = this.getCollectionAuthorityRecord(collectionMintPubkey, collectionAuthority);
-                const accounts = {
-                    collectionAuthorityRecord,
-                    delegateAuthority: collectionAuthority,
-                    revokeAuthority: revokeAuthorityKeypair.publicKey,
-                    metadata: collectionMetadata,
-                    mint: collectionMintPubkey,
-                };
-                const inx = (0, mpl_token_metadata_1.createRevokeCollectionAuthorityInstruction)(accounts);
-                const tx = new web3_js_1.Transaction().add(inx);
-                tx.feePayer = payerKeypair.publicKey;
-                const sig = yield (0, web3_js_1.sendAndConfirmTransaction)(this.connection, tx, [revokeAuthorityKeypair], {
-                    commitment: 'confirmed',
-                    skipPreflight: true,
-                });
-                return sig;
-            }
-            catch (e) {
-                console.error('Failed to revoke collection authority: ', e);
-                throw e;
-            }
-        });
-    }
     getApiEndpoint(path) {
         if (!path.startsWith('/v0') && !path.startsWith('/v1')) {
             throw new Error(`Invalid API path provided: ${path}. Path must start with '/v0' or '/v1'.`);
@@ -389,67 +274,5 @@ class Helius {
             return data;
         });
     }
-    handleImageUpload(mintApiRequest) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (mintApiRequest.imagePath && mintApiRequest.imageUrl) {
-                throw new Error('Cannot provide both imagePath and imageUrl. Please only provide one.');
-            }
-            if (mintApiRequest.imagePath && !mintApiRequest.walletPrivateKey) {
-                throw new Error('Must provide wallet privateKey if providing imagePath.');
-            }
-            if (mintApiRequest.imagePath && mintApiRequest.walletPrivateKey) {
-                mintApiRequest.imageUrl = yield this.uploadImageToArweave(mintApiRequest.imagePath, mintApiRequest.walletPrivateKey);
-            }
-            delete mintApiRequest.imagePath;
-            delete mintApiRequest.walletPrivateKey;
-        });
-    }
-    uploadImageToArweave(imagePath, privateKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const irys = new sdk_1.default({
-                url: this.cluster === 'mainnet-beta'
-                    ? 'https://node2.irys.xyz'
-                    : 'https://devnet.irys.xyz',
-                token: 'solana',
-                key: privateKey,
-                config: {
-                    providerUrl: this.endpoint,
-                },
-            });
-            const stats = fs.statSync(imagePath);
-            const fileSizeInBytes = stats.size;
-            const fileSizeInKB = fileSizeInBytes / 1000;
-            if (this.cluster === 'devnet' || fileSizeInKB >= 200) {
-                const price = yield irys.getPrice(fileSizeInBytes);
-                yield irys.fund(price, 1.1);
-            }
-            try {
-                const receipt = yield irys.uploadFile(imagePath);
-                const url = `https://arweave.net/${receipt.id}`;
-                return url;
-            }
-            catch (e) {
-                throw new Error(`error uploading image to Arweave: ${e}`);
-            }
-        });
-    }
-    getCollectionAuthorityRecord(collectionMint, collectionAuthority) {
-        const [collectionAuthRecordPda] = web3_js_1.PublicKey.findProgramAddressSync([
-            Buffer.from('metadata'),
-            mpl_token_metadata_1.PROGRAM_ID.toBuffer(),
-            collectionMint.toBuffer(),
-            Buffer.from('collection_authority'),
-            collectionAuthority.toBuffer(),
-        ], mpl_token_metadata_1.PROGRAM_ID);
-        return collectionAuthRecordPda;
-    }
-    getCollectionMetadataAccount(collectionMint) {
-        const [collectionMetadataAccount] = web3_js_1.PublicKey.findProgramAddressSync([
-            Buffer.from('metadata', 'utf8'),
-            mpl_token_metadata_1.PROGRAM_ID.toBuffer(),
-            collectionMint.toBuffer(),
-        ], mpl_token_metadata_1.PROGRAM_ID);
-        return collectionMetadataAccount;
-    }
 }
 exports.Helius = Helius;

package/dist/helius_sdk_v1.4.0/RpcClient.d.ts

@@ -3,7 +3,7 @@
 import { BlockhashWithExpiryBlockHeight, VersionedTransaction, AddressLookupTableAccount, Transaction, TransactionInstruction, TransactionSignature, Commitment, PublicKey, AccountInfo, GetLatestBlockhashConfig, RpcResponseAndContext, SignatureResult, Blockhash, Connection, ParsedAccountData, SendOptions, Signer, SerializeConfig } from '@solana/web3.js';
 import { DAS } from './types/das-types';
 import { GetPriorityFeeEstimateRequest, GetPriorityFeeEstimateResponse, JitoRegion, PollTransactionOptions, SmartTransactionContext, HeliusSendOptions } from './types';
-import { _Context } from '../context';
+import { SolanaTradeRuntimeType } from '../context';
 export type SendAndConfirmTransactionResponse = {
     signature: TransactionSignature;
     confirmResponse: RpcResponseAndContext<SignatureResult>;
@@ -11,10 +11,10 @@ export type SendAndConfirmTransactionResponse = {
     lastValidBlockHeight: number;
 };
 export declare class RpcClient {
-    protected readonly _context: _Context;
+    protected readonly solana_trade_runtime: SolanaTradeRuntimeType;
     protected readonly connection: Connection;
     protected readonly id?: string;
-    constructor(_context: _Context, connection: Connection, id?: string);
+    constructor(solana_trade_runtime: SolanaTradeRuntimeType, connection: Connection, id?: string);
     airdrop(publicKey: PublicKey, lamports: number, commitment?: Commitment): Promise<SendAndConfirmTransactionResponse>;
     getLatestBlockhash(commitmentOrConfig?: Commitment | GetLatestBlockhashConfig): Promise<BlockhashWithExpiryBlockHeight>;
     getCurrentTPS(): Promise<number>;

package/dist/helius_sdk_v1.4.0/RpcClient.js

@@ -20,8 +20,8 @@ const types_1 = require("./types");
 const get_signature_1 = require("../get_signature");
 const dist_1 = require("@clonegod/ttd-common/dist");
 class RpcClient {
-    constructor(_context, connection, id) {
-        this._context = _context;
+    constructor(solana_trade_runtime, connection, id) {
+        this.solana_trade_runtime = solana_trade_runtime;
         this.connection = connection;
         this.id = id;
     }
@@ -408,7 +408,7 @@ class RpcClient {
                     throw new Error('Priority fee estimate not available');
                 }
             }), 0);
-            let priorityFeeEstimate = this._context.cu_price;
+            let priorityFeeEstimate = this.solana_trade_runtime.cu_price;
             const computeBudgetIx = web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: priorityFeeEstimate,
             });
@@ -421,7 +421,7 @@ class RpcClient {
                     throw new Error(`Error fetching compute units for the instructions provided`);
                 }
             }), 0);
-            let units = this._context.cu_limit;
+            let units = this.solana_trade_runtime.cu_limit;
             const customersCU = units < 1000 ? 1000 : Math.ceil(units * 1.1);
             const computeUnitsIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
                 units: customersCU,
@@ -469,7 +469,7 @@ class RpcClient {
                 let txid = (0, get_signature_1.getSignature)(transaction);
                 setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                     const commitment = (sendOptions === null || sendOptions === void 0 ? void 0 : sendOptions.preflightCommitment) || 'confirmed';
-                    const currentBlockHeight = yield this._context.read_connection.getBlockHeight();
+                    const currentBlockHeight = yield this.solana_trade_runtime.connection.getBlockHeight();
                     const lastValidBlockHeight = Math.min(blockhash.lastValidBlockHeight, currentBlockHeight + lastValidBlockHeightOffset);
                     let error;
                     do {
@@ -564,7 +564,11 @@ class RpcClient {
                 const serializedTransaction = bs58_1.default.encode(transaction.serialize());
                 const jitoApiUrl = `${types_1.JITO_API_URLS[region]}/api/v1/bundles`;
                 const bundleId = yield this.sendJitoBundle([serializedTransaction], jitoApiUrl);
-                const currentBlockHeight = yield this._context.read_connection.getBlockHeight();
+                (0, dist_1.log_info)(`sendJitoBundle`, {
+                    txid,
+                    bundleId
+                });
+                const currentBlockHeight = yield this.solana_trade_runtime.connection.getBlockHeight();
                 const lastValidBlockHeight = Math.min(blockhash.lastValidBlockHeight, currentBlockHeight + lastValidBlockHeightOffset);
                 const timeout = 60000;
                 const interval = 5000;
@@ -572,9 +576,16 @@ class RpcClient {
                 while (Date.now() - startTime < timeout ||
                     (yield this.connection.getBlockHeight()) <= lastValidBlockHeight) {
                     const bundleStatuses = yield this.getBundleStatuses([bundleId], jitoApiUrl);
+                    (0, dist_1.log_info)(`getBundleStatuses`, {
+                        txid,
+                        bundleId,
+                        jitoApiUrl,
+                        bundleStatuses
+                    });
                     if (bundleStatuses &&
                         bundleStatuses.value &&
-                        bundleStatuses.value.length > 0) {
+                        bundleStatuses.value.length > 0 &&
+                        bundleStatuses.value[0]) {
                         const status = bundleStatuses.value[0].confirmation_status;
                         if (status === 'confirmed') {
                             return bundleStatuses.value[0].transactions[0];

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './constants';
 export * from './context';
+export * from './strategy_util';
 export * from './helius_geyser_ws';
 export * from './send_transaction';

package/dist/index.js

@@ -16,5 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./constants"), exports);
 __exportStar(require("./context"), exports);
+__exportStar(require("./strategy_util"), exports);
 __exportStar(require("./helius_geyser_ws"), exports);
 __exportStar(require("./send_transaction"), exports);

package/dist/send_transaction.d.ts

@@ -1,20 +1,15 @@
-import { TradeRuntimeType, TradeStrategyType } from "@clonegod/ttd-common";
 import { SendOptions, Signer, TransactionInstruction } from "@solana/web3.js";
-import { Helius, JitoRegion } from "./helius_sdk_v1.4.0";
-import { _Context } from "./context";
+import { SolanaTradeRuntimeType } from "./context";
+import { Helius } from "./helius_sdk_v1.4.0";
 export declare class HeliusClient {
     signers: Signer[];
     sendOptions: SendOptions;
     cluster: string;
     helius_mainnet: Helius;
     helius_staked: Helius;
-    _context: _Context;
+    trade_runtime: SolanaTradeRuntimeType;
     constructor(signers: Signer[]);
-    send_transaction(trade_runtime: TradeRuntimeType, instructions: TransactionInstruction[]): Promise<string>;
+    send_transaction(instructions: TransactionInstruction[]): Promise<string>;
     private send_smart_transaction;
     private send_transaction_by_jito;
-    get_jito_region(): JitoRegion;
-    get_gas_fee(trade_strategy: TradeStrategyType): number;
-    get_excat_fee_by_speed(speed: string, fee_exact: number): number;
-    get_dynamic_fee_by_speed(speed: string, estimate_priority_fee: number, fee_max_cap: number): number;
 }

package/dist/send_transaction.js

@@ -11,45 +11,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeliusClient = void 0;
 const dist_1 = require("@clonegod/ttd-common/dist");
-const web3_js_1 = require("@solana/web3.js");
-const constants_1 = require("./constants");
 const helius_sdk_v1_4_0_1 = require("./helius_sdk_v1.4.0");
-const context_1 = require("./context");
+const strategy_util_1 = require("./strategy_util");
 class HeliusClient {
     constructor(signers) {
         this.cluster = 'mainnet-beta';
         let helius_api_key = process.env.HELIUS_API_KEY;
         let helius_mainnet_endpoint = `https://mainnet.helius-rpc.com/?api-key=${helius_api_key}`;
         let helius_staked_endpoint = `https://staked.helius-rpc.com?api-key=${helius_api_key}`;
-        this._context = new context_1._Context();
-        this._context.set_read_connection(new web3_js_1.Connection(process.env.QUICKNODE_ENDPOINT, {
-            commitment: constants_1.COMMITMENT_LEVEL.CONFIRMED
-        }));
         this.signers = signers;
         this.sendOptions = {
             skipPreflight: true,
             maxRetries: 0
         };
-        this.helius_mainnet = new helius_sdk_v1_4_0_1.Helius('', this.cluster, 'helius-sdk', helius_mainnet_endpoint, this._context);
-        this.helius_staked = new helius_sdk_v1_4_0_1.Helius('', this.cluster, 'helius-sdk', helius_staked_endpoint, this._context);
+        this.helius_mainnet = new helius_sdk_v1_4_0_1.Helius('', this.cluster, 'helius-sdk', helius_mainnet_endpoint, this.trade_runtime);
+        this.helius_staked = new helius_sdk_v1_4_0_1.Helius('', this.cluster, 'helius-sdk', helius_staked_endpoint, this.trade_runtime);
     }
-    send_transaction(trade_runtime, instructions) {
+    send_transaction(instructions) {
         return __awaiter(this, void 0, void 0, function* () {
             let txid = '';
-            let trade_strategy = trade_runtime.settings.strategy;
-            let { broadcast_type, speed } = trade_strategy;
-            let gas_fee = this.get_gas_fee(trade_strategy);
-            let cu_limit = 70000;
-            let cu_price = Math.floor(gas_fee / cu_limit);
-            this._context.set_priority_fee(gas_fee);
-            this._context.set_cu_limit(cu_limit);
-            this._context.set_cu_price(cu_price);
-            (0, dist_1.log_info)(`trade_strategy & gas`, {
-                trade_strategy,
-                gas_fee,
-                cu_limit,
-                cu_price
-            });
+            let { broadcast_type, speed } = this.trade_runtime.settings.strategy;
             if (broadcast_type === 'rpc') {
                 let use_staked_endpint = speed === 'turbo' || speed === 'ultra';
                 txid = yield this.send_smart_transaction(instructions, use_staked_endpint);
@@ -81,8 +62,8 @@ class HeliusClient {
         return __awaiter(this, void 0, void 0, function* () {
             (0, dist_1.log_info)(`send_transaction_by_jito, start`);
             let start_time = Date.now();
-            let tipAmount = this._context.priority_fee;
-            let jito_region = this.get_jito_region();
+            let tipAmount = this.trade_runtime.priority_fee;
+            let jito_region = (0, strategy_util_1.get_jito_region)();
             let rpc = this.helius_mainnet.rpc;
             let txid = yield rpc.sendSmartTransactionWithTip(instructions, this.signers, [], tipAmount, jito_region);
             (0, dist_1.log_info)(`send_transaction_by_jito, end`, {
@@ -94,68 +75,5 @@ class HeliusClient {
             return txid;
         });
     }
-    get_jito_region() {
-        let jito_region;
-        let server_info = (0, dist_1.getServerInfo)();
-        switch (server_info.region) {
-            case 'fra':
-                jito_region = 'Frankfurt';
-                break;
-            case 'virginia':
-                jito_region = 'NY';
-                break;
-            case 'jp':
-                jito_region = 'Tokyo';
-                break;
-            default:
-                jito_region = 'Default';
-        }
-        (0, dist_1.log_debug)(`get_jito_region`, {
-            server_info,
-            jito_region
-        });
-        return jito_region;
-    }
-    get_gas_fee(trade_strategy) {
-        let { speed, fee_mode, fee_exact, fee_max_cap, } = trade_strategy;
-        let gas_fee = 5001;
-        switch (fee_mode) {
-            case "exact":
-                gas_fee = this.get_excat_fee_by_speed(speed, fee_exact);
-                break;
-            case "max_cap":
-                gas_fee = this.get_dynamic_fee_by_speed(speed, 50000, fee_max_cap);
-                break;
-            default:
-                throw new Error(`Not support fee_mode: ${fee_mode}`);
-        }
-        return gas_fee;
-    }
-    get_excat_fee_by_speed(speed, fee_exact) {
-        let factor = 1;
-        if (speed === 'fast') {
-            factor = 1;
-        }
-        if (speed === 'turbo') {
-            factor = 2;
-        }
-        if (speed === 'ultra') {
-            factor = 5;
-        }
-        return fee_exact * factor;
-    }
-    get_dynamic_fee_by_speed(speed, estimate_priority_fee, fee_max_cap) {
-        let factor = 1;
-        if (speed === 'fast') {
-            factor = 1.2;
-        }
-        if (speed === 'turbo') {
-            factor = 2;
-        }
-        if (speed === 'ultra') {
-            factor = 5;
-        }
-        return Math.min(estimate_priority_fee * factor, fee_max_cap);
-    }
 }
 exports.HeliusClient = HeliusClient;

package/dist/strategy_util.d.ts

@@ -0,0 +1,7 @@
+import { TradeRuntimeType, TradeStrategyType } from "@clonegod/ttd-common";
+import { JitoRegion } from "./helius_sdk_v1.4.0";
+import { SolanaTradeRuntimeType } from "./context";
+import { Connection } from "@solana/web3.js";
+export declare function create_solana_trade_runtime(trade_runtime: TradeRuntimeType, connection: Connection): SolanaTradeRuntimeType;
+export declare function calculate_gas_fee(trade_strategy: TradeStrategyType): number;
+export declare function get_jito_region(): JitoRegion;

package/dist/strategy_util.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get_jito_region = exports.calculate_gas_fee = exports.create_solana_trade_runtime = void 0;
+const dist_1 = require("@clonegod/ttd-common/dist");
+const constants_1 = require("./constants");
+function create_solana_trade_runtime(trade_runtime, connection) {
+    let trade_strategy = trade_runtime.settings.strategy;
+    let { cu_limit } = trade_runtime.settings;
+    if (cu_limit < 50000) {
+        cu_limit = 50000;
+    }
+    let priority_fee = calculate_gas_fee(trade_strategy);
+    let cu_price = Math.ceil(priority_fee * constants_1.ONE_MILLION / cu_limit);
+    (0, dist_1.log_info)(`trade_strategy & gas`, {
+        trade_strategy,
+        priority_fee,
+        cu_limit,
+        cu_price
+    });
+    let solana_trade_runtime = Object.assign(Object.assign({}, trade_runtime), { connection,
+        priority_fee,
+        cu_limit,
+        cu_price });
+    return solana_trade_runtime;
+}
+exports.create_solana_trade_runtime = create_solana_trade_runtime;
+function calculate_gas_fee(trade_strategy) {
+    let { speed, fee_mode, fee_exact, fee_max_cap, } = trade_strategy;
+    let gas_fee = 1000;
+    switch (fee_mode) {
+        case "exact":
+            gas_fee = get_excat_fee_by_speed(speed, fee_exact);
+            break;
+        case "max_cap":
+            gas_fee = get_dynamic_fee_by_speed(speed, 50000, fee_max_cap);
+            break;
+        default:
+            throw new Error(`Not support fee_mode: ${fee_mode}`);
+    }
+    return gas_fee;
+}
+exports.calculate_gas_fee = calculate_gas_fee;
+function get_excat_fee_by_speed(speed, fee_exact) {
+    let factor = 1;
+    if (speed === 'fast') {
+        factor = 1;
+    }
+    if (speed === 'turbo') {
+        factor = 2;
+    }
+    if (speed === 'ultra') {
+        factor = 5;
+    }
+    return fee_exact * factor;
+}
+function get_dynamic_fee_by_speed(speed, estimate_priority_fee, fee_max_cap) {
+    let factor = 1;
+    if (speed === 'fast') {
+        factor = 1.2;
+    }
+    if (speed === 'turbo') {
+        factor = 2;
+    }
+    if (speed === 'ultra') {
+        factor = 5;
+    }
+    return Math.min(estimate_priority_fee * factor, fee_max_cap);
+}
+function get_jito_region() {
+    let jito_region;
+    let server_info = (0, dist_1.getServerInfo)();
+    switch (server_info.region) {
+        case 'fra':
+            jito_region = 'Frankfurt';
+            break;
+        case 'virginia':
+            jito_region = 'NY';
+            break;
+        case 'jp':
+            jito_region = 'Tokyo';
+            break;
+        default:
+            jito_region = 'Default';
+    }
+    (0, dist_1.log_debug)(`get_jito_region`, {
+        server_info,
+        jito_region
+    });
+    return jito_region;
+}
+exports.get_jito_region = get_jito_region;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-sol-common",
-    "version": "1.0.20",
+    "version": "1.0.22",
     "description": "",
     "main": "dist/index.js",
     "types": "types/index.d.ts",
@@ -13,9 +13,7 @@
         "push": "npm run build && npm publish"
     },
     "dependencies": {
-        "@clonegod/ttd-common": "1.0.133",
-        "@irys/sdk": "^0.2.10",
-        "@metaplex-foundation/mpl-token-metadata": "^2.5.2",
+        "@clonegod/ttd-common": "1.0.134",
         "axios": "^1.2.3",
         "bs58": "^6.0.0"
     },