npm - @triadxyz/triad-protocol - Versions diffs - 0.7.0-beta.devnet → 0.7.1-beta.devnet - Mend

@triadxyz/triad-protocol 0.7.0-beta.devnet → 0.7.1-beta.devnet

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/local-test.js CHANGED Viewed

@@ -168,6 +168,7 @@ const getMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     const markets = yield triadProtocol.trade.getMarkets();
     console.log(markets);
 });
+getMarkets();
 const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const market of markets) {
         try {
@@ -223,4 +224,3 @@ const runBot = () => __awaiter(void 0, void 0, void 0, function* () {
         yield closeOrder();
     }
 });
-openOrder();

package/dist/trade.js CHANGED Viewed

@@ -29,59 +29,15 @@ class Trade {
      */
     getMarkets() {
         return __awaiter(this, void 0, void 0, function* () {
-            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.toString(),
-                name: account.name,
-                hypePrice: account.hypePrice.toString(),
-                flopPrice: account.flopPrice.toString(),
-                hypeLiquidity: account.hypeLiquidity.toString(),
-                flopLiquidity: account.flopLiquidity.toString(),
-                totalHypeShares: account.totalHypeShares.toString(),
-                totalFlopShares: account.totalFlopShares.toString(),
-                totalVolume: account.totalVolume.toString(),
-                mint: account.mint.toString(),
-                ts: account.ts.toString(),
-                updateTs: account.updateTs.toString(),
-                openOrdersCount: account.openOrdersCount.toString(),
-                nextOrderId: account.nextOrderId.toString(),
-                feeBps: account.feeBps,
-                feeVault: account.feeVault.toBase58(),
-                isActive: account.isActive,
-                marketPrice: account.marketPrice.toString(),
-                isOfficial: account.isOfficial
-            })));
+            return this.program.account.market
+                .all()
+                .then((markets) => markets.map(({ account, publicKey }) => (0, helpers_1.accountToMarket)(account, publicKey)));
         });
     }
     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.toString(),
-                name: account.name,
-                hypePrice: account.hypePrice.toString(),
-                flopPrice: account.flopPrice.toString(),
-                hypeLiquidity: account.hypeLiquidity.toString(),
-                flopLiquidity: account.flopLiquidity.toString(),
-                totalHypeShares: account.totalHypeShares.toString(),
-                totalFlopShares: account.totalFlopShares.toString(),
-                totalVolume: account.totalVolume.toString(),
-                mint: account.mint.toString(),
-                ts: account.ts.toString(),
-                updateTs: account.updateTs.toString(),
-                openOrdersCount: account.openOrdersCount.toString(),
-                nextOrderId: account.nextOrderId.toString(),
-                feeBps: account.feeBps,
-                feeVault: account.feeVault.toBase58(),
-                isActive: account.isActive,
-                marketPrice: account.marketPrice.toString(),
-                isOfficial: account.isOfficial
-            };
+            return (0, helpers_1.accountToMarket)(account, address);
         });
     }
     /**

package/dist/types/trade.d.ts CHANGED Viewed

@@ -21,7 +21,28 @@ export type Market = {
     isActive: boolean;
     marketPrice: string;
     isOfficial: boolean;
+    resolvedQuestions: ResolvedQuestion[];
+    currentQuestionId: string;
+    currentQuestionStart: string;
+    currentQuestionEnd: string;
+    currentQuestion: string;
 };
+export type ResolvedQuestion = {
+    question: string;
+    startTime: string;
+    endTime: string;
+    hypeLiquidity: string;
+    flopLiquidity: string;
+    winningDirection: WinningDirection;
+    marketPrice: string;
+    finalHypePrice: string;
+    finalFlopPrice: string;
+};
+export declare enum WinningDirection {
+    Hype = "Hype",
+    Flop = "Flop",
+    None = "None"
+}
 export type OrderDirection = {
     hype: {};
 } | {

package/dist/types/trade.js CHANGED Viewed

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WinningDirection = void 0;
+var WinningDirection;
+(function (WinningDirection) {
+    WinningDirection["Hype"] = "Hype";
+    WinningDirection["Flop"] = "Flop";
+    WinningDirection["None"] = "None";
+})(WinningDirection || (exports.WinningDirection = WinningDirection = {}));

package/dist/utils/helpers.d.ts CHANGED Viewed

@@ -1,7 +1,10 @@
 import { Stake, StakeVault } from './../types/stake';
 import { User } from './../types';
+import { Market } from '../types/trade';
+import { PublicKey } from '@solana/web3.js';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: any) => StakeVault;
 export declare const formatStake: (stake: any) => Stake;
 export declare const formatUser: (user: any) => User;
+export declare const accountToMarket: (account: any, address: PublicKey) => Market;

package/dist/utils/helpers.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.accountToMarket = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+const trade_1 = require("../types/trade");
 const encodeString = (value, alloc = 32) => {
     const buffer = Buffer.alloc(alloc);
     buffer.fill(value);
@@ -62,3 +63,50 @@ const formatUser = (user) => {
     };
 };
 exports.formatUser = formatUser;
+const accountToMarket = (account, address) => {
+    return {
+        bump: account.bump,
+        address: address.toString(),
+        authority: account.authority.toString(),
+        marketId: account.marketId.toString(),
+        name: account.name,
+        hypePrice: account.hypePrice.toString(),
+        flopPrice: account.flopPrice.toString(),
+        hypeLiquidity: account.hypeLiquidity.toString(),
+        flopLiquidity: account.flopLiquidity.toString(),
+        totalHypeShares: account.totalHypeShares.toString(),
+        totalFlopShares: account.totalFlopShares.toString(),
+        totalVolume: account.totalVolume.toString(),
+        mint: account.mint.toString(),
+        ts: account.ts.toString(),
+        updateTs: account.updateTs.toString(),
+        openOrdersCount: account.openOrdersCount.toString(),
+        nextOrderId: account.nextOrderId.toString(),
+        feeBps: account.feeBps,
+        feeVault: account.feeVault.toBase58(),
+        isActive: account.isActive,
+        marketPrice: account.marketPrice.toString(),
+        isOfficial: account.isOfficial,
+        resolvedQuestions: account.resolvedQuestions.map(accountToResolvedQuestion),
+        currentQuestionId: account.currentQuestionId.toString(),
+        currentQuestionStart: account.currentQuestionStart.toString(),
+        currentQuestionEnd: account.currentQuestionEnd.toString(),
+        currentQuestion: Buffer.from(account.currentQuestion)
+            .toString()
+            .replace(/\0+$/, '')
+    };
+};
+exports.accountToMarket = accountToMarket;
+const accountToResolvedQuestion = (question) => {
+    return {
+        question: Buffer.from(question.question).toString().replace(/\0+$/, ''),
+        startTime: question.startTime.toString(),
+        endTime: question.endTime.toString(),
+        hypeLiquidity: question.hypeLiquidity.toString(),
+        flopLiquidity: question.flopLiquidity.toString(),
+        winningDirection: trade_1.WinningDirection[question.winningDirection],
+        marketPrice: question.marketPrice.toString(),
+        finalHypePrice: question.finalHypePrice.toString(),
+        finalFlopPrice: question.finalFlopPrice.toString()
+    };
+};

package/package.json CHANGED Viewed

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