refactor(sdk): add fetch revenue share accounts, overrides for revenue share actions

Author: ChesterSim

sdk/src/accounts/fetch.ts

@@ -1,6 +1,13 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { UserAccount, UserStatsAccount } from '../types';
 import {
+	RevenueShareAccount,
+	RevenueShareEscrowAccount,
+	UserAccount,
+	UserStatsAccount,
+} from '../types';
+import {
+	getRevenueShareAccountPublicKey,
+	getRevenueShareEscrowAccountPublicKey,
 	getUserAccountPublicKey,
 	getUserStatsAccountPublicKey,
 } from '../addresses/pda';
@@ -64,3 +71,45 @@ export async function fetchUserStatsAccount(
 		  ) as UserStatsAccount)
 		: undefined;
 }
+
+export async function fetchRevenueShareAccount(
+	connection: Connection,
+	program: Program,
+	authority: PublicKey
+): Promise<RevenueShareAccount | null> {
+	const revenueShareAccountPublicKey = getRevenueShareAccountPublicKey(
+		program.programId,
+		authority
+	);
+	const accountInfo = await connection.getAccountInfo(
+		revenueShareAccountPublicKey
+	);
+	if (!accountInfo) return null;
+	return program.account.revenueShare.coder.accounts.decode(
+		'RevenueShare',
+		accountInfo.data
+	) as RevenueShareAccount;
+}
+
+export async function fetchRevenueShareEscrowAccount(
+	connection: Connection,
+	program: Program,
+	authority: PublicKey
+): Promise<RevenueShareEscrowAccount | null> {
+	const revenueShareEscrowPubKey = getRevenueShareEscrowAccountPublicKey(
+		program.programId,
+		authority
+	);
+
+	const escrow = await connection.getAccountInfo(revenueShareEscrowPubKey);
+
+	if (!escrow) return null;
+
+	const escrowAccount =
+		program.account.revenueShareEscrow.coder.accounts.decode(
+			'RevenueShareEscrow',
+			escrow.data
+		) as RevenueShareEscrowAccount;
+
+	return escrowAccount;
+}

sdk/src/driftClient.ts

@@ -1255,7 +1255,10 @@ export class DriftClient {
 	}
 
 	public async getInitializeRevenueShareIx(
-		authority: PublicKey
+		authority: PublicKey,
+		overrides?: {
+			payer?: PublicKey;
+		}
 	): Promise<TransactionInstruction> {
 		const revenueShare = getRevenueShareAccountPublicKey(
 			this.program.programId,
@@ -1265,7 +1268,7 @@ export class DriftClient {
 			accounts: {
 				revenueShare,
 				authority,
-				payer: this.wallet.publicKey,
+				payer: overrides?.payer ?? this.wallet.publicKey,
 				rent: anchor.web3.SYSVAR_RENT_PUBKEY,
 				systemProgram: anchor.web3.SystemProgram.programId,
 			},
@@ -1288,7 +1291,10 @@ export class DriftClient {
 
 	public async getInitializeRevenueShareEscrowIx(
 		authority: PublicKey,
-		numOrders: number
+		numOrders: number,
+		overrides?: {
+			payer?: PublicKey;
+		}
 	): Promise<TransactionInstruction> {
 		const escrow = getRevenueShareEscrowAccountPublicKey(
 			this.program.programId,
@@ -1298,7 +1304,7 @@ export class DriftClient {
 			accounts: {
 				escrow,
 				authority,
-				payer: this.wallet.publicKey,
+				payer: overrides?.payer ?? this.wallet.publicKey,
 				userStats: getUserStatsAccountPublicKey(
 					this.program.programId,
 					authority
@@ -1411,9 +1417,14 @@ export class DriftClient {
 	public async getChangeApprovedBuilderIx(
 		builder: PublicKey,
 		maxFeeTenthBps: number,
-		add: boolean
+		add: boolean,
+		overrides?: {
+			authority?: PublicKey;
+			payer?: PublicKey;
+		}
 	): Promise<TransactionInstruction> {
-		const authority = this.wallet.publicKey;
+		const authority = overrides?.authority ?? this.wallet.publicKey;
+		const payer = overrides?.payer ?? this.wallet.publicKey;
 		const escrow = getRevenueShareEscrowAccountPublicKey(
 			this.program.programId,
 			authority
@@ -1426,7 +1437,7 @@ export class DriftClient {
 				accounts: {
 					escrow,
 					authority,
-					payer: this.wallet.publicKey,
+					payer,
 					systemProgram: anchor.web3.SystemProgram.programId,
 				},
 			}