flash-sdk 1.0.133 → 2.0.0

package/dist/CustodyAccount.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
-import { Assets, FeesStats, Custody, Fees, PricingParams, TradeStats, Permissions, BorrowRateParams, OracleParams, VolumeStats, PositionStats, BorrowRateState, Side } from "./types";
-import { PositionAccount } from "./PositionAccount";
+import { Assets, FeesStats, Custody, Fees, PricingParams, Permissions, BorrowRateParams, OracleParams, BorrowRateState } from "./types";
+import BN from "bn.js";
 export declare class CustodyAccount implements Custody {
     publicKey: PublicKey;
     pool: PublicKey;
@@ -8,23 +8,21 @@ export declare class CustodyAccount implements Custody {
     tokenAccount: PublicKey;
     decimals: number;
     isStable: boolean;
+    depegAdjustment: boolean;
     isVirtual: boolean;
+    distributeRewards: boolean;
     oracle: OracleParams;
     pricing: PricingParams;
     permissions: Permissions;
     fees: Fees;
     borrowRate: BorrowRateParams;
+    rewardThreshold: BN;
     assets: Assets;
-    collectedFees: FeesStats;
-    volumeStats: VolumeStats;
-    tradeStats: TradeStats;
-    longPositions: PositionStats;
-    shortPositions: PositionStats;
+    feesStats: FeesStats;
     borrowRateState: BorrowRateState;
     bump: number;
     tokenAccountBump: number;
     constructor(publicKey: PublicKey, parseData: Custody);
     static from(publicKey: PublicKey, parseData: Custody): CustodyAccount;
     updateCustodyData(custody: Custody): void;
-    getCollectivePosition(side: Side): PositionAccount;
 }

package/dist/CustodyAccount.js

@@ -12,10 +12,6 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustodyAccount = void 0;
-var web3_js_1 = require("@solana/web3.js");
-var types_1 = require("./types");
-var PositionAccount_1 = require("./PositionAccount");
-var constants_1 = require("./constants");
 var CustodyAccount = (function () {
     function CustodyAccount(publicKey, parseData) {
         this.publicKey = publicKey;
@@ -27,23 +23,6 @@ var CustodyAccount = (function () {
     CustodyAccount.prototype.updateCustodyData = function (custody) {
         Object.assign(this, __assign({}, custody));
     };
-    CustodyAccount.prototype.getCollectivePosition = function (side) {
-        var stats;
-        if ((0, types_1.isVariant)(side, 'long')) {
-            stats = this.longPositions;
-        }
-        else {
-            stats = this.shortPositions;
-        }
-        ;
-        if (stats.openPositions.gt(constants_1.BN_ZERO)) {
-            var obj = __assign({ side: side, price: stats.averagePrice.div(stats.totalQuantity), sizeUsd: stats.sizeUsd, collateralUsd: stats.collateralUsd, unrealizedLossUsd: stats.cumulativeInterestUsd, cumulativeInterestSnapshot: stats.cumulativeInterestSnapshot, lockedAmount: stats.lockedAmount }, types_1.DEFAULT_POSITION);
-            return new PositionAccount_1.PositionAccount(web3_js_1.PublicKey.default, obj);
-        }
-        else {
-            return new PositionAccount_1.PositionAccount(web3_js_1.PublicKey.default, types_1.DEFAULT_POSITION);
-        }
-    };
     return CustodyAccount;
 }());
 exports.CustodyAccount = CustodyAccount;

package/dist/MarketAccount.d.ts

@@ -0,0 +1,23 @@
+import { PublicKey } from "@solana/web3.js";
+import { Market, MarketPermissions, PositionStats, Side } from "./types";
+import BN from "bn.js";
+import { PositionAccount } from "./PositionAccount";
+export declare class MarketAccount implements Market {
+    publicKey: PublicKey;
+    pool: PublicKey;
+    targetCustody: PublicKey;
+    collateralCustody: PublicKey;
+    side: Side;
+    correlation: boolean;
+    maxPayoffBps: BN;
+    permissions: MarketPermissions;
+    openInterest: BN;
+    collectivePosition: PositionStats;
+    targetCustodyId: BN;
+    collateralCustodyId: BN;
+    bump: number;
+    constructor(publicKey: PublicKey, parseData: Market);
+    static from(publicKey: PublicKey, parseData: Market): MarketAccount;
+    updateMarketData(market: Market): void;
+    getCollectivePosition(): PositionAccount;
+}

package/dist/MarketAccount.js

@@ -0,0 +1,42 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MarketAccount = void 0;
+var web3_js_1 = require("@solana/web3.js");
+var types_1 = require("./types");
+var PositionAccount_1 = require("./PositionAccount");
+var constants_1 = require("./constants");
+var MarketAccount = (function () {
+    function MarketAccount(publicKey, parseData) {
+        this.publicKey = publicKey;
+        Object.assign(this, parseData);
+    }
+    MarketAccount.from = function (publicKey, parseData) {
+        return new MarketAccount(publicKey, parseData);
+    };
+    MarketAccount.prototype.updateMarketData = function (market) {
+        Object.assign(this, __assign({}, market));
+    };
+    MarketAccount.prototype.getCollectivePosition = function () {
+        var stats;
+        if (stats.openPositions.gt(constants_1.BN_ZERO)) {
+            var obj = __assign({ entryPrice: stats.averageEntryPrice, sizeAmount: stats.sizeAmount, sizeUsd: stats.sizeUsd, collateralAmount: stats.collateralAmount, collateralUsd: stats.collateralUsd, lockedAmount: stats.lockedAmount, lockedUsd: stats.lockedUsd, unsettledFeesUsd: stats.unsettledFeeUsd, cumulativeLockFeeSnapshot: stats.cumulativeLockFeeSnapshot }, types_1.DEFAULT_POSITION);
+            return new PositionAccount_1.PositionAccount(web3_js_1.PublicKey.default, obj);
+        }
+        else {
+            return new PositionAccount_1.PositionAccount(web3_js_1.PublicKey.default, types_1.DEFAULT_POSITION);
+        }
+    };
+    return MarketAccount;
+}());
+exports.MarketAccount = MarketAccount;

package/dist/OraclePrice.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
+import { ContractOraclePrice } from "./types";
 export declare class OraclePrice {
     price: BN;
     exponent: BN;
@@ -17,6 +18,7 @@ export declare class OraclePrice {
         confidence: BN;
         timestamp: BN;
     }): OraclePrice;
+    toContractOraclePrice(): ContractOraclePrice;
     cmp(other: OraclePrice): -1 | 0 | 1;
     getDeviationFactor(other: OraclePrice): BN;
     scale_to_exponent(target_exponent: BN): OraclePrice;

package/dist/OraclePrice.js

@@ -11,6 +11,12 @@ var OraclePrice = (function () {
     OraclePrice.from = function (parseData) {
         return new OraclePrice(parseData);
     };
+    OraclePrice.prototype.toContractOraclePrice = function () {
+        return {
+            price: this.price,
+            exponent: this.exponent.toNumber()
+        };
+    };
     OraclePrice.prototype.cmp = function (other) {
         var lhs, rhs;
         if (this.exponent.eq(other.exponent)) {
@@ -32,14 +38,16 @@ var OraclePrice = (function () {
     };
     OraclePrice.prototype.getDeviationFactor = function (other) {
         if (!this.exponent.eq(other.exponent)) {
-            throw "Exponents mistmatch";
+            throw "Exponents mistmatch ".concat(this.exponent.toNumber(), " != ").concat(other.exponent.toNumber());
         }
-        if (this.price.cmp(other.price) == 1) {
-            return ((this.price.sub(other.price)).muln(constants_1.BPS_POWER).div(this.price));
+        var factor;
+        if (this.price.gt(other.price)) {
+            factor = OraclePrice.from({ price: (this.price.sub(other.price).div(other.price)), exponent: this.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
         }
         else {
-            return ((other.price.sub(this.price)).muln(constants_1.BPS_POWER).div(this.price));
+            factor = OraclePrice.from({ price: (other.price.sub(this.price).div(other.price)), exponent: this.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
         }
+        return (factor.scale_to_exponent(new anchor_1.BN(-1 * constants_1.BPS_DECIMALS)).price);
     };
     OraclePrice.prototype.scale_to_exponent = function (target_exponent) {
         if (!target_exponent.isNeg()) {