Skip to content

client.py: Adapt to transactionSubscribe api using "accounts" filter #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

client.py: Adapt to transactionSubscribe api using "accounts" filter #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions phoenix/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import traceback
from dataclasses import dataclass
import base58
import base64
import json
from typing import Any, Callable, Dict, Iterator, Tuple, TypedDict, Union, List
from uuid import uuid4
Expand Down Expand Up @@ -63,6 +64,8 @@
from solana.rpc.commitment import Commitment
from solana.rpc.async_api import AsyncClient
from solana.rpc.types import TxOpts
from solders.transaction import Transaction as SoldersTransaction
from solders.transaction import VersionedTransaction as SoldersVersionedTransaction
from solders.pubkey import Pubkey
from solders.hash import Hash
from solders.signature import Signature
Expand Down Expand Up @@ -324,12 +327,16 @@ async def order_subscribe(
"transactionSubscribe",
params=[
{
"mentions": [str(market_pubkey)],
"accounts":
{
"include": [str(market_pubkey)]
},
"failed": False,
"vote": False,
},
{
"commitment": str(commitment),
"maxSupportedTransactionVersion": 1,
},
],
)
Expand Down Expand Up @@ -385,15 +392,26 @@ async def order_subscribe(
def __process_transaction_event(
self, response, market_pubkey: Pubkey, trader_pubkey: Pubkey
) -> [OrderSubscribeResponse]:
payload = response["params"]["result"]["value"]
if "error" in response["params"]["result"]["value"]:
error = response["params"]["result"]["value"]["error"]
print("Order subscription returned an error %s", error)
return []

payload = response["params"]["result"]["value"]["transaction"]
meta = payload["meta"]
loaded_addresses = meta.get("loadedAddresses", {"readonly": [], "writable": []})
tx_message = payload["transaction"]["message"]
message = tx_message[-1] if isinstance(tx_message, list) else tx_message
version = payload["version"]

if version == "legacy":
tx = SoldersTransaction.from_bytes(base64.b64decode(payload["transaction"][0]))
else:
tx = SoldersVersionedTransaction.from_bytes(base64.b64decode(payload["transaction"][0]))

message = tx.message
base_account_keys = list(
map(
lambda l: Pubkey.from_bytes(bytes(l)),
message["accountKeys"][1:],
message.account_keys,
)
)
lookup_table_keys = list(
Expand All @@ -417,7 +435,7 @@ def __process_transaction_event(

phoenix_tx = PhoenixTransaction(
instructions,
signature=Signature.from_bytes(payload["transaction"]["signatures"][1]),
signature=tx.signatures[0],
txReceived=True,
txFailed=False,
)
Expand Down