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

package/dist/utils/constants.d.ts

@@ -4,3 +4,4 @@ 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,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
+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.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.4-beta.devnet",
+  "version": "0.5.6-beta.devnet",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -8,7 +8,7 @@
     "clean": "rimraf dist",
     "build": "yarn run clean && tsc",
     "prepublishOnly": "yarn build",
-    "test": "rimraf dist && tsc && node ./dist/local-test.ts"
+    "test": "rimraf dist && tsc && node ./dist/local-test.js"
   },
   "publishConfig": {
     "access": "public"