abstract-solana 0.0.0.88__py3-none-any.whl → 0.0.0.89__py3-none-any.whl

abstract_solana/pumpFun/buy_sell_pump.py

@@ -41,13 +41,13 @@ def buildTxn(mint,payer_pubkey, amount, slippage, token_account,sol_in=0,token_p
         txn.add(close_account_instructions)
     return txn
 
-def get_all_buy_sell_info(mint,payer_pubkey,token_balance=None,sol_in=0,amount=None,token_price=None,buy=True):
+def get_all_buy_sell_info(mint,payer_pubkey,token_balance=None,sol_in=0,buy=True):
     
         print("Owner Public Key:", payer_pubkey)
         mint_str = str(mint)
-        #if not get_pubkey(mint_str).is_on_curve():
-        #    print('Mint public key is not on curve')
-        #    return False,amount,token_balance,token_price,token_account,token_account_instructions
+        if not get_pubkey(mint_str).is_on_curve():
+            print('Mint public key is not on curve')
+            return False,amount,token_balance,token_price,token_account,token_account_instructions
         mint_pubkey = get_pubkey(mint_str)
         token_account, token_account_instructions = check_existing_token_account(payer_pubkey, mint_pubkey)
         token_account_pubkey = get_pubkey(token_account)
@@ -60,10 +60,9 @@ def get_all_buy_sell_info(mint,payer_pubkey,token_balance=None,sol_in=0,amount=N
             print("Failed to retrieve or create token account.")
             return False,amount,token_balance,token_price,token_account,token_account_instructions
         # Calculate token price
-        if token_price == None:
-            token_price = get_token_price(mint_str)
-            print(f"Token Price: {token_price:.20f} SOL")
-            amount= int(LAMPORTS_PER_SOL * token_price)
+        token_price = get_token_price(mint_str)
+        print(f"Token Price: {token_price:.20f} SOL")
+        amount = int(LAMPORTS_PER_SOL * token_price)
         print("Calculated Amount:", amount)
         if buy == False:
             if token_balance == None:
@@ -73,8 +72,8 @@ def get_all_buy_sell_info(mint,payer_pubkey,token_balance=None,sol_in=0,amount=N
                 return False,amount,token_balance,token_price,token_account,token_account_instructions        
         return mint,amount,token_balance,token_price,token_account_pubkey,token_account_instructions
 
-def pump_fun_sell(mint: str,amountpayer_pubkey:Pubkey, token_balance: Optional[Union[int, float]] = None,  slippage: int = 25, close_token_account: bool = True,amount=None,token_price=None) -> bool:
-    mint,amount,token_balance,token_price,token_account,token_account_instructions = get_all_buy_sell_info(mint,payer_pubkey,token_balance=token_balance,amount=amount,buy=False)
+def pump_fun_sell(mint: str,payer_pubkey:Pubkey, token_balance: Optional[Union[int, float]] = None,  slippage: int = 25, close_token_account: bool = True) -> bool:
+    mint,amount,token_balance,token_price,token_account,token_account_instructions = get_all_buy_sell_info(mint,payer_pubkey,token_balance=token_balance,buy=False)
     if not mint:
         return mint
     return buildTxn(mint=mint,
@@ -88,8 +87,8 @@ def pump_fun_sell(mint: str,amountpayer_pubkey:Pubkey, token_balance: Optional[U
              token_account_instructions=token_account_instructions,
              buy=False)
 
-def pump_fun_buy(mint: str,payer_pubkey:Pubkey, sol_in: float = 0.001, slippage: int = 25,amount=None,token_price=None) -> bool:
-    mint,amount,token_balance,token_price,token_account,token_account_instructions = get_all_buy_sell_info(mint,payer_pubkey,sol_in=sol_in,amount=amount,token_price=token_price,buy=True)
+def pump_fun_buy(mint: str,payer_pubkey:Pubkey, sol_in: float = 0.001, slippage: int = 25) -> bool:
+    mint,amount,token_balance,token_price,token_account,token_account_instructions = get_all_buy_sell_info(mint,payer_pubkey,sol_in=sol_in,buy=True)
     if not mint:
         return mint
     return buildTxn(mint=mint,
@@ -130,20 +129,20 @@ async def complete_txn(txn, payer_keypair,confirm=False):
 
     print("Transaction confirmed:", confirm)
     return confirm
-def buy_pump(mint: str, payer_keypair: Pubkey, sol_in=None, slippage=None,confirm=False,amount=None,token_price=None):
+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())
-    txn = pump_fun_buy(mint=mint, payer_pubkey=payer_pubkey, sol_in=sol_in, slippage=slippage,amount=amount,token_price=token_price)
+    txn = pump_fun_buy(mint=mint, payer_pubkey=payer_pubkey, sol_in=sol_in, slippage=slippage)
     completed = asyncio.run(complete_txn(txn, payer_keypair,confirm=confirm))  # Await here since `complete_txn` is async
     if not completed:
         print("Buy transaction failed")
     return completed
         
-def sell_pump(mint:str, payer_keypair:Pubkey, token_balance=None, slippage=None,confirm=False,amount=None,token_price=None):
+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,amount=amount,token_price=token_price)
+    txn = pump_fun_sell(mint=mint, payer_pubkey=payer_pubkey, token_balance=token_balance, slippage=slippage)
     completed = asyncio.run(complete_txn(txn, payer_keypair,confirm=confirm))
     if not completed:
         print("sell transaction failed")

abstract_solana/pumpFun/pump_fun_keys.py

@@ -83,9 +83,11 @@ def get_virtual_reserves(bonding_curve: Pubkey):
 
 # Retrieves comprehensive transaction and reserve data for the mint
 def get_pump_fun_data(mint_str: str=None,signature=None,commitment="finalized"):
-    if not mint_str and signature:
+    if mint_str:
+        txn_types = change_keys_lower(getTxnTypes(mint_str))
+    if signature:
         txn_types = change_keys_lower(get_txnTypesFromGenesisSignature(signature,commitment=commitment))
-        mint_str = mint_str or txn_types.get('mint')
+    mint_str = mint_str or txn_types.get('mint')
     bonding_curve = derive_bonding_curve(mint_str)
     virtual_reserves = get_virtual_reserves(bonding_curve)
     if virtual_reserves is None:
@@ -104,9 +106,10 @@ def get_pump_fun_data(mint_str: str=None,signature=None,commitment="finalized"):
     return txn_types
 
 def getKeys(mint_str,token_account,payer_pubkey,buy=True):
+    coin_data = get_pump_fun_data(str(mint_str))
     MINT = get_pubkey(str(mint_str))
-    BONDING_CURVE = get_pubkey(str(derive_bonding_curve(str(mint_str))[0]))
-    ASSOCIATED_BONDING_CURVE = get_pubkey(derive_associated_bonding_curve(str(mint_str)))
+    BONDING_CURVE = get_pubkey(coin_data['bonding_curve'])
+    ASSOCIATED_BONDING_CURVE = get_pubkey(coin_data['associated_bonding_curve'])
     ASSOCIATED_USER = Pubkey.from_string(str(token_account))
     USER = Pubkey.from_string(str(payer_pubkey))
     PUMP_FUN_TOKEN_PROGRAM_SWITCH = TOKEN_PROGRAM_ID_PUBKEY if buy else PUMP_FUN_ASSOC_TOKEN_ACC_PROG_PUBKEY

abstract_solana/pumpFun/token_utils.py

@@ -1,6 +1,6 @@
 from ..constants import TOKEN_DECIMAL_EXP,SOL_DECIMAL_EXP
-from ..pubkey_utils import Pubkey,derive_bonding_curve
-from .pump_fun_keys import get_virtual_reserves,get_pump_fun_data
+from ..pubkey_utils import Pubkey
+from .pump_fun_keys import get_pump_fun_data
 from abstract_solcatcher import getTokenAccountBalance,getTokenAccountsByOwner
 from spl.token.instructions import create_associated_token_account, get_associated_token_address
 from abstract_utilities import get_any_value
@@ -10,15 +10,16 @@ def get_token_balance(payer,mint: str):
     response=response.get('value',response)
     ui_amount = get_any_value(response, "uiAmount") or 0
     return float(ui_amount)
-def calculate_token_price(virtual_sol_reserves,virtual_token_reserves):
-    virtual_sol_reserves = virtual_sol_reserves / SOL_DECIMAL_EXP
-    virtual_token_reserves = virtual_token_reserves / TOKEN_DECIMAL_EXP
-    return virtual_sol_reserves / virtual_token_reserves
 def get_token_price(mint: str) -> float:
     try:
-        bonding_curve = derive_bonding_curve(mint_str)
-        virtual_reserves = get_virtual_reserves(bonding_curve)
-        token_price = calculate_token_price(virtual_reserves.virtualSolReserves,virtual_reserves.virtualTokenReserves)
+        # Get coin data
+        coin_data = get_pump_fun_data(str(mint))
+        if not coin_data:
+            print("Failed to retrieve coin data...")
+            return None
+        virtual_sol_reserves = coin_data['virtual_sol_reserves'] / SOL_DECIMAL_EXP
+        virtual_token_reserves = coin_data['virtual_token_reserves'] / TOKEN_DECIMAL_EXP
+        token_price = virtual_sol_reserves / virtual_token_reserves
         print(f"Token Price: {token_price:.20f} SOL")
         return token_price
     except Exception as e:

{abstract_solana-0.0.0.88.dist-info → abstract_solana-0.0.0.89.dist-info}/METADATA

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

{abstract_solana-0.0.0.88.dist-info → abstract_solana-0.0.0.89.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=bdvotoGQbhjV93F7HFKyXXMCR4WmpAC-28-7Y5RvyxM,8155
+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=iuxTjIGcWuwM8ZvlERqJdKNCMLig2xmZKXuoI0uqNL0,8340
-abstract_solana/pumpFun/token_utils.py,sha256=KeGGYDgG-Ebfr-M5PDUrPzFDrFe7TGFMP5R53VgnLq0,2814
-abstract_solana-0.0.0.88.dist-info/METADATA,sha256=G-zjRhzda9zVV47CHv59O9rvwuYjSX6A3MtPrELGOAk,981
-abstract_solana-0.0.0.88.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-abstract_solana-0.0.0.88.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
-abstract_solana-0.0.0.88.dist-info/RECORD,,
+abstract_solana/pumpFun/pump_fun_keys.py,sha256=4FTgJ50UWUZJXU-zr1IwxW1vqSP80KrlXi7FyLSw3ko,8420
+abstract_solana/pumpFun/token_utils.py,sha256=NhMvpTnw3QZk8DmeKYFzuqEMEZEHUlrBKfFp7662ohw,2684
+abstract_solana-0.0.0.89.dist-info/METADATA,sha256=EcxCcixDrkY7CB1yj_YG0n1jxomGCGLv5-iM-FAatQw,981
+abstract_solana-0.0.0.89.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+abstract_solana-0.0.0.89.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
+abstract_solana-0.0.0.89.dist-info/RECORD,,