abstract-solana 0.0.0.68__tar.gz → 0.0.0.69__tar.gz

{abstract_solana-0.0.0.68 → abstract_solana-0.0.0.69}/PKG-INFO

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

{abstract_solana-0.0.0.68 → abstract_solana-0.0.0.69}/setup.py

@@ -4,7 +4,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 setuptools.setup(
     name='abstract_solana',
-    version='0.0.0.68',
+    version='0.0.0.69',
     author='putkoff',
     author_email='partners@abstractendeavors.com',
     description="",

{abstract_solana-0.0.0.68 → abstract_solana-0.0.0.69}/src/abstract_solana/pumpFun/buy_sell_pump.py

@@ -13,28 +13,6 @@ from ..constants import PUMP_FUN_PROGRAM_PUBKEY,LAMPORTS_PER_SOL,UNIT_PRICE,UNIT
 from solders.compute_budget import set_compute_unit_limit, set_compute_unit_price
 from .token_utils import get_token_balance,check_existing_token_account,get_token_price
 from .pump_fun_keys import getKeys
-async def confirm_txn(txn_sig, max_retries=20, retry_interval=3):
-    retries = 0
-    while retries < max_retries:
-        txn_res = getTransaction(signature=str(txn_sig))
-        if txn_res:
-            print(f"\n\nhttps://solscan.io/tx/{str(txn_sig)}")
-            return txn_res
-        retries += 1
-        print(f"Retrying... ({retries}/{max_retries})")
-        await asyncio.sleep(retry_interval)
-    print(f"Failed to confirm transaction after {max_retries} attempts.")
-    return txn_sig
-async def complete_txn(txn, payer_keypair):
-    txn_sig = sendTransaction(txn=txn,payer_keypair=payer_keypair,  skip_preflight=True)
-    print("Transaction Signature", txn_sig)
-    confirm = await confirm_txn(txn_sig)
-    while not confirm:
-        print("Waiting for transaction confirmation...")
-        time.sleep(1)  # Wait for 1 second before checking again
-        confirm = confirm_txn(txn_sig)
-    print("Transaction confirmed:", confirm)
-    return confirm
 def buildTxn(mint,payer_pubkey, amount, slippage, token_account,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(mint, token_account=token_account, payer_pubkey=payer_pubkey,buy=buy)
@@ -124,22 +102,55 @@ def pump_fun_buy(mint: str,payer_pubkey:Pubkey, sol_in: float = 0.001, slippage:
              token_account_instructions=token_account_instructions,
              buy=True)
     return True
+async def confirm_txn(txn_sig, max_retries=20, retry_interval=3):
+    retries = 0
+    while retries < max_retries:
+        txn_res = getTransaction(signature=str(txn_sig))
+        if txn_res:
+            print(f"\n\nhttps://solscan.io/tx/{str(txn_sig)}")
+            return txn_res
+        retries += 1
+        print(f"Retrying... ({retries}/{max_retries})")
+        await asyncio.sleep(retry_interval)
+    print(f"Failed to confirm transaction after {max_retries} attempts.")
+    return txn_sig
+async def complete_txn(txn, payer_keypair):
+    txn_sig = await sendTransaction(txn=txn, payer_keypair=payer_keypair, skip_preflight=True)  # Await this async call
+    print("Transaction Signature", txn_sig)
+    confirm = await confirm_txn(txn_sig)  # Await confirmation
+
+    while not confirm:
+        print("Waiting for transaction confirmation...")
+        await asyncio.sleep(1)  # Use asyncio.sleep instead of time.sleep to avoid blocking
+        confirm = await confirm_txn(txn_sig)  # Await confirmation check again
+
+    print("Transaction confirmed:", confirm)
+    return confirm
 
-def buy_pump(mint:str, payer_keypair:Pubkey,sol_in=None,slippage=None):
+async def buy_pump_sync(mint: str, payer_keypair: Pubkey, sol_in=None, slippage=None):
     sol_in = sol_in or 0.001
     slippage = slippage or 25
     payer_pubkey = get_pubkey(payer_keypair.pubkey())
-    txn = pump_fun_buy(mint=mint, payer_pubkey=payer_pubkey,sol_in=sol_in,slippage=slippage)
-    completed = asyncio.run(complete_txn(txn, payer_keypair))
+    txn = pump_fun_buy(mint=mint, payer_pubkey=payer_pubkey, sol_in=sol_in, slippage=slippage)
+    
+    completed = await complete_txn(txn, payer_keypair)  # Await here since `complete_txn` is async
     if not completed:
         print("Buy transaction failed")
     return completed
-        
-def sell_pump(mint:str, payer_keypair:Pubkey, token_balance=None, slippage=None):
+
+
+async def sell_pump_sync(mint: str, payer_keypair: Pubkey, token_balance=None, slippage=None):
     slippage = slippage or 25
     payer_pubkey = get_pubkey(payer_keypair.pubkey())
     txn = pump_fun_sell(mint=mint, payer_pubkey=payer_pubkey, token_balance=token_balance, slippage=slippage)
-    completed = complete_txn(txn, payer_keypair)
+
+    completed = await complete_txn(txn, payer_keypair)  # Await here since `complete_txn` is async
     if not completed:
-        print("sell transaction failed")
+        print("Sell transaction failed")
     return completed
+
+def buy_pump(mint: str, payer_keypair: Pubkey, sol_in=None, slippage=None):
+    return asyncio.run(buy_pump_sync(mint, payer_keypair, sol_in, slippage))
+
+def sell_pump(mint: str, payer_keypair: Pubkey, token_balance=None, slippage=None):
+    return asyncio.run(sell_pump_sync(mint, payer_keypair, token_balance, slippage))

{abstract_solana-0.0.0.68 → abstract_solana-0.0.0.69}/src/abstract_solana.egg-info/PKG-INFO

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