hedge-web3 0.2.14 → 0.2.17

package/lib/idl/vault.js

@@ -1759,7 +1759,7 @@ exports.IDL = {
             "args": []
         },
         {
-            "name": "adminResetVaultValues",
+            "name": "psmCreate",
             "accounts": [
                 {
                     "name": "payer",
@@ -1772,30 +1772,106 @@ exports.IDL = {
                     "isSigner": false
                 },
                 {
-                    "name": "vaultAccount",
+                    "name": "psmAccount",
                     "isMut": true,
                     "isSigner": false
                 },
                 {
-                    "name": "vaultAssociatedTokenAccount",
+                    "name": "collateralMint",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "mintFee",
+                    "type": "u64"
+                },
+                {
+                    "name": "redeemFee",
+                    "type": "u64"
+                },
+                {
+                    "name": "debtLimit",
+                    "type": "u64"
+                },
+                {
+                    "name": "minSwap",
+                    "type": "u64"
+                },
+                {
+                    "name": "collateralDecimals",
+                    "type": "u8"
+                },
+                {
+                    "name": "overrideCurrentTime",
+                    "type": "i64"
+                }
+            ]
+        },
+        {
+            "name": "psmMintUsh",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "vaultSystemState",
                     "isMut": true,
                     "isSigner": false
                 },
                 {
-                    "name": "vaultTypeAccount",
+                    "name": "feePool",
                     "isMut": true,
                     "isSigner": false
                 },
                 {
-                    "name": "vaultTypeAssociatedTokenAccount",
+                    "name": "feePoolAssociatedUshTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "psmAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "psmAccountAta",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "ownerUshAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "ownerCollateralAccount",
                     "isMut": true,
                     "isSigner": false
                 },
                 {
                     "name": "collateralMint",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "ushMint",
                     "isMut": true,
                     "isSigner": false
                 },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
                 {
                     "name": "tokenProgram",
                     "isMut": false,
@@ -1804,12 +1880,87 @@ exports.IDL = {
             ],
             "args": [
                 {
-                    "name": "setCollateral",
+                    "name": "collateralAmount",
                     "type": "u64"
                 },
                 {
-                    "name": "setDebt",
+                    "name": "overrideCurrentTime",
+                    "type": "i64"
+                }
+            ]
+        },
+        {
+            "name": "psmRedeemUsh",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "vaultSystemState",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "feePool",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "feePoolAssociatedUshTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "psmAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "psmAccountAta",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "ownerUshAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "ownerCollateralAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "collateralMint",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "ushMint",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "ushAmount",
                     "type": "u64"
+                },
+                {
+                    "name": "overrideCurrentTime",
+                    "type": "i64"
                 }
             ]
         }
@@ -2043,6 +2194,80 @@ exports.IDL = {
                 ]
             }
         },
+        {
+            "name": "psmAccount",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "collateralMint",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "minCollateralRatio",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "mintFee",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "redeemFee",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "totalFeesAccumulatedUsh",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "totalFeesAccumulatedCollateral",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "recentPrice",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "debtLimit",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "deposited",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "amountMinted",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "minSwap",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "timeCreated",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "timeLastInteraction",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "priceLastUpdatedTimestamp",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "psmStatus",
+                        "type": {
+                            "defined": "PsmStatus"
+                        }
+                    },
+                    {
+                        "name": "collateralDecimals",
+                        "type": "u8"
+                    }
+                ]
+            }
+        },
         {
             "name": "stakingPoolPosition",
             "type": {
@@ -2620,6 +2845,26 @@ exports.IDL = {
                 ]
             }
         },
