abstract-solana 0.0.0.2__tar.gz → 0.0.0.5__tar.gz

{abstract_solana-0.0.0.2 → abstract_solana-0.0.0.5}/PKG-INFO

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

{abstract_solana-0.0.0.2 → abstract_solana-0.0.0.5}/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.02',
+    version='0.0.0.05',
     author='putkoff',
     author_email='partners@abstractendeavors.com',
     description="",

{abstract_solana-0.0.0.2 → abstract_solana-0.0.0.5}/src/abstract_solana/index_utils.py

@@ -25,6 +25,7 @@ def fix_relaxed_json_in_lp_log_entry(relaxed_json: str) -> str:
 
 def get_associations(event, txnData):
     accountKeys = get_all_account_keys(txnData)
+    input(accountKeys)
     key_properties = {'associatedAccounts': ['accountIndex', 'accounts'], 'programId': ['programIdIndex']}
     new_accounts = {k: None for k in key_properties}
     for key, values in key_properties.items():

{abstract_solana-0.0.0.2 → abstract_solana-0.0.0.5}/src/abstract_solana.egg-info/PKG-INFO

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

{abstract_solana-0.0.0.2 → abstract_solana-0.0.0.5}/test/test_abstract_solana.py

@@ -1,6 +1,8 @@
 from abstract_solana import *
 from spl.token.instructions import create_associated_token_account, get_associated_token_address
-from solders_rpc import *
+from price_functions import *
+PUMP_FUN_PROGRAM = get_pubkey("6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P")
+TOKEN_PROGRAM_ID = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
 PUMP_FUN_PROGRAM = get_pubkey("6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P")
 
 PUMP_FUN_ASSOC_TOKEN_ACC_PROG = get_pubkey("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL")
@@ -9,23 +11,7 @@ def get_solcatcher_api(endpoint,*args,**kwargs):
     return get_async_response(get_solcatcher_endpoint,endpoint=endpoint,*args,**kwargs)
 def get_balance_info(balanceInfo, programId, authority):
     return next((bal for bal in balanceInfo if programId == bal.get("programId") and authority == bal.get("owner")), {})
-def get_balance_from_instruction(transfer_instruction, txnData):
-    preBalance = txnData["meta"].get("preTokenBalances", [])
-    postBalance = txnData["meta"].get("postTokenBalances", [])
-    
-    # Update transfer_instruction with source, destination, and authority
-    accounts = transfer_instruction.get("accounts", [])
-    transfer_instruction.update({
-        key: accounts[i] for i, key in enumerate(["source", "destination", "authority"])
-    })
-    
-    preBalanceInfo = get_balance_info(preBalance, transfer_instruction['programId'], transfer_instruction['authority'])
-    postBalanceInfo = get_balance_info(postBalance, transfer_instruction['programId'], transfer_instruction['authority'])
-    
-    amount = preBalanceInfo.get('uiTokenAmount', {}).get('amount', 0) - postBalanceInfo.get('uiTokenAmount', {}).get('amount', 0)
-    transfer_instruction['amount'] = amount
-    
-    return transfer_instruction
+
 def get_transfer_info(transfer_instructions, txnData):
     for transfer_instruction in transfer_instructions:
         updated_instruction = get_balance_from_instruction(transfer_instruction, txnData)
@@ -39,6 +25,10 @@ def get_transfer_instructions(txnData,programId=None):
 mint = "911eA3wRZ85ZiSTpmCH1hksPGLGgzyVpfMXtJ4zSzVJ5"
 bondingCurve = str(derive_bonding_curve(mint))
 #input(getsignaturesforaddress(str(derive_bonding_curve(mint)[0])))
-input(get_solcatcher_api("getGenesisSignature",account=str(derive_bonding_curve(mint)[0])))
-parsed_txn = get_solcatcher_api("getParsedTransaction",signature="2pQRuCawe8it1X4bvKZnmSZZfcLUXd3q1ki8z1kMBCKm52eU2obQxGSkpRR1tX88nquy5iNiycebit3BFsQaDPcx")
-input(get_transfer_instructions(parsed_txn,programId=PUMP_FUN_ASSOC_TOKEN_ACC_PROG))
+signature = get_solcatcher_api("getGenesisSignature",account=str(derive_bonding_curve(mint)[0]))
+txnData = get_solcatcher_api("getTransaction",tx_sig=str(signature))
+input(get_all_account_keys(txnData))
+parsed_txnData=parse_instruction_and_token_balances(txnData)
+
+input(get_transfer_info(find_in_catalog('transfer',parsed_txnData,programId=PUMP_FUN_PROGRAM),txnData))
+input(get_transfer_instructions(txnData))

{abstract_solana-0.0.0.2 → abstract_solana-0.0.0.5}/src/abstract_solana/pubkey_utils.py

@@ -1,6 +1,5 @@
 from solders.pubkey import Pubkey
 from solders.signature import Signature
-PUMP_FUN_PROGRAM = get_pubkey("6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P")
 
 def get_pubString(obj):
     return Pubkey.from_string(str(obj))
@@ -62,6 +61,7 @@ def get_sigkey(obj):
 
 def derive_associated_bonding_curve(mint,programId=None):
     return get_associated_token_address(derive_bonding_curve(mint,programId)[0], get_pubkey(mint))
+PUMP_FUN_PROGRAM = get_pubkey("6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P")
 
 def derive_bonding_curve(mint,programId=None):
     programId = programId or PUMP_FUN_PROGRAM