@symmetry-hq/temp-v3-sdk 0.0.35 → 0.0.37

package/dist/src/constants.d.ts

@@ -1,5 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
+export declare const COMPUTE_UNITS = 1000000;
+export declare const PRIORITY_FEE = 100000;
 export declare const BASKETS_V3_PROGRAM_ID: PublicKey;
 export declare const METADATA_PROGRAM_ID: PublicKey;
 export declare const ADDRESS_LOOKUP_TABLE_PROGRAM_ID: PublicKey;

package/dist/src/constants.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_EXTRA_DATA_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = exports.MAX_SUPPORTED_TOKENS_PER_BASKET = exports.USDC_DECIMALS = exports.WSOL_DECIMALS = exports.HUNDRED_PERCENT_BPS = exports.X64 = exports.MAX_TRANSFER_TOKENS = exports.MAX_MANAGERS_PER_BASKET = exports.INTENT_TASK_DATA_SIZE = exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = exports.MINTS = exports.RENT_SYSVAR_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.METADATA_PROGRAM_ID = exports.BASKETS_V3_PROGRAM_ID = void 0;
+exports.MAX_EXTRA_DATA_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = exports.MAX_SUPPORTED_TOKENS_PER_BASKET = exports.USDC_DECIMALS = exports.WSOL_DECIMALS = exports.HUNDRED_PERCENT_BPS = exports.X64 = exports.MAX_TRANSFER_TOKENS = exports.MAX_MANAGERS_PER_BASKET = exports.INTENT_TASK_DATA_SIZE = exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = exports.MINTS = exports.RENT_SYSVAR_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.METADATA_PROGRAM_ID = exports.BASKETS_V3_PROGRAM_ID = exports.PRIORITY_FEE = exports.COMPUTE_UNITS = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
+exports.COMPUTE_UNITS = 1000000;
+exports.PRIORITY_FEE = 100000;
 exports.BASKETS_V3_PROGRAM_ID = new web3_js_1.PublicKey("BASKT7aKd8n7ibpUbwLP3Wiyxyi3yoiXsxBk4Hpumate");
 exports.METADATA_PROGRAM_ID = new web3_js_1.PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
 exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = new web3_js_1.PublicKey("AddressLookupTab1e1111111111111111111111111");

package/dist/src/index.d.ts

@@ -10,18 +10,13 @@ import { IntentFilter } from './states/intents/intent';
 import { RebalanceIntentFilter } from './states/intents/rebalanceIntent';
 import { TxPayloadBatchSequence, VersionedTxs, Wallet } from './txUtils';
 import { FormattedOracleType } from './layouts/oracle';
-export declare const COMPUTE_UNITS = 1000000;
-export declare const PRIORITY_FEE = 100000;
-export declare const JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
-export declare const MAX_JUPITER_ACCOUNTS = 35;
+import { getJupTokenLedgerAndSwapInstructions } from './jup';
 export declare class SymmetryCore {
     private sdkParams;
     constructor(params: {
         connection: Connection;
         network: "devnet" | "mainnet";
         priorityFee?: number;
-        jupiterApiKey?: string;
-        maxAllowedAccounts?: number;
     });
     fetchGlobalConfig(): Promise<GlobalConfig>;
     fetchBasket(basketPubkey: string): Promise<Basket>;
@@ -124,6 +119,15 @@ export declare class SymmetryCore {
         min_bounty_amount?: number;
         max_bounty_amount?: number;
     }): Promise<TxPayloadBatchSequence>;
