abstract-solana 0.0.0.72__py3-none-any.whl → 0.0.0.74__py3-none-any.whl

abstract_solana/pumpFun/buy_sell_pump.py

@@ -115,22 +115,21 @@ async def confirm_txn(txn_sig, max_retries=20, retry_interval=3):
     print(f"Failed to confirm transaction after {max_retries} attempts.")
     return txn_sig
 
-async def complete_txn(txn, payer_keypair,confirm=True):
+async def complete_txn(txn, payer_keypair,confirm=False):
     txn_sig = await sendTransaction(txn=txn, payer_keypair=payer_keypair, skip_preflight=True)  # Await this async call
     print("Transaction Signature", txn_sig)
-    if confirm:
-        confirm = await confirm_txn(txn_sig)  # Await confirmation
+    if confirm == False:
+        return 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
-            if confirm:
-                return confirm
-        print("Transaction confirmed:", confirm)
-        return confirm
-    return txn_sig
-def buy_pump(mint: str, payer_keypair: Pubkey, sol_in=None, slippage=None,confirm=True):
+    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,confirm=False):
     sol_in = sol_in or 0.001
     slippage = slippage or 25
     payer_pubkey = get_pubkey(payer_keypair.pubkey())
@@ -140,7 +139,7 @@ def buy_pump(mint: str, payer_keypair: Pubkey, sol_in=None, slippage=None,confir
         print("Buy transaction failed")
     return completed
         
-def sell_pump(mint:str, payer_keypair:Pubkey, token_balance=None, slippage=None,confirm=True):
+def sell_pump(mint:str, payer_keypair:Pubkey, token_balance=None, slippage=None,confirm=False):
     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)

abstract_solana/pumpFun/pump_fun_keys.py

@@ -40,27 +40,25 @@ def get_create_map():
         {'instruction_number': '14', 'instruction_name': 'Program', 'token_address': '6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P', 'token_name': 'Pump.fun'}
     ]
 
-# Fetches and organizes transaction types based on provided mint
-def getTxnTypes(mint):
-    bonding_curve = str(derive_bonding_curve(mint)[0])
-    bonding_curve_signature = getGenesisSignature(address=bonding_curve)
-    txn_data = getTransaction(signature=bonding_curve_signature)
+def get_txnTypesFromGenesisSignature(genesisSignature):
+    txn_data = getTransaction(signature=genesisSignature)
     txn_data = get_for_program_ids_info(txn_data)
-
     for new_map in get_create_map():
         instructions = txn_data['transaction']['message']['instructions']
         inner_instructions = txn_data['meta']['innerInstructions'][0]['instructions']
         all_instructions = instructions + inner_instructions
-
         instruction = [inst for inst in all_instructions if len(inst.get('associatedAccounts', [])) > 13]
-        
         txn_types = {create_index['instruction_name']: instruction[0]['associatedAccounts'][int(create_index['instruction_number']) - 1] for create_index in get_create_map()}
-
         if txn_types:
-            txn_types['signature'] = bonding_curve_signature
+            txn_types['signature'] = genesisSignature
             break
     return txn_types
 
+# Fetches and organizes transaction types based on provided mint
+def getTxnTypes(mint):
+    bonding_curve = str(derive_bonding_curve(mint)[0])
+    bonding_curve_signature = getGenesisSignature(address=bonding_curve)
+    return get_txnTypesFromGenesisSignature(bonding_curve_signature)
 # Retrieve virtual reserves for a bonding curve using a structured layout
 def get_virtual_reserves(bonding_curve: Pubkey):
     bonding_curve_struct = Struct(
@@ -84,8 +82,11 @@ def get_virtual_reserves(bonding_curve: Pubkey):
     return parsed_data
 
 # Retrieves comprehensive transaction and reserve data for the mint
-def get_pump_fun_data(mint_str: str):
-    txn_types = change_keys_lower(getTxnTypes(mint_str))
+def get_pump_fun_data(mint_str: str=None,signature=None):
+    if mint_str:
+        txn_types = change_keys_lower(getTxnTypes(mint_str))
+    if signature:
+        txn_types = change_keys_lower(get_txnTypesFromGenesisSignature(signature))
     bonding_curve = derive_bonding_curve(mint_str)
     virtual_reserves = get_virtual_reserves(bonding_curve)
     if virtual_reserves is None:

{abstract_solana-0.0.0.72.dist-info → abstract_solana-0.0.0.74.dist-info}/METADATA

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

{abstract_solana-0.0.0.72.dist-info → abstract_solana-0.0.0.74.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=Nb8GxOaC0p3EphMPicKfiHMpGiMP-R9cXAJDg8fFPa0,7896
+abstract_solana/pumpFun/buy_sell_pump.py,sha256=fBJRFVfH00bczQ1ZrVPaHh4ot8eJ8ZwanqfPSpp2ur0,7830
 abstract_solana/pumpFun/pumpFunKeys.py,sha256=yMS_fT-0ESndluVpZ17XdMhpXVtSfhtIG5njy7DJkfI,7961
-abstract_solana/pumpFun/pump_fun_keys.py,sha256=3ykkcogaptbzJ6MwI6OWzUdo5rA1qW54fY0KAJAXgIc,8050
+abstract_solana/pumpFun/pump_fun_keys.py,sha256=bSXjZXAMdnppFhkICcvL_QyHia55GcUe1r20COi9sP8,8291
 abstract_solana/pumpFun/token_utils.py,sha256=NhMvpTnw3QZk8DmeKYFzuqEMEZEHUlrBKfFp7662ohw,2684
-abstract_solana-0.0.0.72.dist-info/METADATA,sha256=gMd0xb9DblmTZYgYdh4O9njJC6Is0kL0x0noqyhOsEQ,981
-abstract_solana-0.0.0.72.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-abstract_solana-0.0.0.72.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
-abstract_solana-0.0.0.72.dist-info/RECORD,,
+abstract_solana-0.0.0.74.dist-info/METADATA,sha256=YrJAj6X-Sg9YYqajG9lQZmUG-Ketdo4pMiZVb0OPMwA,981
+abstract_solana-0.0.0.74.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+abstract_solana-0.0.0.74.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
+abstract_solana-0.0.0.74.dist-info/RECORD,,