abstract-solana 0.0.0.34__py3-none-any.whl → 0.0.0.35__py3-none-any.whl

abstract_solana/pumpFun/buy_sell_pump.py

@@ -1,10 +1,10 @@
 import struct,base58,time
+from typing import Optional,Union
 from solders.hash import Hash
 from solders.keypair import Keypair
 from solders.instruction import Instruction
 from solana.rpc.types import TokenAccountOpts,TxOpts
 from solana.transaction import Transaction
-from ..pubkey_utils import Pubkey,get_pubkey
 from ..constants import PUMP_FUN_PROGRAM_PUBKEY,LAMPORTS_PER_SOL
 from solders.compute_budget import set_compute_unit_limit, set_compute_unit_price
 from .token_utils import get_token_balance
@@ -60,9 +60,9 @@ def confirm_txn(txn_sig, max_retries=20, retry_interval=3):
             time.sleep(retry_interval)
     print("Max retries reached. Transaction confirmation failed.")
     return None
-def buildTxn(mint, amount, slippage, token_account_pubkey,sol_in=0,token_price=0,token_balance=0,token_account_instructions=None,close_token_account=False,buy=True):
+def buildTxn(mint,payer_pubkey, amount, slippage, token_account_pubkey,sol_in=0,token_price=0,token_balance=0,token_account_instructions=None,close_token_account=False,buy=True):
     # Get keys for the transaction, pass the token account's pubkey instead of the AccountMeta object
-    keys = getKeys(get_coin_data(mint), token_account_pubkey, owner,buy=buy)
+    keys = getKeys(get_coin_data(mint), token_account_pubkey, payer_pubkey,buy=buy)
     slippage_adjustment = 1 - (slippage / 100)
     sol_change = sol_in if buy else float(token_balance) * float(token_price)
     sol_change_with_slippage = sol_change * slippage_adjustment
