abstract-solana 0.0.0.22__tar.gz → 0.0.0.24__tar.gz

{abstract_solana-0.0.0.22 → abstract_solana-0.0.0.24}/PKG-INFO

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

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

{abstract_solana-0.0.0.22 → abstract_solana-0.0.0.24}/src/abstract_solana/constants.py

@@ -1,15 +1,16 @@
 from .pubkey_utils import get_pubkey
-
-SYSTEM_PROGRAM = "11111111111111111111111111111111"
-SYSTEM_PROGRAM_PUBKEY = get_pubkey(SYSTEM_PROGRAM)
 RENT = "SysvarRent111111111111111111111111111111111"
 RENT_PUBKEY= get_pubkey(RENT)
 TOKEN_PROGRAM_ID = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
 TOKEN_PROGRAM_ID_PUBKEY = get_pubkey(TOKEN_PROGRAM_ID)
-    
+SYSTEM_PROGRAM = "11111111111111111111111111111111"
+SYSTEM_PROGRAM_PUBKEY = get_pubkey(SYSTEM_PROGRAM)
+SOL_MINT = "So11111111111111111111111111111111111111112"
+SOL_MINT_PUBKEY=get_pubkey(SOL_MINT)
+
 PUMP_FUN_GLOBAL = "4wTV1YmiEkRvAtNtsSGPtUrqRYQMe5SKy2uB4Jjaxnjf"
 PUMP_FUN_GLOBAL_PUBKEY = get_pubkey(PUMP_FUN_GLOBAL)
-PUMP_FUN_FEE_RECIPIENT = "CebN5WGQ4jvEPvsVU4EoHEpgzq1VV7AbicfhtW4xC9iM"
+FEE_RECIPIENT = "CebN5WGQ4jvEPvsVU4EoHEpgzq1VV7AbicfhtW4xC9iM"
 PUMP_FUN_FEE_RECIPIENT_PUBKEY = get_pubkey(PUMP_FUN_FEE_RECIPIENT)
 PUMP_FUN_ASSOC_TOKEN_ACC_PROG = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
 PUMP_FUN_ASSOC_TOKEN_ACC_PROG_PUBKEY = get_pubkey(PUMP_FUN_ASSOC_TOKEN_ACC_PROG)
@@ -17,20 +18,13 @@ PUMP_FUN_EVENT_AUTHORITY = "Ce6TQqeHC9p8KetsN6JsjHK7UTZk7nasjjnr7XxXp9F1"
 PUMP_FUN_EVENT_AUTHORITY_PUBKEY = get_pubkey(PUMP_FUN_EVENT_AUTHORITY)
 PUMP_FUN_PROGRAM = "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P"
 PUMP_FUN_PROGRAM_PUBKEY = get_pubkey(PUMP_FUN_PROGRAM)
-PUMP_FUN_SYSTEM_PROGRAM=SYSTEM_PROGRAM
-PUMP_FUN_SYSTEM_PROGRAM_PUBKEY = SYSTEM_PROGRAM_PUBKEY
-PUMP_FUN_TOKEN_PROGRAM_ID=TOKEN_PROGRAM_ID
-PUMP_FUN_TOKEN_PROGRAM_ID_PUBKEY=TOKEN_PROGRAM_ID_PUBKEY
-PUMP_FUN_RENT = RENT
-PUMP_FUN_RENT_PUBKEY = RENT_PUBKEY
 
 RAYDIUM_POOL_V4_PROGRAM_ID = "675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8"
 RAYDIUM_POOL_V4_PROGRAM_ID_PUBKEY=get_pubkey(RAYDIUM_POOL_V4_PROGRAM_ID)
-SOL_MINT = "So11111111111111111111111111111111111111112"
-SOL_MINT_PUBKEY=get_pubkey(SOL_MINT)
-
 
 LAMPORTS_PER_SOL = 1_000_000_000
 UNIT_PRICE =  1_000_000
 UNIT_BUDGET =  100_000
 SOL_DECIMALS = 9
+SOL_DECIMAL_EXP = 10**9
+TOKEN_DECIMAL_EXP = 10**6

abstract_solana-0.0.0.24/src/abstract_solana/keypair_utils.py

