@reflectmoney/stable.ts 2.8.0 → 2.8.2

package/dist/classes/ReflectKeeper.js

@@ -35,8 +35,8 @@ class ReflectKeeper {
     constructor({ admin, connection, devnet = false, }) {
         this.admin = admin;
         this.connection = connection;
-        this.main = PdaClient_1.PdaClient.deriveMain();
         this.devnet = devnet;
+        this.main = PdaClient_1.PdaClient.deriveMain(devnet);
     }
     /**
      * Creates the main program account. This is the initial step of protocol setup.
@@ -50,7 +50,7 @@ class ReflectKeeper {
             main,
             admin,
             systemProgram: web3_js_1.SystemProgram.programId,
-            creds: PdaClient_1.PdaClient.derivePermissions(admin),
+            creds: PdaClient_1.PdaClient.derivePermissions(admin, devnet),
         }, devnet ? devnet_1.DEVNET_PROGRAM_ID : reflect_main_1.PROGRAM_ID);
         return ix;
     }
@@ -73,7 +73,7 @@ class ReflectKeeper {
             admin: this.admin,
             main: this.main,
             systemProgram: web3_js_1.SystemProgram.programId,
-            adminPermissions: PdaClient_1.PdaClient.derivePermissions(this.admin),
+            adminPermissions: PdaClient_1.PdaClient.derivePermissions(this.admin, this.devnet),
         }, {
             freeze,
             action,
@@ -92,7 +92,7 @@ class ReflectKeeper {
             admin: this.admin,
             main: this.main,
             systemProgram: web3_js_1.SystemProgram.programId,
-            adminPermissions: PdaClient_1.PdaClient.derivePermissions(this.admin),
+            adminPermissions: PdaClient_1.PdaClient.derivePermissions(this.admin, this.devnet),
         }, {
             freeze,
             programIndex,
@@ -109,7 +109,7 @@ class ReflectKeeper {
     createAdminAccount(signer, newAdmin, roles = 18) {
         const ix = (0, reflect_main_1.createCreateAdminAccountInstruction)({
             caller: signer,
-            newCreds: PdaClient_1.PdaClient.derivePermissions(newAdmin),
+            newCreds: PdaClient_1.PdaClient.derivePermissions(newAdmin, this.devnet),
             systemProgram: web3_js_1.SystemProgram.programId,
         }, {
             newAdmin,
@@ -129,12 +129,12 @@ class ReflectKeeper {
     updateRoleHolderProtocol(signer, adminToUpdate, affectedRole, update) {
         const ix = (0, reflect_main_1.createUpdateRoleHolderProtocolInstruction)({
             admin: signer,
-            adminPermissions: PdaClient_1.PdaClient.derivePermissions(signer),
-            main: PdaClient_1.PdaClient.deriveMain(),
+            adminPermissions: PdaClient_1.PdaClient.derivePermissions(signer, this.devnet),
+            main: PdaClient_1.PdaClient.deriveMain(this.devnet),
             systemProgram: web3_js_1.SystemProgram.programId,
-            updateAdminPermissions: PdaClient_1.PdaClient.derivePermissions(adminToUpdate),
+            updateAdminPermissions: PdaClient_1.PdaClient.derivePermissions(adminToUpdate, this.devnet),
             // Dummy strategy account.
-            strategy: PdaClient_1.PdaClient.deriveController(0),
+            strategy: PdaClient_1.PdaClient.deriveController(0, this.devnet),
         }, {
             update,
             accessLevel: affectedRole,
@@ -154,11 +154,11 @@ class ReflectKeeper {
     updateRoleHolderStrategy(signer, strategyId, adminToUpdate, affectedRole, update) {
         const ix = (0, reflect_main_1.createUpdateRoleHolderStrategyInstruction)({
             admin: signer,
-            adminPermissions: PdaClient_1.PdaClient.derivePermissions(signer),
-            main: PdaClient_1.PdaClient.deriveMain(),
+            adminPermissions: PdaClient_1.PdaClient.derivePermissions(signer, this.devnet),
+            main: PdaClient_1.PdaClient.deriveMain(this.devnet),
             systemProgram: web3_js_1.SystemProgram.programId,
-            updateAdminPermissions: PdaClient_1.PdaClient.derivePermissions(adminToUpdate),
-            strategy: PdaClient_1.PdaClient.deriveController(strategyId),
+            updateAdminPermissions: PdaClient_1.PdaClient.derivePermissions(adminToUpdate, this.devnet),
+            strategy: PdaClient_1.PdaClient.deriveController(strategyId, this.devnet),
         }, {
             update,
             role: affectedRole,
@@ -178,10 +178,10 @@ class ReflectKeeper {
     updateActionRoleStrategy(signer, strategyId, action, affectedRole, update) {
         const ix = (0, reflect_main_1.createUpdateActionRoleStrategyInstruction)({
             admin: signer,
-            adminPermissions: PdaClient_1.PdaClient.derivePermissions(signer),
-            main: PdaClient_1.PdaClient.deriveMain(),
+            adminPermissions: PdaClient_1.PdaClient.derivePermissions(signer, this.devnet),
+            main: PdaClient_1.PdaClient.deriveMain(this.devnet),
             systemProgram: web3_js_1.SystemProgram.programId,
-            strategy: PdaClient_1.PdaClient.deriveController(strategyId),
+            strategy: PdaClient_1.PdaClient.deriveController(strategyId, this.devnet),
         }, {
             update,
             role: affectedRole,
@@ -201,8 +201,8 @@ class ReflectKeeper {
     updateActionRoleProtocol(signer, action, affectedRole, update) {
         const ix = (0, reflect_main_1.createUpdateActionRoleProtocolInstruction)({
             admin: signer,
-            adminPermissions: PdaClient_1.PdaClient.derivePermissions(signer),
-            main: PdaClient_1.PdaClient.deriveMain(),
+            adminPermissions: PdaClient_1.PdaClient.derivePermissions(signer, this.devnet),
+            main: PdaClient_1.PdaClient.deriveMain(this.devnet),
             systemProgram: web3_js_1.SystemProgram.programId,
         }, {
             action,

package/dist/stablecoins/UsdcPlusStablecoin.d.ts

@@ -14,7 +14,7 @@ export declare class UsdcPlusStablecoin extends Stablecoin<DriftUsdcController>
      * @param connection - Solana connection instance for RPC communication
      * @param stablecoinMintOverride - Optional override for the stablecoin mint address
      */
-    constructor(connection: Connection, stablecoinMintOverride?: PublicKey, devnet?: boolean);
+    constructor(connection: Connection, stablecoinMintOverride?: PublicKey, skipInitializeDriftClient?: boolean, devnet?: boolean);
     /**
      * Loads the USDC+ controller data from the blockchain.
      * Updates the stablecoin mint and strategy information.
@@ -32,6 +32,7 @@ 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[]>;
+    initializeDriftClient(): void;
     /**
      * Initializes the stablecoin drift account for the USDC+ controller.
      *

package/dist/stablecoins/UsdcPlusStablecoin.js

@@ -37,28 +37,23 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
      * @param connection - Solana connection instance for RPC communication
      * @param stablecoinMintOverride - Optional override for the stablecoin mint address
      */
-    constructor(connection, stablecoinMintOverride, devnet) {
+    constructor(connection, stablecoinMintOverride, skipInitializeDriftClient = false, devnet) {
         super(0, "USD Coin Plus", connection, devnet ? constants_3.USDC_PLUS_LOOKUP_TABLE_DEVNET : constants_2.USDC_PLUS_LOOKUP_TABLE, devnet);
-        this.collaterals = [{
+        this.collaterals = [
+            {
                 mint: devnet ? constants_3.USDC_MINT_DEVNET : constants_1.USDC_MINT,
                 oracle: "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
-                decimals: 6
-            }];
-        this.driftClient = new sdk_2.DriftClient({
-            connection,
-            env: 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(connection, "confirmed", 1000),
-            }
-        });
+                decimals: 6,
+            },
+        ];
         this.isPermissioned = true;
         this.devnet = devnet;
         // Otherwise has to be loaded first.
         if (stablecoinMintOverride)
             this.stablecoinMint = stablecoinMintOverride;
+        if (!skipInitializeDriftClient) {
+            this.initializeDriftClient();
+        }
     }
     /**
      * Loads the USDC+ controller data from the blockchain.
@@ -99,11 +94,13 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
                 main: classes_1.PdaClient.deriveMain(this.devnet),
                 driftUsdcController: this.controllerKey,
                 systemProgram: web3_js_1.SystemProgram.programId,
-                anchorRemainingAccounts: [{
+                anchorRemainingAccounts: [
+                    {
                         isSigner: false,
                         isWritable: false,
-                        pubkey: this.devnet ? constants_3.USDC_MINT_DEVNET : constants_1.USDC_MINT
-                    }]
+                        pubkey: this.devnet ? constants_3.USDC_MINT_DEVNET : constants_1.USDC_MINT,
+                    },
+                ],
             }, {
                 mint,
                 cap,
@@ -113,6 +110,18 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
             return [ix];
         });
     }
+    initializeDriftClient() {
+        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),
+            },
+        });
+    }
     /**
      * Initializes the stablecoin drift account for the USDC+ controller.
      *
@@ -121,13 +130,10 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
      */
     initializeStablecoinDriftAccount(signer) {
         return __awaiter(this, void 0, void 0, function* () {
-            const anchorRemainingAccounts = [
-                constants_1.REFERRAL_USER,
-                constants_1.REFERRAL_USER_STATS
-            ].map(account => ({
+            const anchorRemainingAccounts = [constants_1.REFERRAL_USER, constants_1.REFERRAL_USER_STATS].map((account) => ({
                 isSigner: false,
                 isWritable: true,
-                pubkey: account
+                pubkey: account,
             }));
             const ix = (0, reflect_main_1.createInitDriftAccountsS1Instruction)({
                 admin: signer,
@@ -140,7 +146,7 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
                 userAccount: (0, sdk_1.getUserAccountPublicKeySync)(constants_1.DRIFT_PROGRAM_ID, this.controllerKey),
                 userStats: (0, sdk_1.getUserStatsAccountPublicKey)(constants_1.DRIFT_PROGRAM_ID, this.controllerKey),
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                anchorRemainingAccounts
+                anchorRemainingAccounts,
             }, this.programId);
             return ix;
         });
@@ -181,10 +187,12 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
                 userReceiptAta,
                 userStats,
                 userUsdcAta,
-                adminPermissions: permissions ? classes_1.PdaClient.derivePermissions(signer, this.devnet) : null,
+                adminPermissions: permissions
+                    ? classes_1.PdaClient.derivePermissions(signer, this.devnet)
+                    : null,
                 anchorRemainingAccounts,
                 systemProgram: web3_js_1.SystemProgram.programId,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             };
             return accounts;
         });
@@ -203,17 +211,16 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
                 {
                     pubkey: oracle,
                     isSigner: false,
-                    isWritable: true
+                    isWritable: true,
                 },
                 {
                     pubkey: spotMarket,
                     isSigner: false,
-                    isWritable: true
+                    isWritable: true,
                 },
             ];
         });
     }