+        {
+            "name": "PsmStatus",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "PsmEnabled"
+                    },
+                    {
+                        "name": "PsmDisabled"
+                    },
+                    {
+                        "name": "MintOnly"
+                    },
+                    {
+                        "name": "RedeemOnly"
+                    }
+                ]
+            }
+        },
         {
             "name": "SystemStatus",
             "type": {
@@ -2916,26 +3161,36 @@ exports.IDL = {
         },
         {
             "code": 6027,
+            "name": "PsmDisabled",
+            "msg": "PSM is currently disabled."
+        },
+        {
+            "code": 6028,
+            "name": "PsmError",
+            "msg": "PSM error."
+        },
+        {
+            "code": 6029,
             "name": "UpdateVaultTypeBadMaxDebtExtended",
             "msg": "New Max debt extended value is less than the current debt!"
         },
         {
-            "code": 6028,
+            "code": 6030,
             "name": "UpdateVaultTypeNoEnabledOracles",
             "msg": "No Enabled Oracles!"
         },
         {
-            "code": 6029,
+            "code": 6031,
             "name": "UpdateVaultTypeDuplicateOraclePriorities",
             "msg": "Duplicate Oracle Priorities"
         },
         {
-            "code": 6030,
+            "code": 6032,
             "name": "UpdateVaultTypeInvalidOraclePriority",
             "msg": "Invalid Oracle Priority"
         },
         {
-            "code": 6031,
+            "code": 6033,
             "name": "OracleUpdateFailed",
             "msg": "OracleUpdateFailed"
         }

package/lib/index.js

@@ -19,6 +19,8 @@ __exportStar(require("./instructions/closeLiquidationPoolPosition"), exports);
 __exportStar(require("./instructions/claimLiquidationPoolPosition"), exports);
 __exportStar(require("./instructions/closeClaimedLiquidationPoolPosition"), exports);
 __exportStar(require("./instructions/createVault"), exports);
+__exportStar(require("./instructions/psmMintUsh"), exports);
+__exportStar(require("./instructions/psmRedeemUsh"), exports);
 __exportStar(require("./instructions/depositVault"), exports);
 __exportStar(require("./instructions/withdrawVault"), exports);
 __exportStar(require("./instructions/loanVault"), exports);

package/lib/instructions/psmMintUsh.js

@@ -0,0 +1,65 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.psmMintUshInstruction = exports.psmMintUsh = void 0;
+const anchor_1 = require("@project-serum/anchor");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const Constants_1 = require("../Constants");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+function psmMintUsh(program, provider, payer, collateralMint, collateralAmount, overrideTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
+        const payerCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
+        const enc = new TextEncoder();
+        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')], Constants_1.HEDGE_PROGRAM_PUBLICKEY);
+        const psmAccountAta = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, psmAccount, true);
+        const transaction = new web3_js_1.Transaction().add(yield psmMintUshInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(collateralAmount), overrideTime));
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
+        return payer.publicKey;
+    });
+}
+exports.psmMintUsh = psmMintUsh;
+function psmMintUshInstruction(program, payerPublicKey, psmAccount, collateralMint, collateralAmount, overrideTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
+        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
+        const psmAccountAta = yield (0, Constants_1.findAssociatedTokenAddress)(psmAccount, collateralMint);
+        const ownerCollateralAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, collateralMint);
+        const ownerUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, ushMintPublickey);
+        return yield program.methods
+            .psmMintUsh(collateralAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            psmAccount: psmAccount,
+            psmAccountAta: psmAccountAta,
+            ownerUshAccount: ownerUshAccount,
+            ownerCollateralAccount: ownerCollateralAccount,
+            collateralMint: collateralMint,
+            ushMint: ushMintPublickey,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        })
+            .instruction();
+    });
+}
+exports.psmMintUshInstruction = psmMintUshInstruction;

package/lib/instructions/psmRedeemUsh.js

@@ -0,0 +1,65 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.psmRedeemUshInstruction = exports.psmRedeemUsh = void 0;
+const anchor_1 = require("@project-serum/anchor");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const Constants_1 = require("../Constants");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+function psmRedeemUsh(program, provider, payer, collateralMint, ushAmount, overrideTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
+        const payerCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
+        const enc = new TextEncoder();
+        const [psmAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')], Constants_1.HEDGE_PROGRAM_PUBLICKEY);
+        const psmAccountAta = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, psmAccount, true);
+        const transaction = new web3_js_1.Transaction().add(yield psmRedeemUshInstruction(program, payer.publicKey, psmAccount, collateralMint, new anchor_1.BN(ushAmount), overrideTime));
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
+        return payer.publicKey;
+    });
+}
+exports.psmRedeemUsh = psmRedeemUsh;
+function psmRedeemUshInstruction(program, payerPublicKey, psmAccount, collateralMint, ushAmount, overrideTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
+        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
+        const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
+        const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
+        const psmAccountAta = yield (0, Constants_1.findAssociatedTokenAddress)(psmAccount, collateralMint);
+        const ownerCollateralAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, collateralMint);
+        const ownerUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, ushMintPublickey);
+        return yield program.methods
+            .psmRedeemUsh(ushAmount, new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            psmAccount: psmAccount,
+            psmAccountAta: psmAccountAta,
+            ownerUshAccount: ownerUshAccount,
+            ownerCollateralAccount: ownerCollateralAccount,
+            collateralMint: collateralMint,
+            ushMint: ushMintPublickey,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        })
+            .instruction();
+    });
+}
+exports.psmRedeemUshInstruction = psmRedeemUshInstruction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.2.14",
+  "version": "0.2.17",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",