@@ -0,0 +1,13 @@
+from abstract_security import *
+def load_from_private_key(env_key='AMM_P'):
+    env_value = get_env_value(key=env_key)
+    if env_value:
+        return Keypair.from_base58_string(env_value)
+
+def load_keypair_from_file(filename):
+    curr = os.path.join(sys.path[0], 'data',  filename)
+    with open(curr, 'r') as file:
+        secret = json.load(file)
+        secret_key = bytes(secret)
+        print(base58.b58encode(secret_key))
+        return Keypair.from_bytete_key()

{abstract_solana-0.0.0.22 → abstract_solana-0.0.0.24}/src/abstract_solana/utils.py

@@ -10,3 +10,7 @@ def if_list_get_Part(obj,i=0):
 def updateData(data,**kwargs):
   data.update(kwargs)
   return data
+def isListZero(obj):
+    if obj and isinstance(obj, list):
+        return obj[0]
+    return obj

{abstract_solana-0.0.0.22 → abstract_solana-0.0.0.24}/src/abstract_solana.egg-info/PKG-INFO

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

{abstract_solana-0.0.0.22 → abstract_solana-0.0.0.24}/src/abstract_solana.egg-info/SOURCES.txt

@@ -5,10 +5,10 @@ src/abstract_solana/account_key_utils.py
 src/abstract_solana/constants.py
 src/abstract_solana/genesis_functions.py
 src/abstract_solana/index_utils.py
+src/abstract_solana/keypair_utils.py
 src/abstract_solana/log_message_functions.py
 src/abstract_solana/price_utils.py
 src/abstract_solana/pubkey_utils.py
-src/abstract_solana/pumpFunKeys.py
 src/abstract_solana/signature_data_parse.py
 src/abstract_solana/utils.py
 src/abstract_solana.egg-info/PKG-INFO

abstract_solana-0.0.0.24/test/test_abstract_solana.py

