abstract-solana 0.0.2.133__py3-none-any.whl → 0.0.2.137__py3-none-any.whl

abstract_solana/abstract_solana_utils/genesis_functions.py

@@ -1,8 +1,16 @@
-from abstract_apis import get_headers,get_response,get_text_response,load_inner_json
-from abstract_solcatcher import call_async_function,call_solcatcher_db,async_call_solcatcher_py,async_make_rate_limited_call
+from abstract_apis import get_async_response,get_headers,get_response,get_text_response,load_inner_json
+from abstract_solcatcher import call_solcatcher_db,async_call_solcatcher_py,async_make_rate_limited_call
 from abstract_utilities import get_any_value,make_list
 from ..rpc_utils import get_signatures,async_get_signatures
 import asyncio,httpx,logging
+async def call_async_function(func, *args, **kwargs):
+    """Helper function to call async functions in sync or async contexts."""
+    if asyncio.isrunning():
+        # If an event loop is already running, use await
+        return await func(*args, **kwargs)
+    else:
+        # If no event loop is running, use asyncio.run()
+        return await asyncio.run(func(*args, **kwargs))
 def get_block_time_from_txn(txnData):
     return int(get_any_value(txnData,'blockTime') or 0)
 def get_error_message_from_txn(txnData):
@@ -20,24 +28,24 @@ def return_oldest_last_and_original_length_from_signature_array(signatureArray):
     return {"oldest":return_oldest_from_signature_array(signatureArray),
      "oldestValid":return_oldest_from_signature_array(signatureArray,errorless=True),
      "length":len(signatureArray or '')}
-def get_first_sigs(address, until=None, limit=1000,get_signature_function=None):
+async def get_first_sigs(address, until=None, limit=1000,get_signature_function=None):
     get_signature_function = get_signature_function or async_get_signatures
     original_length=None
     while True:
-        signatureArray = call_async_function(get_signature_function,address, until=until, limit=limit)
+        signatureArray = await get_signature_function(address,until=until, limit=limit)
         if signatureArray:
             original_length = len(signatureArray)
         if original_length:
             return signatureArray
-def getGenesisSignature(address, limit=1000, until=None,encoding='jsonParsed',commitment=0,get_signature_function=None,errorProof=True,url_1_only=True,url_2_only=False):
+async def async_getGenesisSignature(address, limit=1000, until=None,encoding='jsonParsed',commitment=0,get_signature_function=None,errorProof=True,url_1_only=True,url_2_only=False):
     method = "getGenesisSignature"
     validBefore=None
     get_signature_function = get_signature_function or async_get_signatures
-    signatureArray = call_async_function(get_first_sigs,address, until=until, limit=limit,get_signature_function=get_signature_function)
+    signatureArray = await get_first_sigs(address, until=until, limit=limit,get_signature_function=get_signature_function)
     original_length=len(signatureArray)
     while True:
         if validBefore != None:
-            signatureArray = call_async_function(get_signature_function,address, until=until, limit=limit)
+            signatureArray = await get_signature_function(address, until=until, limit=limit)
             if signatureArray:
                 original_length = len(signatureArray)
             else:
@@ -48,9 +56,9 @@ def getGenesisSignature(address, limit=1000, until=None,encoding='jsonParsed',co
         if original_length < limit or original_length == 0 or (original_length>0 and (oldest == validOldest or oldest == validBefore) and oldest != None):
             return validOldest
         validBefore = oldest
-
+    
 def getGenesisSignature(*args,**kwargs):
-    return getGenesisSignature(*args,**kwargs)
+    return get_async_response(async_getGenesisSignature,*args,**kwargs))
 
 
 

abstract_solana/rpc_utils/rpc_utils.py

@@ -1,4 +1,6 @@
 import requests,json
+from abstract_security import get_env_value
+solana_rpc_url="http://api.mainnet-beta.solana.com"
 def get_if_None(obj,fallBack):
     return obj if obj != None else fallBack
 def get_rpc_payload(method,params=None,id=None,jsonrpc=None):
@@ -20,11 +22,11 @@ def get_result(response):
     except:
         result = response.text
     return result
-def make_rpc_call(method, params=[]):
-    url = 'https://rpc.ankr.com/solana/c3b7fd92e298d5682b6ef095eaa4e92160989a713f5ee9ac2693b4da8ff5a370'
+def make_rpc_call(method, params=[],rpc_url=None):
+    rpc_url = rpc_url or solana_rpc_url
     headers = {'Content-Type': 'application/json'}
     payload = get_rpc_payload(method=method, params=params)
-    response = requests.post(url, data=json.dumps(payload), headers=headers)
+    response = requests.post(rpc_url, data=json.dumps(payload), headers=headers)
     return response
 def get_transaction(signature):
     transaction=None
@@ -36,13 +38,15 @@ def get_transaction(signature):
         if transaction:
             break
     return transaction
-def get_signatures(address, until=None, limit=1000):
+def get_signatures(address, until=None, limit=1000,rpc_url=None):
+    rpc_url = rpc_url or solana_rpc_url
     method = 'getSignaturesForAddress'
