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

package/dist/index.d.ts

@@ -14,22 +14,22 @@ export default class TriadProtocolClient {
      * Get User by wallet
      * @param wallet - User wallet
      */
-    getUser: (wallet: PublicKey) => Promise<import("./types/stake").UserResponse>;
+    getUser(wallet: PublicKey): Promise<import("./types/stake").UserResponse>;
     /**
      * Get User by wallet
      * @param wallet - User wallet
      */
-    getUsers: () => Promise<import("./types/stake").UserResponse[]>;
+    getUsers(): Promise<import("./types/stake").UserResponse[]>;
     /**
      * Check if user exists
      * @param username - User name
      */
-    hasUser: (wallet: PublicKey) => Promise<boolean>;
+    hasUser(wallet: PublicKey): Promise<boolean>;
     /**
      * Get Refferal
      * @param name - User name
      */
-    getReferral: (name: string) => Promise<string>;
+    getReferral(name: string): Promise<string>;
     /**
      *  Create User
      *  @param wallet - User wallet
@@ -37,5 +37,5 @@ export default class TriadProtocolClient {
      *  @param referral - user referral
      *
      */
-    createUser: ({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions) => Promise<string>;
+    createUser({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -20,30 +20,40 @@ const helpers_1 = require("./utils/helpers");
 const stake_1 = __importDefault(require("./stake"));
 class TriadProtocolClient {
     constructor(connection, wallet) {
-        /**
-         * Get User by wallet
-         * @param wallet - User wallet
-         */
-        this.getUser = (wallet) => __awaiter(this, void 0, void 0, function* () {
+        this.provider = new anchor_1.AnchorProvider(connection, wallet, anchor_1.AnchorProvider.defaultOptions());
+        this.program = new anchor_1.Program(idl_triad_protocol_json_1.default, this.provider);
+        this.trade = new trade_1.default(this.program, this.provider);
+        this.stake = new stake_1.default(this.program, this.provider);
+    }
+    /**
+     * Get User by wallet
+     * @param wallet - User wallet
+     */
+    getUser(wallet) {
+        return __awaiter(this, void 0, void 0, function* () {
             const UserPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
             const response = yield this.program.account.user.fetch(UserPDA);
             return (0, helpers_1.formatUser)(response);
         });
-        /**
-         * Get User by wallet
-         * @param wallet - User wallet
-         */
-        this.getUsers = () => __awaiter(this, void 0, void 0, function* () {
+    }
+    /**
+     * Get User by wallet
+     * @param wallet - User wallet
+     */
+    getUsers() {
+        return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.program.account.user.all();
             return response
                 .map((item) => (0, helpers_1.formatUser)(item.account))
                 .sort((a, b) => b.referred - a.referred);
         });
-        /**
-         * Check if user exists
-         * @param username - User name
-         */
-        this.hasUser = (wallet) => __awaiter(this, void 0, void 0, function* () {
+    }
+    /**
+     * Check if user exists
+     * @param username - User name
+     */
+    hasUser(wallet) {
+        return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.program.account.user.fetch((0, helpers_1.getUserAddressSync)(this.program.programId, wallet));
                 return true;
@@ -52,11 +62,13 @@ class TriadProtocolClient {
                 return false;
             }
         });
-        /**
-         * Get Refferal
-         * @param name - User name
-         */
-        this.getReferral = (name) => __awaiter(this, void 0, void 0, function* () {
+    }
+    /**
+     * Get Refferal
+     * @param name - User name
+     */
+    getReferral(name) {
+        return __awaiter(this, void 0, void 0, function* () {
             try {
                 const users = yield this.program.account.user.all([
                     {
@@ -76,14 +88,16 @@ class TriadProtocolClient {
                 return '';
             }
         });
-        /**
-         *  Create User
-         *  @param wallet - User wallet
-         *  @param name - user name
-         *  @param referral - user referral
-         *
-         */
-        this.createUser = ({ wallet, name, referral }, options) => {
+    }
+    /**
+     *  Create User
+     *  @param wallet - User wallet
+     *  @param name - user name
+     *  @param referral - user referral
+     *
+     */
+    createUser({ wallet, name, referral }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
             const method = this.program.methods
                 .createUser({
                 name
@@ -101,11 +115,7 @@ class TriadProtocolClient {
                 ]);
             }
             return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
-        };
-        this.provider = new anchor_1.AnchorProvider(connection, wallet, anchor_1.AnchorProvider.defaultOptions());
-        this.program = new anchor_1.Program(idl_triad_protocol_json_1.default, this.provider);
-        this.trade = new trade_1.default(this.program, this.provider);
-        this.stake = new stake_1.default(this.program, this.provider);
+        });
     }
 }
 exports.default = TriadProtocolClient;

package/dist/local-test.js

@@ -13,22 +13,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const web3_js_1 = require("@solana/web3.js");
 const index_1 = __importDefault(require("./index"));
 const anchor_1 = require("@coral-xyz/anchor");
-const constants_1 = require("./utils/constants");
 const axios_1 = __importDefault(require("axios"));
-const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/triad-builder.json');
-const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc.txt');
+const web3_js_1 = require("@solana/web3.js");
+const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/id.json');
+const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc-devnet.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');
 const wallet = new anchor_1.Wallet(keypair);
 const triadProtocol = new index_1.default(connection, wallet);
-const depositStakeRewards = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.depositStakeRewards({
-        wallet: wallet.publicKey,
-        mint: constants_1.TRD_MINT,
-        amount: new anchor_1.BN(0 * Math.pow(10, 6))
+const markets = [
+    { name: 'JUPITER/TRD', marketId: 0 },
+    { name: 'DRIFT/TRD', marketId: 1 },
+    { name: 'PYTH/TRD', marketId: 2 },
+    { name: 'UNDEAD/TRD', marketId: 3 },
+    { name: 'MADLADS/TRD', marketId: 4 },
+    { name: 'DEGODS/TRD', marketId: 5 },
+    { name: 'ISLANDDAO/TRD', marketId: 6 },
+    { name: 'COLOSSEUM/TRD', marketId: 7 }
+];
+const updateStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.updateStakeVault({
+        wallet: wallet.publicKey
     });
     console.log(response);
 });
@@ -51,3 +58,34 @@ const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     console.log(updateBoostResponse);
 });
+const getMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.trade.getMarkets();
+    console.log(response);
+});
+const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
+    for (const market of markets) {
+        try {
+            const response = yield triadProtocol.trade.initializeMarket(market, {
+                skipPreflight: true
+            });
+            console.log(`Initialized market ${market.name}:`, response);
+        }
+        catch (error) {
+            console.error(`Error initializing market ${market.name}:`, error);
+        }
+    }
+});
+const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.trade.openOrder(0, {
+        amount: 100,
+        direction: {
+            hype: {}
+        },
+        orderType: {
+            market: {}
+        },
+        comment: 'test'
+    });
+    console.log(response);
+});
+openOrder();

package/dist/stake.d.ts

@@ -3,7 +3,7 @@ import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { DepositStakeRewardsArgs, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, StakeResponse, ClaimStakeRewardsArgs, StakeTokenArgs, UpdateBoostArgs } from './types/stake';
+import { UpdateStakeVaultArgs, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, StakeResponse, ClaimStakeRewardsArgs, StakeTokenArgs, UpdateBoostArgs } from './types/stake';
 export default class Stake {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -52,13 +52,13 @@ export default class Stake {
      */
     stakeToken({ name, wallet, amount }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
     /**
-     *  Deposit Stake Rewards
+     *  Update Stake Vault
      *  @param wallet - User wallet
-     *  @param mint - NFT mint
-     *  @param amount - Reward amount
+     *  @param amount - Reward amount to deposit (optional)
+     *  @param status - Status of the stake vault (optional)
      *
      */
-    depositStakeRewards({ wallet, mint, amount }: DepositStakeRewardsArgs, options?: RpcOptions): Promise<string>;
+    updateStakeVault({ wallet, amount, status }: UpdateStakeVaultArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Request Withdraw
      *  @param wallet - User wallet

package/dist/stake.js

@@ -135,13 +135,11 @@ class Stake {
                 }));
             }
             const { blockhash } = yield this.provider.connection.getLatestBlockhash();
-            const messageV0 = new web3_js_1.TransactionMessage({
+            return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
                 instructions: ixs,
                 recentBlockhash: blockhash,
                 payerKey: wallet
-            }).compileToV0Message();
-            const tx = new web3_js_1.VersionedTransaction(messageV0);
-            return this.provider.sendAndConfirm(tx, [], {
+            }).compileToV0Message()), [], {
                 skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
                 commitment: 'confirmed'
             });
@@ -179,22 +177,23 @@ class Stake {
         });
     }
     /**
-     *  Deposit Stake Rewards
+     *  Update Stake Vault
      *  @param wallet - User wallet
-     *  @param mint - NFT mint
-     *  @param amount - Reward amount
+     *  @param amount - Reward amount to deposit (optional)
+     *  @param status - Status of the stake vault (optional)
      *
      */