@@ -0,0 +1,186 @@
+from abstract_solana import Pubkey,get_pubkey,Optional,Union,LAMPORTS_PER_SOL,get_any_value
+from abstract_solana.pumpFunKeys import get_pump_fun_data
+from abstract_solcatcher import *
+from abstract_security import *
+import struct
+import base58,time
+from solders.hash import Hash
+from solders.instruction import Instruction
+from solders.compute_budget import set_compute_unit_limit, set_compute_unit_price #type: ignore
+from solana.rpc.types import TokenAccountOpts,TxOpts
+from solders.keypair import Keypair
+from solana.transaction import AccountMeta, Transaction
+from construct import Padding, Struct, Int64ul, Flag
+LAMPORTS_PER_SOL = 1_000_000_000
+UNIT_PRICE =  1_000_000
+UNIT_BUDGET =  100_000
+def sendTransaction(txn: Transaction, payer_keypair, opts=TxOpts(skip_preflight=True)) -> dict:
+    # Sign the transaction
+    txn.sign(payer_keypair)
+    
+    # Serialize the transaction to a base64 string
+    txn_base64 = base58.b58encode(txn.serialize()).decode('utf-8')
+    
+    # Prepare the RPC request payload
+    payload = {
+        "jsonrpc": "2.0",
+        "id": 1,
+        "method": "sendTransaction",
+        "params": [txn_base64, {"skipPreflight": opts.skip_preflight, "preflightCommitment": "finalized"}]
+    }
+    
+    # Send the transaction
+    response = requests.post(
+        url="https://rpc.ankr.com/solana/c3b7fd92e298d5682b6ef095eaa4e92160989a713f5ee9ac2693b4da8ff5a370",
+        json=payload
+    )
+    
+    # Parse the JSON response
+    response_json = response.json()
+    
+    # Return the result or the entire response in case of error
+    return response_json.get('result', response_json)
+def load_from_private_key(env_key='AMM_P'):
+    env_value = get_env_value(key=env_key)
+    if env_value:
+        return Keypair.from_base58_string(env_value)
+
+def load_keypair_from_file(filename):
+    curr = os.path.join(sys.path[0], 'data',  filename)
+    with open(curr, 'r') as file:
+        secret = json.load(file)
+        secret_key = bytes(secret)
+        print(base58.b58encode(secret_key))
+        return Keypair.from_bytete_key()
+payer_keypair = load_from_private_key()
+payer_pubkey = str(payer_keypair.pubkey())
+owner=Pubkey.from_string(payer_pubkey)
+def get_token_balance(payer,mint_str: str):
+    
+    response = getTokenAccountBalance(str(payer),str(mint_str))
+    response=response.get('value',response)
+    ui_amount = get_any_value(response, "uiAmount") or 0
+    return float(ui_amount)
+def check_existing_token_account(owner: Pubkey, mint: Pubkey):
+    try:
+        account_data = get_account_by_owner(str(owner), str(mint))
+        if account_data:
+            token_account = account_data['pubkey']
+            print(f"Existing token account found: {token_account}")
+            return token_account, None
+        else:
+            print("No existing token account found. Creating a new one...")
+            token_account = get_associated_token_address(owner, mint)
+            token_account_instructions = create_associated_token_account(owner, owner, mint)
+            return token_account, token_account_instructions
+    except Exception as e:
+        print(f"Error checking or creating token account: {e}")
+        return None, None
+def confirm_txn(txn_sig, max_retries=20, retry_interval=3):
+    retries = 0
+    
+    while retries < max_retries:
+        try:
+            
+            txn_res = get_transaction(signature=str(txn_sig))
+            if txn_res:
+                print(txn_res)
+                print(f"\n\nhttps://solscan.io/tx/{str(txn_sig)}")
+                break
+            txn_json = safe_json_loads(txn_res.get('transaction',{}).get('meta',{}))
+            error = txn_json.get('err')
+            if error is None:
+                print("Transaction confirmed... try count:", retries+1)
+                return True
+            print("Error: Transaction not confirmed. Retrying...")
+            if error:
+                print("Transaction failed.")
+                return False
+        except Exception as e:
+            print("Awaiting confirmation... try count:", retries+1)
+            retries += 1
+            time.sleep(retry_interval)
+    print("Max retries reached. Transaction confirmation failed.")
+    return None
+
+def get_coin_data(mint_str):
+    return get_pump_fun_data(str(mint_str))
+
+
+
+def buildTxn(mint, amount, slippage, token_account_pubkey,sol_in=0,token_price=None,token_balance=None,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(get_coin_data(mint), token_account_pubkey, owner,buy=buy)
+    
+    if buy:
+        # Calculate max_sol_cost
+        slippage_adjustment = 1 + (slippage / 100)
+        sol_in_with_slippage = sol_in * slippage_adjustment
+        max_sol_cost = int(sol_in_with_slippage * LAMPORTS_PER_SOL)
+        print("Max Sol Cost:", sol_in_with_slippage)
+        hex_data = bytes.fromhex("66063d1201daebea")
+        solCost = max_sol_cost
+    else:
+        # Calculate minimum SOL output
+        sol_out = float(token_balance) * float(token_price)
+        slippage_adjustment = 1 - (slippage / 100)
+        sol_out_with_slippage = sol_out * slippage_adjustment
+        min_sol_output = int(sol_out_with_slippage * LAMPORTS_PER_SOL)
+        print("Min Sol Output:", sol_out_with_slippage)
+        hex_data = bytes.fromhex("33e685a4017f83ad")
+        solCost = min_sol_output
+    
+    data = bytearray()
+    data.extend(hex_data)
+    data.extend(struct.pack('<Q', amount))
+    data.extend(struct.pack('<Q', solCost))
+    data = bytes(data)
+    PUMP_FUN_PROGRAM = Pubkey.from_string("6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P")
+
+    swap_instruction = Instruction(PUMP_FUN_PROGRAM, data, keys)
+    blockHash = requests.post(url="https://rpc.ankr.com/solana/c3b7fd92e298d5682b6ef095eaa4e92160989a713f5ee9ac2693b4da8ff5a370",data=json.dumps({"id":1,"jsonrpc":"2.0","method":"getLatestBlockhash","params":[{"commitment":"processed"}]}))
+    recent_blockhash = get_any_value(blockHash.json(),'blockhash')
+    recent_blockhash = Hash.from_string(recent_blockhash)
+    txn = Transaction(recent_blockhash=recent_blockhash, fee_payer=owner)
+    txn.add(set_compute_unit_price(UNIT_PRICE))
+    txn.add(set_compute_unit_limit(UNIT_BUDGET))
+    
+    if buy:
+        if token_account_instructions:
+            txn.add(token_account_instructions)
+        txn.add(swap_instruction)
+    else:
+        txn.add(swap_instruction)
+        if close_token_account:
+            close_account_instructions = close_account(CloseAccountParams(PUMP_FUN_PROGRAM_PUBKEY, token_account_pubkey, owner, owner))
+            txn.add(close_account_instructions)
+    
+    txn.sign(payer_keypair)
+    # Send and confirm transaction
+    txn_sig = sendTransaction(txn, payer_keypair, TxOpts(skip_preflight=True))
+    print("Transaction Signature", txn_sig)
+    confirm = confirm_txn(txn_sig)
+    print(confirm)
+
+
+
+
+
+
+def isListZero(obj):
+    if obj and isinstance(obj, list):
+        return obj[0]
+    return obj
+
+
+
+
+
+
+
+mint_str = "3bb6QmvustnZ627Kg2QvwTSi8gmxp7Y6orwXUokEwUyV"
+result = pump_fun_sell(mint_str=mint_str, token_balance=None, slippage=25)
+# Example usage
+input(result)
+
+

abstract_solana-0.0.0.22/src/abstract_solana/pumpFunKeys.py

@@ -1,94 +0,0 @@
-from .pubkey_utils import get_pubkey,derive_bonding_curve,derive_associated_bonding_curve
-from .log_message_functions import get_for_program_ids_info
-from spl.token.instructions import create_associated_token_account, get_associated_token_address
-from abstract_solcatcher import getGenesisSignature,getTransaction,getAccountInfo
-from construct import Padding, Struct, Int64ul, Flag
-import base64
-
-# Change dictionary keys to lowercase and replace spaces with underscores
-def change_keys_lower(dict_obj):
-    new_dict = {}
-    for key, value in dict_obj.items():
-        new_dict[key.lower().replace(' ', '_')] = value
-    return new_dict
-
-# Predefined map for different transaction types
-def get_create_map():
-    return [
-        {'instruction_number': '1', 'instruction_name': 'Mint', 'token_address': 'AkAUSJg1v9xYT3HUxdALH7NsrC6owmwoZuP9MLw8fxTL', 'token_name': '3CAT'},
-        {'instruction_number': '2', 'instruction_name': 'Mint Authority', 'token_address': 'TSLvdd1pWpHVjahSpsvCXUbgwsL3JAcvokwaKt1eokM', 'token_name': 'Pump.fun Token Mint Authority'},
-        {'instruction_number': '3', 'instruction_name': 'Bonding Curve', 'token_address': '9nhxvNxfSUaJddVco6oa6NodtsCscqCScp6UU1hZkfGm', 'token_name': 'Pump.fun (3CAT) Bonding Curve'},
-        {'instruction_number': '4', 'instruction_name': 'Associated Bonding Curve', 'token_address': '889XLp3qvVAHpTYQmhn6cBpYSppV8Gi8E2Rgp9RH2vRy', 'token_name': 'Pump.fun (3CAT) Vault'},
-        {'instruction_number': '5', 'instruction_name': 'Global', 'token_address': '4wTV1YmiEkRvAtNtsSGPtUrqRYQMe5SKy2uB4Jjaxnjf', 'token_name': '4wTV1YmiEkRvAtNtsSGPtUrqRYQMe5SKy2uB4Jjaxnjf'},
-        {'instruction_number': '6', 'instruction_name': 'Mpl Token Metadata', 'token_address': 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s', 'token_name': 'Metaplex Token Metadata'},
-        {'instruction_number': '7', 'instruction_name': 'Metadata', 'token_address': 'CH41RxpjSXHqr1vfLTVYJMsfNs2fBCCWoAE13tPihXh7', 'token_name': 'CH41RxpjSXHqr1vfLTVYJMsfNs2fBCCWoAE13tPihXh7'},
-        {'instruction_number': '8', 'instruction_name': 'User', 'token_address': 'Fuy5MvbgzjSok1U8hH6mUY6WnLynzUextDxfEWMiTkn4', 'token_name': 'Fuy5MvbgzjSok1U8hH6mUY6WnLynzUextDxfEWMiTkn4'},
-        {'instruction_number': '9', 'instruction_name': 'System Program', 'token_address': '11111111111111111111111111111111', 'token_name': 'System Program'},
-        {'instruction_number': '10', 'instruction_name': 'Token Program', 'token_address': 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA', 'token_name': 'Token Program'},
-        {'instruction_number': '11', 'instruction_name': 'Associated Token Program', 'token_address': 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL', 'token_name': 'Associated Token Account Program'},
-        {'instruction_number': '12', 'instruction_name': 'Rent', 'token_address': 'SysvarRent111111111111111111111111111111111', 'token_name': 'Rent Program'},
-        {'instruction_number': '13', 'instruction_name': 'Event Authority', 'token_address': 'Ce6TQqeHC9p8KetsN6JsjHK7UTZk7nasjjnr7XxXp9F1', 'token_name': 'Ce6TQqeHC9p8KetsN6JsjHK7UTZk7nasjjnr7XxXp9F1'},
-        {'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)
-    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
-            break
-    return txn_types
-
-# Retrieve virtual reserves for a bonding curve using a structured layout
-def get_virtual_reserves(bonding_curve: Pubkey):
-    bonding_curve_struct = Struct(
-        Padding(8),
-        "virtualTokenReserves" / Int64ul,
-        "virtualSolReserves" / Int64ul,
-        "realTokenReserves" / Int64ul,
-        "realSolReserves" / Int64ul,
-        "tokenTotalSupply" / Int64ul,
-        "complete" / Flag
-    )
-    account_info = getAccountInfo(account=str(bonding_curve[0]))
-    
-    if not account_info or 'value' not in account_info or 'data' not in account_info['value']:
-        print("Failed to retrieve account info.")
-        return None
-
-    data_base64 = account_info['value']['data'][0]
-    data = base64.b64decode(data_base64)
-    parsed_data = bonding_curve_struct.parse(data)
-    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))
-    bonding_curve = derive_bonding_curve(mint_str)
-    virtual_reserves = get_virtual_reserves(bonding_curve)
-    if virtual_reserves is None:
-        return None
-
-    txn_types.update({
-        "mint": mint_str,
-        "bonding_curve": str(bonding_curve[0]),
-        "associated_bonding_curve": str(derive_associated_bonding_curve(mint_str)),
-        "virtual_token_reserves": int(virtual_reserves.virtualTokenReserves),
-        "virtual_sol_reserves": int(virtual_reserves.virtualSolReserves),
-        "token_total_supply": int(virtual_reserves.tokenTotalSupply),
-        "complete": bool(virtual_reserves.complete)
-    })
-    
-    return txn_types

abstract_solana-0.0.0.22/test/test_abstract_solana.py

@@ -1,106 +0,0 @@
-from abstract_solana import *
-from spl.token.instructions import create_associated_token_account, get_associated_token_address
-from abstract_solcatcher import getGenesisSignature,getTransaction,getAccountInfo
-from construct import Padding, Struct, Int64ul, Flag
-import base64
-
-
-
-# Change dictionary keys to lowercase and replace spaces with underscores
-def change_keys_lower(dict_obj):
-    new_dict = {}
-    for key, value in dict_obj.items():
-        new_dict[key.lower().replace(' ', '_')] = value
-    return new_dict
-
-# Predefined map for different transaction types
-def get_create_map():
-    return [
-        {'instruction_number': '1', 'instruction_name': 'Mint', 'token_address': 'AkAUSJg1v9xYT3HUxdALH7NsrC6owmwoZuP9MLw8fxTL', 'token_name': '3CAT'},
-        {'instruction_number': '2', 'instruction_name': 'Mint Authority', 'token_address': 'TSLvdd1pWpHVjahSpsvCXUbgwsL3JAcvokwaKt1eokM', 'token_name': 'Pump.fun Token Mint Authority'},
-        {'instruction_number': '3', 'instruction_name': 'Bonding Curve', 'token_address': '9nhxvNxfSUaJddVco6oa6NodtsCscqCScp6UU1hZkfGm', 'token_name': 'Pump.fun (3CAT) Bonding Curve'},
-        {'instruction_number': '4', 'instruction_name': 'Associated Bonding Curve', 'token_address': '889XLp3qvVAHpTYQmhn6cBpYSppV8Gi8E2Rgp9RH2vRy', 'token_name': 'Pump.fun (3CAT) Vault'},
-        {'instruction_number': '5', 'instruction_name': 'Global', 'token_address': '4wTV1YmiEkRvAtNtsSGPtUrqRYQMe5SKy2uB4Jjaxnjf', 'token_name': '4wTV1YmiEkRvAtNtsSGPtUrqRYQMe5SKy2uB4Jjaxnjf'},
-        {'instruction_number': '6', 'instruction_name': 'Mpl Token Metadata', 'token_address': 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s', 'token_name': 'Metaplex Token Metadata'},
-        {'instruction_number': '7', 'instruction_name': 'Metadata', 'token_address': 'CH41RxpjSXHqr1vfLTVYJMsfNs2fBCCWoAE13tPihXh7', 'token_name': 'CH41RxpjSXHqr1vfLTVYJMsfNs2fBCCWoAE13tPihXh7'},
-        {'instruction_number': '8', 'instruction_name': 'User', 'token_address': 'Fuy5MvbgzjSok1U8hH6mUY6WnLynzUextDxfEWMiTkn4', 'token_name': 'Fuy5MvbgzjSok1U8hH6mUY6WnLynzUextDxfEWMiTkn4'},
-        {'instruction_number': '9', 'instruction_name': 'System Program', 'token_address': '11111111111111111111111111111111', 'token_name': 'System Program'},
-        {'instruction_number': '10', 'instruction_name': 'Token Program', 'token_address': 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA', 'token_name': 'Token Program'},
-        {'instruction_number': '11', 'instruction_name': 'Associated Token Program', 'token_address': 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL', 'token_name': 'Associated Token Account Program'},
-        {'instruction_number': '12', 'instruction_name': 'Rent', 'token_address': 'SysvarRent111111111111111111111111111111111', 'token_name': 'Rent Program'},
-        {'instruction_number': '13', 'instruction_name': 'Event Authority', 'token_address': 'Ce6TQqeHC9p8KetsN6JsjHK7UTZk7nasjjnr7XxXp9F1', 'token_name': 'Ce6TQqeHC9p8KetsN6JsjHK7UTZk7nasjjnr7XxXp9F1'},
-        {'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)
-    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
-            break
-    return txn_types
-
-# Retrieve virtual reserves for a bonding curve using a structured layout
-def get_virtual_reserves(bonding_curve: Pubkey):
-    bonding_curve_struct = Struct(
-        Padding(8),
-        "virtualTokenReserves" / Int64ul,
-        "virtualSolReserves" / Int64ul,
-        "realTokenReserves" / Int64ul,
-        "realSolReserves" / Int64ul,
-        "tokenTotalSupply" / Int64ul,
-        "complete" / Flag
-    )
-    account_info = getAccountInfo(account=str(bonding_curve[0]))
-    
-    if not account_info or 'value' not in account_info or 'data' not in account_info['value']:
-        print("Failed to retrieve account info.")
-        return None
-
-    data_base64 = account_info['value']['data'][0]
-    data = base64.b64decode(data_base64)
-    parsed_data = bonding_curve_struct.parse(data)
-    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))
-    bonding_curve = derive_bonding_curve(mint_str)
-    virtual_reserves = get_virtual_reserves(bonding_curve)
-    if virtual_reserves is None:
-        return None
-
-    txn_types.update({
-        "mint": mint_str,
-        "bonding_curve": str(bonding_curve[0]),
-        "associated_bonding_curve": str(derive_associated_bonding_curve(mint_str)),
-        "virtual_token_reserves": int(virtual_reserves.virtualTokenReserves),
-        "virtual_sol_reserves": int(virtual_reserves.virtualSolReserves),
-        "token_total_supply": int(virtual_reserves.tokenTotalSupply),
-        "complete": bool(virtual_reserves.complete)
-    })
-    
-    return txn_types
-
-# Example usage
-mint = "911eA3wRZ85ZiSTpmCH1hksPGLGgzyVpfMXtJ4zSzVJ5"
-mint_pub_key = get_pubkey(mint)
-
-if not mint_pub_key.is_on_curve():
-    print('Mint public key is not on curve')
-
-txn_types = get_pump_fun_data(mint)
-
-input(txn_types)