@triadxyz/triad-protocol 0.1.2-alpha.6 → 0.1.2-alpha.8

package/dist/vault.d.ts

@@ -52,12 +52,13 @@ export default class Vault {
      *  @param position - Long or Short
      *  @param mint - Token mint for the vault (e.g. USDC)
      */
-    openPosition({ tickerPDA, amount, position, mint, RPCURL }: {
+    openPosition({ tickerPDA, amount, position, mint }: {
         tickerPDA: PublicKey;
         amount: string;
         position: 'Long' | 'Short';
         mint: PublicKey;
-        RPCURL: string;
+    }, options?: {
+        priorityFee: number;
     }): Promise<string>;
     /**
      * Withdraw from a vault
@@ -72,5 +73,7 @@ export default class Vault {
         tickerPDA: PublicKey;
         mint: PublicKey;
         positionIndex: number;
+    }, options?: {
+        priorityFee: number;
     }): Promise<string>;
 }

package/dist/vault.js

@@ -13,7 +13,6 @@ const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const helpers_1 = require("./utils/helpers");
 const spl_token_1 = require("@solana/spl-token");
-const priorityFee_1 = require("./utils/priorityFee");
 class Vault {
     constructor(program, provider) {
         this.provider = provider;
@@ -50,7 +49,7 @@ class Vault {
      *  @param position - Long or Short
      *  @param mint - Token mint for the vault (e.g. USDC)
      */
-    openPosition({ tickerPDA, amount, position, mint, RPCURL }) {
+    openPosition({ tickerPDA, amount, position, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const UserPositionPDA = (0, helpers_1.getUserPositionAddressSync)(this.program.programId, this.provider.wallet.publicKey, tickerPDA);
@@ -64,6 +63,11 @@ class Vault {
                 }
                 catch (_a) { }
                 const instructions = [];
+                if (options === null || options === void 0 ? void 0 : options.priorityFee) {
+                    instructions.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                        microLamports: options.priorityFee
+                    }));
+                }
                 if (!hasUserPosition) {
                     instructions.push(yield this.program.methods
                         .createUserPosition()
@@ -93,11 +97,6 @@ class Vault {
                     recentBlockhash: blockhash,
                     instructions
                 }).compileToV0Message();
-                let feeEstimate = { priorityFeeEstimate: 65000 };
-                feeEstimate = yield (0, priorityFee_1.getPriorityFeeEstimate)('HIGH', message, RPCURL);
-                instructions.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                    microLamports: feeEstimate.priorityFeeEstimate
-                }));
                 return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(message));
             }
             catch (error) {
@@ -114,7 +113,7 @@ class Vault {
      *  @param positionPubkey - The position public key
      *
      */
-    closePosition({ tickerPDA, mint, positionIndex }) {
+    closePosition({ tickerPDA, mint, positionIndex }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const UserPositionPDA = (0, helpers_1.getUserPositionAddressSync)(this.program.programId, this.provider.wallet.publicKey, tickerPDA);
@@ -129,11 +128,12 @@ class Vault {
                 catch (e) {
                     console.log(e);
                 }
-                const instructions = [
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: 65000
-                    })
-                ];
+                const instructions = [];
+                if (options === null || options === void 0 ? void 0 : options.priorityFee) {
+                    instructions.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                        microLamports: options.priorityFee
+                    }));
+                }
                 if (!hasUser) {
                     instructions.push(yield this.program.methods
                         .createUserPosition()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "0.1.2-alpha.6",
+  "version": "0.1.2-alpha.8",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",