abstract-solana 0.0.0.59__tar.gz → 0.0.0.61__tar.gz

{abstract_solana-0.0.0.59 → abstract_solana-0.0.0.61}/PKG-INFO

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

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

{abstract_solana-0.0.0.59 → abstract_solana-0.0.0.61}/src/abstract_solana/pumpFun/buy_sell_pump.py

@@ -65,9 +65,9 @@ def confirm_txn(txn_sig, max_retries=20, retry_interval=3):
             time.sleep(retry_interval)
     print("Max retries reached. Transaction confirmation failed.")
     return None
-def buildTxn(mint,payer_pubkey, amount, slippage, token_account_pubkey,sol_in=0,token_price=0,token_balance=0,token_account_instructions=None,close_token_account=False,buy=True):
+def buildTxn(mint,payer_pubkey, amount, slippage, token_account,sol_in=0,token_price=0,token_balance=0,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(mint, token_account_pubkey=token_account_pubkey, payer_pubkey=payer_pubkey,buy=buy)
+    keys = getKeys(mint, token_account=token_account, payer_pubkey=payer_pubkey,buy=buy)
     slippage_adjustment = 1 - (slippage / 100)
     sol_change = sol_in if buy else float(token_balance) * float(token_price)
     sol_change_with_slippage = sol_change * slippage_adjustment
@@ -93,8 +93,8 @@ def buildTxn(mint,payer_pubkey, amount, slippage, token_account_pubkey,sol_in=0,
         txn.add(close_account_instructions)
     return txn
 
-def get_all_buy_sell_info(mint,payer_pubkey,token_balance=None,sol_in=0):
-    try:
+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():
@@ -116,17 +116,16 @@ def get_all_buy_sell_info(mint,payer_pubkey,token_balance=None,sol_in=0):
         print(f"Token Price: {token_price:.20f} SOL")
         amount = int(LAMPORTS_PER_SOL * token_price)
         print("Calculated Amount:", amount)
-        if token_balance == None:
-            token_balance = get_token_balance(token_account,mint_str)
-        print("Token Balance:", token_balance)
-        if token_balance == 0:
-            return False        
+        if buy == False:
+            if token_balance == None:
+                token_balance = get_token_balance(token_account,mint_str)
+            print("Token Balance:", token_balance)
+            if token_balance == 0:
+                return False        
         return mint,amount,token_balance,token_price,token_account_pubkey,token_account_instructions
-    except Exception as e:
-        print(e)
-        
+
 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_pubkey,token_account_instructions = get_all_buy_sell_info(mint,payer_pubkey,token_balance=token_balance)
+    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)
     return buildTxn(mint=mint,
              payer_pubkey=payer_pubkey,
              amount=amount,
@@ -134,12 +133,12 @@ def pump_fun_sell(mint: str,payer_pubkey:Pubkey, token_balance: Optional[Union[i
              sol_in=0,
              token_balance=token_balance,
              token_price=token_price,
-             token_account_pubkey=token_account_pubkey,
+             token_account=token_account,
              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) -> bool:
-    mint,amount,token_balance,token_price,token_account_pubkey,token_account_instructions = get_all_buy_sell_info(mint,payer_pubkey,sol_in=sol_in)
+    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,)
     # Build the transaction
     return buildTxn(mint=mint,
              payer_pubkey=payer_pubkey,
@@ -148,7 +147,7 @@ def pump_fun_buy(mint: str,payer_pubkey:Pubkey, sol_in: float = 0.001, slippage:
              sol_in=sol_in,
              token_balance=0,
              token_price=0,
-             token_account_pubkey=token_account_pubkey,
+             token_account=token_account,
              token_account_instructions=token_account_instructions,
              buy=True)
     return True

{abstract_solana-0.0.0.59 → abstract_solana-0.0.0.61}/src/abstract_solana/pumpFun/pump_fun_keys.py

@@ -103,13 +103,13 @@ def get_pump_fun_data(mint_str: str):
     
     return txn_types
 
-def getKeys(mint_str,token_account_pubkey,payer_pubkey,buy=True):
+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(coin_data['bonding_curve'])
     ASSOCIATED_BONDING_CURVE = get_pubkey(coin_data['associated_bonding_curve'])
-    ASSOCIATED_USER = get_pubkey(token_account_pubkey)
-    USER = get_pubkey(payer_pubkey)
+    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
     PUMP_FUN_RENT_PROGRAM_SWITCH = RENT_PUBKEY if buy else TOKEN_PROGRAM_ID_PUBKEY
     # Build account key list 

{abstract_solana-0.0.0.59 → abstract_solana-0.0.0.61}/src/abstract_solana/pumpFun/token_utils.py

@@ -4,6 +4,7 @@ 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
+import requests
 def get_token_balance(payer,mint: str):
     response = getTokenAccountBalance(str(payer),str(mint))
     response=response.get('value',response)
@@ -24,8 +25,20 @@ def get_token_price(mint: str) -> float:
     except Exception as e:
         print(f"Error calculating token price: {e}")
         return None
-def get_account_by_owner(payer, mint: str) -> dict:
-    result = getTokenAccountsByOwner(**{"account":payer,"mint":str(mint),"encoding":"jsonParsed"})
+def get_account_by_owner(payer, mint_str: str) -> dict:
+    payload = {
+        "jsonrpc": "2.0",
+        "id": 1,
+        "method": "getTokenAccountsByOwner",
+        "params": [payer, {"mint": mint_str}, {"encoding": "jsonParsed"}]
+    }
+    response = requests.post(
+        url="https://rpc.ankr.com/solana/c3b7fd92e298d5682b6ef095eaa4e92160989a713f5ee9ac2693b4da8ff5a370",
+        json=payload
+    )
+    response_json = response.json()
+
+    result = response_json.get('result')
     if not result or 'value' not in result:
         return None
 

{abstract_solana-0.0.0.59 → abstract_solana-0.0.0.61}/src/abstract_solana.egg-info/PKG-INFO

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

{abstract_solana-0.0.0.59 → abstract_solana-0.0.0.61}/test/test_abstract_solana.py

@@ -1,10 +1,11 @@
 from spl.token.instructions import CloseAccountParams
-from abstract_solana import pump_fun_sell,load_from_private_key,sendTransaction,load_from_private_key
+from src.abstract_solana import get_pubkey,confirm_txn,pump_fun_sell,pump_fun_buy,load_from_private_key,sendTransaction,load_from_private_key
 from solana.rpc.types import TxOpts
 payer_keypair = load_from_private_key()
-payer_pubkey = payer_keypair.pubkey()
+payer_pubkey = get_pubkey(payer_keypair.pubkey())
 mint_str = "3bb6QmvustnZ627Kg2QvwTSi8gmxp7Y6orwXUokEwUyV"
 txn = pump_fun_sell(mint=mint_str,payer_pubkey=payer_pubkey, token_balance=None, slippage=25)
+#txn = pump_fun_buy(mint=mint_str,payer_pubkey=payer_pubkey)
 txn.sign(payer_keypair)
 txn_sig = sendTransaction(txn, payer_keypair, TxOpts(skip_preflight=True))
 print("Transaction Signature", txn_sig)