@quartz-labs/sdk 0.2.1 → 0.3.1

package/README.md

@@ -18,11 +18,19 @@ There is currently an issue with dependancy resolutions, so add the following to
 
 ```json
 "resolutions": {
-  "rpc-websockets": "^9.0.2",
+  "rpc-websockets": "^9.0.4",
   "@solana/web3.js": "^1.95.8"
 }
 ```
 
+If you want to use this SDK in a front-end, note that some Node modules don't work in the browser. Because of this, you'll normally want to import the SDK in your client side code like this:
+
+```javascript
+import * from "@quartz-labs/sdk/browser";
+```
+
+Server-side code can still be imported without the /browser path at the end, but you may need to set up your config so your web app doesn't try to bundle the problematic Node modules with the and client side code.
+
 ## Links
 
 Website and waitlist: [quartzpay.io](https://quartzpay.io/)

package/dist/client.d.ts

@@ -3,16 +3,21 @@ import { type Quartz } from "./types/idl/quartz.js";
 import { Program } from "@coral-xyz/anchor";
 import type { PublicKey, Connection, AddressLookupTableAccount, MessageCompiledInstruction } from "@solana/web3.js";
 import { QuartzUser } from "./user.js";
-import { QuartzClientLight } from "./clientLight.js";
-export declare class QuartzClient extends QuartzClientLight {
+import type { TransactionInstruction } from "@solana/web3.js";
+export declare class QuartzClient {
+    private connection;
+    private program;
+    private quartzLookupTable;
     private driftClient;
-    constructor(connection: Connection, program: Program<Quartz>, quartzAddressTable: AddressLookupTableAccount, driftClient: DriftClient, oracles: Map<string, PublicKey>);
+    constructor(connection: Connection, program: Program<Quartz>, quartzAddressTable: AddressLookupTableAccount, driftClient: DriftClient);
     static fetchClient(connection: Connection): Promise<QuartzClient>;
+    getAllQuartzAccountOwnerPubkeys(): Promise<PublicKey[]>;
     getQuartzAccount(owner: PublicKey): Promise<QuartzUser>;
     getMultipleQuartzAccounts(owners: PublicKey[]): Promise<(QuartzUser | null)[]>;
     getDepositRate(spotMarketIndex: number): Promise<import("bn.js")>;
     getBorrowRate(spotMarketIndex: number): Promise<import("bn.js")>;
     private getSpotMarketAccount;
     listenForInstruction(instructionName: string, onInstruction: (instruction: MessageCompiledInstruction, accountKeys: PublicKey[]) => void): Promise<void>;
+    makeInitQuartzUserIxs(owner: PublicKey): Promise<TransactionInstruction[]>;
 }
 //# sourceMappingURL=client.d.ts.map

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAO,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAyC,OAAO,EAAe,MAAM,mBAAmB,CAAC;AAChG,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,yBAAyB,EAAE,0BAA0B,EAAS,MAAM,iBAAiB,CAAC;AAC3H,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAKvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,qBAAa,YAAa,SAAQ,iBAAiB;IAC/C,OAAO,CAAC,WAAW,CAAc;gBAG7B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,kBAAkB,EAAE,yBAAyB,EAC7C,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;WAMf,WAAW,CAC3B,UAAU,EAAE,UAAU;IAuBb,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IAsBvD,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;IAoC9E,cAAc,CAAC,eAAe,EAAE,MAAM;IAMtC,aAAa,CAAC,eAAe,EAAE,MAAM;YAMpC,oBAAoB;IAMrB,oBAAoB,CAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,CAAC,WAAW,EAAE,0BAA0B,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,IAAI;CA4BjG"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAO,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAyC,OAAO,EAAe,MAAM,mBAAmB,CAAC;AAChG,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,yBAAyB,EAAE,0BAA0B,EAAS,MAAM,iBAAiB,CAAC;AAC3H,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAKvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE9D,qBAAa,YAAY;IACrB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,WAAW,CAAc;gBAG7B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,kBAAkB,EAAE,yBAAyB,EAC7C,WAAW,EAAE,WAAW;WAQR,WAAW,CAC3B,UAAU,EAAE,UAAU;IAoBb,+BAA+B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAMvD,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBvD,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;IAmC9E,cAAc,CAAC,eAAe,EAAE,MAAM;IAMtC,aAAa,CAAC,eAAe,EAAE,MAAM;YAMpC,oBAAoB;IAMrB,oBAAoB,CAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,CAAC,WAAW,EAAE,0BAA0B,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,IAAI;IAgCjF,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;CA2B1F"}

package/dist/client.js

@@ -1,21 +1,25 @@
-import { calculateBorrowRate, calculateDepositRate, fetchUserAccountsUsingKeys as fetchDriftAccountsUsingKeys } from "@drift-labs/sdk";
+import { calculateBorrowRate, calculateDepositRate, DRIFT_PROGRAM_ID, fetchUserAccountsUsingKeys as fetchDriftAccountsUsingKeys } from "@drift-labs/sdk";
 import { QUARTZ_ADDRESS_TABLE, QUARTZ_PROGRAM_ID } from "./config/constants.js";
 import { IDL } from "./types/idl/quartz.js";
 import { AnchorProvider, BorshInstructionCoder, Program, setProvider } from "@coral-xyz/anchor";
 import { QuartzUser } from "./user.js";
-import { getDriftUserPublicKey, getVaultPublicKey } from "./utils/helpers.js";
+import { getDriftStatePublicKey, getDriftUserPublicKey, getDriftUserStatsPublicKey, getVaultPublicKey } from "./utils/helpers.js";
 import { DriftClientService } from "./services/driftClientService.js";
-import { Keypair, } from "@solana/web3.js";
+import { SystemProgram, SYSVAR_RENT_PUBKEY, } from "@solana/web3.js";
 import { DummyWallet } from "./types/classes/dummyWallet.class.js";
-import { QuartzClientLight } from "./clientLight.js";
-export class QuartzClient extends QuartzClientLight {
+export class QuartzClient {
+    connection;
+    program;
+    quartzLookupTable;
     driftClient;
-    constructor(connection, program, quartzAddressTable, driftClient, oracles) {
-        super(connection, program, quartzAddressTable, oracles);
+    constructor(connection, program, quartzAddressTable, driftClient) {
+        this.connection = connection;
+        this.program = program;
+        this.quartzLookupTable = quartzAddressTable;
         this.driftClient = driftClient;
     }
     static async fetchClient(connection) {
-        const wallet = new DummyWallet(Keypair.generate());
+        const wallet = new DummyWallet();
         const provider = new AnchorProvider(connection, wallet, { commitment: "confirmed" });
         setProvider(provider);
         const program = new Program(IDL, QUARTZ_PROGRAM_ID, provider);
@@ -23,8 +27,10 @@ export class QuartzClient extends QuartzClientLight {
         if (!quartzLookupTable)
             throw Error("Address Lookup Table account not found");
         const driftClient = await DriftClientService.getDriftClient(connection);
-        const oracles = await QuartzClient.fetchOracles();
-        return new QuartzClient(connection, program, quartzLookupTable, driftClient, oracles);
+        return new QuartzClient(connection, program, quartzLookupTable, driftClient);
+    }
+    async getAllQuartzAccountOwnerPubkeys() {
+        return (await this.program.account.vault.all()).map((vault) => vault.account.owner);
     }
     async getQuartzAccount(owner) {
         const vault = getVaultPublicKey(owner);
@@ -32,7 +38,7 @@ export class QuartzClient extends QuartzClientLight {
         const [driftUserAccount] = await fetchDriftAccountsUsingKeys(this.connection, this.driftClient.program, [getDriftUserPublicKey(vault)]);
         if (!driftUserAccount)
             throw Error("Drift user not found");
-        return new QuartzUser(owner, this.connection, this.program, this.quartzLookupTable, this.oracles, this.driftClient, driftUserAccount);
+        return new QuartzUser(owner, this.connection, this.program, this.quartzLookupTable, this.driftClient, driftUserAccount);
     }
     async getMultipleQuartzAccounts(owners) {
         if (owners.length === 0)
@@ -54,7 +60,7 @@ export class QuartzClient extends QuartzClientLight {
                 return null;
             if (owners[index] === undefined)
                 throw Error("Missing pubkey in owners array");
-            return new QuartzUser(owners[index], this.connection, this.program, this.quartzLookupTable, this.oracles, this.driftClient, driftUser);
+            return new QuartzUser(owners[index], this.connection, this.program, this.quartzLookupTable, this.driftClient, driftUser);
         });
     }
     async getDepositRate(spotMarketIndex) {
@@ -97,5 +103,31 @@ export class QuartzClient extends QuartzClientLight {
             }
         }, "confirmed");
     }
+    // --- Instructions ---
+    async makeInitQuartzUserIxs(owner) {
+        const vault = getVaultPublicKey(owner);
+        const ix_initUser = await this.program.methods
+            .initUser()
+            .accounts({
+            vault: vault,
+            owner: owner,
+            systemProgram: SystemProgram.programId,
+        })
+            .instruction();
+        const ix_initVaultDriftAccount = await this.program.methods
+            .initDriftAccount()
+            .accounts({
+            vault: vault,
+            owner: owner,
+            driftUser: getDriftUserPublicKey(vault),
+            driftUserStats: getDriftUserStatsPublicKey(vault),
+            driftState: getDriftStatePublicKey(),
+            driftProgram: DRIFT_PROGRAM_ID,
+            rent: SYSVAR_RENT_PUBKEY,
+            systemProgram: SystemProgram.programId,
+        })
+            .instruction();
+        return [ix_initUser, ix_initVaultDriftAccount];
+    }
 }
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/dist/clientLight.d.ts

@@ -3,7 +3,8 @@ import type { Connection, TransactionInstruction } from "@solana/web3.js";
 import { type Quartz } from "./types/idl/quartz.js";
 import type { AddressLookupTableAccount } from "@solana/web3.js";
 import type { PublicKey } from "@solana/web3.js";
-import { QuartzUserLight } from "./userLight.js";
+import { QuartzUserLight } from "./userLights.js";
+import { DummyWallet } from "./types/classes/dummyWallet.class.js";
 export declare class QuartzClientLight {
     protected connection: Connection;
     protected program: Program<Quartz>;
@@ -11,7 +12,7 @@ export declare class QuartzClientLight {
     protected oracles: Map<string, PublicKey>;
     constructor(connection: Connection, program: Program<Quartz>, quartzAddressTable: AddressLookupTableAccount, oracles: Map<string, PublicKey>);
     static fetchClientLight(connection: Connection): Promise<QuartzClientLight>;
-    protected static fetchOracles(): Promise<Map<string, PublicKey>>;
+    protected static fetchOracles(connection: Connection, wallet: DummyWallet): Promise<Map<string, PublicKey>>;
     makeInitQuartzUserIxs(owner: PublicKey): Promise<TransactionInstruction[]>;
     getAllQuartzAccountOwnerPubkeys(): Promise<PublicKey[]>;
     getQuartzAccountLight(pubkey: PublicKey): QuartzUserLight;

package/dist/clientLight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientLight.d.ts","sourceRoot":"","sources":["../src/clientLight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,OAAO,EAAe,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAO,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIjD,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IACjC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,SAAS,CAAC,iBAAiB,EAAE,yBAAyB,CAAC;IACvD,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBAGtC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,kBAAkB,EAAE,yBAAyB,EAC7C,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;WAQf,gBAAgB,CAChC,UAAU,EAAE,UAAU;qBAqBH,YAAY;IAUtB,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IA4B1E,+BAA+B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAM7D,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,eAAe;CASnE"}
+{"version":3,"file":"clientLight.d.ts","sourceRoot":"","sources":["../src/clientLight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,OAAO,EAAe,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAO,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAOjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAInE,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IACjC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,SAAS,CAAC,iBAAiB,EAAE,yBAAyB,CAAC;IACvD,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBAGtC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EACxB,kBAAkB,EAAE,yBAAyB,EAC7C,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;WAQf,gBAAgB,CAChC,UAAU,EAAE,UAAU;qBAqBH,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW;IAWlE,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IA4B1E,+BAA+B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAM7D,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,eAAe;CASnE"}

package/dist/clientLight.js

@@ -1,11 +1,16 @@
 import { AnchorProvider, Program, setProvider } from "@coral-xyz/anchor";
 import { IDL } from "./types/idl/quartz.js";
-import { getDriftUserPublicKey, getVaultPublicKey, getDriftUserStatsPublicKey, getDriftStatePublicKey, getPythPriceFeedAccount } from "./utils/helpers.js";
+import { getDriftUserPublicKey, getVaultPublicKey } from "./utils/helpers.js";
+import { getDriftUserStatsPublicKey } from "./utils/helpers.js";
 import { Keypair, SystemProgram } from "@solana/web3.js";
 import { SYSVAR_RENT_PUBKEY } from "@solana/web3.js";
-import { QuartzUserLight } from "./userLight.js";
+import { DRIFT_PROGRAM_ID } from "@drift-labs/sdk";
+import { getDriftStatePublicKey } from "./utils/helpers.js";
+import { QuartzUserLight } from "./userLights.js";
+import { QUARTZ_ADDRESS_TABLE } from "./config/constants.js";
 import { DummyWallet } from "./types/classes/dummyWallet.class.js";
-import { QUARTZ_PROGRAM_ID, DRIFT_PROGRAM_ID, QUARTZ_ADDRESS_TABLE } from "./config/constants.js";
+import { QUARTZ_PROGRAM_ID } from "./config/constants.js";
+import { PythSolanaReceiver } from "@pythnetwork/pyth-solana-receiver";
 export class QuartzClientLight {
     connection;
     program;
@@ -25,13 +30,14 @@ export class QuartzClientLight {
         const quartzLookupTable = await connection.getAddressLookupTable(QUARTZ_ADDRESS_TABLE).then((res) => res.value);
         if (!quartzLookupTable)
             throw Error("Address Lookup Table account not found");
-        const oracles = await QuartzClientLight.fetchOracles();
+        const oracles = await QuartzClientLight.fetchOracles(connection, wallet);
         return new QuartzClientLight(connection, program, quartzLookupTable, oracles);
     }
-    static async fetchOracles() {
+    static async fetchOracles(connection, wallet) {
+        const pythSolanaReceiver = new PythSolanaReceiver({ connection, wallet });
         const oracles = new Map([
-            ["SOL/USD", getPythPriceFeedAccount(0, "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d")],
-            ["USDC/USD", getPythPriceFeedAccount(0, "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a")]
+            ["SOL/USD", pythSolanaReceiver.getPriceFeedAccountAddress(0, "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d")],
+            ["USDC/USD", pythSolanaReceiver.getPriceFeedAccountAddress(0, "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a")]
         ]);
         return oracles;
     }

package/dist/clientLight.js.map

@@ -1 +1 @@
-{"version":3,"file":"clientLight.js","sourceRoot":"","sources":["../src/clientLight.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clientLight.js","sourceRoot":"","sources":["../src/clientLight.ts"],"names":[],"mappings":"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"}

package/dist/config/constants.d.ts

@@ -1,16 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
 export declare const QUARTZ_PROGRAM_ID: PublicKey;
 export declare const QUARTZ_ADDRESS_TABLE: PublicKey;
+export declare const QUARTZ_DRIFT_ACCOUNT: PublicKey;
 export declare const DRIFT_PROGRAM_ID: PublicKey;
 export declare const PYTH_ORACLE_PROGRAM_ID: PublicKey;
 export declare const QUARTZ_HEALTH_BUFFER = 10;
-export declare const USDC_MINT: PublicKey;
-export declare const WSOL_MINT: PublicKey;
-export declare const DRIFT_MARKET_INDEX_USDC = 0;
-export declare const DRIFT_MARKET_INDEX_SOL = 1;
-export declare const SUPPORTED_DRIFT_MARKETS: readonly [0, 1];
-export declare const DRIFT_ORACLE_1: PublicKey;
-export declare const DRIFT_ORACLE_2: PublicKey;
-export declare const DRIFT_SPOT_MARKET_SOL: PublicKey;
-export declare const DRIFT_SPOT_MARKET_USDC: PublicKey;
 //# sourceMappingURL=constants.d.ts.map

package/dist/config/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAElG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAC7F,eAAO,MAAM,sBAAsB,WAA+D,CAAC;AAEnG,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,eAAO,MAAM,SAAS,WAAgE,CAAC;AACvF,eAAO,MAAM,SAAS,WAA+D,CAAC;AAEtF,eAAO,MAAM,uBAAuB,IAAI,CAAC;AACzC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,uBAAuB,iBAA6D,CAAC;AAElG,eAAO,MAAM,cAAc,WAAgE,CAAC;AAC5F,eAAO,MAAM,cAAc,WAAgE,CAAC;AAC5F,eAAO,MAAM,qBAAqB,WAAgE,CAAC;AACnG,eAAO,MAAM,sBAAsB,WAAgE,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAClG,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAElG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAC7F,eAAO,MAAM,sBAAsB,WAA+D,CAAC;AAEnG,eAAO,MAAM,oBAAoB,KAAK,CAAC"}

package/dist/config/constants.js

@@ -1,16 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
 export const QUARTZ_PROGRAM_ID = new PublicKey("6JjHXLheGSNvvexgzMthEcgjkcirDrGduc3HAKB2P1v2");
 export const QUARTZ_ADDRESS_TABLE = new PublicKey("96BmeKKVGX3LKYSKo3FCEom1YpNY11kCnGscKq6ouxLx");
+export const QUARTZ_DRIFT_ACCOUNT = new PublicKey("5XY5pQbBjwv8ByBxKPNE7Xyb9dVcdFgd51xcxKDJjGWE");
 export const DRIFT_PROGRAM_ID = new PublicKey("dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH");
 export const PYTH_ORACLE_PROGRAM_ID = new PublicKey("pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT");
 export const QUARTZ_HEALTH_BUFFER = 10;
-export const USDC_MINT = new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
-export const WSOL_MINT = new PublicKey("So11111111111111111111111111111111111111112");
-export const DRIFT_MARKET_INDEX_USDC = 0;
-export const DRIFT_MARKET_INDEX_SOL = 1;
-export const SUPPORTED_DRIFT_MARKETS = [DRIFT_MARKET_INDEX_USDC, DRIFT_MARKET_INDEX_SOL];
-export const DRIFT_ORACLE_1 = new PublicKey("En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce");
-export const DRIFT_ORACLE_2 = new PublicKey("BAtFj4kQttZRVep3UZS2aZRDixkGYgWsbqTBVDbnSsPF");
-export const DRIFT_SPOT_MARKET_SOL = new PublicKey("3x85u7SWkmmr7YQGYhtjARgxwegTLJgkSLRprfXod6rh");
-export const DRIFT_SPOT_MARKET_USDC = new PublicKey("6gMq3mRCKf8aP3ttTyYhuijVZ2LGi14oDsBbkgubfLB3");
 //# sourceMappingURL=constants.js.map

package/dist/config/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC/F,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAEnG,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEvC,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AACvF,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAEtF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AACzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,uBAAuB,EAAE,sBAAsB,CAAU,CAAC;AAElG,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC5F,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC5F,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AACnG,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC/F,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAClG,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAEnG,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAC"}

package/dist/config/tokens.d.ts

@@ -0,0 +1,5 @@
+import type { Token } from "../types/interfaces/token.interface.js";
+export declare const MarketIndex: readonly [1, 0, 5, 22, 28];
+export type MarketIndex = (typeof MarketIndex)[number];
+export declare const TOKENS: Record<MarketIndex, Token>;
+//# sourceMappingURL=tokens.d.ts.map

package/dist/config/tokens.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/config/tokens.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAEpE,eAAO,MAAM,WAAW,4BAEd,CAAC;AACX,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,KAAK,CA+B7C,CAAC"}

package/dist/config/tokens.js

@@ -0,0 +1,37 @@
+import { PublicKey } from "@solana/web3.js";
+export const MarketIndex = [
+    1, 0, 5, 22, 28
+];
+export const TOKENS = {
+    1: {
+        name: "SOL",
+        mint: new PublicKey("So11111111111111111111111111111111111111112"),
+        pythPriceFeedId: "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
+        decimalPrecision: 9,
+    },
+    0: {
+        name: "USDC",
+        mint: new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"),
+        pythPriceFeedId: "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+        decimalPrecision: 6,
+    },
+    5: {
+        name: "USDT",
+        mint: new PublicKey("Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB"),
+        pythPriceFeedId: "0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b",
+        decimalPrecision: 6,
+    },
+    22: {
+        name: "PYUSD",
+        mint: new PublicKey("2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo"),
+        pythPriceFeedId: "0xc1da1b73d7f01e7ddd54b3766cf7fcd644395ad14f70aa706ec5384c59e76692",
+        decimalPrecision: 6,
+    },
+    28: {
+        name: "USDS",
+        mint: new PublicKey("USDSwr9ApdHk5bvJKMjzff41FfuX8bSxdKcR81vTwcA"),
+        pythPriceFeedId: "0x77f0971af11cc8bac224917275c1bf55f2319ed5c654a1ca955c82fa2d297ea1",
+        decimalPrecision: 6,
+    }
+};
+//# sourceMappingURL=tokens.js.map

package/dist/config/tokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/config/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,CAAC,MAAM,WAAW,GAAG;IACvB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE;CACT,CAAC;AAGX,MAAM,CAAC,MAAM,MAAM,GAA+B;IAC9C,CAAC,EAAE;QACC,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,IAAI,SAAS,CAAC,6CAA6C,CAAC;QAClE,eAAe,EAAE,oEAAoE;QACrF,gBAAgB,EAAE,CAAC;KACtB;IACD,CAAC,EAAE;QACC,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI,SAAS,CAAC,8CAA8C,CAAC;QACnE,eAAe,EAAE,oEAAoE;QACrF,gBAAgB,EAAE,CAAC;KACtB;IACD,CAAC,EAAE;QACC,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI,SAAS,CAAC,8CAA8C,CAAC;QACnE,eAAe,EAAE,oEAAoE;QACrF,gBAAgB,EAAE,CAAC;KACtB;IACD,EAAE,EAAE;QACA,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,IAAI,SAAS,CAAC,8CAA8C,CAAC;QACnE,eAAe,EAAE,oEAAoE;QACrF,gBAAgB,EAAE,CAAC;KACtB;IACD,EAAE,EAAE;QACA,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI,SAAS,CAAC,6CAA6C,CAAC;QAClE,eAAe,EAAE,oEAAoE;QACrF,gBAAgB,EAAE,CAAC;KACtB;CACJ,CAAC"}

package/dist/index.browser.d.ts

@@ -1,8 +1,6 @@
-export type { BN } from "bn.js";
-export { QuartzClientLight } from "./clientLight.js";
-export { QuartzUserLight } from "./userLight.js";
+import BN from "bn.js";
+export { BN };
 export * from "./config/constants.js";
+export * from "./config/tokens.js";
 export * from "./utils/helpers.js";
-import type { Wallet } from "@coral-xyz/anchor/dist/cjs/provider.js";
-export type { Wallet };
 //# sourceMappingURL=index.browser.d.ts.map

package/dist/index.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../src/index.browser.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AAEnC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wCAAwC,CAAC;AACrE,YAAY,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../src/index.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,EAAE,EAAE,CAAC;AACd,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC"}

package/dist/index.browser.js

@@ -1,5 +1,6 @@
-export { QuartzClientLight } from "./clientLight.js";
-export { QuartzUserLight } from "./userLight.js";
+import BN from "bn.js";
+export { BN };
 export * from "./config/constants.js";
+export * from "./config/tokens.js";
 export * from "./utils/helpers.js";
 //# sourceMappingURL=index.browser.js.map

package/dist/index.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.js","sourceRoot":"","sources":["../src/index.browser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.browser.js","sourceRoot":"","sources":["../src/index.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,EAAE,EAAE,CAAC;AACd,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC"}

package/dist/index.d.ts

@@ -1,9 +1,5 @@
-export type { BN } from "bn.js";
+export * from "./index.browser.js";
+export { DummyWallet } from "./types/classes/dummyWallet.class.js";
 export { QuartzClient } from "./client.js";
 export { QuartzUser } from "./user.js";
-export { QuartzClientLight } from "./clientLight.js";
-export { QuartzUserLight } from "./userLight.js";
-export * from "./config/constants.js";
-export * from "./utils/helpers.js";
-export { Wallet } from "@coral-xyz/anchor";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC"}

package/dist/index.js

@@ -1,8 +1,5 @@
+export * from "./index.browser.js";
+export { DummyWallet } from "./types/classes/dummyWallet.class.js";
 export { QuartzClient } from "./client.js";
 export { QuartzUser } from "./user.js";
-export { QuartzClientLight } from "./clientLight.js";
-export { QuartzUserLight } from "./userLight.js";
-export * from "./config/constants.js";
-export * from "./utils/helpers.js";
-export { Wallet } from "@coral-xyz/anchor";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC"}

package/dist/services/driftClientService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driftClientService.d.ts","sourceRoot":"","sources":["../../src/services/driftClientService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAU,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAIlD,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAqB;IAC5C,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,sBAAsB,CAAmB;gBAG7C,UAAU,EAAE,UAAU;WAmBN,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;CAOnF"}
+{"version":3,"file":"driftClientService.d.ts","sourceRoot":"","sources":["../../src/services/driftClientService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAKlD,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAqB;IAC5C,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,sBAAsB,CAAmB;gBAG7C,UAAU,EAAE,UAAU;WAmBN,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;CAOnF"}

package/dist/services/driftClientService.js

@@ -1,19 +1,20 @@
-import { DriftClient, Wallet } from "@drift-labs/sdk";
-import { Keypair } from "@solana/web3.js";
-import { SUPPORTED_DRIFT_MARKETS } from "../config/constants.js";
+import { DriftClient } from "@drift-labs/sdk";
+import { MarketIndex } from "../config/tokens.js";
+import { DummyWallet } from "../types/classes/dummyWallet.class.js";
+import { QUARTZ_DRIFT_ACCOUNT } from "../config/constants.js";
 export class DriftClientService {
     static instance;
     driftClient;
     driftClientInitPromise;
     constructor(connection) {
-        const wallet = new Wallet(Keypair.generate());
+        const wallet = new DummyWallet(QUARTZ_DRIFT_ACCOUNT);
         this.driftClient = new DriftClient({
             connection: connection,
             wallet: wallet,
             env: 'mainnet-beta',
             userStats: false,
             perpMarketIndexes: [],
-            spotMarketIndexes: [...SUPPORTED_DRIFT_MARKETS],
+            spotMarketIndexes: [...MarketIndex],
             accountSubscription: {
                 type: 'websocket',
                 commitment: "confirmed"

package/dist/services/driftClientService.js.map

@@ -1 +1 @@
-{"version":3,"file":"driftClientService.js","sourceRoot":"","sources":["../../src/services/driftClientService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,OAAO,kBAAkB;IACnB,MAAM,CAAC,QAAQ,CAAqB;IACpC,WAAW,CAAc;IACzB,sBAAsB,CAAmB;IAEjD,YACI,UAAsB;QAEtB,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE9C,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC;YAC/B,UAAU,EAAE,UAAU;YACtB,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,cAAc;YACnB,SAAS,EAAE,KAAK;YAChB,iBAAiB,EAAE,EAAE;YACrB,iBAAiB,EAAE,CAAC,GAAG,uBAAuB,CAAC;YAC/C,mBAAmB,EAAE;gBACjB,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,WAAW;aAC1B;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;IAC/D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,UAAsB;QACrD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;YAC/B,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,kBAAkB,CAAC,QAAQ,CAAC,sBAAsB,CAAC;QACzD,OAAO,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnD,CAAC;CACJ"}
+{"version":3,"file":"driftClientService.js","sourceRoot":"","sources":["../../src/services/driftClientService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,OAAO,kBAAkB;IACnB,MAAM,CAAC,QAAQ,CAAqB;IACpC,WAAW,CAAc;IACzB,sBAAsB,CAAmB;IAEjD,YACI,UAAsB;QAEtB,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,oBAAoB,CAAC,CAAC;QAErD,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC;YAC/B,UAAU,EAAE,UAAU;YACtB,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,cAAc;YACnB,SAAS,EAAE,KAAK;YAChB,iBAAiB,EAAE,EAAE;YACrB,iBAAiB,EAAE,CAAC,GAAG,WAAW,CAAC;YACnC,mBAAmB,EAAE;gBACjB,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,WAAW;aAC1B;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;IAC/D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,UAAsB;QACrD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;YAC/B,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,kBAAkB,CAAC,QAAQ,CAAC,sBAAsB,CAAC;QACzD,OAAO,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnD,CAAC;CACJ"}

package/dist/types/classes/driftUser.class.d.ts

@@ -1,14 +1,16 @@
 import { BN, type DriftClient, type MarginCategory, type UserAccount } from "@drift-labs/sdk";
-import type { Connection, PublicKey } from "@solana/web3.js";
+import type { PublicKey } from "@solana/web3.js";
+import type { AccountMeta } from "../interfaces/accountMeta.interface.js";
+import type { MarketIndex } from "../../config/tokens.js";
 export declare class DriftUser {
     private authority;
-    private connection;
     private driftClient;
     private userAccount;
     pubkey: PublicKey;
     statsPubkey: PublicKey;
-    constructor(authority: PublicKey, connection: Connection, driftClient: DriftClient, userAccount: UserAccount);
+    constructor(authority: PublicKey, driftClient: DriftClient, userAccount: UserAccount);
     getDriftUserAccount(): UserAccount;
+    getRemainingAccounts(marketIndex: MarketIndex): AccountMeta[];
     getHealth(): number;
     getTokenAmount(marketIndex: number): BN;
     getWithdrawalLimit(marketIndex: number, reduceOnly?: boolean, adjustForAutoRepayLimit?: boolean): BN;

package/dist/types/classes/driftUser.class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driftUser.class.d.ts","sourceRoot":"","sources":["../../../src/types/classes/driftUser.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,EAAE,EAAiT,KAAK,WAAW,EAA0J,KAAK,cAAc,EAAsL,KAAK,WAAW,EAA0D,MAAM,iBAAiB,CAAC;AACn0B,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI7D,qBAAa,SAAS;IAClB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,WAAW,CAAc;IAEjC,OAAO,CAAC,WAAW,CAA0B;IACzC,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,SAAS,CAAC;gBAGvB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EAC9B,WAAW,EAAE,WAAW;IAWlB,mBAAmB,IAAI,WAAW;IAK/B,SAAS,IAAI,MAAM;IAyBnB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,EAAE;IAuB1C,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB,UAAQ,GAAG,EAAE;IAiFzG,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,uBAAuB;IA2D5B,OAAO,CAAC,iBAAiB;IASlB,uBAAuB,CAChC,cAAc,CAAC,EAAE,cAAc,EAC/B,MAAM,UAAQ,EACd,iBAAiB,UAAO,GACtB,EAAE;IAWF,OAAO,CAAC,uBAAuB;IAkB/B,OAAO,CAAC,mCAAmC;IA+L3C,OAAO,CAAC,qBAAqB;IA8C7B,OAAO,CAAC,iBAAiB;IAyCzB,OAAO,CAAC,gBAAgB;IAiFxB,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,2BAA2B;IAsMnC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,iBAAiB;IAKlB,+BAA+B,IAAI,EAAE;IAc5C,OAAO,CAAC,oBAAoB;IAsB5B,OAAO,CAAC,6BAA6B;IAqBrC,OAAO,CAAC,sCAAsC;IAqH9C,OAAO,CAAC,2BAA2B;CAkBtC"}
+{"version":3,"file":"driftUser.class.d.ts","sourceRoot":"","sources":["../../../src/types/classes/driftUser.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,EAAE,EAAiT,KAAK,WAAW,EAA0J,KAAK,cAAc,EAAsL,KAAK,WAAW,EAA0D,MAAM,iBAAiB,CAAC;AACn0B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,qBAAa,SAAS;IAClB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,WAAW,CAAc;IAEjC,OAAO,CAAC,WAAW,CAA0B;IACzC,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,SAAS,CAAC;gBAGvB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EAC9B,WAAW,EAAE,WAAW;IAUlB,mBAAmB,IAAI,WAAW;IAKlC,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,EAAE;IAe1D,SAAS,IAAI,MAAM;IAyBnB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,EAAE;IAuB1C,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB,UAAQ,GAAG,EAAE;IA2EzG,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,uBAAuB;IA2D5B,OAAO,CAAC,iBAAiB;IASlB,uBAAuB,CAChC,cAAc,CAAC,EAAE,cAAc,EAC/B,MAAM,UAAQ,EACd,iBAAiB,UAAO,GACtB,EAAE;IAWF,OAAO,CAAC,uBAAuB;IAkB/B,OAAO,CAAC,mCAAmC;IA+L3C,OAAO,CAAC,qBAAqB;IA8C7B,OAAO,CAAC,iBAAiB;IAyCzB,OAAO,CAAC,gBAAgB;IAiFxB,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,2BAA2B;IAsMnC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,iBAAiB;IAKlB,+BAA+B,IAAI,EAAE;IAc5C,OAAO,CAAC,oBAAoB;IAsB5B,OAAO,CAAC,6BAA6B;IAqBrC,OAAO,CAAC,sCAAsC;IAqH9C,OAAO,CAAC,2BAA2B;CAkBtC"}

package/dist/types/classes/driftUser.class.js

@@ -3,14 +3,12 @@ import { getDriftUserPublicKey, getDriftUserStatsPublicKey } from "../../utils/h
 import { QUARTZ_HEALTH_BUFFER } from "../../config/constants.js";
 export class DriftUser {
     authority;
-    connection;
     driftClient;
     userAccount;
     pubkey;
     statsPubkey;
-    constructor(authority, connection, driftClient, userAccount) {
+    constructor(authority, driftClient, userAccount) {
         this.authority = authority;
-        this.connection = connection;
         this.driftClient = driftClient;
         this.pubkey = getDriftUserPublicKey(this.authority);
         this.statsPubkey = getDriftUserStatsPublicKey(this.authority);
@@ -21,6 +19,19 @@ export class DriftUser {
             throw new Error("DriftUser not initialized");
         return this.userAccount;
     }
+    getRemainingAccounts(marketIndex) {
+        const remainingAccounts = this.driftClient.getRemainingAccounts({
+            userAccounts: [this.getDriftUserAccount()],
+            useMarketLastSlotCache: true,
+            writableSpotMarketIndexes: [marketIndex],
+            readableSpotMarketIndexes: [QUOTE_SPOT_MARKET_INDEX]
+        });
+        const spotMarketAccount = this.driftClient.getSpotMarketAccount(marketIndex);
+        if (!spotMarketAccount)
+            throw new Error("Spot market not found");
+        this.driftClient.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
+        return remainingAccounts;
+    }
     getHealth() {
         if (this.isBeingLiquidated())
             return 0;
@@ -53,7 +64,7 @@ export class DriftUser {
             throw new Error("Spot market not found");
         // eslint-disable-next-line prefer-const
         let { borrowLimit, withdrawLimit } = calculateWithdrawLimit(spotMarket, nowTs);
-        const freeCollateral = this.getFreeCollateral("Initial");
+        const freeCollateral = this.getFreeCollateral("Initial", adjustForAutoRepayLimit);
         const initialMarginRequirement = this.getMarginRequirement('Initial', undefined, false, true);
         const oracleData = this.driftClient.getOracleDataForSpotMarket(marketIndex);
         const precisionIncrease = TEN.pow(new BN(spotMarket.decimals - 6));
@@ -79,22 +90,22 @@ export class DriftUser {
         const freeCollatAfterWithdraw = userDepositAmount.gt(ZERO)
             ? freeCollateral.sub(weightedAssetValue)
             : freeCollateral;
-        const borrowLimitScale = adjustForAutoRepayLimit
-            ? new BN(100 - QUARTZ_HEALTH_BUFFER)
-            : new BN(100);
         const maxLiabilityAllowed = freeCollatAfterWithdraw
             .mul(MARGIN_PRECISION)
             .div(new BN(spotMarket.initialLiabilityWeight))
             .mul(PRICE_PRECISION)
             .div(oracleData.price)
-            .mul(precisionIncrease)
-            .mul(borrowLimitScale)
-            .div(new BN(100));
+            .mul(precisionIncrease);
         const maxBorrowValue = BN.min(maxWithdrawValue.add(maxLiabilityAllowed), borrowLimit.abs());
         return BN.max(maxBorrowValue, ZERO);
     }
-    getFreeCollateral(marginCategory = 'Initial') {
-        const totalCollateral = this.getTotalCollateralValue(marginCategory, true);
+    getFreeCollateral(marginCategory = 'Initial', adjustForAutoRepayLimit = false) {
+        const borrowLimitScale = adjustForAutoRepayLimit
+            ? new BN(100 - QUARTZ_HEALTH_BUFFER)
+            : new BN(100);
+        const totalCollateral = this.getTotalCollateralValue(marginCategory, true)
+            .mul(borrowLimitScale)
+            .div(new BN(100));
         const marginRequirement = marginCategory === 'Initial'
             ? this.getMarginRequirement('Initial', undefined, false, true)
             : this.getMaintenanceMarginRequirement();