@triadxyz/triad-protocol 1.1.1-beta → 1.1.2-beta

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
@@ -22,6 +23,16 @@ export default class TriadProtocolClient {
      *
      */
     getUsers(): Promise<import("./types").User[]>;
+    getTickers(): Promise<import("@coral-xyz/anchor").ProgramAccount<{
+        initTs: import("bn.js");
+        updatedTs: import("bn.js");
+        bump: number;
+        authority: PublicKey;
+        name: string;
+        protocolProgramId: PublicKey;
+        price: import("bn.js");
+        vault: PublicKey;
+    }>[]>;
     /**
      * Check if user exists
      * @param username - User name
@@ -44,4 +55,33 @@ export default class TriadProtocolClient {
      *
      */
     createUser({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions): Promise<any>;
+    /**
+     * Get User Positions with amount
+     * @param wallet - User wallet
+     *
+     */
+    getUserPositionsWithAmount(wallet: PublicKey): Promise<{
+        ts: import("bn.js");
+        bump: number;
+        totalDeposited: import("bn.js");
+        totalWithdrawn: import("bn.js");
+        lpShare: import("bn.js");
+        totalPositions: number;
+        ticker: PublicKey;
+        authority: PublicKey;
+        positions: {
+            amount: import("bn.js");
+            entryPrice: import("bn.js");
+            ts: import("bn.js");
+            isLong: boolean;
+            isOpen: boolean;
+            pnl: import("bn.js");
+        }[];
+    }[]>;
+    withdrawV1({ wallet, ticker, userPosition, positionIndex }: {
+        wallet: PublicKey;
+        userPosition: PublicKey;
+        ticker: PublicKey;
+        positionIndex: number;
+    }, options?: RpcOptions): Promise<any>;
 }

package/dist/index.js

@@ -13,9 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
+const web3_js_1 = require("@solana/web3.js");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const trade_1 = __importDefault(require("./trade"));
 const helpers_1 = require("./utils/helpers");
+const spl_token_1 = require("@solana/spl-token");
 const pda_1 = require("./utils/pda");
 const stake_1 = __importDefault(require("./stake"));
 const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
@@ -53,6 +55,11 @@ class TriadProtocolClient {
                 .sort((a, b) => b.referred - a.referred);
         });
     }
+    getTickers() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.program.account.ticker.all();
+        });
+    }
     /**
      * Check if user exists
      * @param username - User name
@@ -117,5 +124,39 @@ class TriadProtocolClient {
             }), options);
         });
     }
+    /**
+     * Get User Positions with amount
+     * @param wallet - User wallet
+     *
+     */
+    getUserPositionsWithAmount(wallet) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tickers = yield this.program.account.ticker.all();
+            const userPositions = [];
+            for (const ticker of tickers) {
+                const userPositionPDA = (0, pda_1.getUserPositionPDA)(this.program.programId, wallet, ticker.publicKey);
+                userPositions.push(userPositionPDA);
+            }
+            const userPositionsWithAmount = yield this.program.account.userPosition.fetchMultiple(userPositions);
+            return userPositionsWithAmount.filter((item) => item &&
+                parseFloat(item.totalDeposited.toString()) >
+                    parseFloat(item.totalWithdrawn.toString()));
+        });
+    }
+    withdrawV1({ wallet, ticker, userPosition, positionIndex }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const vaultPDA = (0, pda_1.getVaultAddressSync)(this.program.programId, ticker);
+            const VaultTokenAccountPDA = (0, pda_1.getTokenVaultAddressSync)(this.program.programId, vaultPDA);
+            const userTokenAccount = yield (0, spl_token_1.getAssociatedTokenAddress)(new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'), this.provider.wallet.publicKey);
+            return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawV1(positionIndex).accounts({
+                signer: wallet,
+                userPosition,
+                userTokenAccount,
+                vault: vaultPDA,
+                ticker,
+                vaultTokenAccount: VaultTokenAccountPDA
+            }), options);
+        });
+    }
 }
 exports.default = TriadProtocolClient;

package/dist/local-test.js

@@ -17,7 +17,7 @@ const _1 = __importDefault(require("./"));
 const anchor_1 = require("@coral-xyz/anchor");
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
-const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/id.json');
+const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/triad.json');
 const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc.txt');
 const keypair = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse(file.toString())));
 const connection = new web3_js_1.Connection(rpc_file.toString(), 'confirmed');
@@ -164,4 +164,8 @@ const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.getReferral('dannpl');
     console.log(response);
 });
-getReferral();
+const getUserPositions = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.getUserPositionsWithAmount(wallet.publicKey);
+    console.log(response);
+});
+getUserPositions();

package/dist/utils/pda/index.d.ts

@@ -1,4 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const getUserPDA: (programId: PublicKey, wallet: PublicKey) => PublicKey;
 export declare const getTickerPDA: (programId: PublicKey, tickerName: string) => PublicKey;
+export declare const getVaultAddressSync: (programId: PublicKey, tickerAddress: PublicKey) => PublicKey;
+export declare const getUserPositionPDA: (programId: PublicKey, wallet: PublicKey, ticker: PublicKey) => PublicKey;
+export declare const getTokenVaultAddressSync: (programId: PublicKey, vault: PublicKey) => PublicKey;
 export declare const getTokenATA: (address: PublicKey, Mint: PublicKey) => PublicKey;

package/dist/utils/pda/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenATA = exports.getTickerPDA = exports.getUserPDA = void 0;
+exports.getTokenATA = exports.getTokenVaultAddressSync = exports.getUserPositionPDA = exports.getVaultAddressSync = exports.getTickerPDA = exports.getUserPDA = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const getUserPDA = (programId, wallet) => {
@@ -11,6 +11,18 @@ const getTickerPDA = (programId, tickerName) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('ticker'), Buffer.from(tickerName)], programId)[0];
 };
 exports.getTickerPDA = getTickerPDA;
+const getVaultAddressSync = (programId, tickerAddress) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('vault'), tickerAddress.toBuffer()], programId)[0];
+};
+exports.getVaultAddressSync = getVaultAddressSync;
+const getUserPositionPDA = (programId, wallet, ticker) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user_position'), wallet.toBuffer(), ticker.toBuffer()], programId)[0];
+};
+exports.getUserPositionPDA = getUserPositionPDA;
+const getTokenVaultAddressSync = (programId, vault) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('vault_token_account'), vault.toBuffer()], programId)[0];
+};
+exports.getTokenVaultAddressSync = getTokenVaultAddressSync;
 const getTokenATA = (address, Mint) => {
     return web3_js_1.PublicKey.findProgramAddressSync([address.toBytes(), spl_token_1.TOKEN_2022_PROGRAM_ID.toBytes(), Mint.toBytes()], new web3_js_1.PublicKey(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID))[0];
 };

package/package.json

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