+    rebalanceBasketTx(params: {
+        keeper: string;
+        basket_mint: string;
+        rebalance_slippage_bps?: number;
+        per_trade_rebalance_slippage_bps?: number;
+        execution_start_time?: number;
+        min_bounty_amount?: number;
+        max_bounty_amount?: number;
+    }): Promise<TxPayloadBatchSequence>;
     startPriceUpdatesTx(params: {
         keeper: string;
         basket: string;
@@ -146,6 +150,7 @@ export declare class SymmetryCore {
         mode?: number;
         jup_token_ledger_ix?: TransactionInstruction;
         jup_swap_ix?: TransactionInstruction;
+        jup_address_lookup_table_addresses?: PublicKey[];
     }): Promise<TxPayloadBatchSequence>;
     mintTx(params: {
         keeper: string;
@@ -159,6 +164,10 @@ export declare class SymmetryCore {
         keeper: string;
         rebalance_intent: string;
     }): Promise<TxPayloadBatchSequence>;
+    claimBasketFeesTx(params: {
+        claimer: string;
+        basket: string;
+    }): Promise<TxPayloadBatchSequence>;
     signAndSendVersionedTxs(params: {
         versionedTxs: VersionedTxs;
         wallet: Wallet;
@@ -173,3 +182,5 @@ export { FormattedGlobalConfig, FormattedIntentStatus, FormattedTaskType, Format
 export { FormattedRebalanceType, FormattedRebalanceAction, FormattedOraclePrice, FormattedTokenAuction, FormattedTaskCompletion, FormattedRebalanceIntent, };
 export { FormattedCreatorSettings, FormattedManagersSettings, FormattedFeeSettings, FormattedScheduleSettings, FormattedAutomationSettings, FormattedLpSettings, FormattedMetadataSettings, FormattedDepositsSettings, FormattedForceRebalanceSettings, FormattedCustomRebalanceSettings, FormattedAddTokenSettings, FormattedUpdateWeightsSettings, FormattedMakeDirectSwapSettings, FormattedAccumulatedFees, FormattedLookupTables, FormattedAsset, FormattedOracleSettings, FormattedOracleAggregator, FormattedOracle, FormattedOracleType, FormattedBasket, };
 export { EditCreatorSettings, EditManagerSettings, EditFeeSettings, EditScheduleSettings, EditAutomationSettings, EditLpSettings, EditMetadataSettings, EditDepositsSettings, EditForceRebalanceSettings, EditCustomRebalanceSettings, EditAddTokenSettings, EditUpdateWeightsSettings, EditMakeDirectSwapSettings, AddOrEditTokenInput, OracleInput, UpdateWeightsInput, MakeDirectSwapInput, Settings, TaskContext, TaskType, };
+export { getJupTokenLedgerAndSwapInstructions, };
+export { KeeperMonitor } from './keeperMonitor';

package/dist/src/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TaskType = exports.SymmetryCore = exports.MAX_JUPITER_ACCOUNTS = exports.JUPITER_API_KEY = exports.PRIORITY_FEE = exports.COMPUTE_UNITS = void 0;
+exports.KeeperMonitor = exports.getJupTokenLedgerAndSwapInstructions = exports.TaskType = exports.SymmetryCore = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
@@ -36,26 +36,19 @@ const rebalanceIntent_3 = require("./states/intents/rebalanceIntent");
 const txUtils_1 = require("./txUtils");
 const config_1 = require("./states/config");
 const flashSwap_1 = require("./instructions/automation/flashSwap");
+const claimFees_1 = require("./instructions/management/claimFees");
+const jup_1 = require("./jup");
+Object.defineProperty(exports, "getJupTokenLedgerAndSwapInstructions", { enumerable: true, get: function () { return jup_1.getJupTokenLedgerAndSwapInstructions; } });
 const constants_1 = require("./constants");
-exports.COMPUTE_UNITS = 1000000;
-exports.PRIORITY_FEE = 100000;
-exports.JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
-exports.MAX_JUPITER_ACCOUNTS = 35;
 class SymmetryCore {
     constructor(params) {
-        var _a, _b, _c;
+        var _a;
         this.sdkParams = {
             connection: params.connection,
             network: params.network,
-            // payer: params.payer ?? Keypair.generate().publicKey,
-            priorityFee: (_a = params.priorityFee) !== null && _a !== void 0 ? _a : exports.PRIORITY_FEE,
-            jupiterApiKey: (_b = params.jupiterApiKey) !== null && _b !== void 0 ? _b : exports.JUPITER_API_KEY,
-            maxAllowedAccounts: (_c = params.maxAllowedAccounts) !== null && _c !== void 0 ? _c : exports.MAX_JUPITER_ACCOUNTS,
+            priorityFee: (_a = params.priorityFee) !== null && _a !== void 0 ? _a : constants_1.PRIORITY_FEE,
         };
     }
-    // async setPayer(payer: PublicKey) {
-    //     this.sdkParams.payer = payer;
-    // }
     fetchGlobalConfig() {
         return __awaiter(this, void 0, void 0, function* () {
             return yield (0, config_1.fetchGlobalConfig)(this.sdkParams.connection);
@@ -185,7 +178,7 @@ class SymmetryCore {
                             payer: params.signer,
                             instructions: [
                                 ix,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -202,7 +195,7 @@ class SymmetryCore {
                             payer: params.signer,
                             instructions: [
                                 ix,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -257,7 +250,7 @@ class SymmetryCore {
                             payer: creator,
                             instructions: [
                                 preIx, preIx2, preIx2, ix, createBasketFeesAccountIx,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -408,7 +401,7 @@ class SymmetryCore {
                             instructions: [
                                 ...wsolIxs,
                                 openBasketIntentIx,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -446,7 +439,7 @@ class SymmetryCore {
                                 ixWithdraw,
                                 params.jup_swap_ix,
                                 ixDeposit,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -455,7 +448,7 @@ class SymmetryCore {
                             payer: manager,
                             instructions: [
                                 executeBasketIntentIx,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -466,7 +459,7 @@ class SymmetryCore {
                         ...wsolIxs,
                         openBasketIntentIx,
                         executeBasketIntentIx,
-                        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                         web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                     ];
                 }
@@ -498,7 +491,7 @@ class SymmetryCore {
                             payer: keeper,
                             instructions: [
                                 ix,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -524,7 +517,7 @@ class SymmetryCore {
                             payer: keeper,
                             instructions: [
                                 ix,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -547,7 +540,7 @@ class SymmetryCore {
                             payer: keeper,
                             instructions: [
                                 ix,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -617,7 +610,7 @@ class SymmetryCore {
                                     minBountyAmount: minBountyAmount,
                                     maxBountyAmount: maxBountyAmount,
                                 }),
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -631,7 +624,7 @@ class SymmetryCore {
                             payer: buyer,
                             instructions: [
                                 ix,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee })
                             ],
                             lookupTables: [],
@@ -648,8 +641,8 @@ class SymmetryCore {
                                     keeper: buyer,
                                     basket: basket.ownAddress,
                                     rebalanceIntent: rebalanceIntent,
-                                }) : web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                }) : web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -750,7 +743,7 @@ class SymmetryCore {
                                     withdrawParamsKeepTokensBitmask: keepTokensBitmask,
                                     withdrawParamsKeepAllTokens: keepAllTokensFlag,
                                 }),
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -762,8 +755,8 @@ class SymmetryCore {
                                     keeper: seller,
                                     basket: basket.ownAddress,
                                     rebalanceIntent: rebalanceIntent,
-                                }) : web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                }) : web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -774,6 +767,70 @@ class SymmetryCore {
             return txPayloadBatchSequence;
         });
     }
+    rebalanceBasketTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f;
+            let keeper = new web3_js_1.PublicKey(params.keeper);
+            let rebalanceSlippageBps = (_a = params.rebalance_slippage_bps) !== null && _a !== void 0 ? _a : 100;
+            let perTradeRebalanceSlippageBps = (_b = params.per_trade_rebalance_slippage_bps) !== null && _b !== void 0 ? _b : 100;
+            let executionStartTime = (_c = params.execution_start_time) !== null && _c !== void 0 ? _c : 0;
+            let minBountyAmount = (_d = params.min_bounty_amount) !== null && _d !== void 0 ? _d : 0;
+            let maxBountyAmount = (_e = params.max_bounty_amount) !== null && _e !== void 0 ? _e : 0;
+            const basket = yield this.fetchBasket((0, pda_1.getBasketState)(new web3_js_1.PublicKey(params.basket_mint)).toBase58());
+            let globalConfig = yield this.fetchGlobalConfig();
+            let bountyWsolAmount = 0;
+            if (globalConfig.bountyMint.equals(constants_1.MINTS["mainnet"].WSOL)) {
+                let boundBounty = parseInt(globalConfig.bountyBondAmount.toString());
+                let maxBountyPerTask = parseInt(globalConfig.bountyPerTask.maxBounty.toString());
+                let bountyPerPriceUpdateTaskDivisor = parseInt(globalConfig.bountyPerPriceUpdateTaskDivisor.toString());
+                if (maxBountyAmount > maxBountyPerTask)
+                    maxBountyPerTask = maxBountyAmount;
+                bountyWsolAmount = (0, rebalanceIntent_3.computeRebalanceIntentBountyAmount)(rebalanceIntent_2.RebalanceType.Basket, basket.numTokens, boundBounty, maxBountyPerTask, Math.floor(maxBountyPerTask / bountyPerPriceUpdateTaskDivisor));
+            }
+            let wsolIxs = yield (0, txUtils_1.wrapWsolIxs)(this.sdkParams.connection, keeper, bountyWsolAmount);
+            const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, basket.ownAddress);
+            let rentPayer = (0, pda_1.getRentPayerPda)();
+            let renPayerAi = yield this.sdkParams.connection.getAccountInfo(rentPayer);
+            let rebalanceIntentRentPayer = keeper;
+            // TODO: check actual lamports required for rent
+            if ((_f = renPayerAi === null || renPayerAi === void 0 ? void 0 : renPayerAi.lamports) !== null && _f !== void 0 ? _f : 0 > 0)
+                rebalanceIntentRentPayer = rentPayer;
+            let bountyMint = basket.settings.bountyMint;
+            let txBatchData = { batches: [[{
+                            payer: keeper,
+                            instructions: [
+                                ...wsolIxs,
+                                (0, rebalanceIntent_1.createRebalanceIntentIx)({
+                                    signer: keeper,
+                                    owner: basket.ownAddress,
+                                    basket: basket.ownAddress,
+                                }),
+                                (0, rebalanceIntent_1.resizeRebalanceIntentIx)(rebalanceIntent),
+                                (0, rebalanceIntent_1.initRebalanceIntentIx)({
+                                    signer: keeper,
+                                    owner: basket.ownAddress,
+                                    basket: basket.ownAddress,
+                                    basketTokenMint: basket.mint,
+                                    rebalanceIntentRentPayer: rebalanceIntentRentPayer,
+                                    bountyMint: bountyMint,
+                                    rebalanceType: rebalanceIntent_2.RebalanceType.Basket,
+                                    basketRebalanceIntent: undefined,
+                                    rebalanceSlippageBps: rebalanceSlippageBps,
+                                    perTradeRebalanceSlippageBps: perTradeRebalanceSlippageBps,
+                                    executionStartTime: executionStartTime,
+                                    minBountyAmount: minBountyAmount,
+                                    maxBountyAmount: maxBountyAmount,
+                                }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        }]] };
+            let versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
+            let txPayloadBatchSequence = (0, txUtils_1.prepareTxPayloadBatchSequence)(txBatchData, versionedTxs);
+            return txPayloadBatchSequence;
+        });
+    }
     startPriceUpdatesTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let keeper = new web3_js_1.PublicKey(params.keeper);
@@ -787,7 +844,7 @@ class SymmetryCore {
                                     basket: basket,
                                     rebalanceIntent: rebalanceIntent,
                                 }),
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -827,6 +884,7 @@ class SymmetryCore {
                 while (tokenIndices.length < 20)
                     tokenIndices.push(0);
                 // TODO: in last instruction we should include performance fee accounts
+                let performanceFees = basket.settings.fees.hostPerformanceFeeBps + basket.settings.fees.creatorPerformanceFeeBps + basket.settings.fees.managersPerformanceFeeBps;
                 ixs.push((0, priceUpdate_1.updateTokenPricesIx)({
                     keeper: keeper,
                     basket: basket.ownAddress,
@@ -836,13 +894,14 @@ class SymmetryCore {
                     tokenIndices: tokenIndices,
                     additionalOracleAccounts: allKeys,
                     basketRebalanceIntent: basket.settings.activeRebalance.eq(new anchor_1.BN(0)) ? undefined : basketRebalanceIntent,
+                    basketMint: performanceFees > 0 ? basket.mint : undefined,
                 }));
             }
             let txBatchData = { batches: [ixs.map(ix => ({
                         payer: keeper,
                         instructions: [
                             ix,
-                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                             web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                         ],
                         lookupTables: [basket.lookupTables.active[0], basket.lookupTables.active[1]],
@@ -854,6 +913,7 @@ class SymmetryCore {
     }
     flashSwapTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             let keeper = new web3_js_1.PublicKey(params.keeper);
             let basket = new web3_js_1.PublicKey(params.basket);
             let rebalanceIntent = params.rebalance_intent ? new web3_js_1.PublicKey(params.rebalance_intent) : undefined;
@@ -877,7 +937,7 @@ class SymmetryCore {
             let ixWithdraw = (0, flashSwap_1.flashWithdrawIx)(flashParams);
             let ixDeposit = (0, flashSwap_1.flashDepositIx)(flashParams);
             let ixs = [];
-            ixs.concat([
+            ixs = ixs.concat([
                 (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(keeper, (0, pda_1.getAta)(keeper, mintIn), keeper, mintIn),
                 (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(keeper, (0, pda_1.getAta)(keeper, mintOut), keeper, mintOut),
             ]);
@@ -890,13 +950,13 @@ class SymmetryCore {
             }
             ixs.push(ixDeposit);
             ixs = ixs.concat([
-                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
             ]);
             let txBatchData = { batches: [[{
                             payer: keeper,
                             instructions: ixs,
-                            lookupTables: [],
+                            lookupTables: (_a = params.jup_address_lookup_table_addresses) !== null && _a !== void 0 ? _a : [],
                         }]] };
             let versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
             let txPayloadBatchSequence = (0, txUtils_1.prepareTxPayloadBatchSequence)(txBatchData, versionedTxs);
@@ -920,7 +980,7 @@ class SymmetryCore {
                             payer: keeper,
                             instructions: [
                                 ix,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
@@ -954,7 +1014,7 @@ class SymmetryCore {
                         payer: keeper,
                         instructions: [
                             ix,
-                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                             web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                         ],
                         lookupTables: [],
@@ -970,17 +1030,17 @@ class SymmetryCore {
             let rebalanceIntent = yield this.fetchRebalanceIntent(params.rebalance_intent);
             let keepersArray = [];
             if (!rebalanceIntent.startPriceUpdateTask.completedBy.equals(web3_js_1.PublicKey.default))
-                keepersArray.push(rebalanceIntent.startPriceUpdateTask.completedBy);
+                keepersArray.push(rebalanceIntent.startPriceUpdateTask.completedBy.toBase58());
             if (!rebalanceIntent.finishPriceUpdateTask.completedBy.equals(web3_js_1.PublicKey.default))
-                keepersArray.push(rebalanceIntent.finishPriceUpdateTask.completedBy);
+                keepersArray.push(rebalanceIntent.finishPriceUpdateTask.completedBy.toBase58());
             if (!rebalanceIntent.mintBasketTask.completedBy.equals(web3_js_1.PublicKey.default))
-                keepersArray.push(rebalanceIntent.mintBasketTask.completedBy);
+                keepersArray.push(rebalanceIntent.mintBasketTask.completedBy.toBase58());
             for (let i = 0; i < rebalanceIntent.priceUpdateTasks.length; i++)
                 if (!rebalanceIntent.priceUpdateTasks[i].completedBy.equals(web3_js_1.PublicKey.default))
-                    keepersArray.push(rebalanceIntent.priceUpdateTasks[i].completedBy);
+                    keepersArray.push(rebalanceIntent.priceUpdateTasks[i].completedBy.toBase58());
             for (let i = 0; i < rebalanceIntent.tokenSettlementTasks.length; i++)
                 if (!rebalanceIntent.tokenSettlementTasks[i].completedBy.equals(web3_js_1.PublicKey.default))
-                    keepersArray.push(rebalanceIntent.tokenSettlementTasks[i].completedBy);
+                    keepersArray.push(rebalanceIntent.tokenSettlementTasks[i].completedBy.toBase58());
             keepersArray = Array.from(new Set(keepersArray));
             let batchSize = 10;
             let ixs = [];
@@ -992,13 +1052,13 @@ class SymmetryCore {
                     bountyMint: rebalanceIntent.bounty.bountyMint,
                     bountyDepositor: rebalanceIntent.bounty.bountyDepositor,
                     rentPayer: rebalanceIntent.rentPayer,
-                    keepers: keepersArray.slice(batchStart, batchStart + batchSize),
+                    keepers: keepersArray.map(keeper => new web3_js_1.PublicKey(keeper)).slice(batchStart, batchStart + batchSize),
                 }));
             let txBatchData = { batches: [ixs.map(ix => ({
                         payer: keeper,
                         instructions: [
                             ix,
-                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
                             web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                         ],
                         lookupTables: [],
@@ -1008,6 +1068,54 @@ class SymmetryCore {
             return txPayloadBatchSequence;
         });
     }
+    claimBasketFeesTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let claimer = new web3_js_1.PublicKey(params.claimer);
+            let basket = yield this.fetchBasket(params.basket);
+            let globalConfig = yield this.fetchGlobalConfig();
+            let ixs = [];
+            if (claimer.equals(globalConfig.symmetryFeeCollector))
+                ixs.push((0, claimFees_1.claimFeesIx)({
+                    claimer: claimer,
+                    basketTokenMint: basket.mint,
+                    feeType: 0,
+                    managers: [],
+                }));
+            if (claimer.equals(basket.settings.creator))
+                ixs.push((0, claimFees_1.claimFeesIx)({
+                    claimer: claimer,
+                    basketTokenMint: basket.mint,
+                    feeType: 1,
+                    managers: [],
+                }));
+            if (claimer.equals(basket.settings.host))
+                ixs.push((0, claimFees_1.claimFeesIx)({
+                    claimer: claimer,
+                    basketTokenMint: basket.mint,
+                    feeType: 2,
+                    managers: [],
+                }));
+            if (basket.settings.managers.managers.find(manager => manager.equals(claimer)))
+                ixs.push((0, claimFees_1.claimFeesIx)({
+                    claimer: claimer,
+                    basketTokenMint: basket.mint,
+                    feeType: 3,
+                    managers: basket.settings.managers.managers,
+                }));
+            let txBatchData = { batches: [[{
+                            payer: claimer,
+                            instructions: [
+                                ...ixs,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        }]] };
+            let versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
+            let txPayloadBatchSequence = (0, txUtils_1.prepareTxPayloadBatchSequence)(txBatchData, versionedTxs);
+            return txPayloadBatchSequence;
+        });
+    }
     signAndSendVersionedTxs(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let { versionedTxs, wallet } = params;
@@ -1024,3 +1132,5 @@ class SymmetryCore {
     }
 }
 exports.SymmetryCore = SymmetryCore;
+var keeperMonitor_1 = require("./keeperMonitor");
+Object.defineProperty(exports, "KeeperMonitor", { enumerable: true, get: function () { return keeperMonitor_1.KeeperMonitor; } });

package/dist/src/instructions/automation/priceUpdate.d.ts

@@ -14,6 +14,7 @@ export declare function updateTokenPricesIx(params: {
     lookupTable1: PublicKey;
     tokenIndices: number[];
     additionalOracleAccounts: PublicKey[];
+    basketMint?: PublicKey;
 }): TransactionInstruction;
 export declare function updateTokenPricesCustomIx(params: {
     manager: PublicKey;

package/dist/src/instructions/automation/priceUpdate.js

@@ -8,6 +8,7 @@ const constants_1 = require("../../constants");
 const oracle_1 = require("../../layouts/oracle");
 const pda_1 = require("../pda");
 const anchor_1 = require("@coral-xyz/anchor");
+const spl_token_1 = require("@solana/spl-token");
 const START_PRICE_UPDATES_DISCRIMINATOR = Buffer.from([240, 67, 241, 88, 0, 32, 224, 184]);
 const UPDATE_TOKEN_PRICES_DISCRIMINATOR = Buffer.from([147, 87, 140, 33, 214, 189, 181, 242]);
 const UPDATE_TOKEN_PRICES_CUSTOM_DISCRIMINATOR = Buffer.from([71, 100, 35, 136, 116, 239, 54, 126]);
@@ -50,6 +51,13 @@ function updateTokenPricesIx(params) {
     ];
     // remaining accounts
     keys.push(...params.additionalOracleAccounts.map((pubkey) => ({ pubkey, isSigner: false, isWritable: false })));
+    if (params.basketMint) {
+        let basketFeesWallet = (0, pda_1.getBasketFeesPda)(params.basket);
+        let basketFeesTokenAccount = (0, pda_1.getAta)(basketFeesWallet, params.basketMint);
+        keys.push({ pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false });
+        keys.push({ pubkey: params.basketMint, isSigner: false, isWritable: true });
+        keys.push({ pubkey: basketFeesTokenAccount, isSigner: false, isWritable: true });
+    }
     return new web3_js_1.TransactionInstruction({
         keys,
         programId: constants_1.BASKETS_V3_PROGRAM_ID,

package/dist/src/instructions/management/claimFees.js

@@ -7,7 +7,8 @@ const constants_1 = require("../../constants");
 const pda_1 = require("../pda");
 const CLAIM_FEES_DISCRIMINATOR = Buffer.from([97, 50, 216, 3, 144, 118, 13, 164]);
 function claimFeesIx(params) {
-    const { claimer, basketTokenMint, feeType, managers } = params;
+    let { claimer, basketTokenMint, feeType, managers } = params;
+    managers = managers.filter(manager => !manager.equals(web3_js_1.PublicKey.default));
     let basket = (0, pda_1.getBasketState)(basketTokenMint);
     let basketFeesWallet = (0, pda_1.getBasketFeesPda)(basket);
     let basketFeesTokenAccount = (0, pda_1.getAta)(basketFeesWallet, basketTokenMint);

package/dist/src/instructions/management/edit.js

@@ -67,7 +67,7 @@ function editPrivateBasketSettingsIx(params) {
     });
 }
 function createEditBasketIntentIx(params) {
-    var _a;
+    var _a, _b, _c;
     const { manager, basket, intent, intentSeedArray, useBounty, activationTimestamp, editType, editData, } = params;
     let globalConfig = (0, pda_1.getGlobalConfigPda)();
     let bountyVault = (0, pda_1.getBountyVaultPda)();
@@ -266,7 +266,7 @@ function createEditBasketIntentIx(params) {
             for (let i = 0; i < addTokenData.oracles.length; i++) {
                 let oracleData = {
                     oracleSettings: {
-                        oracleType: oracle_1.ORACLE_TYPES_STRINGS.indexOf(addTokenData.oracles[i].oracle_type),
+                        oracleType: (_b = (_a = [...oracle_1.ORACLE_TYPES_STRINGS.entries()].find(([, name]) => name === addTokenData.oracles[i].oracle_type)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 255,
                         numRequiredAccounts: addTokenData.oracles[i].num_required_accounts,
                         weight: addTokenData.oracles[i].weight,
                         isRequired: addTokenData.oracles[i].is_required ? 1 : 0,
@@ -342,7 +342,7 @@ function createEditBasketIntentIx(params) {
             const weights = updateWeightsData.token_weights.slice(0, constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET);
             while (weights.length < constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET)
                 weights.push({ mint: '', weight_bps: 0 });
-            let tokenMintsHash = (_a = updateWeightsData.token_mints_hash) !== null && _a !== void 0 ? _a : (0, basket_1.computeTokenMintsHash)(basket.composition.slice(0, basket.numTokens)
+            let tokenMintsHash = (_c = updateWeightsData.token_mints_hash) !== null && _c !== void 0 ? _c : (0, basket_1.computeTokenMintsHash)(basket.composition.slice(0, basket.numTokens)
                 .filter((asset) => asset.active === 1)
                 .map((asset) => asset.mint.toBase58()));
             let updateWeights = {

package/dist/src/jup.d.ts

@@ -0,0 +1,49 @@
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+export declare function processJupInstruction(instruction: {
+    programId: string;
+    accounts: {
+        pubkey: string;
+        isSigner: boolean;
+        isWritable: boolean;
+    }[];
+    data: string;
+}): TransactionInstruction;
+export declare function getJupQuote(params: {
+    keeper: PublicKey;
+    basketMintIn: PublicKey;
+    basketMintOut: PublicKey;
+    basketAmountIn: number;
+    basketAmountOut: number;
+    swapMode: "exact_in" | "exact_out" | "ioc";
+    apiKey: string;
+    maxJupAccounts: number;
+}): Promise<{
+    mode: string;
+    inputMint: string;
+    outputMint: string;
+    inAmount: number;
+    outAmount: number;
+    swapUsdValue: number;
+    routePlan: any;
+    transaction: string;
+}>;
+export declare function getJupSwapInstructions(params: {
+    keeper: PublicKey;
+    quoteResponse: any;
+    apiKey: string;
+}): Promise<any>;
+export declare function getJupTokenLedgerAndSwapInstructions(params: {
+    keeper: PublicKey;
+    basketMintIn: PublicKey;
+    basketMintOut: PublicKey;
+    basketAmountIn: number;
+    basketAmountOut: number;
+    swapMode: "exact_in" | "exact_out" | "ioc";
+    apiKey: string;
+    maxJupAccounts: number;
+}): Promise<{
+    tokenLedgerInstruction: TransactionInstruction;
+    swapInstruction: TransactionInstruction;
+    addressLookupTableAddresses: PublicKey[];
+    quoteResponse: any;
+}>;