flash-sdk 1.0.4 → 1.0.5

package/lib/utils/index.js

@@ -1,9 +1,45 @@
 "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());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkedDecimalDiv = exports.checkedDecimalMul = exports.checkedDecimalCeilMul = exports.checkedCeilDiv = exports.scaleToExponent = exports.toUiDecimals = exports.getUnixTs = void 0;
+exports.checkedDecimalDiv = exports.checkedDecimalMul = exports.checkedDecimalCeilMul = exports.checkedCeilDiv = exports.scaleToExponent = exports.checkIfAccountExists = exports.toUiDecimals = exports.getUnixTs = void 0;
 var bn_js_1 = __importDefault(require("bn.js"));
 var constants_1 = require("../constants");
 var getUnixTs = function () {
@@ -54,6 +90,26 @@ function toUiDecimals(nativeAmount, decimals, precision, commaSeperated) {
     }
 }
 exports.toUiDecimals = toUiDecimals;
+function checkIfAccountExists(account, connection) {
+    return __awaiter(this, void 0, void 0, function () {
+        var bal;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, connection.getBalance(account)];
+                case 1:
+                    bal = _a.sent();
+                    if (bal > 0) {
+                        return [2 /*return*/, true];
+                    }
+                    else {
+                        return [2 /*return*/, false];
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.checkIfAccountExists = checkIfAccountExists;
 // recheck ?? logic 
 var scaleToExponent = function (arg, exponent, target_exponent) {
     if (target_exponent.eq(exponent)) {

package/lib/utils/rpc.d.ts

@@ -0,0 +1,13 @@
+import { AnchorProvider } from '@coral-xyz/anchor';
+import { AddressLookupTableAccount, TransactionInstruction } from '@solana/web3.js';
+export declare function sendTransaction(provider: AnchorProvider, ixs: TransactionInstruction[], alts: AddressLookupTableAccount[], opts?: any): Promise<string>;
+export declare function confirmTransaction(provider: AnchorProvider, signature: string, opts?: any): Promise<string>;
+export declare const createComputeBudgetIx: (microLamports: number) => TransactionInstruction;
+export declare class TransactionFailError extends Error {
+    message: string;
+    txid: string;
+    constructor({ txid, message }: {
+        txid: any;
+        message: any;
+    });
+}

package/lib/utils/rpc.js

@@ -0,0 +1,217 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+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());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionFailError = exports.createComputeBudgetIx = exports.confirmTransaction = exports.sendTransaction = void 0;
+var nodewallet_1 = __importDefault(require("@coral-xyz/anchor/dist/cjs/nodewallet"));
+var web3_js_1 = require("@solana/web3.js");
+function sendTransaction(provider, ixs, alts, opts) {
+    var _a, _b, _c, _d;
+    if (opts === void 0) { opts = {}; }
+    return __awaiter(this, void 0, void 0, function () {
+        var connection, latestBlockhash, _e, payer, message, vtx, signature;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
+                case 0:
+                    connection = provider.connection;
+                    if (!((_a = opts.latestBlockhash) !== null && _a !== void 0)) return [3 /*break*/, 1];
+                    _e = _a;
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, connection.getLatestBlockhash((_c = (_b = opts.preflightCommitment) !== null && _b !== void 0 ? _b : provider.opts.preflightCommitment) !== null && _c !== void 0 ? _c : 'finalized')];
+                case 2:
+                    _e = (_f.sent());
+                    _f.label = 3;
+                case 3:
+                    latestBlockhash = _e;
+                    payer = provider.wallet;
+                    if (opts.prioritizationFee) {
+                        ixs = __spreadArray([(0, exports.createComputeBudgetIx)(opts.prioritizationFee)], ixs, true);
+                    }
+                    message = web3_js_1.MessageV0.compile({
+                        payerKey: provider.wallet.publicKey,
+                        instructions: ixs,
+                        recentBlockhash: latestBlockhash.blockhash,
+                        addressLookupTableAccounts: alts,
+                    });
+                    vtx = new web3_js_1.VersionedTransaction(message);
+                    if ((_d = opts === null || opts === void 0 ? void 0 : opts.additionalSigners) === null || _d === void 0 ? void 0 : _d.length) {
+                        vtx.sign(__spreadArray([], opts === null || opts === void 0 ? void 0 : opts.additionalSigners, true));
+                    }
+                    if (!(typeof payer.signTransaction === 'function' &&
+                        !(payer instanceof nodewallet_1.default || payer.constructor.name == 'NodeWallet'))) return [3 /*break*/, 5];
+                    return [4 /*yield*/, payer.signTransaction(vtx)];
+                case 4:
+                    vtx = (_f.sent());
+                    return [3 /*break*/, 6];
+                case 5:
+                    // Maybe this path is only correct for NodeWallet?
+                    vtx.sign([payer.payer]);
+                    _f.label = 6;
+                case 6: return [4 /*yield*/, connection.sendRawTransaction(vtx.serialize(), {
+                        skipPreflight: true, // mergedOpts.skipPreflight,
+                    })];
+                case 7:
+                    signature = _f.sent();
+                    return [2 /*return*/, signature];
+            }
+        });
+    });
+}
+exports.sendTransaction = sendTransaction;
+function confirmTransaction(provider, signature, opts) {
+    var _a, _b, _c, _d;
+    if (opts === void 0) { opts = {}; }
+    return __awaiter(this, void 0, void 0, function () {
+        var connection, latestBlockhash, _e, txConfirmationCommitment, status;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
+                case 0:
+                    connection = provider.connection;
+                    if (!((_a = opts.latestBlockhash) !== null && _a !== void 0)) return [3 /*break*/, 1];
+                    _e = _a;
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, connection.getLatestBlockhash((_c = (_b = opts.preflightCommitment) !== null && _b !== void 0 ? _b : provider.opts.preflightCommitment) !== null && _c !== void 0 ? _c : 'finalized')];
+                case 2:
+                    _e = (_f.sent());
+                    _f.label = 3;
+                case 3:
+                    latestBlockhash = _e;
+                    txConfirmationCommitment = (_d = opts.txConfirmationCommitment) !== null && _d !== void 0 ? _d : 'processed';
+                    if (!(latestBlockhash.blockhash != null &&
+                        latestBlockhash.lastValidBlockHeight != null)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, connection.confirmTransaction({
+                            signature: signature,
+                            blockhash: latestBlockhash.blockhash,
+                            lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
+                        }, txConfirmationCommitment)];
+                case 4:
+                    status = (_f.sent()).value;
+                    return [3 /*break*/, 7];
+                case 5: return [4 /*yield*/, connection.confirmTransaction(signature, txConfirmationCommitment)];
+                case 6:
+                    status = (_f.sent()).value;
+                    _f.label = 7;
+                case 7:
+                    if (status.err) {
+                        console.warn('Tx status: ', status);
+                        throw new TransactionFailError({
+                            txid: signature,
+                            message: "".concat(JSON.stringify(status)),
+                        });
+                    }
+                    return [2 /*return*/, signature];
+            }
+        });
+    });
+}
+exports.confirmTransaction = confirmTransaction;
+var createComputeBudgetIx = function (microLamports) {
+    var computeBudgetIx = web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+        microLamports: microLamports,
+    });
+    return computeBudgetIx;
+};
+exports.createComputeBudgetIx = createComputeBudgetIx;
+var TransactionFailError = /** @class */ (function (_super) {
+    __extends(TransactionFailError, _super);
+    function TransactionFailError(_a) {
+        var txid = _a.txid, message = _a.message;
+        var _this = _super.call(this) || this;
+        _this.message = message;
+        _this.txid = txid;
+        return _this;
+    }
+    return TransactionFailError;
+}(Error));
+exports.TransactionFailError = TransactionFailError;
+// const sendAndConfirmTransaction = async (
+//     ixs: TransactionInstruction[],
+//     opts: any = {},
+//     provider: AnchorProvider,
+//     postSendTxCallback?: Function,
+//     prioritizationFee?: number,
+//     txConfirmationCommitment?: Commitment
+//   ): Promise<string> => {
+//     return await sendTransaction(
+//       provider,
+//       ixs,
+//       opts.alts ?? [],
+//       {
+//         postSendTxCallback,
+//         prioritizationFee,
+//         txConfirmationCommitment,
+//         ...opts,
+//       },
+//     );
+//   }
+//   private async sendAndConfirmTransactionForGroup(
+//     group: Group,
+//     ixs: TransactionInstruction[],
+//     opts: any = {},
+//   ): Promise<string> {
+//     return await this.sendAndConfirmTransaction(ixs, {
+//       alts: group.addressLookupTablesList,
+//       ...opts,
+//     });
+//   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flash-sdk",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "description": "Client to interact with the Flash program on Solana",

