flash-sdk 8.0.1 → 9.0.0-alpha.0

package/dist/PerpetualsClient.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");
@@ -2767,12 +2767,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swapAndOpen = function (targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, minCollateralAmountOut_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1) {
+        this.swapAndOpen = function (targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1) {
             var args_1 = [];
-            for (var _i = 10; _i < arguments.length; _i++) {
-                args_1[_i - 10] = arguments[_i];
+            for (var _i = 9; _i < arguments.length; _i++) {
+                args_1[_i - 9] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, minCollateralAmountOut_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, minCollateralAmountOut, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, targetToken, userInputTokenAccount, userInputToken, lamports, unWrappedSolBalance, _a, userOutputTokenAccount, tokenAccountBalance, _b, userOutputTokenAccount, rebateMintAccount, inx, err_3;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
@@ -2881,7 +2881,6 @@ var PerpetualsClient = (function () {
                             return [4, this.program.methods
                                     .swapAndOpen({
                                     amountIn: amountIn,
-                                    minCollateralAmountOut: minCollateralAmountOut,
                                     priceWithSlippage: priceWithSlippage,
                                     sizeAmount: sizeAmount,
                                     privilege: privilege
@@ -3166,12 +3165,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swapAndAddCollateral = function (targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1) {
+        this.swapAndAddCollateral = function (targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, side_1, positionPubKey_1, poolConfig_1) {
             var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
+            for (var _i = 7; _i < arguments.length; _i++) {
+                args_1[_i - 7] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, minCollateralAmountOut, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, marketAccount, instruction;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
@@ -3250,7 +3249,6 @@ var PerpetualsClient = (function () {
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods.swapAndAddCollateral({
                                     amountIn: amountIn,
-                                    minCollateralAmountOut: minCollateralAmountOut,
                                 }).accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
@@ -3286,12 +3284,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeCollateral = function (collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
+        this.removeCollateral = function (collateralDeltaUsd_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
             var args_1 = [];
             for (var _i = 6; _i < arguments.length; _i++) {
                 args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([collateralDeltaUsd_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralDeltaUsd, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, marketAccount, instruction, closeWsolATAIns, error_2;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
@@ -3355,7 +3353,7 @@ var PerpetualsClient = (function () {
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods
                                     .removeCollateral({
-                                    collateralDelta: collateralWithFee,
+                                    collateralDeltaUsd: collateralDeltaUsd,
                                 })
                                     .accounts({
                                     owner: publicKey,
@@ -3397,12 +3395,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeCollateralAndSwap = function (targetSymbol_1, collateralSymbol_1, outputSymbol_1, minSwapAmountOut_1, collateralDelta_1, side_1, poolConfig_1) {
+        this.removeCollateralAndSwap = function (targetSymbol_1, collateralSymbol_1, outputSymbol_1, collateralDeltaUsd_1, side_1, poolConfig_1) {
             var args_1 = [];
-            for (var _i = 7; _i < arguments.length; _i++) {
-                args_1[_i - 7] = arguments[_i];
+            for (var _i = 6; _i < arguments.length; _i++) {
+                args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, outputSymbol_1, minSwapAmountOut_1, collateralDelta_1, side_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, outputSymbol, minSwapAmountOut, collateralDelta, side, poolConfig, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, outputSymbol_1, collateralDeltaUsd_1, side_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, outputSymbol, collateralDeltaUsd, side, poolConfig, ephemeralSignerPubkey) {
                 var publicKey, targetCustodyConfig, collateralCustodyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, instruction;
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_a) {
@@ -3459,8 +3457,7 @@ var PerpetualsClient = (function () {
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
                                     .removeCollateralAndSwap({
-                                    collateralDelta: collateralDelta,
-                                    minSwapAmountOut: minSwapAmountOut,
+                                    collateralDeltaUsd: collateralDeltaUsd,
                                 })
                                     .accounts({
                                     owner: publicKey,
@@ -7030,11 +7027,7 @@ var PerpetualsClient = (function () {
                                 rewardCustody: rewardCustody.custodyAccount,
                                 rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
                                 rewardCustodyTokenAccount: rewardCustody.tokenAccount,
-                                custody: custody.custodyAccount,
-                                custodyOracleAccount: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
-                                custodyTokenAccount: custody.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })

package/dist/PoolAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { Pool, TokenRatios, StakeStats, CompoundingStats, Permissions } from "./types";
 import { PublicKey } from "@solana/web3.js";
@@ -38,6 +37,9 @@ export declare class PoolAccount implements Pool {
     compoundingLpPrice: BN;
     lastUpdatedTimestamp: BN;
     padding2: BN[];
+    feesObligationUsd: BN;
+    rebateObligationUsd: BN;
+    thresholdUsd: BN;
     constructor(publicKey: PublicKey, parseData: Pool);
     static from(publicKey: PublicKey, parseData: Pool): PoolAccount;
     updatePoolData(parseData: Pool): void;

package/dist/PoolConfig.json

@@ -1626,7 +1626,7 @@
                     "isStable": false,
                     "isVirtual": false,
                     "pythTicker": "Crypto.FARTCOIN/USD",
-                    "pythPriceId": "58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608",
+                    "pythPriceId": "0x58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608",
                     "isToken2022": false
                 }
             ],
@@ -1661,7 +1661,7 @@
                     "intOracleAddress": "CXUxUV4tsf7sYnX52KrKDdkskyGGHXGkQgDHXf2fk2UW",
                     "extOracleAddress": "2t8eUbYKjidMs3uSeYM9jXM9uudYZwGkSeTB4TKjmvnC",
                     "pythTicker": "Crypto.FARTCOIN/USD",
-                    "pythPriceId": "58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608"
+                    "pythPriceId": "0x58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608"
                 }
             ],
             "markets": [
@@ -1805,7 +1805,7 @@
                     "isStable": false,
                     "isVirtual": false,
                     "pythTicker": "Crypto.JITOSOL/USD",
-                    "pythPriceId": "67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb",
+                    "pythPriceId": "0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb",
                     "isToken2022": false
                 }
             ],
@@ -1888,7 +1888,7 @@
                     "intOracleAddress": "CvoTpWoqprBrzApWq5PQyxaj3neyYEMchSm1AVi43FrD",
                     "extOracleAddress": "AxaxyeDT8JnWERSaTKvFXvPKkEdxnamKSqpWbsSjYg1g",
                     "pythTicker": "Crypto.JITOSOL/USD",
-                    "pythPriceId": "67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb"
+                    "pythPriceId": "0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb"
                 }
             ],
             "markets": [
@@ -3319,7 +3319,7 @@
                     "isStable": false,
                     "isVirtual": false,
                     "pythTicker": "Crypto.FARTCOIN/USD",
-                    "pythPriceId": "58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608",
+                    "pythPriceId": "0x58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608",
                     "isToken2022": false
                 }
             ],
@@ -3354,7 +3354,7 @@
                     "intOracleAddress": "97WpDbJGCpjSQmWsP7ao5CF7kesyyQ4MTk54tWoaP4bD",
                     "extOracleAddress": "2t8eUbYKjidMs3uSeYM9jXM9uudYZwGkSeTB4TKjmvnC",
                     "pythTicker": "Crypto.FARTCOIN/USD",
-                    "pythPriceId": "58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608"
+                    "pythPriceId": "0x58cd29ef0e714c5affc44f269b2c1899a52da4169d7acc147b9da692e6953608"
                 }
             ],
             "markets": [

package/dist/PoolDataClient.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { Mint } from "@solana/spl-token";
 import { CustodyAccount } from "./CustodyAccount";

package/dist/PositionAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { ContractOraclePrice, Position } from "./types";
@@ -16,7 +15,7 @@ export declare class PositionAccount implements Position {
     lockedUsd: BN;
     collateralAmount: BN;
     collateralUsd: BN;
-    unsettledAmount: BN;
+    unsettledValue: BN;
     unsettledFeesUsd: BN;
     cumulativeLockFeeSnapshot: BN;
     degenSizeUsd: BN;

package/dist/TokenStakeAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { TokenStake, WithdrawStakeLog } from "./types";
 import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
@@ -17,7 +16,7 @@ export declare class TokenStakeAccount implements TokenStake {
     rewardTokens: BN;
     unclaimedRevenueAmount: BN;
     revenueSnapshot: BN;
-    padding: BN[];
+    claimableRebateUsd: BN;
     constructor(data: {
         owner: PublicKey;
         isInitialized: boolean;
@@ -33,7 +32,7 @@ export declare class TokenStakeAccount implements TokenStake {
         rewardTokens: BN;
         unclaimedRevenueAmount: BN;
         revenueSnapshot: BN;
-        padding: BN[];
+        claimableRebateUsd: BN;
     });
     static from(decodedData: any): TokenStakeAccount;
     updateData(newData: Partial<TokenStakeAccount>): void;

package/dist/TokenStakeAccount.js

@@ -18,7 +18,7 @@ var TokenStakeAccount = (function () {
         this.lastRewardEpochCount = data.lastRewardEpochCount;
         this.unclaimedRevenueAmount = data.unclaimedRevenueAmount;
         this.revenueSnapshot = data.revenueSnapshot;
-        this.padding = data.padding;
+        this.claimableRebateUsd = data.claimableRebateUsd;
     }
     TokenStakeAccount.from = function (decodedData) {
         return new TokenStakeAccount({
@@ -36,7 +36,7 @@ var TokenStakeAccount = (function () {
             lastRewardEpochCount: decodedData.lastRewardEpochCount,
             unclaimedRevenueAmount: decodedData.unclaimedRevenueAmount,
             revenueSnapshot: decodedData.revenueSnapshot,
-            padding: decodedData.padding.map(function (p) { return new anchor_1.BN(p); }),
+            claimableRebateUsd: decodedData.claimableRebateUsd,
         });
     };
     TokenStakeAccount.prototype.updateData = function (newData) {

package/dist/TokenVaultAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { TokenVault } from "./types";

package/dist/TradingAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { Trading, VoltageStats } from "./types";
 import { PublicKey } from "@solana/web3.js";

package/dist/ViewHelper.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");

package/dist/backupOracle.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");
@@ -40,7 +40,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBackupOracleInstruction = exports.getBackupOracleInstruction = exports.getPythnetOraclePrices = exports.pythPriceServiceConnection = exports.API_ENDPOINT = void 0;
+exports.getBackupOracleInstruction = exports.getPythnetOraclePrices = exports.pythPriceServiceConnection = exports.API_ENDPOINT = void 0;
+exports.createBackupOracleInstruction = createBackupOracleInstruction;
 var price_service_client_1 = require("@pythnetwork/price-service-client");
 var web3_js_1 = require("@solana/web3.js");
 var bn_js_1 = __importDefault(require("bn.js"));
@@ -156,4 +157,3 @@ function createBackupOracleInstruction(poolAddress_1) {
         });
     });
 }
-exports.createBackupOracleInstruction = createBackupOracleInstruction;

package/dist/constants/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 export declare const PERCENTAGE_DECIMALS = 4;
 export declare const USD_DECIMALS = 6;