Skip to content

Add isolated pool to user decoding #242

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

Merged
SinaKhalili merged 3 commits into from
Jun 3, 2025
Merged

Add isolated pool to user decoding #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8782cc7
Update user decoding
SinaKhalili Jun 3, 2025
fe06079
Update protocol reference
SinaKhalili Jun 3, 2025
d99b690
update idl version
SinaKhalili Jun 3, 2025
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
2 changes: 1 addition & 1 deletion protocol-v2
Open in desktop
Submodule protocol-v2 updated 36 files
+9 −0 CHANGELOG.md
+1 −1 Cargo.lock
+1 −1 programs/drift/Cargo.toml
+3 −3 programs/drift/src/controller/amm/tests.rs
+4 −4 programs/drift/src/controller/orders/tests.rs
+171 −42 programs/drift/src/controller/spot_balance/tests.rs
+24 −2 programs/drift/src/instructions/admin.rs
+2 −2 programs/drift/src/lib.rs
+10 −0 programs/drift/src/math/constants.rs
+2 −2 programs/drift/src/math/orders/tests.rs
+43 −27 programs/drift/src/math/spot_balance.rs
+4 −4 programs/drift/src/math/spot_withdraw.rs
+1 −1 programs/drift/src/state/spot_market.rs
+1 −1 sdk/VERSION
+15 −48 sdk/bun.lock
+1 −1 sdk/package.json
+1 −1 sdk/src/accounts/webSocketAccountSubscriber.ts
+1 −1 sdk/src/accounts/webSocketProgramAccountSubscriber.ts
+16 −16 sdk/src/adminClient.ts
+1 −1 sdk/src/blockhashSubscriber/BlockhashSubscriber.ts
+1 −1 sdk/src/clock/clockSubscriber.ts
+1 −1 sdk/src/dlob/DLOBSubscriber.ts
+1 −1 sdk/src/events/eventsServerLogProvider.ts
+1 −1 sdk/src/events/webSocketLogProvider.ts
+2 −2 sdk/src/idl/drift.json
+2 −2 sdk/src/indicative-quotes/indicativeQuotesSender.ts
+1 −1 sdk/src/math/auction.ts
+50 −24 sdk/src/math/spotBalance.ts
+1 −1 sdk/src/orderSubscriber/WebsocketSubscription.ts
+1 −1 sdk/src/orderSubscriber/grpcSubscription.ts
+1 −1 sdk/src/slot/SlotSubscriber.ts
+1 −1 sdk/src/slot/SlothashSubscriber.ts
+1 −1 sdk/src/swift/signedMsgUserAccountSubscriber.ts
+1 −1 sdk/src/swift/swiftOrderSubscriber.ts
+1 −1 sdk/src/userMap/PollingSubscription.ts
+1 −1 sdk/src/util/TransactionConfirmationManager.ts
18 changes: 16 additions & 2 deletions src/driftpy/decode/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,19 @@ def decode_user(buffer: bytes) -> UserAccount:
margin_mode = MarginMode.HighLeverage()
offset += 1

padding = [0] * 21
pool_id = read_uint8(buffer, offset)
offset += 1

padding1_bytes = [buffer[offset + i] for i in range(3)]
offset += 3

last_fuel_bonus_update_ts = read_int32_le(buffer, offset, signed=False)
offset += 4

final_padding_bytes = [buffer[offset + i] for i in range(12)]
offset += 12

user_account_padding = padding1_bytes + final_padding_bytes

return UserAccount(
authority,
Expand Down Expand Up @@ -394,5 +406,7 @@ def decode_user(buffer: bytes) -> UserAccount:
open_auctions,
has_open_auction,
margin_mode,
padding,
pool_id,
last_fuel_bonus_update_ts,
user_account_padding,
)
2 changes: 1 addition & 1 deletion src/driftpy/idl/drift.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.120.0",
"version": "2.121.0",
"name": "drift",
"instructions": [
{
Expand Down
4 changes: 3 additions & 1 deletion src/driftpy/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,9 @@ class UserAccount:
open_auctions: int
has_open_auction: bool
margin_mode: MarginMode
padding: list[int] = field(default_factory=lambda: [0] * 21)
pool_id: int
last_fuel_bonus_update_ts: int
padding: list[int] = field(default_factory=lambda: [0] * 15)


@dataclass
Expand Down
Loading