abstract-solana 0.0.0.73__tar.gz → 0.0.0.74__tar.gz

{abstract_solana-0.0.0.73 → abstract_solana-0.0.0.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: abstract_solana
-Version: 0.0.0.73
+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.73 → abstract_solana-0.0.0.74}/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.73',
+    version='0.0.0.74',
     author='putkoff',
     author_email='partners@abstractendeavors.com',
     description="",

{abstract_solana-0.0.0.73 → abstract_solana-0.0.0.74}/src/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.73 → abstract_solana-0.0.0.74}/src/abstract_solana.egg-info/PKG-INFO

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