abstract-solana 0.0.0.16__py3-none-any.whl → 0.0.0.18__py3-none-any.whl

abstract_solana/log_message_functions.py

@@ -30,15 +30,35 @@ def get_end_log_index(txnData,index):
         if 'invoke' in log.lower():
             return index+1+i
     return len(allLogs)
-def get_for_program_ids_info(txnData):
+def get_stack_height_from_logs(logs):
+    for log in make_list(logs):
+        if 'invoke' in log.lower():
+            return int(log.split(' ')[-1][1:-1])
+def get_program_id_from_log(logs):
+    for log in make_list(logs):
+        if 'invoke' in log.lower():
+            return log.split(' ')[1]
+
+def get_all_logs(txnData):
+    logits = []
     allLogs = get_log_messages_from_txn(txnData)
-    return [{"programId":get_program_id_from_log(allLogs[i]),
-             "start":i,
-             "end":get_end_log_index(txnData,i),
-             'stackHeight':get_stack_height_from_logs(allLogs[i]),
-             'events':[event.split(':')[0] for event in get_log_events(get_logs_from_index(txnData,index=i))],
-             'logs':get_logs_from_index(txnData,index=i)
-             } for i in range(len(allLogs)) if 'invoke' in allLogs[i].lower()]
+    for i,log in enumerate(allLogs):
+        if 'invoke' in log.lower():
+            logits.append([])
+        logits[-1].append(log)
+    start = 0
+    for i,log in enumerate(logits):    
+        length = len(log)
+        end = start+length
+        logits[i]={"programId":get_program_id_from_log(log[0]),
+                   "start":start,
+                   "end":end-1,
+                   'stackHeight':get_stack_height_from_logs(log[0]) or 1,
+                   'events':[event.split(':')[-1] or 'unknown' for event in get_log_events(log)],
+                   'vars':[event.split(':')[1:] or 'unknown' for event in get_log_events(log)],
+                   'logs':log}
+        start = end
+    return logits
 def split_log_for_instruction(log):
     return log.split('log:')[-1].split('Instruction:')[-1]
 def clean_split_string(string,delim=' '):
@@ -88,3 +108,47 @@ def findKeyValueIdInCatalog(key,value,txnData,programId=None):
     return [txn for txn in make_list(complete_catalog) if txn.get(key) == value]
 def find_account_in_catalog(account,catalog):
     return ifListGetSection([txn for txn in make_list(catalog) if account in txn.get('associatedAccounts')])
+def associate_logs_with_instructions(txnData):
+    accountKeys = get_all_account_keys(txnData)
+    instructions = txnData['transaction']['message']['instructions']
+    innerInstructions = txnData['meta']['innerInstructions'][0]['instructions']
+    allLogs = txnData['meta']['logMessages']
+    for logIndex,log in enumerate(allLogs):
+        log_programId = log['programId']
+        log_stackHeight = log.get('stackHeight')  # Default to 0 if stackHeight is missing
+        # Search for matching instructions by programId and stackHeight
+        for instIndex,allInstruction in enumerate([instructions,innerInstructions]):
+            for i,instruction in enumerate(allInstruction):
+                program_id_index = instruction.get('programIdIndex')
+                if program_id_index is not None:
+                    instruction_program_id = accountKeys[program_id_index]
+                    instruction_stack_height = instruction.get('stackHeight', 1)
+                    if instruction_program_id == log_programId and instruction_stack_height == log_stackHeight:
+                        # Add log data to the matching instruction
+                        instruction['logs'] = log['logs']
+                        instruction['event'] = None if log['events'] == [] else log['events'][0]
+                        instruction['start'] = log['start']
+                        instruction['end'] = log['end']
+                        instruction['stackHeight'] = instruction_stack_height
+                        instruction['programId'] = instruction_program_id
+                        instruction['associatedAccounts'] = [accountKeys[index] for index in instruction['accounts']]
+                        if instIndex == 0:
+                            instructions[i] = instruction
+                        else:
+                            innerInstructions[i] = instruction
+                        allLogs[logIndex].update(instruction)
+    txnData['transaction']['message']['instructions'] = instructions
+    txnData['meta']['innerInstructions'][0]['instructions'] = innerInstructions
+    txnData['meta']['logMessages'] = allLogs
+    return txnData
+def update_initial_txnData(txnData):
+    accountKeys = get_all_account_keys(txnData)
+    txnData = update_balance_data(txnData)
+    txnData['transaction']['message']['instructions'] = [{**inst,"instructionIndex":instIndex,"programId":accountKeys[inst.get('programIdIndex')],"stackHeight":inst.get('stackHeight', 1),"associatedAccounts":[accountKeys[index] for index in inst['accounts']]} for instIndex,inst in enumerate(txnData['transaction']['message']['instructions'])]
+    txnData['meta']['innerInstructions'][0]['instructions'] = [{**inst,"instructionIndex":instIndex+len(txnData['transaction']['message']['instructions']),"programId":accountKeys[inst.get('programIdIndex')],"stackHeight":inst.get('stackHeight', 1),"associatedAccounts":[accountKeys[index] for index in inst['accounts']]} for instIndex,inst in enumerate(txnData['meta']['innerInstructions'][0]['instructions'])]
+    txnData['meta']['logMessages'] = get_all_logs(txnData)
+    return txnData
+def get_for_program_ids_info(txnData):
+    txnData = update_initial_txnData(txnData)
+    txnData = associate_logs_with_instructions(txnData)
+    return txnData