package/src/CustodyAccount.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { Assets, FeesStats, Custody, Fees,  PricingParams, TradeStats, Permissions, BorrowRateParams, OracleParams, VolumeStats, PositionStats, BorrowRateState, Side, isVariant, Position } from "./types";
+import { Assets, FeesStats, Custody, Fees,  PricingParams, TradeStats, Permissions, BorrowRateParams, OracleParams, VolumeStats, PositionStats, BorrowRateState, Side, isVariant, Position, DEFAULT_POSITION } from "./types";
 import { PositionAccount } from "./PositionAccount";
 import BN from "bn.js";
 import { BN_ZERO, RATE_POWER } from "./constants";
@@ -30,6 +30,7 @@ export class CustodyAccount implements Custody {
       longPositions: PositionStats;
       shortPositions: PositionStats;
       borrowRateState: BorrowRateState;
+
       bump: number;
       tokenAccountBump: number;
 
@@ -93,29 +94,29 @@ export class CustodyAccount implements Custody {
         } else {
           stats = this.shortPositions;
         };
-        // if (!stats.openPositions.isNeg()) {
-            
-        //     const obj: Position =  {
-        //       side,
-        //       price: 
-        //           stats.weighted_price.div(stats.total_quantity)
+        if (stats.openPositions.gt(BN_ZERO)) {
             
-        //       size_usd: stats.size_usd,
-        //       collateral_usd: stats.collateral_usd,
-        //       unrealized_loss_usd: stats.cumulative_interest_usd,
-        //       cumulative_interest_snapshot: stats.cumulative_interest_snapshot,
-        //       locked_amount: stats.locked_amount,
-        //       ..Position::default()
-        //     }
-        //     return new PositionAccount(
-        //       new PublicKey('dgfgfg'),
-              
-        //     )
-        // } else {
-        //     Ok(Position::default())
-        // }
-
-        throw Error("Incomplete")
+            const obj: Position =  {
+              side,
+              price: stats.weightedPrice.div(stats.totalQuantity),
+              sizeUsd: stats.sizeUsd,
+              collateralUsd: stats.collateralUsd,
+              unrealizedLossUsd: stats.cumulativeInterestUsd,
+              cumulativeInterestSnapshot: stats.cumulativeInterestSnapshot,
+              lockedAmount: stats.lockedAmount,
+              ...DEFAULT_POSITION
+            } as Position;
+            return new PositionAccount(
+              PublicKey.default,
+              obj
+            )
+        } else {
+          return new PositionAccount(
+            PublicKey.default,
+            DEFAULT_POSITION
+          )
+        }
+
     }
 
       

package/src/OraclePrice.ts

@@ -101,8 +101,8 @@ export class OraclePrice {
         )
     }
 
-    // get_pyth_price() {
-        
-    // }
-
+    toUiPrice(precision: number): number {
+        const x: BN = this.price.div(new BN(10).pow(new BN((this.exponent.toNumber()*-1) - precision)))
+        return x.toNumber()/10**precision
+    }
 }