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

package/dist/utils/constants.d.ts

@@ -1,10 +1,6 @@
-export declare const TRIAD_PROTOCOL_PROGRAM_ID = "TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss";
-export declare const ATA_PROGRAM_ID = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
-export declare const ADMIN = "";
-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 TTRIAD_FEE = 2;
-export declare const ORE_PROGRAM_ID = "oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ";
-export declare const NOOP_PROGRAM_ID = "noop8ytexvkpCuqbf6FB89BSuNemHtPRqaNC31GWivW";
+export declare const TRD_DECIMALS = 6;
+export declare const VERIFIER: PublicKey;
+export declare const TRD_MINT: PublicKey;
+export declare const TRIAD_ADMIN: PublicKey;

package/dist/utils/constants.js

@@ -1,13 +1,9 @@
 "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_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.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.TTRIAD_FEE = 2;
-exports.ORE_PROGRAM_ID = 'oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ';
-exports.NOOP_PROGRAM_ID = 'noop8ytexvkpCuqbf6FB89BSuNemHtPRqaNC31GWivW';
+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');

package/dist/utils/helpers.d.ts

@@ -12,8 +12,6 @@ export declare const getStakeAddressSync: (programId: PublicKey, wallet: PublicK
 export declare const getNFTRewardsAddressSync: (programId: PublicKey, stake: PublicKey) => PublicKey;
 export declare const getATASync: (address: PublicKey, Mint: PublicKey) => PublicKey;
 export declare const getUserAddressSync: (programId: PublicKey, wallet: PublicKey) => PublicKey;
-export declare const getProofOreAddressSync: (wallet: PublicKey) => PublicKey;
-export declare const configOreProgramAddressSync: () => PublicKey;
 export declare const formatNumber: (number: bigint | BN, decimals?: number) => number;
 export declare const formatStakeVault: (stakeVault: any) => StakeVaultResponse;
 export declare const formatStake: (stake: any) => StakeResponse;

package/dist/utils/helpers.js

@@ -23,12 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.configOreProgramAddressSync = exports.getProofOreAddressSync = 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.getUserPositionAddressSync = exports.getTokenVaultAddressSync = exports.getVaultAddressSync = 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 spl_token_1 = require("@solana/spl-token");
-const constants_1 = require("./constants");
 const getTickerAddressSync = (programId, tickerName) => {
     const [TickerPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('ticker'), Buffer.from(tickerName)], programId);
     return TickerPDA;
@@ -87,7 +86,7 @@ const getNFTRewardsAddressSync = (programId, stake) => {
 };
 exports.getNFTRewardsAddressSync = getNFTRewardsAddressSync;
 const getATASync = (address, Mint) => {
-    const [ATA] = web3_js_1.PublicKey.findProgramAddressSync([address.toBytes(), spl_token_1.TOKEN_2022_PROGRAM_ID.toBytes(), Mint.toBytes()], new web3_js_1.PublicKey(constants_1.ATA_PROGRAM_ID));
+    const [ATA] = 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));
     return ATA;
 };
 exports.getATASync = getATASync;
@@ -96,16 +95,6 @@ const getUserAddressSync = (programId, wallet) => {
     return StakePDA;
 };
 exports.getUserAddressSync = getUserAddressSync;
-const getProofOreAddressSync = (wallet) => {
-    const [ProofPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('proof'), wallet.toBuffer()], new web3_js_1.PublicKey(constants_1.ORE_PROGRAM_ID));
-    return ProofPDA;
-};
-exports.getProofOreAddressSync = getProofOreAddressSync;
-const configOreProgramAddressSync = () => {
-    const [ProofPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('config')], new web3_js_1.PublicKey(constants_1.ORE_PROGRAM_ID));
-    return ProofPDA;
-};
-exports.configOreProgramAddressSync = configOreProgramAddressSync;
 const formatNumber = (number, decimals = 6) => {
     return Number(number.toString()) / Math.pow(10, decimals);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "0.5.2-beta.devnet",
+  "version": "0.5.4-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.ts"
   },
   "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;