-    params = [address, {"limit": limit}]
-    response = make_rpc_call(method=method,params=params)
+    params = [address, {"until":until,"limit": limit}]
+    response = make_rpc_call(method=method,params=params,rpc_url=rpc_url)
     return get_result(response)
-async def async_get_signatures(address, until=None, limit=1000):
+async def async_get_signatures(address, until=None, limit=1000,rpc_url=None):
+    rpc_url = rpc_url or solana_rpc_url
     method = 'getSignaturesForAddress'
-    params = [address, {"limit": limit}]
-    response = make_rpc_call(method=method,params=params)
+    params = [address, {"until":until,"limit": limit}]
+    response = make_rpc_call(method=method,params=params,rpc_url=rpc_url)
     return get_result(response)

{abstract_solana-0.0.2.133.dist-info → abstract_solana-0.0.2.137.dist-info}/METADATA

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

{abstract_solana-0.0.2.133.dist-info → abstract_solana-0.0.2.137.dist-info}/RECORD

@@ -7,7 +7,7 @@ abstract_solana/abstract_rpcs/rate_limiter.py,sha256=yfUwmdMXty05VN_A-baTrOKY4EH
 abstract_solana/abstract_rpcs/solana_rpc_client.py,sha256=s-Mg0mDcDwjU3dm6nK_U6wWysaWTLoC4eXpSHbYsbyY,4132
 abstract_solana/abstract_solana_utils/__init__.py,sha256=9wyZpK5Gv3xMhmhHWA9OarvH3VqLXLO6mx4RNU6bgSo,89
 abstract_solana/abstract_solana_utils/bondingCurves.py,sha256=06vmusYnq2jcZasPNC8mzsv6Qoz0AaRenue3VCmiXzw,1342
-abstract_solana/abstract_solana_utils/genesis_functions.py,sha256=IL94IXZXJ6j1yFdSU10U1RvBfwIf_YQhRhSyxKCw1Gs,3151
+abstract_solana/abstract_solana_utils/genesis_functions.py,sha256=hzJMzKo0G3clOHDj3djTM3W9KJwUwzQ5puQk8FhoL5E,3537
 abstract_solana/abstract_solana_utils/pubKeyUtils.py,sha256=IZuQN7TUFCUxqv0q_FiufIw1OkNgF252gF6W-LzAluA,1856
 abstract_solana/abstract_utils/__init__.py,sha256=d0JzaSlwLMU4GPq8PO7UucTtNXUSVdBjOAtIZ8BDAQE,60
 abstract_solana/abstract_utils/account_key_utils.py,sha256=VMJd4GOTK1vn8UZsfXDnjxDOGoQWGY6fvflJqPZ7Xvs,877
@@ -28,12 +28,12 @@ abstract_solana/pump_functions/buy_sell_pump.py,sha256=gjv_1et20s1Li0ygcURofO29V
 abstract_solana/pump_functions/pump_fun_keys.py,sha256=BeWbV9_wd-c6ydF33drW-gZBDPWolbsMZL4cNhP3eOU,8537
 abstract_solana/pump_functions/token_utils.py,sha256=O-Fgj3L1NhND-k4INa3WvLAEXg2N9u1fVqyLFzn1PwM,2714
 abstract_solana/rpc_utils/__init__.py,sha256=N0ZEvVoLpxi0lWX0ZjBt3mKWGLVvDw35moj_2e9vChk,25
-abstract_solana/rpc_utils/rpc_utils.py,sha256=pPZz3CvEAi0HSNmCRVXGT--3bCgKa2BGVDyjvZRzyzg,1770
+abstract_solana/rpc_utils/rpc_utils.py,sha256=SbB2rYVr7rLtrDHsAGPGV_kBBL6DcagYaPiJkMFMto0,1984
 abstract_solana/utils/__init__.py,sha256=9wyZpK5Gv3xMhmhHWA9OarvH3VqLXLO6mx4RNU6bgSo,89
 abstract_solana/utils/bondingCurves.py,sha256=gGAm0dyrth3ScTRzhIWwb1_cA7GMztdkwmuB2ylT79c,1717
 abstract_solana/utils/genesis_functions.py,sha256=-O44ZHYb6zrhvqhPpN1cZzdUpvON2q4sPblS4Ezo-ag,2223
 abstract_solana/utils/pubKeyUtils.py,sha256=IZuQN7TUFCUxqv0q_FiufIw1OkNgF252gF6W-LzAluA,1856
-abstract_solana-0.0.2.133.dist-info/METADATA,sha256=xqwgNXI0I1Sb5pC4RXsj0Y2GmbemvNtoUrYDfCd_yqc,1162
-abstract_solana-0.0.2.133.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-abstract_solana-0.0.2.133.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
-abstract_solana-0.0.2.133.dist-info/RECORD,,
+abstract_solana-0.0.2.137.dist-info/METADATA,sha256=APeZqK9PPIcQlKKuo1U4_w9jVIaO7BB10u2nGYV8oBU,1162
+abstract_solana-0.0.2.137.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+abstract_solana-0.0.2.137.dist-info/top_level.txt,sha256=SsJYent8eZQ0FU2jmP8wTj7aFZFhNwxxP-5cCTQ2B-o,16
+abstract_solana-0.0.2.137.dist-info/RECORD,,