@reflectmoney/stable.ts 2.8.3 → 2.8.4

package/dist/stablecoins/UsdcPlusStablecoin.d.ts

@@ -32,8 +32,6 @@ export declare class UsdcPlusStablecoin extends Stablecoin<DriftUsdcController>
      * @returns Promise resolving to an array of TransactionInstruction objects
      */
     initialize(signer: PublicKey, mint: PublicKey, cap: BN, recipientAddresses: PublicKey[], recipientCuts: number[]): Promise<TransactionInstruction[]>;
-    initializePollingDriftClient(): void;
-    initializeWebsocketDriftClient(): void;
     /**
      * Initializes the stablecoin drift account for the USDC+ controller.
      *

package/dist/stablecoins/UsdcPlusStablecoin.js

@@ -51,11 +51,12 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
         // Otherwise has to be loaded first.
         if (stablecoinMintOverride)
             this.stablecoinMint = stablecoinMintOverride;
-        // Unless explicitly told to skip, default to polling Drift client.
-        // This may be skipped, and custom drift client initialization may be handled with `initializePollingDriftClient` or `initializeWebsocketDriftClient`.
-        if (!skipInitializeDriftClient) {
-            this.initializePollingDriftClient();
-        }
+        this.driftClient = new sdk_2.DriftClient({
+            connection: this.connection,
+            env: this.devnet ? "devnet" : "mainnet-beta",
+            wallet: new nodewallet_1.default(web3_js_1.Keypair.generate()),
+            authority: this.controllerKey
+        });
     }
     /**
      * Loads the USDC+ controller data from the blockchain.
@@ -69,9 +70,6 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
             this.strategy = baseStrategy;
             this.controller = controller;
             yield this.loadMint();
-            const subscribed = yield this.driftClient.subscribe();
-            if (!subscribed)
-                throw new Error("Failed to subscribe to Drift Client");
             const addedController = yield this.driftClient.addUser(0, this.controllerKey);
             if (!addedController)
                 throw new Error("Failed to add controller account to Drift Client");
@@ -112,29 +110,6 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
             return [ix];
         });
     }
-    initializePollingDriftClient() {
-        this.driftClient = new sdk_2.DriftClient({
-            connection: this.connection,
-            env: this.devnet ? "devnet" : "mainnet-beta",
-            wallet: new nodewallet_1.default(web3_js_1.Keypair.generate()),
-            authority: this.controllerKey,
-            accountSubscription: {
-                type: "polling",
-                accountLoader: new sdk_1.BulkAccountLoader(this.connection, "confirmed", 1000),
-            },
-        });
-    }
-    initializeWebsocketDriftClient() {
-        this.driftClient = new sdk_2.DriftClient({
-            connection: this.connection,
-            env: this.devnet ? "devnet" : "mainnet-beta",
-            wallet: new nodewallet_1.default(web3_js_1.Keypair.generate()),
-            authority: this.controllerKey,
-            accountSubscription: {
-                type: "websocket",
-            },
-        });
-    }
     /**
      * Initializes the stablecoin drift account for the USDC+ controller.
      *
@@ -292,8 +267,10 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
      */
     getBaseUsdExchangeRate() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { scaledBalance, balanceType } = this.driftClient.getSpotPosition(0);
-            const spotMarketAccount = this.driftClient.getSpotMarketAccount(0);
+            const [userAccount] = yield (0, sdk_1.fetchUserAccounts)(this.connection, this.driftClient.program, this.controllerKey);
+            const spotPosition = userAccount.spotPositions[0];
+            const { scaledBalance, balanceType } = spotPosition;
+            const spotMarketAccount = yield this.driftClient.forceGetSpotMarketAccount(0);
             const usdcAmount = (0, sdk_2.getTokenAmount)(scaledBalance, spotMarketAccount, balanceType);
             const { supply, decimals } = yield (0, spl_token_1.getMint)(this.connection, this.stablecoinMint, "confirmed");
             const [{ mint: usdcMint }] = this.collaterals;
@@ -317,8 +294,10 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
      */
     getBaseToCollateralExchangeRate() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { scaledBalance, balanceType } = this.driftClient.getSpotPosition(0);
-            const spotMarketAccount = this.driftClient.getSpotMarketAccount(0);
+            const [userAccount] = yield (0, sdk_1.fetchUserAccounts)(this.connection, this.driftClient.program, this.controllerKey);
+            const spotPosition = userAccount.spotPositions[0];
+            const { scaledBalance, balanceType } = spotPosition;
+            const spotMarketAccount = yield this.driftClient.forceGetSpotMarketAccount(0);
             const usdcAmount = (0, sdk_2.getTokenAmount)(scaledBalance, spotMarketAccount, balanceType);
             const { supply, decimals } = yield (0, spl_token_1.getMint)(this.connection, this.stablecoinMint, "confirmed");
             const exchangeRate = usdcAmount
@@ -454,7 +433,7 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
     }
     cleanup() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.driftClient.unsubscribe();
+            return;
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reflectmoney/stable.ts",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "type": "commonjs",
   "author": "stablecoinjesus @ Palindrome Engineering",
   "repository": {