@@ -77,25 +77,21 @@ def buildTxn(mint, amount, slippage, token_account_pubkey,sol_in=0,token_price=0
     blockHash = getLatestBlockhash(commitment="processed")
     recent_blockhash = get_any_value(blockHash.json(),'blockhash')
     recent_blockhash = Hash.from_string(recent_blockhash)
-    txn = Transaction(recent_blockhash=recent_blockhash, fee_payer=owner)
+    txn = Transaction(recent_blockhash=recent_blockhash, fee_payer=payer_pubkey)
     txn.add(set_compute_unit_price(UNIT_PRICE))
     txn.add(set_compute_unit_limit(UNIT_BUDGET))
     if buy and token_account_instructions:
         txn.add(token_account_instructions)
     txn.add(swap_instruction)
     if buy == False and close_token_account:
-        close_account_instructions = close_account(CloseAccountParams(PUMP_FUN_PROGRAM_PUBKEY, token_account_pubkey, owner, owner))
+        close_account_instructions = close_account(CloseAccountParams(PUMP_FUN_PROGRAM_PUBKEY, token_account_pubkey, payer_pubkey, payer_pubkey))
         txn.add(close_account_instructions)
     txn.sign(payer_keypair)
-    txn_sig = sendTransaction(txn, payer_keypair, TxOpts(skip_preflight=True))
-    print("Transaction Signature", txn_sig)
-    confirm = confirm_txn(txn_sig)
-    print(confirm)
-def get_all_buy_sell_info(mint,payer_keypair=None,token_balance=None):
+    return txn
+
+def get_all_buy_sell_info(mint,payer_pubkey,token_balance=None,sol_in=0):
     try:
-        payer_keypair = payer_keypair or load_from_private_key()
-        payer_pubkey = payer_keypair.pubkey()
-        print("Owner Public Key:", owner)
+        print("Owner Public Key:", payer_pubkey)
         mint_str = str(mint)
         if not get_pubkey(mint_str).is_on_curve():
             print('Mint public key is not on curve')
@@ -109,7 +105,7 @@ def get_all_buy_sell_info(mint,payer_keypair=None,token_balance=None):
             print("Failed to retrieve coin data...")
             return False
         mint_pubkey = get_pubkey(mint_str)
-        token_account, token_account_instructions = check_existing_token_account(owner, mint_pubkey)
+        token_account, token_account_instructions = check_existing_token_account(payer_pubkey, mint_pubkey)
         token_account_pubkey = get_pubkey(token_account)
         # Ensure the token_account is a valid Pubkey
         if not isinstance(token_account_pubkey, Pubkey):
@@ -133,22 +129,22 @@ def get_all_buy_sell_info(mint,payer_keypair=None,token_balance=None):
     except Exception as e:
         print(e)
         
-def pump_fun_sell(mint_str: str, token_balance: Optional[Union[int, float]] = None,  slippage: int = 25, close_token_account: bool = True) -> bool:
-        mint,amount,token_balance,token_price,token_account_pubkey,token_account_instructions = get_all_buy_sell_info(mint,payer_keypair,token_balance)
-        buildTxn(mint=mint,
-                 amount=amount,
-                 slippage=slippage,
-                 sol_in=0,
-                 token_balance=token_balance,
-                 token_price=token_price,
-                 token_account_pubkey=token_account_pubkey,
-                 token_account_instructions=token_account_instructions,
-                 buy=False)
+def pump_fun_sell(mint: str,payer_pubkey:Pubkey, token_balance: Optional[Union[int, float]] = None,  slippage: int = 25, close_token_account: bool = True) -> bool:
+    mint,amount,token_balance,token_price,token_account_pubkey,token_account_instructions = get_all_buy_sell_info(mint,payer_pubkey,token_balance=token_balance)
+    return buildTxn(mint=mint,
+             amount=amount,
+             slippage=slippage,
+             sol_in=0,
+             token_balance=token_balance,
+             token_price=token_price,
+             token_account_pubkey=token_account_pubkey,
+             token_account_instructions=token_account_instructions,
+             buy=False)
 
-def pump_fun_buy(mint_str: str, sol_in: float = 0.001, slippage: int = 25) -> bool:
-    mint,amount,token_balance,token_price,token_account_pubkey,token_account_instructions = get_all_buy_sell_info(mint,payer_keypair)
+def pump_fun_buy(mint: str,payer_pubkey:Pubkey, sol_in: float = 0.001, slippage: int = 25) -> bool:
+    mint,amount,token_balance,token_price,token_account_pubkey,token_account_instructions = get_all_buy_sell_info(mint,payer_pubkey,sol_in=sol_in)
     # Build the transaction
-    buildTxn(mint=mint,
+    return buildTxn(mint=mint,
              amount=amount,
              slippage=slippage,
              sol_in=sol_in,

{abstract_solana-0.0.0.34.dist-info → abstract_solana-0.0.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: abstract_solana
-Version: 0.0.0.34
+Version: 0.0.0.35
 Home-page: https://github.com/AbstractEndeavors/abstract_solana
 Author: putkoff
 Author-email: partners@abstractendeavors.com

{abstract_solana-0.0.0.34.dist-info → abstract_solana-0.0.0.35.dist-info}/RECORD

@@ -11,11 +11,11 @@ abstract_solana/pumpFunKeys.py,sha256=KHZyQ_GFS9XzmNNMzEDQkAZsiM5Mpua6ZE1e3WebEr
 abstract_solana/signature_data_parse.py,sha256=5AOMtJZADWcwR0JLDbd2kXZNzW129qeB0lvYUrE_tm0,1974
 abstract_solana/utils.py,sha256=RcnGEiZ0aJbcw8ObpjHU3WUFU4Tmy-exCs6qIbEu4_c,444
 abstract_solana/pumpFun/__init__.py,sha256=BiRxwJd1JWwEft63zqYwZ_Xs6UDp4hjczjzvuwy3sHg,85
-abstract_solana/pumpFun/buy_sell_pump.py,sha256=7f9Y4gc-DMC-IVFcpAYA8omNZzYCvE3tphEKie4uSAY,7391
+abstract_solana/pumpFun/buy_sell_pump.py,sha256=pGyuFmG07KieuCdl0sxrhNDYKamgLx79zfBv5g08y8c,7198
 abstract_solana/pumpFun/pumpFunKeys.py,sha256=yMS_fT-0ESndluVpZ17XdMhpXVtSfhtIG5njy7DJkfI,7961
 abstract_solana/pumpFun/pump_fun_keys.py,sha256=lL7afQx3-PYOHz69rm7Cyr2_tLp0nFXLZAd-7tvztm8,7963
 abstract_solana/pumpFun/token_utils.py,sha256=oDvY0YVn8vWwSS3yS-tpZVxb3IvqovGPFicxiXg7YHI,2297
-abstract_solana-0.0.0.34.dist-info/METADATA,sha256=yxy4V-KpzmCUH4JnJ5C3urpifPLV-FhIp9ci_qaOMXw,924
-abstract_solana-0.0.0.34.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-abstract_solana-0.0.0.34.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
-abstract_solana-0.0.0.34.dist-info/RECORD,,
+abstract_solana-0.0.0.35.dist-info/METADATA,sha256=9SrN44bJzSnHTWb24HT0Ddcv11o2qZ0r-nU2rnMLhHo,924
+abstract_solana-0.0.0.35.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+abstract_solana-0.0.0.35.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
+abstract_solana-0.0.0.35.dist-info/RECORD,,