@triadxyz/triad-protocol 0.5.3-beta.devnet → 0.5.5-beta.devnet

package/dist/utils/constants.d.ts

@@ -1,4 +1,7 @@
-export declare const VERIFIER = "42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919";
+import { PublicKey } from '@solana/web3.js';
 export declare const STAKE_VAULT_NAME = "Triad Share 1";
-export declare const TTRIAD_DECIMALS = 6;
-export declare const TTRIAD_MINT = "t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV";
+export declare const TRD_DECIMALS = 6;
+export declare const VERIFIER: PublicKey;
+export declare const TRD_MINT: PublicKey;
+export declare const TRIAD_ADMIN: PublicKey;
+export declare const TRD_MINT_DEVNET: PublicKey;

package/dist/utils/constants.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TTRIAD_MINT = exports.TTRIAD_DECIMALS = exports.STAKE_VAULT_NAME = exports.VERIFIER = void 0;
-exports.VERIFIER = '42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919';
+exports.TRD_MINT_DEVNET = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
+const web3_js_1 = require("@solana/web3.js");
 exports.STAKE_VAULT_NAME = 'Triad Share 1';
-exports.TTRIAD_DECIMALS = 6;
-exports.TTRIAD_MINT = 't3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV';
+exports.TRD_DECIMALS = 6;
+exports.VERIFIER = new web3_js_1.PublicKey('42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919');
+exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
+exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
+exports.TRD_MINT_DEVNET = new web3_js_1.PublicKey('9ti9L1a4ynpTj4gbGQLkYmZh7495nvLEgWtw5mtUkGQj');

package/dist/utils/helpers.d.ts

@@ -2,11 +2,10 @@ import { COLLECTION_MUlTIPLIER, StakeResponse, StakeVaultResponse, UserResponse
 import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
 export declare const getTickerAddressSync: (programId: PublicKey, tickerName: string) => PublicKey;
-export declare const encodeString: (value: string) => number[];
+export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
-export declare const getVaultAddressSync: (programId: PublicKey, tickerAddress: PublicKey) => PublicKey;
-export declare const getTokenVaultAddressSync: (programId: PublicKey, vault: PublicKey) => PublicKey;
-export declare function getUserPositionAddressSync(programId: PublicKey, authority: PublicKey, ticker: PublicKey): PublicKey;
+export declare const getMarketAddressSync: (programId: PublicKey, marketId: number) => PublicKey;
+export declare const getFeeVaultAddressSync: (programId: PublicKey, market: PublicKey) => PublicKey;
 export declare const getStakeVaultAddressSync: (programId: PublicKey, vaultName: string) => PublicKey;
 export declare const getStakeAddressSync: (programId: PublicKey, wallet: PublicKey, name: string) => PublicKey;
 export declare const getNFTRewardsAddressSync: (programId: PublicKey, stake: PublicKey) => PublicKey;

package/dist/utils/helpers.js

@@ -1,40 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.getUserAddressSync = exports.getATASync = exports.getNFTRewardsAddressSync = exports.getStakeAddressSync = exports.getStakeVaultAddressSync = exports.getUserPositionAddressSync = exports.getTokenVaultAddressSync = exports.getVaultAddressSync = exports.decodeString = exports.encodeString = exports.getTickerAddressSync = void 0;
+exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.getUserAddressSync = exports.getATASync = exports.getNFTRewardsAddressSync = exports.getStakeAddressSync = exports.getStakeVaultAddressSync = exports.getFeeVaultAddressSync = exports.getMarketAddressSync = exports.decodeString = exports.encodeString = exports.getTickerAddressSync = void 0;
 const stake_1 = require("./../types/stake");
 const web3_js_1 = require("@solana/web3.js");
-const anchor = __importStar(require("@coral-xyz/anchor"));
+const bn_js_1 = __importDefault(require("bn.js"));
 const spl_token_1 = require("@solana/spl-token");
 const getTickerAddressSync = (programId, tickerName) => {
     const [TickerPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('ticker'), Buffer.from(tickerName)], programId);
     return TickerPDA;
 };
 exports.getTickerAddressSync = getTickerAddressSync;
