From 0cf24b17175a40019d63087c391a4f536fb03427 Mon Sep 17 00:00:00 2001
From: Wei <wei@dappio.xyz>
Date: Fri, 13 Jan 2023 19:58:34 +0800
Subject: [PATCH 1/2] update ids in marinade

---
 src/marinade/ids.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/marinade/ids.ts b/src/marinade/ids.ts
index 6d6ae0f6..dd4f55a6 100644
--- a/src/marinade/ids.ts
+++ b/src/marinade/ids.ts
@@ -5,3 +5,13 @@ export const MARINADE_FINANCE_PROGRAM_ID = new PublicKey("MarBmsSgKXdrN1egZf5sqe
 export const MSOL_MINT_ADDRESS = new PublicKey("mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So");
 
 export const MARINADE_STATE_ADDRESS = new PublicKey("8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC");
+
+export const MARINADE_SOL_LEG_ADDRESS = new PublicKey("UefNb6z6yvArqe4cJHTXCqStRsKmWhGxnZzuHbikP5Q");
+
+export const MARINADE_MSOL_LEG_ADDRESS = new PublicKey("7GgPYjS5Dza89wV6FpZ23kUJRG5vbQ1GM25ezspYFSoE");
+
+export const MARINADE_MSOL_LEG_AUTHORITY_ADDRESS = new PublicKey("EyaSjUtSgo9aRD1f8LWXwdvkpDTmXAW54yoSHZRF14WL");
+
+export const MARINADE_RESERVE_ADDRESS = new PublicKey("Du3Ysj1wKbxPKkuPPnvzQLQh8oMSVifs3jGZjJWXFmHN");
+
+export const MARINADE_MSOL_MINT_AUTHORITY = new PublicKey("3JLPCS1qM2zRw3Dp6V4hZnYHd4toMNPkNesXdX9tg6KM");

From d4c8a41e943f12a77d5cffa31da2718ba97fb6df Mon Sep 17 00:00:00 2001
From: Wei <wei@dappio.xyz>
Date: Fri, 13 Jan 2023 19:58:55 +0800
Subject: [PATCH 2/2] add withdrawer handling

---
 src/marinade/index.ts   |  7 ++++++-
 src/marinade/infos.ts   | 25 +++++++++++++++++++++++--
 src/marinade/layouts.ts |  8 +++++++-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/marinade/index.ts b/src/marinade/index.ts
index 16311269..5bbab373 100644
--- a/src/marinade/index.ts
+++ b/src/marinade/index.ts
@@ -3,7 +3,7 @@ export * from "./infos";
 export * from "./layouts";
 
 import BN from "bn.js";
-import { IDepositorInfo, IVaultInfo } from "../types";
+import { IDepositorInfo, IVaultInfo, IWithdrawerInfo } from "../types";
 import { PublicKey } from "@solana/web3.js";
 import { RawAccount } from "@solana/spl-token-v2";
 
@@ -90,3 +90,8 @@ export interface VaultInfo extends IVaultInfo {
 export interface DepositorInfo extends IDepositorInfo {
   tokenAccount: RawAccount;
 }
+
+export interface WithdrawerInfo extends IWithdrawerInfo {
+  lamports: BN;
+  epochCreated: BN;
+}
diff --git a/src/marinade/infos.ts b/src/marinade/infos.ts
index a834b2a4..630658eb 100644
--- a/src/marinade/infos.ts
+++ b/src/marinade/infos.ts
@@ -1,9 +1,9 @@
-import { Connection, PublicKey } from "@solana/web3.js";
+import { Connection, PublicKey, GetProgramAccountsConfig, DataSizeFilter } from "@solana/web3.js";
 
 import { MARINADE_FINANCE_PROGRAM_ID, MARINADE_STATE_ADDRESS, MSOL_MINT_ADDRESS } from "./ids";
 
 import { IInstanceVault, IVaultInfoWrapper } from "../types";
-import { MARINADE_FINANCE_ACCOUNT_STATE } from "./layouts";
+import { MARINADE_FINANCE_ACCOUNT_STATE, MARINADE_FINANCE_ACCOUNT_TICKET_ACCOUNT_DATA } from "./layouts";
 
 import * as types from ".";
 import { AccountLayout, ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token-v2";
@@ -135,7 +135,28 @@ infos = class InstanceMarinade {
       tokenAccount: rawAccount,
     };
   }
+  static parseWithdrawer(data: Buffer, withdrawalId: PublicKey): types.WithdrawerInfo {
+    let rawData = MARINADE_FINANCE_ACCOUNT_TICKET_ACCOUNT_DATA.decode(data);
+    return {
+      withdrawerId: withdrawalId,
+      lamports: rawData.lamportsAmount,
+      epochCreated: rawData.createdEpoch,
+      userKey: rawData.beneficiary,
+    };
+  }
+  static async getAllWithdrawers(connection: Connection, userKey: PublicKey): Promise<types.WithdrawerInfo[]> {
+    let filter: GetProgramAccountsConfig = {
+      filters: [
+        { dataSize: MARINADE_FINANCE_ACCOUNT_TICKET_ACCOUNT_DATA.span as number },
+        { memcmp: { offset: 40, bytes: userKey.toBase58() } },
+      ],
+    };
+    let withdrawerAccounts = await connection.getProgramAccounts(MARINADE_FINANCE_PROGRAM_ID, filter);
 
+    return withdrawerAccounts.map((account) => {
+      return this.parseWithdrawer(account.account.data, account.pubkey);
+    });
+  }
   private static _isAllowed(mint: PublicKey): boolean {
     return mint.equals(MSOL_MINT_ADDRESS);
   }
diff --git a/src/marinade/layouts.ts b/src/marinade/layouts.ts
index 35ebd253..621559e0 100644
--- a/src/marinade/layouts.ts
+++ b/src/marinade/layouts.ts
@@ -68,6 +68,12 @@ export const MARINADE_FINANCE_ACCOUNT_STATE = struct(
 );
 
 export const MARINADE_FINANCE_ACCOUNT_TICKET_ACCOUNT_DATA = struct(
-  [publicKey("stateAddress"), publicKey("beneficiary"), u64("lamportsAmount"), u64("createdEpoch")],
+  [
+    blob(8, "identifier"),
+    publicKey("stateAddress"),
+    publicKey("beneficiary"),
+    u64("lamportsAmount"),
+    u64("createdEpoch"),
+  ],
   "TicketAccountData"
 );