@triadxyz/triad-protocol 0.5.0-beta → 0.5.2-beta.devnet

package/dist/utils/constants.d.ts

@@ -2,7 +2,7 @@ export declare const TRIAD_PROTOCOL_PROGRAM_ID = "TRDwq3BN4mP3m9KsuNUWSN6QDff93V
 export declare const ATA_PROGRAM_ID = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
 export declare const ADMIN = "";
 export declare const VERIFIER = "42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919";
-export declare const STAKE_SEASON = "Triad Share 1";
+export declare const STAKE_VAULT_NAME = "Triad Share 1";
 export declare const TTRIAD_DECIMALS = 6;
 export declare const TTRIAD_MINT = "t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV";
 export declare const TTRIAD_FEE = 2;

package/dist/utils/constants.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NOOP_PROGRAM_ID = exports.ORE_PROGRAM_ID = exports.TTRIAD_FEE = exports.TTRIAD_MINT = exports.TTRIAD_DECIMALS = exports.STAKE_SEASON = exports.VERIFIER = exports.ADMIN = exports.ATA_PROGRAM_ID = exports.TRIAD_PROTOCOL_PROGRAM_ID = void 0;
+exports.NOOP_PROGRAM_ID = exports.ORE_PROGRAM_ID = exports.TTRIAD_FEE = exports.TTRIAD_MINT = exports.TTRIAD_DECIMALS = exports.STAKE_VAULT_NAME = exports.VERIFIER = exports.ADMIN = exports.ATA_PROGRAM_ID = exports.TRIAD_PROTOCOL_PROGRAM_ID = void 0;
 exports.TRIAD_PROTOCOL_PROGRAM_ID = 'TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss';
 exports.ATA_PROGRAM_ID = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
 exports.ADMIN = '';
 exports.VERIFIER = '42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919';
-exports.STAKE_SEASON = 'Triad Share 1';
+exports.STAKE_VAULT_NAME = 'Triad Share 1';
 exports.TTRIAD_DECIMALS = 6;
 exports.TTRIAD_MINT = 't3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV';
 exports.TTRIAD_FEE = 2;

package/dist/vault.d.ts

@@ -45,35 +45,4 @@ export default class Vault {
         longPositionsOpened: BN;
         shortPositionsOpened: BN;
     }>;
-    /**
-     * Open Position
-     *  @param tickerPDA - Ticker PDA
-     *  @param amount - The amount to deposit
-     *  @param position - Long or Short
-     *  @param mint - Token mint for the vault (e.g. USDC)
-     */
-    openPosition({ tickerPDA, amount, position, mint }: {
-        tickerPDA: PublicKey;
-        amount: string;
-        position: 'Long' | 'Short';
-        mint: PublicKey;
-    }, options?: {
-        priorityFee: number;
-    }): Promise<string>;
-    /**
-     * Withdraw from a vault
-     *  @param tickerPDA - Ticker PDA
-     *  @param amount - The amount to deposit
-     *  @param position - Long or Short
-     *  @param mint - Token mint for the vault (e.g. USDC)
-     *  @param positionPubkey - The position public key
-     *
-     */
-    closePosition({ tickerPDA, mint, positionIndex }: {
-        tickerPDA: PublicKey;
-        mint: PublicKey;
-        positionIndex: number;
-    }, options?: {
-        priorityFee: number;
-    }): Promise<string>;
 }

package/dist/vault.js

@@ -9,8 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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");
 class Vault {
@@ -42,146 +40,5 @@ class Vault {
             }
         });
     }