abstract_solana/pubkey_utils.py

@@ -1,9 +1,10 @@
 from solders.pubkey import Pubkey
 from solders.signature import Signature
 from spl.token.instructions import get_associated_token_address
+TOKEN_PROGRAM_ID = "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P"
 
 def pubkey_find_program_address(string,address,programId):
-    return Pubkey.find_program_address([str(string).encode(), bytes(get_pubkey(address))],programId)
+    return Pubkey.find_program_address([str(string).encode(), bytes(get_pubkey(address))],get_pubkey(programId))
 
 def get_pubString(obj):
     return Pubkey.from_string(str(obj))
@@ -67,5 +68,5 @@ def derive_associated_bonding_curve(mint,programId=None):
     return get_associated_token_address(derive_bonding_curve(mint,programId)[0], get_pubkey(mint))
 
 def derive_bonding_curve(mint,programId=None):
-    programId = programId or "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+    programId = programId or TOKEN_PROGRAM_ID
     return pubkey_find_program_address("bonding-curve",mint,programId)

{abstract_solana-0.0.0.16.dist-info → abstract_solana-0.0.0.18.dist-info}/METADATA

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

{abstract_solana-0.0.0.16.dist-info → abstract_solana-0.0.0.18.dist-info}/RECORD

@@ -3,12 +3,12 @@ abstract_solana/account_key_utils.py,sha256=VMJd4GOTK1vn8UZsfXDnjxDOGoQWGY6fvflJ
 abstract_solana/constants.py,sha256=m1TsZLBAgcdM7Rrw_3_6YrFU9zdVFpghZXZKk7T38J8,1624
 abstract_solana/genesis_functions.py,sha256=2WRQUxN9j-dpLfYIBiX3URM-_uDGkh-eTy08Gi-qWgo,939
 abstract_solana/index_utils.py,sha256=Ed07BYTZWp-SVfpthAUqjRY00U3ZYldPCqd7LJy9AO8,1884
-abstract_solana/log_message_functions.py,sha256=bsofpTSMr0P5yEIUs2Y2Qsmwz_AQNn2HATTvz0IWodM,4603
+abstract_solana/log_message_functions.py,sha256=vXcIk8TyMBcRyg2iM4UE0pQ3UsDkbvYswmRR-yrQO9g,8428
 abstract_solana/price_utils.py,sha256=BLkwFLhlsTHeW0NTdzCAUi2xhc2lX7SrHz5sslDbUrY,4288
-abstract_solana/pubkey_utils.py,sha256=ojBkJ5RDagnty-MtDRLT8Grfod_TdDFuxaEtKBR89Gk,1962
+abstract_solana/pubkey_utils.py,sha256=TAYF74fKAuTBnqIP2SnA-BttO5uoHbxI9BRZRpGCMNY,2010
 abstract_solana/signature_data_parse.py,sha256=5AOMtJZADWcwR0JLDbd2kXZNzW129qeB0lvYUrE_tm0,1974
 abstract_solana/utils.py,sha256=Y1nyq-x7GqN09MEDrmiBM5iNDLJHDafFZ_lXrV0ua8k,348
-abstract_solana-0.0.0.16.dist-info/METADATA,sha256=-60JwpQUyojtrlUqGOt7eULtk5kso19gompdkF5W8so,924
-abstract_solana-0.0.0.16.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-abstract_solana-0.0.0.16.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
-abstract_solana-0.0.0.16.dist-info/RECORD,,
+abstract_solana-0.0.0.18.dist-info/METADATA,sha256=mGMlJ3pQ0hmW2pzsP8bNApIQZS_YYfIfKOqUTRHg2YI,924
+abstract_solana-0.0.0.18.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+abstract_solana-0.0.0.18.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
+abstract_solana-0.0.0.18.dist-info/RECORD,,