-    depositStakeRewards({ wallet, mint, amount }, options) {
+    updateStakeVault({ wallet, amount, status }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const method = this.program.methods
-                .depositStakeRewards({
+                .updateStakeVault({
                 amount,
+                status,
                 stakeVault: this.stakeVaultName
             })
                 .accounts({
                 signer: wallet,
-                mint: mint
+                mint: constants_1.TRD_MINT
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([

package/dist/trade.d.ts

@@ -1,7 +1,8 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
-import { Market } from './types/trade';
 import { PublicKey } from '@solana/web3.js';
+import { Market, OrderDirection, OrderType } from './types/trade';
+import { RpcOptions } from './types';
 export default class Trade {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -10,8 +11,22 @@ export default class Trade {
      * Get all Markets
      */
     getMarkets(): Promise<Market[]>;
+    getMarketByAddress(address: PublicKey): Promise<Market>;
     /**
-     * Get Market By Address
+     * Initialize Market
+     * @param market id - new markert id - length + 1
+     * @param name - PYTH/TRD JUP/TRD DRIFT/TRD
+     *
      */
-    getMarketByAddress(address: PublicKey): Promise<Market>;
+    initializeMarket({ marketId, name }: {
+        marketId: number;
+        name: string;
+    }, options?: RpcOptions): Promise<string>;
+    openOrder(marketId: number, args: {
+        amount: number;
+        direction: OrderDirection;
+        orderType: OrderType;
+        limitPrice?: number;
+        comment?: string;
+    }, options?: RpcOptions): Promise<string>;
 }

package/dist/trade.js

@@ -8,7 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const web3_js_1 = require("@solana/web3.js");
+const bn_js_1 = __importDefault(require("bn.js"));
+const constants_1 = require("./utils/constants");
+const helpers_1 = require("./utils/helpers");
 class Trade {
     constructor(program, provider) {
         this.provider = provider;
@@ -19,8 +26,9 @@ class Trade {
      */
     getMarkets() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.program.account.market.all().then((markets) => markets.map(({ account }) => ({
+            return this.program.account.market.all().then((markets) => markets.map(({ account, publicKey }) => ({
                 bump: account.bump,
+                address: publicKey.toString(),
                 authority: account.authority.toString(),
                 marketId: account.marketId.toNumber(),
                 name: account.name,
@@ -33,7 +41,8 @@ class Trade {
                 totalVolume: account.totalVolume.toNumber(),
                 vaultTokenAccount: account.vaultTokenAccount.toString(),
                 mint: account.mint.toString(),
-                lastUpdateTs: account.lastUpdateTs.toNumber(),
+                ts: account.ts.toNumber(),
+                updateTs: account.updateTs.toNumber(),
                 openOrdersCount: account.openOrdersCount.toNumber(),
                 nextOrderId: account.nextOrderId.toNumber(),
                 feeBps: account.feeBps,
@@ -43,14 +52,12 @@ class Trade {
             })));
         });
     }
-    /**
-     * Get Market By Address
-     */
     getMarketByAddress(address) {
         return __awaiter(this, void 0, void 0, function* () {
             const account = yield this.program.account.market.fetch(address);
             return {
                 bump: account.bump,
+                address: address.toString(),
                 authority: account.authority.toString(),
                 marketId: account.marketId.toNumber(),
                 name: account.name,
@@ -63,7 +70,8 @@ class Trade {
                 totalVolume: account.totalVolume.toNumber(),
                 vaultTokenAccount: account.vaultTokenAccount.toString(),
                 mint: account.mint.toString(),
-                lastUpdateTs: account.lastUpdateTs.toNumber(),
+                ts: account.ts.toNumber(),
+                updateTs: account.updateTs.toNumber(),
                 openOrdersCount: account.openOrdersCount.toNumber(),
                 nextOrderId: account.nextOrderId.toNumber(),
                 feeBps: account.feeBps,
@@ -73,5 +81,60 @@ class Trade {
             };
         });
     }
+    /**
+     * Initialize Market
+     * @param market id - new markert id - length + 1
+     * @param name - PYTH/TRD JUP/TRD DRIFT/TRD
+     *
+     */
+    initializeMarket({ marketId, name }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const method = this.program.methods
+                .initializeMarket({
+                marketId: new bn_js_1.default(marketId),
+                name: name
+            })
+                .accounts({
+                signer: this.provider.publicKey,
+                mint: constants_1.TRD_MINT
+            });
+            if (options === null || options === void 0 ? void 0 : options.microLamports) {
+                method.postInstructions([
+                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                        microLamports: options.microLamports
+                    })
+                ]);
+            }
+            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
+        });
+    }
+    openOrder(marketId, args, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const marketPDA = (0, helpers_1.getMarketAddressSync)(this.program.programId, marketId);
+            const method = this.program.methods
+                .openOrder({
+                amount: new bn_js_1.default(args.amount / Math.pow(10, constants_1.TRD_DECIMALS)),
+                direction: args.direction,
+                orderType: args.orderType,
+                limitPrice: args.limitPrice
+                    ? new bn_js_1.default(args.limitPrice / Math.pow(10, constants_1.TRD_DECIMALS))
+                    : undefined,
+                comment: (0, helpers_1.encodeString)(args.comment, 64)
+            })
+                .accounts({
+                signer: this.provider.publicKey,
+                market: marketPDA,
+                mint: constants_1.TRD_MINT
+            });
+            if (options === null || options === void 0 ? void 0 : options.microLamports) {
+                method.postInstructions([
+                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                        microLamports: options.microLamports
+                    })
+                ]);
+            }
+            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
+        });
+    }
 }
 exports.default = Trade;