-    /**
-     * Open Position
-     *  @param tickerPDA - Ticker PDA
-     *  @param amount - The amount to deposit
-     *  @param position - Long or Short
-     *  @param mint - Token mint for the vault (e.g. USDC)
-     */
-    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);
-                const VaultPDA = (0, helpers_1.getVaultAddressSync)(this.program.programId, tickerPDA);
-                const userTokenAccount = yield (0, spl_token_1.getAssociatedTokenAddress)(mint, this.provider.wallet.publicKey);
-                let hasUserPosition = false;
-                try {
-                    yield this.program.account.userPosition.fetch(UserPositionPDA);
-                    hasUserPosition = true;
-                }
-                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()
-                        .accounts({
-                        signer: this.provider.wallet.publicKey,
-                        ticker: tickerPDA
-                    })
-                        .instruction());
-                }
-                instructions.push(yield this.program.methods
-                    .openPosition({
-                    amount: new anchor_1.BN(amount),
-                    isLong: position === 'Long'
-                })
-                    .accounts({
-                    userPosition: UserPositionPDA,
-                    ticker: tickerPDA,
-                    vault: VaultPDA,
-                    userTokenAccount
-                })
-                    .instruction());
-                const { blockhash } = yield this.provider.connection.getLatestBlockhash();
-                const message = new web3_js_1.TransactionMessage({
-                    payerKey: this.provider.wallet.publicKey,
-                    recentBlockhash: blockhash,
-                    instructions
-                }).compileToV0Message();
-                const hash = yield this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(message));
-                const { blockhash: blockhash2, lastValidBlockHeight } = yield this.provider.connection.getLatestBlockhash();
-                const confirmTx = yield this.provider.connection.confirmTransaction({
-                    signature: hash,
-                    blockhash: blockhash2,
-                    lastValidBlockHeight
-                }, 'finalized');
-                if (confirmTx.value.err) {
-                    throw new Error('Failed to open position');
-                }
-                return hash;
-            }
-            catch (error) {
-                console.error(error);
-            }
-        });
-    }
-    /**
-     * Withdraw from a vault
-     *  @param tickerPDA - Ticker PDA
-     *  @param amount - The amount to deposit
-     *  @param position - Long or Short
-     *  @param mint - Token mint for the vault (e.g. USDC)
-     *  @param positionPubkey - The position public key
-     *
-     */
-    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);
-                const VaultPDA = (0, helpers_1.getVaultAddressSync)(this.program.programId, tickerPDA);
-                const VaultTokenAccountPDA = (0, helpers_1.getTokenVaultAddressSync)(this.program.programId, VaultPDA);
-                const userTokenAccount = yield (0, spl_token_1.getAssociatedTokenAddress)(mint, this.provider.wallet.publicKey);
-                let hasUser = false;
-                try {
-                    yield this.program.account.userPosition.fetch(UserPositionPDA);
-                    hasUser = true;
-                }
-                catch (e) {
-                    console.log(e);
-                }
-                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()
-                        .accounts({
-                        signer: this.provider.wallet.publicKey,
-                        ticker: tickerPDA
-                    })
-                        .instruction());
-                }
-                instructions.push(yield this.program.methods
-                    .closePosition({ positionIndex })
-                    .accounts({
-                    userPosition: UserPositionPDA,
-                    ticker: tickerPDA,
-                    vault: VaultPDA,
-                    vaultTokenAccount: VaultTokenAccountPDA,
-                    userTokenAccount
-                })
-                    .instruction());
-                const { blockhash } = yield this.provider.connection.getLatestBlockhash();
-                const message = new web3_js_1.TransactionMessage({
-                    payerKey: this.provider.wallet.publicKey,
-                    recentBlockhash: blockhash,
-                    instructions
-                }).compileToV0Message();
-                const hash = yield this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(message));
-                const { blockhash: blockhash2, lastValidBlockHeight } = yield this.provider.connection.getLatestBlockhash();
-                const confirmTx = yield this.provider.connection.confirmTransaction({
-                    signature: hash,
-                    blockhash: blockhash2,
-                    lastValidBlockHeight
-                }, 'finalized');
-                if (confirmTx.value.err) {
-                    throw new Error('Failed to open position');
-                }
-                return hash;
-            }
-            catch (error) {
-                console.error(error);
-            }
-        });
-    }
 }
 exports.default = Vault;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "0.5.0-beta",
+  "version": "0.5.2-beta.devnet",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",