-const encodeString = (value) => {
-    const buffer = Buffer.alloc(32);
+const encodeString = (value, alloc = 32) => {
+    const buffer = Buffer.alloc(alloc);
     buffer.fill(value);
     buffer.fill(' ', value.length);
     return Array(...buffer);
@@ -45,31 +25,16 @@ const decodeString = (bytes) => {
     return buffer.toString('utf8').trim();
 };
 exports.decodeString = decodeString;
-const getVaultAddressSync = (programId, tickerAddress) => {
-    const [VaultPDA] = web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from(anchor.utils.bytes.utf8.encode('vault')),
-        tickerAddress.toBuffer()
-    ], programId);
-    return VaultPDA;
-};
-exports.getVaultAddressSync = getVaultAddressSync;
-const getTokenVaultAddressSync = (programId, vault) => {
-    const [VaultTokenPDA] = web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from(anchor.utils.bytes.utf8.encode('vault_token_account')),
-        vault.toBuffer()
-    ], programId);
-    return VaultTokenPDA;
-};
-exports.getTokenVaultAddressSync = getTokenVaultAddressSync;
-function getUserPositionAddressSync(programId, authority, ticker) {
-    const [UserPositionPDA] = web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from(anchor.utils.bytes.utf8.encode('user_position')),
-        authority.toBuffer(),
-        ticker.toBuffer()
-    ], programId);
-    return UserPositionPDA;
-}
-exports.getUserPositionAddressSync = getUserPositionAddressSync;
+const getMarketAddressSync = (programId, marketId) => {
+    const [MarketPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('market'), new bn_js_1.default(marketId).toArrayLike(Buffer, 'le', 8)], programId);
+    return MarketPDA;
+};
+exports.getMarketAddressSync = getMarketAddressSync;
+const getFeeVaultAddressSync = (programId, market) => {
+    const [FeeVaultPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('fee_vault'), market.toBuffer()], programId);
+    return FeeVaultPDA;
+};
+exports.getFeeVaultAddressSync = getFeeVaultAddressSync;
 const getStakeVaultAddressSync = (programId, vaultName) => {
     const [StakeVaultPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake_vault'), Buffer.from(vaultName)], programId);
     return StakeVaultPDA;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "0.5.3-beta.devnet",
+  "version": "0.5.5-beta.devnet",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -8,8 +8,7 @@
     "clean": "rimraf dist",
     "build": "yarn run clean && tsc",
     "prepublishOnly": "yarn build",
-    "start": "yarn build && node ./dist/test.js",
-    "test": "rimraf dist && tsc && node ./dist/test.js"
+    "test": "rimraf dist && tsc && node ./dist/local-test.js"
   },
   "publishConfig": {
     "access": "public"

package/dist/ticker.d.ts

@@ -1,33 +0,0 @@
-/// <reference types="bn.js" />
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
-import { PublicKey } from '@solana/web3.js';
-import { TriadProtocol } from './types/triad_protocol';
-export default class Ticker {
-    program: Program<TriadProtocol>;
-    provider: AnchorProvider;
-    constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
-    /**
-     * Get all tickers
-     */
-    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;
-    }>[]>;
-    /**
-     * Create a new ticker
-     *  @param name - The ticker's name
-     *  @param token mint - Token mint for the ticker (e.g. USDC)
-     *
-     */
-    createTicker({ name, tokenMint }: {
-        name: string;
-        protocolProgramId: PublicKey;
-        tokenMint: PublicKey;
-    }): Promise<string>;
-}

package/dist/ticker.js

@@ -1,43 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-class Ticker {
-    constructor(program, provider) {
-        this.provider = provider;
-        this.program = program;
-    }
-    /**
-     * Get all tickers
-     */
-    getTickers() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.program.account.ticker.all();
-        });
-    }
-    /**
-     * Create a new ticker
-     *  @param name - The ticker's name
-     *  @param token mint - Token mint for the ticker (e.g. USDC)
-     *
-     */
-    createTicker({ name, tokenMint }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.program.methods
-                .createTicker({ name })
-                .accounts({
-                signer: this.provider.wallet.publicKey,
-                payerTokenMint: tokenMint
-            })
-                .rpc();
-        });
-    }
-}
-exports.default = Ticker;

package/dist/vault.d.ts

@@ -1,48 +0,0 @@
-/// <reference types="bn.js" />
-import { AnchorProvider, BN, Program } from '@coral-xyz/anchor';
-import { PublicKey } from '@solana/web3.js';
-import { TriadProtocol } from './types/triad_protocol';
-export default class Vault {
-    program: Program<TriadProtocol>;
-    provider: AnchorProvider;
-    constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
-    /**
-     * Get all vaults
-     */
-    getVaults(): Promise<import("@coral-xyz/anchor").ProgramAccount<{
-        bump: number;
-        authority: PublicKey;
-        name: string;
-        tokenAccount: PublicKey;
-        tickerAddress: PublicKey;
-        totalDeposited: BN;
-        totalWithdrawn: BN;
-        initTs: BN;
-        netDeposits: BN;
-        netWithdraws: BN;
-        longBalance: BN;
-        shortBalance: BN;
-        longPositionsOpened: BN;
-        shortPositionsOpened: BN;
-    }>[]>;
-    /**
-     * Get vault by ticker Address
-     */
-    getVaultByTickerAddress(tickerAddress: PublicKey): Promise<{
-        tvl: number;
-        bump: number;
-        authority: PublicKey;
-        name: string;
-        tokenAccount: PublicKey;
-        tickerAddress: PublicKey;
-        totalDeposited: BN;
-        totalWithdrawn: BN;
-        initTs: BN;
-        netDeposits: BN;
-        netWithdraws: BN;
-        longBalance: BN;
-        shortBalance: BN;
-        longPositionsOpened: BN;
-        shortPositionsOpened: BN;
-    }>;
-}

package/dist/vault.js

@@ -1,44 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const helpers_1 = require("./utils/helpers");
-const spl_token_1 = require("@solana/spl-token");
-class Vault {
-    constructor(program, provider) {
-        this.provider = provider;
-        this.program = program;
-    }
-    /**
-     * Get all vaults
-     */
-    getVaults() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.program.account.vault.all();
-        });
-    }
-    /**
-     * Get vault by ticker Address
-     */
-    getVaultByTickerAddress(tickerAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const VaultPDA = (0, helpers_1.getVaultAddressSync)(this.program.programId, tickerAddress);
-            try {
-                const vault = yield this.program.account.vault.fetch(VaultPDA);
-                const tokenAcc = yield (0, spl_token_1.getAccount)(this.provider.connection, vault.tokenAccount);
-                return Object.assign(Object.assign({}, vault), { tvl: (0, helpers_1.formatNumber)(tokenAcc.amount) });
-            }
-            catch (e) {
-                throw new Error(e);
-            }
-        });
-    }
-}
-exports.default = Vault;