Merge pull request #81 from mircial/feature/transaction

Feature/transaction

Author: GitBolt

solathon/client.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, List, Literal, Optional, Text, Union
+from typing import Any, Dict, List, Literal, Optional, Text, Union
 
 from .utils import RPCRequestError, validate_commitment
 from .publickey import PublicKey
@@ -765,12 +765,13 @@ def request_airdrop(
         """
         return self.build_and_send_request("requestAirdrop", [public_key, lamports])
 
-    def send_transaction(self, transaction: Transaction) -> RPCResponse[str] | str:
+    def send_transaction(self, transaction: Transaction, options: Optional[Dict] = None) -> RPCResponse[str] | str:
         """
         Sends a transaction to the Solana network.
 
         Args:
             transaction (Transaction): The transaction to send.
+            options (Dict): Options for sending transactions
 
         Returns:
             RPCResponse: The response from the Solana network.
@@ -780,10 +781,15 @@ def send_transaction(self, transaction: Transaction) -> RPCResponse[str] | str:
         if recent_blockhash is None:
             blockhash_resp = self.get_latest_blockhash()
             recent_blockhash = blockhash_resp.blockhash
+        
+        if options:
+            options = options
+        else:
+            options = {"encoding": "base64"}
 
         transaction.recent_blockhash = recent_blockhash
         transaction.sign()
 
         return self.build_and_send_request(
-            "sendTransaction", [transaction.serialize(), {"encoding": "base64"}]
+            "sendTransaction", [transaction.serialize(), options]
         )

solathon/core/instructions.py

@@ -23,6 +23,19 @@ class Instruction(NamedTuple):
     program_id: PublicKey
     data: bytes = bytes(0)
 
+    def _to_json(self):
+        return {
+            "keys": [
+                {
+                    "pubkey": key.public_key.base58_encode(),
+                    "isSigner": key.is_signer,
+                    "isWritable": key.is_writable
+                }
+                for key in self.keys
+            ],
+            "programId": self.program_id.base58_encode(),
+            "data": list(self.data)
+        }
 
 def create_account(
         from_public_key: PublicKey,

solathon/core/message.py

@@ -137,8 +137,8 @@ def serialize(self) -> bytes:
 
         return bytes(message_buffer)
 
-    @classmethod
-    def from_buffer(cls, buffer: bytes) -> Message:
+    @staticmethod
+    def from_buffer(buffer: bytes) -> Message:
         # Reference: https://github.com/solana-labs/solana-web3.js/blob/a1fafee/packages/library-legacy/src/message/legacy.ts#L267
 
         buffer_array = list(buffer)

solathon/transaction.py

@@ -31,9 +31,9 @@ def __init__(self, **config):
         self.fee_payer: PublicKey = config.get("fee_payer")
         self.nonce_info = config.get("nonce_info")
         self.recent_blockhash = config.get("recent_blockhash")
-        self.signers: List[PublicKey] | List[Keypair] = config.get("signers")
-        self.instructions: List[Instruction] = []
-        self.signatures: List[PKSigPair] = []
+        self.signers: list[PublicKey] | list[Keypair] = config.get("signers")
+        self.instructions: list[Instruction] = []
+        self.signatures: list[PKSigPair] = config.get("signatures", [])
         if "instructions" in config:
             instructions: Instruction = config.get("instructions")
             if (
@@ -60,9 +60,29 @@ def to_public_key(signer: PublicKey | Keypair) -> PublicKey:
             public_key=to_public_key(signer)
         ) for signer in self.signers]
 
-        self.signatures = pk_sig_pairs
-
+        if not self.signatures:
+            self.signatures = pk_sig_pairs
+
+        self._message: Message = None
+        self.json = None
+
+    def _to_json(self):
+        return {
+            "recentBlockhash": self.recent_blockhash if hasattr(self, 'recent_blockhash') else None,
+            "feePayer": self.fee_payer.base58_encode() if hasattr(self, 'fee_payer') else None,
+            "nonceInfo": {
+                "nonce": self.nonce_info.nonce,
+                "nonceInstruction": self.nonce_info.nonce_instruction._to_json()
+            } if self.nonce_info else None,
+            "instructions": [instruction._to_json() for instruction in self.instructions],
+            "signers": [signature.public_key.base58_encode() for signature in self.signatures]
+        }
+    
     def compile_transaction(self) -> bytes:
+        # Reference: https://github.com/solana-labs/solana-web3.js/blob/a1fafee/packages/library-legacy/src/transaction/legacy.ts#L367
+        if self._message and self._to_json() == self.json:
+            return self._message.serialize()
+
         if self.nonce_info:
             self.recent_blockhash = self.nonce_info.nonce
 
@@ -282,13 +302,16 @@ def populate(self, message: Message, signatures: List[bytes], signers: List[Keyp
             ))
 
         fee_payer = message.account_keys[0] if message.header.num_required_signatures > 0 else None
-        return Transaction(
+        transaction =  Transaction(
             fee_payer=fee_payer,
             recent_blockhash=message.recent_blockhash,
             signatures=decoded_signatures,
             instructions=instructions,
             signers = signers
         )
+        transaction._message = message
+        transaction.json = transaction._to_json()
+        return transaction
 
     @classmethod
     def from_buffer(self, buffer: bytes, signers: List[Keypair]) -> Transaction: