Merge branch 'master' into feature/transaction

GitBolt · web-flow · commit 505b7211e2ab · 2024-11-16T22:38:11.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@ env/
 venv/
 env3/
 .ipynb_checkpoints
-
+package_test/
 .history/*
 
 
diff --git a/docs/pages/models/transaction/instructions.mdx b/docs/pages/models/transaction/instructions.mdx
@@ -230,7 +230,7 @@ This is a named tuple representing an instruction object. Here keys are `Account
 <Code>
 ```python
 class Instruction(NamedTuple):
-    keys: list[AccountMeta]
+    keys: List[AccountMeta]
     program_id: PublicKey
     data: bytes = bytes(0)
 ```
diff --git a/docs/pages/utility/functions.mdx b/docs/pages/utility/functions.mdx
@@ -35,7 +35,7 @@ The message argument is optional, when not provided the public key itself is use
 ```python 
 def verify_signature(
                     public_key: PublicKey | str, 
-                    signature: list[int], 
+                    signature: List[int], 
                     message: str | bytes | None = None
                     )
 ```
@@ -50,7 +50,7 @@ from nacl.exceptions import BadSignatureError
 
 # Getting the public key and the signature array
 public_key: str = request.headers.get("public_key")
-signature_array: list[int] = request.headers.get("signature")
+signature_array: List[int] = request.headers.get("signature")
 
 try:
     verify_signature(public_key, signature_array)
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solathon"
-version = "1.0.4"
+version = "1.0.5"
 description = "High performance, easy to use and feature-rich Solana SDK for Python."
 license = "MIT"
 authors = ["GitBolt"]
@@ -22,13 +22,13 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-httpx = "^0.22.0"
 PyNaCl = "^1.5.0"
 base58 = "^2.1.1"
 construct = "^2.10.67"
 typing-extensions = { version = "^4.1.1", python = "3.10" }
 qrcode = "^7.4.2"
 pillow = "^10.2.0"
+httpx = "^0.27.2"
 
 [tool.poetry.dev-dependencies]
 jedi = "^0.18.1"
diff --git a/solathon/__init__.py b/solathon/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.0.4"
+__version__ = "1.0.5"
 
 from .client import Client
 from .async_client import AsyncClient
diff --git a/solathon/async_client.py b/solathon/async_client.py
@@ -250,7 +250,7 @@ async def get_inflation_reward(self, addresses: List[Text]) -> RPCResponse:
         Get the inflation reward for a list of addresses.
 
         Args:
-            addresses (list[Text]): A list of addresses to get the inflation reward for.
+            addresses (List[Text]): A list of addresses to get the inflation reward for.
 
         Returns:
             RPCResponse: The response from the RPC server.
@@ -362,12 +362,12 @@ async def get_signatures_for_address(self, acct_address: Text) -> RPCResponse:
             "getSignaturesForAddress", [acct_address]
         )
 
-    async def get_signature_statuses(self, transaction_sigs: list[Text]) -> RPCResponse:
+    async def get_signature_statuses(self, transaction_sigs: List[Text]) -> RPCResponse:
         """
         Returns the current status of a list of signatures.
 
         Args:
-            transaction_sigs (list[str]): List of transaction signatures to check status for.
+            transaction_sigs (List[str]): List of transaction signatures to check status for.
 
         Returns:
             RPCResponse: Response object containing the status of the signatures.
@@ -518,6 +518,6 @@ async def build_and_send_request_async(
         Returns:
             RPCResponse: The response from the server.
         """
-        data: dict[Text, Any] = self.http.build_data(method=method, params=params)
+        data: Dict[Text, Any] = self.http.build_data(method=method, params=params)
         res: RPCResponse = await self.http.send(data)
         return res
diff --git a/solathon/client.py b/solathon/client.py
@@ -389,7 +389,7 @@ def get_inflation_reward(
         Returns the inflation reward for the specified addresses.
 
         Args:
-            addresses (list[str]): The addresses.
+            addresses (List[str]): The addresses.
             commitment (Commitment, optional): The level of commitment desired when querying state.
 
         Returns:
@@ -419,7 +419,7 @@ def get_largest_accounts(
     def get_leader_schedule(
         self,
     ) -> (
-        RPCResponse[dict[str, Union[List[int], Any]]] | dict[str, Union[List[int], Any]]
+        RPCResponse[Dict[str, Union[List[int], Any]]] | Dict[str, Union[List[int], Any]]
     ):
         """
         Returns the leader schedule.
@@ -580,7 +580,7 @@ def get_signature_statuses(
         Returns the signature statuses for the specified transaction signatures.
 
         Args:
-            transaction_sigs (list[str]): The transaction signatures.
+            transaction_sigs (List[str]): The transaction signatures.
 
         Returns:
             RPCResponse: The response from the RPC endpoint.
@@ -715,7 +715,7 @@ def get_transaction(
 
     def build_and_send_request(
         self, method, params: List[Any]
-    ) -> RPCResponse | dict[str, Any] | List[dict[str, Any]]:
+    ) -> RPCResponse | Dict[str, Any] | List[Dict[str, Any]]:
         """
         Builds and sends an RPC request to the server.
 
@@ -726,7 +726,7 @@ def build_and_send_request(
         Returns:
             RPCResponse: The response from the server.
         """
-        data: dict[str, Any] = self.http.build_data(method=method, params=params)
+        data: Dict[str, Any] = self.http.build_data(method=method, params=params)
         res: RPCResponse = self.http.send(data)
         if self.clean_response:
             if "error" in res:
diff --git a/solathon/core/http.py b/solathon/core/http.py
@@ -4,7 +4,7 @@
 import asyncio
 import base64
 import httpx
-from typing import Any
+from typing import Any, List, Dict
 
 
 from .. import __version__
@@ -27,14 +27,14 @@ def __init__(self, endpoint: str):
         self.request_id = 0
         self.client = httpx.Client()
 
-    def send(self, data: dict[str, Any]) -> RPCResponse:
+    def send(self, data: Dict[str, Any]) -> RPCResponse:
         res = self.client.post(
                 url=self.endpoint, headers=self.headers, json=data)
         return res.json()
 
-    def build_data(self, method: str, params: list[Any]) -> dict[str, Any]:
+    def build_data(self, method: str, params: List[Any]) -> Dict[str, Any]:
         self.request_id += 1
-        params: list[Any] = [
+        params: List[Any] = [
             str(i) if isinstance(i, PublicKey) else i for i in params
             ]
 
@@ -72,14 +72,14 @@ def __init__(self, endpoint: str):
         self.client = httpx.AsyncClient()
         
 
-    async def send(self, data: dict[str, Any]) -> RPCResponse:
+    async def send(self, data: Dict[str, Any]) -> RPCResponse:
         res = await self.client.post(
                 url=self.endpoint, headers=self.headers, json=data)
         return res.json()
 
-    def build_data(self, method: str, params: list[Any]) -> dict[str, Any]:
+    def build_data(self, method: str, params: List[Any]) -> Dict[str, Any]:
         self.request_id += 1
-        params: list[Any] = [
+        params: List[Any] = [
             str(i) if isinstance(i, PublicKey) else i for i in params
             ]
 
diff --git a/solathon/core/instructions.py b/solathon/core/instructions.py
@@ -1,7 +1,7 @@
 # Developer reference: https://github.com/solana-labs/solana/blob/master/sdk/program/src/system_instruction.rs
 from __future__ import annotations
 
-from typing import NamedTuple
+from typing import NamedTuple, List
 from dataclasses import dataclass
 from ..publickey import PublicKey
 from ..core.layouts import (
@@ -19,7 +19,7 @@ class AccountMeta:
 
 
 class Instruction(NamedTuple):
-    keys: list[AccountMeta]
+    keys: List[AccountMeta]
     program_id: PublicKey
     data: bytes = bytes(0)
 
@@ -44,7 +44,7 @@ def create_account(
         space: int,
         program_id: PublicKey
 ) -> Instruction:
-    account_metas: list[AccountMeta] = [
+    account_metas: List[AccountMeta] = [
         AccountMeta(
             public_key=from_public_key,
             is_signer=True,
@@ -81,7 +81,7 @@ def create_account_with_seed(
         space: int,
         program_id: PublicKey
 ) -> Instruction:
-    account_metas: list[AccountMeta] = [
+    account_metas: List[AccountMeta] = [
         AccountMeta(
             public_key=from_public_key,
             is_signer=True,
@@ -149,7 +149,7 @@ def transfer(
         to_public_key: PublicKey | str,
         lamports: int
 ) -> Instruction:
-    account_metas: list[AccountMeta] = [
+    account_metas: List[AccountMeta] = [
         AccountMeta(
             public_key=from_public_key,
             is_signer=True,
diff --git a/solathon/core/message.py b/solathon/core/message.py
@@ -37,7 +37,7 @@ def to_uint8_bytes(val: int) -> bytes:
 
 
 class CompiledInstruction(NamedTuple):
-    accounts: bytes | list[int]
+    accounts: bytes | List[int]
     program_id_index: int
     data: bytes
 
@@ -52,8 +52,8 @@ class Message:
     def __init__(
         self,
         header: MessageHeader,
-        account_keys: list[str],
-        instructions: list[CompiledInstruction],
+        account_keys: List[str],
+        instructions: List[CompiledInstruction],
         recent_blockhash: str
     ):
         self.header = header
diff --git a/solathon/core/types/__init__.py b/solathon/core/types/__init__.py
@@ -35,7 +35,7 @@ class Result(TypedDict):
 class RPCResponse(TypedDict):
     jsonrpc: Literal["2.0"]
     id: int
-    result: Union[Result[T], T]
+    result: Any
     error: RPCErrorType
 
 Commitment = Literal["processed", "confirmed", "finalized", "recent", "single", "singleGossip", "root", "max"]
diff --git a/solathon/core/types/account_info.py b/solathon/core/types/account_info.py
@@ -1,4 +1,4 @@
-from typing import Any, TypedDict, Union
+from typing import Any, TypedDict, Union, Dict
 
 class AccountInfoType(TypedDict):
     '''
@@ -9,7 +9,7 @@ class AccountInfoType(TypedDict):
     executable: bool
     rentEpoch: int
     size: Union[int, None]
-    data: Union[str, dict[str, Any]]
+    data: Union[str, Dict[str, Any]]
 
     def __repr__(self) -> str:
         return f"AccountInfoType(owner={self.owner!r})"
diff --git a/solathon/core/types/block.py b/solathon/core/types/block.py
@@ -1,5 +1,5 @@
 from solathon.core.message import Message as CoreMessage, MessageHeader
-from typing import Any, List, TypedDict, Union
+from typing import Any, List, TypedDict, Union, Dict
 
 
 class HeaderType(TypedDict):
@@ -214,7 +214,7 @@ class BlockProductionType(TypedDict):
     '''
     JSON Response type of Block Production Information received by RPC
     '''
-    byIdentity: dict[str, Any]
+    byIdentity: Dict[str, Any]
     range: RangeType
 
 
diff --git a/solathon/publickey.py b/solathon/publickey.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import base58
-
+from typing import List
 
 class PublicKey:
     LENGTH = 32
 
-    def __init__(self, value: bytes | int | str | list[int] | bytearray):
+    def __init__(self, value: bytes | int | str | List[int] | bytearray):
         if isinstance(value, str):
             try:
                 self.byte_value = base58.b58decode(value)
diff --git a/solathon/transaction.py b/solathon/transaction.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import List, Tuple, Dict
 from base58 import b58decode, b58encode
 from .keypair import Keypair
 from .publickey import PublicKey
@@ -56,7 +56,7 @@ def to_public_key(signer: PublicKey | Keypair) -> PublicKey:
                 raise TypeError(("The argument must be either "
                                 "PublicKey or Keypair object."))
 
-        pk_sig_pairs: list[PKSigPair] = [PKSigPair(
+        pk_sig_pairs: List[PKSigPair] = [PKSigPair(
             public_key=to_public_key(signer)
         ) for signer in self.signers]
 
@@ -98,8 +98,8 @@ def compile_transaction(self) -> bytes:
         if not self.fee_payer:
             self.fee_payer = self.signatures[0].public_key
 
-        account_metas: list[AccountMeta] = []
-        program_ids: list[str] = []
+        account_metas: List[AccountMeta] = []
+        program_ids: List[str] = []
 
         for instruction in self.instructions:
             if not instruction.program_id:
@@ -122,8 +122,8 @@ def compile_transaction(self) -> bytes:
             not account.is_signer, not account.is_writable))
 
         fee_payer_idx = 0
-        seen: dict[str, int] = {}
-        uniq_metas: list[AccountMeta] = []
+        seen: Dict[str, int] = {}
+        uniq_metas: List[AccountMeta] = []
 
         for sig in self.signatures:
             public_key = str(sig.public_key)
@@ -154,8 +154,8 @@ def compile_transaction(self) -> bytes:
                 uniq_metas[fee_payer_idx + 1:]
             )
 
-        signed_keys: list[str] = []
-        unsigned_keys: list[str] = []
+        signed_keys: List[str] = []
+        unsigned_keys: List[str] = []
         num_required_signatures = num_readonly_signed_accounts = num_readonly_unsigned_accounts = 0
         for a_m in uniq_metas:
             if a_m.is_signer:
@@ -169,10 +169,10 @@ def compile_transaction(self) -> bytes:
             self.signatures = [PKSigPair(public_key=PublicKey(
                 key), signature=None) for key in signed_keys]
 
-        account_keys: list[str] = signed_keys + unsigned_keys
-        account_indices: dict[str, int] = {
+        account_keys: List[str] = signed_keys + unsigned_keys
+        account_indices: Dict[str, int] = {
             str(key): i for i, key in enumerate(account_keys)}
-        compiled_instructions: list[CompiledInstruction] = [
+        compiled_instructions: List[CompiledInstruction] = [
             CompiledInstruction(
                 accounts=[account_indices[str(a_m.public_key)]
                           for a_m in instr.keys],
@@ -194,7 +194,7 @@ def compile_transaction(self) -> bytes:
         serialized_message: bytes = message.serialize()
         return serialized_message
 
-    def sign(self, signatures: list[bytes] = None) -> None:
+    def sign(self, signatures: List[bytes] = None) -> None:
         sign_data: bytes = self.compile_transaction()
         if signatures:
             if len(signatures) != len(self.signers):
@@ -275,7 +275,7 @@ def add_instructions(self, *instructions: Instruction) -> None:
             self.instructions.append(instr)
 
     @classmethod
-    def populate(self, message: Message, signatures: List[bytes], signers: list[Keypair]) -> Transaction:
+    def populate(self, message: Message, signatures: List[bytes], signers: List[Keypair]) -> Transaction:
         decoded_signatures = list(map(lambda x: PKSigPair(
             public_key=message.account_keys[x[0]],
             signature=None if x[1] == b58encode(
@@ -314,7 +314,7 @@ def populate(self, message: Message, signatures: List[bytes], signers: list[Keyp
         return transaction
 
     @classmethod
-    def from_buffer(self, buffer: bytes, signers: list[Keypair]) -> Transaction:
+    def from_buffer(self, buffer: bytes, signers: List[Keypair]) -> Transaction:
         # Reference: https://github.com/solana-labs/solana-web3.js/blob/a1fafee/packages/library-legacy/src/transaction/legacy.ts#L878
         if not isinstance(buffer, bytes):
             raise TypeError("Buffer must be a bytes object.")
diff --git a/solathon/utils.py b/solathon/utils.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = "1.0.4"`
	`1`	`+__version__ = "1.0.5"`
`2`	`2`
`3`	`3`	`from .client import Client`
`4`	`4`	`from .async_client import AsyncClient`