-    ;
     /**
      * Creates a mint instruction for the USDC+ stablecoin.
      *
@@ -227,7 +234,7 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
             const accounts = yield this.constructAccounts(signer, true);
             const ix = (0, reflect_main_1.createMintDriftS1Instruction)(accounts, {
                 minUsdcAmount: minimumReceived,
-                usdcAmount: amount
+                usdcAmount: amount,
             }, this.programId);
             return [ix];
         });
@@ -244,7 +251,7 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
             const ix = (0, reflect_main_1.createRedeemDriftS1Instruction)(accounts, {
                 canChill: false,
                 minLstRedeem: minimumReceived,
-                rusdBurnAmount: amount
+                rusdBurnAmount: amount,
             }, this.programId);
             return [ix];
         });
@@ -260,7 +267,7 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
             const ix = new web3_js_1.TransactionInstruction({
                 programId: web3_js_1.Keypair.generate().publicKey,
                 data: Buffer.from(""),
-                keys: []
+                keys: [],
             });
             return [ix];
         });
@@ -272,16 +279,12 @@ 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 { scaledBalance, balanceType } = this.driftClient.getSpotPosition(0);
+            const spotMarketAccount = this.driftClient.getSpotMarketAccount(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;
-            const { data: [{ price: { expo, price } }] } = yield this.getCollateralPrice(usdcMint);
+            const { data: [{ price: { expo, price }, },], } = yield this.getCollateralPrice(usdcMint);
             const exchangeRate = usdcAmount
                 .mul(new bn_js_1.default(price))
                 .mul(new bn_js_1.default(constants_1.EXCHANGE_RATE_PRECISION)) // gives us exhcnage rate precision
@@ -301,12 +304,8 @@ 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 { scaledBalance, balanceType } = this.driftClient.getSpotPosition(0);
+            const spotMarketAccount = this.driftClient.getSpotMarketAccount(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
@@ -431,7 +430,7 @@ class UsdcPlusStablecoin extends Stablecoin_1.Stablecoin {
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 state: yield (0, sdk_1.getDriftStateAccountPublicKey)(constants_1.DRIFT_PROGRAM_ID),
                 depositorTokenAccount,
-                drift: constants_1.DRIFT_PROGRAM_ID
+                drift: constants_1.DRIFT_PROGRAM_ID,
             }, {
                 amount,
                 controllerBump: bump,

package/package.json

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