hedge-web3 0.2.17 → 0.2.18

package/declarations/idl/vault.d.ts

@@ -1802,8 +1802,56 @@ export declare type Vault = {
                     "type": "u64";
                 },
                 {
-                    "name": "collateralDecimals";
-                    "type": "u8";
+                    "name": "overrideCurrentTime";
+                    "type": "i64";
+                }
+            ];
+        },
+        {
+            "name": "psmEditAccount";
+            "accounts": [
+                {
+                    "name": "payer";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "vaultSystemState";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "psmAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "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": "overrideCurrentTime";
@@ -3163,31 +3211,36 @@ export declare type Vault = {
         },
         {
             "code": 6028;
-            "name": "PsmError";
-            "msg": "PSM error.";
+            "name": "PsmMaxDebtReached";
+            "msg": "PSM - Max Debt reached";
         },
         {
             "code": 6029;
+            "name": "PsmMinSwapAmount";
+            "msg": "PSM - Need more to swap";
+        },
+        {
+            "code": 6030;
             "name": "UpdateVaultTypeBadMaxDebtExtended";
             "msg": "New Max debt extended value is less than the current debt!";
         },
         {
-            "code": 6030;
+            "code": 6031;
             "name": "UpdateVaultTypeNoEnabledOracles";
             "msg": "No Enabled Oracles!";
         },
         {
-            "code": 6031;
+            "code": 6032;
             "name": "UpdateVaultTypeDuplicateOraclePriorities";
             "msg": "Duplicate Oracle Priorities";
         },
         {
-            "code": 6032;
+            "code": 6033;
             "name": "UpdateVaultTypeInvalidOraclePriority";
             "msg": "Invalid Oracle Priority";
         },
         {
-            "code": 6033;
+            "code": 6034;
             "name": "OracleUpdateFailed";
             "msg": "OracleUpdateFailed";
         }

package/lib/idl/vault.js

@@ -1805,8 +1805,56 @@ exports.IDL = {
                     "type": "u64"
                 },
                 {
-                    "name": "collateralDecimals",
-                    "type": "u8"
+                    "name": "overrideCurrentTime",
+                    "type": "i64"
+                }
+            ]
+        },
+        {
+            "name": "psmEditAccount",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "vaultSystemState",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "psmAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "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": "overrideCurrentTime",
@@ -3166,31 +3214,36 @@ exports.IDL = {
         },
         {
             "code": 6028,
-            "name": "PsmError",
-            "msg": "PSM error."
+            "name": "PsmMaxDebtReached",
+            "msg": "PSM - Max Debt reached"
         },
         {
             "code": 6029,
+            "name": "PsmMinSwapAmount",
+            "msg": "PSM - Need more to swap"
+        },
+        {
+            "code": 6030,
             "name": "UpdateVaultTypeBadMaxDebtExtended",
             "msg": "New Max debt extended value is less than the current debt!"
         },
         {
-            "code": 6030,
+            "code": 6031,
             "name": "UpdateVaultTypeNoEnabledOracles",
             "msg": "No Enabled Oracles!"
         },
         {
-            "code": 6031,
+            "code": 6032,
             "name": "UpdateVaultTypeDuplicateOraclePriorities",
             "msg": "Duplicate Oracle Priorities"
         },
         {
-            "code": 6032,
+            "code": 6033,
             "name": "UpdateVaultTypeInvalidOraclePriority",
             "msg": "Invalid Oracle Priority"
         },
         {
-            "code": 6033,
+            "code": 6034,
             "name": "OracleUpdateFailed",
             "msg": "OracleUpdateFailed"
         }

package/package.json

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

package/src/idl/vault.ts

@@ -1802,8 +1802,56 @@ export type Vault = {
           "type": "u64"
         },
         {
-          "name": "collateralDecimals",
-          "type": "u8"
+          "name": "overrideCurrentTime",
+          "type": "i64"
+        }
+      ]
+    },
+    {
+      "name": "psmEditAccount",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "vaultSystemState",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "psmAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "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": "overrideCurrentTime",
@@ -3163,31 +3211,36 @@ export type Vault = {
     },
     {
       "code": 6028,
-      "name": "PsmError",
-      "msg": "PSM error."
+      "name": "PsmMaxDebtReached",
+      "msg": "PSM - Max Debt reached"
     },
     {
       "code": 6029,
+      "name": "PsmMinSwapAmount",
+      "msg": "PSM - Need more to swap"
+    },
+    {
+      "code": 6030,
       "name": "UpdateVaultTypeBadMaxDebtExtended",
       "msg": "New Max debt extended value is less than the current debt!"
     },
     {
-      "code": 6030,
+      "code": 6031,
       "name": "UpdateVaultTypeNoEnabledOracles",
       "msg": "No Enabled Oracles!"
     },
     {
-      "code": 6031,
+      "code": 6032,
       "name": "UpdateVaultTypeDuplicateOraclePriorities",
       "msg": "Duplicate Oracle Priorities"
     },
     {
-      "code": 6032,
+      "code": 6033,
       "name": "UpdateVaultTypeInvalidOraclePriority",
       "msg": "Invalid Oracle Priority"
     },
     {
-      "code": 6033,
+      "code": 6034,
       "name": "OracleUpdateFailed",
       "msg": "OracleUpdateFailed"
     }
@@ -4998,8 +5051,56 @@ export const IDL: Vault = {
           "type": "u64"
         },
         {
-          "name": "collateralDecimals",
-          "type": "u8"
+          "name": "overrideCurrentTime",
+          "type": "i64"
+        }
+      ]
+    },
+    {
+      "name": "psmEditAccount",
+      "accounts": [
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "vaultSystemState",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "psmAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "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": "overrideCurrentTime",
@@ -6359,31 +6460,36 @@ export const IDL: Vault = {
     },
     {
       "code": 6028,
-      "name": "PsmError",
-      "msg": "PSM error."
+      "name": "PsmMaxDebtReached",
+      "msg": "PSM - Max Debt reached"
     },
     {
       "code": 6029,
+      "name": "PsmMinSwapAmount",
+      "msg": "PSM - Need more to swap"
+    },
+    {
+      "code": 6030,
       "name": "UpdateVaultTypeBadMaxDebtExtended",
       "msg": "New Max debt extended value is less than the current debt!"
     },
     {
-      "code": 6030,
+      "code": 6031,
       "name": "UpdateVaultTypeNoEnabledOracles",
       "msg": "No Enabled Oracles!"
     },
     {
-      "code": 6031,
+      "code": 6032,
       "name": "UpdateVaultTypeDuplicateOraclePriorities",
       "msg": "Duplicate Oracle Priorities"
     },
     {
-      "code": 6032,
+      "code": 6033,
       "name": "UpdateVaultTypeInvalidOraclePriority",
       "msg": "Invalid Oracle Priority"
     },
     {
-      "code": 6033,
+      "code": 6034,
       "name": "OracleUpdateFailed",
       "msg": "OracleUpdateFailed"
     }

package/src/instructions/psmEditAccount.rs

@@ -0,0 +1,124 @@
+import { BN, Program, Provider } from '@project-serum/anchor'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import {
+  findAssociatedTokenAddress,
+  getHedgeMintPublicKey,
+  getPoolPublicKeyForMint,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+  HEDGE_PROGRAM_PUBLICKEY,
+} from '../Constants'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
+import { parseAnchorErrors } from '../utils/Errors'
+import { VaultAccount } from '../state/VaultAccount'
+
+export enum psmStatus {
+    PsmEnabled,
+    PsmDisabled,
+    MintOnly,
+    RedeemOnly
+  }
+
+export async function psmEditAccount(
+  program: Program<Vault>,
+  provider: Provider,
+  payer: Signer,
+  collateralMint: PublicKey,
+  mintFee: number,
+  redeemFee: number,
+  debtLimit: number,
+  minSwap: number,
+  overrideTime?: number
+): Promise<PublicKey> {
+  const ushMintPublickey = await getUshMintPublicKey()
+
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublickey,
+    payer.publicKey
+  )
+
+  const payerCollateralAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    payer.publicKey
+  )
+
+
+  const enc = new TextEncoder()
+  const [psmAccount] = await PublicKey.findProgramAddress(
+    [enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')],
+    HEDGE_PROGRAM_PUBLICKEY
+  )
+
+  const psmAccountAta = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    psmAccount,
+    true
+  )
+
+  const transaction = new Transaction().add(
+    await psmEditAccountInstruction(
+      program,
+      payer.publicKey,
+      psmAccount,
+      collateralMint,
+      new BN(mintFee),
+      new BN(redeemFee),
+      new BN(debtLimit),
+      new BN(minSwap),
+      overrideTime
+    )
+  )
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer])
+  return payer.publicKey
+}
+
+export async function psmEditAccountInstruction(
+  program: Program<Vault>,
+  payerPublicKey: PublicKey,
+  psmAccount: PublicKey,
+  collateralMint: PublicKey,
+  mintFee: BN,
+  redeemFee: BN,
+  debtLimit: BN,
+  minSwap: BN,
+  overrideTime?: number
+): Promise<TransactionInstruction> {
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const hedgeMintPublickey = await getHedgeMintPublicKey()
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
+
+
+  return await program.methods
+    .psmEditAccount(
+      mintFee,
+      redeemFee,
+      debtLimit,
+      minSwap,
+      new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
+    )
+    .accounts({
+      payer: payerPublicKey,
+      vaultSystemState: vaultSystemStatePublicKey,
+      psmAccount: psmAccount,
+      collateralMint: collateralMint,
+      systemProgram: SystemProgram.programId,
+    })
+    .instruction()
+}