@symmetry-hq/temp-v3-sdk 0.0.4 → 0.0.6

package/dist/src/constants.d.ts

@@ -1,15 +1,20 @@
 import { PublicKey } from '@solana/web3.js';
+import Decimal from 'decimal.js';
 export declare const BASKETS_V3_PROGRAM_ID: PublicKey;
 export declare const METADATA_PROGRAM_ID: PublicKey;
 export declare const ADDRESS_LOOKUP_TABLE_PROGRAM_ID: PublicKey;
 export declare const RENT_SYSVAR_ID: PublicKey;
 export declare const WSOL_MINT: PublicKey;
 export declare const USDC_MINT: PublicKey;
-export declare const PYTH_SOL_ACCOUNT: PublicKey;
-export declare const PYTH_USDC_ACCOUNT: PublicKey;
+export declare const PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT: PublicKey;
+export declare const PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT: PublicKey;
 export declare const BOUNTY_MINT: PublicKey;
 export declare const INTENT_TASK_DATA_SIZE = 600;
 export declare const MAX_MANAGERS_PER_BASKET = 10;
+export declare const X64: Decimal;
+export declare const HUNDRED_PERCENT_BPS = 10000;
+export declare const WSOL_DECIMALS = 9;
+export declare const USDC_DECIMALS = 6;
 export declare const MAX_SUPPORTED_TOKENS_PER_BASKET: number;
 export declare const MAX_ORACLES_PER_TOKEN: number;
 export declare const MAX_EXTRA_DATA_PER_ORACLE: number;

package/dist/src/constants.js

@@ -1,7 +1,11 @@
 "use strict";
+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.MAX_MANAGERS_PER_BASKET = exports.INTENT_TASK_DATA_SIZE = exports.BOUNTY_MINT = exports.PYTH_USDC_ACCOUNT = exports.PYTH_SOL_ACCOUNT = exports.USDC_MINT = exports.WSOL_MINT = 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_MANAGERS_PER_BASKET = exports.INTENT_TASK_DATA_SIZE = exports.BOUNTY_MINT = exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = exports.USDC_MINT = exports.WSOL_MINT = exports.RENT_SYSVAR_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.METADATA_PROGRAM_ID = exports.BASKETS_V3_PROGRAM_ID = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const decimal_js_1 = __importDefault(require("decimal.js"));
 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");
@@ -9,11 +13,15 @@ exports.RENT_SYSVAR_ID = new web3_js_1.PublicKey("SysvarRent11111111111111111111
 exports.WSOL_MINT = new web3_js_1.PublicKey("So11111111111111111111111111111111111111112");
 // export const USDC_MINT = new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
 exports.USDC_MINT = new web3_js_1.PublicKey("USDCoctVLVnvTXBEuP9s8hntucdJokbo17RwHuNXemT");
-exports.PYTH_SOL_ACCOUNT = new web3_js_1.PublicKey("7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE");
-exports.PYTH_USDC_ACCOUNT = new web3_js_1.PublicKey("Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX");
-exports.BOUNTY_MINT = new web3_js_1.PublicKey("49hY35FvJ8KimFrkGL1X89GSve1C1ZVoLPeQBUHXCouy");
+exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = new web3_js_1.PublicKey("7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE");
+exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = new web3_js_1.PublicKey("Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX");
+exports.BOUNTY_MINT = new web3_js_1.PublicKey("So11111111111111111111111111111111111111112");
 exports.INTENT_TASK_DATA_SIZE = 600;
 exports.MAX_MANAGERS_PER_BASKET = 10;
+exports.X64 = new decimal_js_1.default(2).pow(new decimal_js_1.default(64));
+exports.HUNDRED_PERCENT_BPS = 10000;
+exports.WSOL_DECIMALS = 9;
+exports.USDC_DECIMALS = 6;
 exports.MAX_SUPPORTED_TOKENS_PER_BASKET = 100;
 exports.MAX_ORACLES_PER_TOKEN = 4;
 exports.MAX_EXTRA_DATA_PER_ORACLE = 4;

package/dist/src/index.d.ts

@@ -1,7 +1,5 @@
-import { BN } from '@coral-xyz/anchor';
 import { Connection, PublicKey, TransactionSignature } from '@solana/web3.js';
 import { Basket } from './layouts/basket';
-import { Fraction } from './layouts/fraction';
 import { EditData, HostFees, Intent, MetadataParams, TaskType } from './layouts/intents/intent';
 import { RebalanceIntent } from './layouts/intents/rebalanceIntent';
 import { BasketFilter } from './states/basket';
@@ -26,29 +24,45 @@ export declare class SymmetryCore {
         basket: PublicKey;
     }): Promise<Basket>;
     fetchAllBaskets(filters: BasketFilter[]): Promise<Basket[]>;
+    loadBasketPrice(basket: Basket): Promise<Basket>;
     fetchAllIntents(filters: IntentFilter[]): Promise<Intent[]>;
     fetchAllRebalanceIntents(filters: RebalanceIntentFilter[]): Promise<RebalanceIntent[]>;
     createBasketTx(params: {
         creator: PublicKey;
         host: PublicKey;
-        startPrice: Fraction;
+        startPrice: number;
         hostFees: HostFees;
         metadataParams: MetadataParams;
-        metadataModificationDelay: BN;
+        metadataModificationDelay: number;
     }): Promise<VersionedTxs>;
     createEditBasketIntentTx(params: {
-        manager: PublicKey;
         basket: Basket;
+        manager: PublicKey;
         editType: TaskType;
         editData: EditData;
-        useBounty: number;
+        useBounty: boolean;
     }): Promise<VersionedTxs>;
-    createEditBasketTx(params: {
+    executeEditBasketIntentTx(params: {
         keeper: PublicKey;
         basket: PublicKey;
         manager: PublicKey;
         editType: TaskType;
     }): Promise<VersionedTxs>;
+    depositTx(params: {
+        buyer: PublicKey;
+        basket: PublicKey;
+        contributions: {
+            mint: PublicKey;
+            amount: number;
+        }[];
+        rebalanceSlippageBps?: number;
+        executionStartTime?: number;
+    }): Promise<VersionedTxs>;
+    updateTokenPricesTx(params: {
+        keeper: PublicKey;
+        rebalanceIntent: RebalanceIntent;
+        basket: Basket;
+    }): Promise<VersionedTxs>;
     signAndSendVersionedTxs(params: {
         vtxs: VersionedTxs;
         wallet: Wallet;

package/dist/src/index.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SymmetryCore = exports.MAX_JUPITER_ACCOUNTS = exports.JUPITER_API_KEY = exports.PRIORITY_FEE = exports.COMPUTE_UNITS = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
@@ -16,10 +19,15 @@ const constants_1 = require("./constants");
 const createBasket_1 = require("./instructions/management/createBasket");
 const edit_1 = require("./instructions/management/edit");
 const pda_1 = require("./instructions/pda");
+const fraction_1 = require("./layouts/fraction");
+const intent_1 = require("./layouts/intents/intent");
 const basket_1 = require("./states/basket");
-const intent_1 = require("./states/intents/intent");
+const intent_2 = require("./states/intents/intent");
 const rebalanceIntent_1 = require("./states/intents/rebalanceIntent");
 const txUtils_1 = require("./txUtils");
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const deposit_1 = require("./instructions/user/deposit");
+const priceUpdate_1 = require("./instructions/automation/priceUpdate");
 exports.COMPUTE_UNITS = 1000000;
 exports.PRIORITY_FEE = 100000;
 exports.JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
@@ -52,9 +60,14 @@ class SymmetryCore {
             return baskets;
         });
     }
+    loadBasketPrice(basket) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, basket_1.loadBasketPrice)(basket, this.sdkParams.connection);
+        });
+    }
     fetchAllIntents(filters) {
         return __awaiter(this, void 0, void 0, function* () {
-            const intents = yield (0, intent_1.fetchIntents)(this.sdkParams.connection, filters);
+            const intents = yield (0, intent_2.fetchIntents)(this.sdkParams.connection, filters);
             return intents;
         });
     }
@@ -66,7 +79,6 @@ class SymmetryCore {
     }
     createBasketTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             const { creator, host, startPrice, hostFees, metadataParams, metadataModificationDelay } = params;
             // generate random seed
             const basketSeeds = (0, pda_1.getRandomSeed)();
@@ -78,10 +90,10 @@ class SymmetryCore {
                 slot,
                 creator,
                 host,
-                startPrice,
+                startPrice: (0, fraction_1.decimalToFraction)(new decimal_js_1.default(startPrice)),
                 hostFees,
                 metadataParams,
-                metadataModificationDelay
+                metadataModificationDelay: new anchor_1.BN(metadataModificationDelay),
             });
             let preIx = (0, createBasket_1.createBasketStateAccountIx)({
                 creator,
@@ -94,7 +106,7 @@ class SymmetryCore {
             let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
                 connection: this.sdkParams.connection,
                 payer: creator,
-                priorityFee: (_a = this.sdkParams.priorityFee) !== null && _a !== void 0 ? _a : 1000000,
+                priorityFee: this.sdkParams.priorityFee,
                 multipleIxs: [[preIx, preIx2, preIx2, ix]],
                 multipleLookupTableAddresses: [],
                 signers: [[]],
@@ -105,80 +117,47 @@ class SymmetryCore {
     }
     createEditBasketIntentTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { manager, basket, editType, editData, useBounty } = params;
-            let ix = (0, edit_1.createEditBasketIntentIx)({
-                manager,
-                basket: basket.ownAddress,
-                bountyMint: constants_1.BOUNTY_MINT,
-                editType,
-                editData,
-                useBounty
-            });
-            let ix2 = null;
-            let modificationDelay;
-            switch (editType) {
-                case 1: modificationDelay = basket.settings.schedule.modificationDelay;
-                case 2: modificationDelay = basket.settings.feeSettings.modificationDelay;
-                case 3: modificationDelay = basket.settings.managerSettings.modificationDelay;
-                case 4: modificationDelay = basket.settings.automationSettings.modificationDelay;
-                case 5: modificationDelay = basket.settings.lpSettings.modificationDelay;
-                case 6: modificationDelay = basket.settings.metadataSettings.modificationDelay;
-                case 7: modificationDelay = basket.settings.addTokenDelay;
-                case 8: modificationDelay = basket.settings.updateWeightsDelay;
-                case 9: modificationDelay = basket.settings.addTokenDelay;
-                case 10: modificationDelay = basket.settings.updateWeightsDelay;
-                case 11: modificationDelay = basket.settings.makeDirectSwapDelay;
-            }
+            let { basket } = params;
+            let ixs = [
+                (0, edit_1.createEditBasketIntentIx)(params)
+            ];
+            let modificationDelay = (() => {
+                switch (params.editType) {
+                    case intent_1.TaskType.EditSchedule: return basket.settings.schedule.modificationDelay;
+                    case intent_1.TaskType.EditFeeSettings: return basket.settings.feeSettings.modificationDelay;
+                    case intent_1.TaskType.EditManagerSettings: return basket.settings.managerSettings.modificationDelay;
+                    case intent_1.TaskType.EditAutomationSettings: return basket.settings.automationSettings.modificationDelay;
+                    case intent_1.TaskType.EditLpSettings: return basket.settings.lpSettings.modificationDelay;
+                    case intent_1.TaskType.EditMetadataSettings: return basket.settings.metadataSettings.modificationDelay;
+                    case intent_1.TaskType.EditAddTokenDelay: return basket.settings.addTokenDelay;
+                    case intent_1.TaskType.EditUpdateWeightsDelay: return basket.settings.updateWeightsDelay;
+                    case intent_1.TaskType.AddToken: return basket.settings.addTokenDelay;
+                    case intent_1.TaskType.UpdateWeights: return basket.settings.updateWeightsDelay;
+                    case intent_1.TaskType.Swap: return basket.settings.makeDirectSwapDelay;
+                    default: return new anchor_1.BN(0);
+                }
+            })();
             if (modificationDelay.eq(new anchor_1.BN(0))) {
-                let intent = (0, pda_1.getIntentPda)(basket.ownAddress, manager, editType);
-                let basketTokenMint = (0, pda_1.getBasketTokenMintPda)(basket.ownAddress);
-                let metadataAccount = (0, pda_1.getMetadataAccount)(basketTokenMint);
-                ix2 = (0, edit_1.editBasketIx)({
-                    keeper: manager,
-                    basket: basket.ownAddress,
-                    intent,
-                    bountyMint: constants_1.BOUNTY_MINT,
-                    manager,
-                    editType,
-                    metadataAccount
-                });
+                ixs.push((0, edit_1.editBasketIx)(Object.assign(Object.assign({}, params), { basket: basket.ownAddress, keeper: params.manager })));
             }
-            let ixs = [];
-            if (ix2 === null)
-                ixs = [[ix]];
-            else
-                ixs = [[ix, ix2]];
-            const signers = ixs.map(() => []);
             let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
                 connection: this.sdkParams.connection,
-                payer: manager,
+                payer: params.manager,
                 priorityFee: this.sdkParams.priorityFee,
-                multipleIxs: ixs,
+                multipleIxs: [ixs],
                 multipleLookupTableAddresses: [],
-                signers,
+                signers: [[]],
                 batches: [1],
             });
             return vtxs;
         });
     }
-    createEditBasketTx(params) {
+    executeEditBasketIntentTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { keeper, basket, manager, editType } = params;
-            let intent = (0, pda_1.getIntentPda)(basket, manager, editType);
-            let basketTokenMint = (0, pda_1.getBasketTokenMintPda)(basket);
-            let metadataAccount = (0, pda_1.getMetadataAccount)(basketTokenMint);
-            let ix = (0, edit_1.editBasketIx)({
-                keeper,
-                basket,
-                intent,
-                bountyMint: constants_1.BOUNTY_MINT,
-                manager,
-                editType,
-                metadataAccount
-            });
+            let ix = (0, edit_1.editBasketIx)(params);
             let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
                 connection: this.sdkParams.connection,
-                payer: manager,
+                payer: params.keeper,
                 priorityFee: this.sdkParams.priorityFee,
                 multipleIxs: [[ix]],
                 multipleLookupTableAddresses: [],
@@ -188,6 +167,119 @@ class SymmetryCore {
             return vtxs;
         });
     }
+    depositTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { buyer, basket, contributions, rebalanceSlippageBps, executionStartTime } = params;
+            if (!rebalanceSlippageBps)
+                rebalanceSlippageBps = 100;
+            if (!executionStartTime)
+                executionStartTime = 0;
+            let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, buyer);
+            let batchIxs = [
+                [
+                    (0, deposit_1.createUserRebalanceIntentIx)({
+                        user: params.buyer,
+                        basket: params.basket,
+                    }),
+                    (0, deposit_1.resizeRebalanceIntentIx)(rebalanceIntent),
+                    (0, deposit_1.depositStateIx)({
+                        buyer,
+                        basket,
+                        bountyMint: constants_1.BOUNTY_MINT,
+                        rebalanceIntentRentPayer: buyer,
+                        rebalanceSlippageBps: rebalanceSlippageBps,
+                        executionStartTime: executionStartTime,
+                    }),
+                ]
+            ];
+            let depositTokensIxs = (0, deposit_1.depositTokensIx)({
+                owner: buyer,
+                basket: basket,
+                contributions: contributions,
+            });
+            depositTokensIxs.forEach((ix) => {
+                batchIxs.push([ix]);
+            });
+            batchIxs.push([
+                (0, deposit_1.lockDepositsIx)({
+                    owner: buyer,
+                    basket: basket,
+                }),
+            ]);
+            let signers = [];
+            let multipleLookupTableAddresses = [];
+            for (let i = 0; i < batchIxs.length; i++) {
+                signers.push([]);
+                multipleLookupTableAddresses.push([]);
+            }
+            let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
+                connection: this.sdkParams.connection,
+                payer: buyer,
+                priorityFee: this.sdkParams.priorityFee,
+                multipleIxs: batchIxs,
+                multipleLookupTableAddresses: multipleLookupTableAddresses,
+                signers: signers,
+                batches: [1, depositTokensIxs.length, 1],
+            });
+            return vtxs;
+        });
+    }
+    updateTokenPricesTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { keeper, rebalanceIntent, basket } = params;
+            let ixs = [];
+            let signers = [];
+            let multipleLookupTableAddresses = [];
+            let batches = [];
+            let batchSize = 5;
+            for (let batchStart = 0; batchStart < basket.numTokens; batchStart += batchSize) {
+                let allKeys = [];
+                let tokenIndices = [];
+                for (let i = batchStart; i < basket.numTokens && i < batchStart + batchSize; i++) {
+                    tokenIndices.push(i);
+                    let agg = basket.composition[i].oracleAggregator;
+                    for (let i = 0; i < agg.numOracles; i++) {
+                        const oracleData = agg.oracles[i];
+                        for (let j = 0; j < oracleData.oracleSettings.numRequiredAccounts; j++) {
+                            const lutId = oracleData.accountsToLoadLutIds[j];
+                            const lutIdx = oracleData.accountsToLoadLutIndices[j];
+                            if (lutId === 0 && lutIdx === 0)
+                                continue;
+                            if (!basket.lutPubkeys)
+                                continue;
+                            allKeys.push(basket.lutPubkeys[lutId].state.addresses[lutIdx]);
+                        }
+                    }
+                }
+                while (tokenIndices.length < 20)
+                    tokenIndices.push(0);
+                ixs.push([
+                    (0, priceUpdate_1.updateTokenPricesIx)({
+                        keeper: keeper,
+                        basket: rebalanceIntent.basket, //@ts-ignore
+                        rebalanceIntent: rebalanceIntent.ownAddress,
+                        lookupTable0: basket.lookupTables.active[0],
+                        lookupTable1: basket.lookupTables.active[1],
+                        tokenIndices: tokenIndices,
+                        additionalOracleAccounts: allKeys,
+                    }),
+                ]);
+                signers.push([]);
+                multipleLookupTableAddresses.push([]);
+                batches.push(1);
+            }
+            let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
+                connection: this.sdkParams.connection,
+                payer: keeper,
+                priorityFee: this.sdkParams.priorityFee,
+                multipleIxs: ixs,
+                multipleLookupTableAddresses: multipleLookupTableAddresses,
+                signers: signers,
+                batches: batches,
+            });
+            return vtxs;
+        });
+    }
     signAndSendVersionedTxs(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let { vtxs, wallet } = params;

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

@@ -32,8 +32,8 @@ function updateTokenPricesIx(params) {
         { pubkey: params.basket, isSigner: false, isWritable: true },
         { pubkey: params.rebalanceIntent, isSigner: false, isWritable: true },
         { pubkey: globalConfig, isSigner: false, isWritable: false },
-        { pubkey: constants_1.PYTH_SOL_ACCOUNT, isSigner: false, isWritable: true },
-        { pubkey: constants_1.PYTH_USDC_ACCOUNT, isSigner: false, isWritable: true },
+        { pubkey: constants_1.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT, isSigner: false, isWritable: true },
+        { pubkey: constants_1.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, isSigner: false, isWritable: true },
         { pubkey: params.lookupTable0, isSigner: false, isWritable: true },
         { pubkey: params.lookupTable1, isSigner: false, isWritable: true },
     ];

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

@@ -82,10 +82,10 @@ function createBasketIx(params) {
         { pubkey: lookupTableInfo1, isSigner: false, isWritable: true },
         { pubkey: wsolBasketTokenAccount, isSigner: false, isWritable: true },
         { pubkey: constants_1.WSOL_MINT, isSigner: false, isWritable: true },
-        { pubkey: constants_1.PYTH_SOL_ACCOUNT, isSigner: false, isWritable: true },
+        { pubkey: constants_1.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT, isSigner: false, isWritable: true },
         { pubkey: usdcBasketTokenAccount, isSigner: false, isWritable: true },
         { pubkey: constants_1.USDC_MINT, isSigner: false, isWritable: true },
-        { pubkey: constants_1.PYTH_USDC_ACCOUNT, isSigner: false, isWritable: true },
+        { pubkey: constants_1.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, isSigner: false, isWritable: true },
         { pubkey: constants_1.ADDRESS_LOOKUP_TABLE_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: constants_1.METADATA_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: web3_js_1.SYSVAR_RENT_PUBKEY, isSigner: false, isWritable: false },

package/dist/src/instructions/management/edit.d.ts

@@ -2,6 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import { AuthorityBitmasks, EditData, MetadataParams, TaskType } from "../../layouts/intents/intent";
 import { TransactionInstruction } from "@solana/web3.js";
 import { AutomationSettings, FeeSettings, LpSettings, ManagerSettings, ScheduleSettings } from "../../layouts/config";
+import { Basket } from "../../layouts/basket";
 export declare function editPrivateBasketSettingsIx(params: {
     creator: PublicKey;
     basket: PublicKey;
@@ -16,19 +17,15 @@ export declare function editPrivateBasketSettingsIx(params: {
     metadataModificationDelay: number;
 }): TransactionInstruction;
 export declare function createEditBasketIntentIx(params: {
+    basket: Basket;
     manager: PublicKey;
-    basket: PublicKey;
-    bountyMint: PublicKey;
     editType: TaskType;
     editData: EditData;
-    useBounty: number;
+    useBounty: boolean;
 }): TransactionInstruction;
 export declare function editBasketIx(params: {
     keeper: PublicKey;
     basket: PublicKey;
-    intent: PublicKey;
-    bountyMint: PublicKey;
     manager: PublicKey;
     editType: TaskType;
-    metadataAccount: PublicKey;
 }): TransactionInstruction;

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

@@ -11,6 +11,7 @@ const spl_token_1 = require("@solana/spl-token");
 const config_1 = require("../../layouts/config");
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_2 = require("@solana/web3.js");
+const oracle_1 = require("../../layouts/oracle");
 const EDIT_PRIVATE_BASKET_SETTINGS_DISCRIMINATOR = Buffer.from([202, 54, 138, 17, 3, 104, 128, 229]);
 const CREATE_EDIT_BASKET_INTENT_DISCRIMINATOR = Buffer.from([82, 150, 58, 227, 153, 129, 20, 30]);
 const EDIT_BASKET_DISCRIMINATOR = Buffer.from([156, 31, 4, 39, 248, 29, 55, 220]);
@@ -50,7 +51,7 @@ function editPrivateBasketSettingsIx(params) {
         { pubkey: params.basket, isSigner: false, isWritable: true },
         { pubkey: metadataAccount, isSigner: false, isWritable: true },
         { pubkey: globalConfig, isSigner: false, isWritable: false },
-        { pubkey: pda_1.METADATA_PROGRAM_ID, isSigner: false, isWritable: false }
+        { pubkey: constants_1.METADATA_PROGRAM_ID, isSigner: false, isWritable: false }
     ];
     return new web3_js_1.TransactionInstruction({
         keys,
@@ -59,14 +60,16 @@ function editPrivateBasketSettingsIx(params) {
     });
 }
 function createEditBasketIntentIx(params) {
-    const { manager, basket, bountyMint, editType, editData, useBounty, } = params;
-    let intent = (0, pda_1.getIntentPda)(basket, manager, editType);
+    const { manager, basket, editType, editData, useBounty, } = params;
+    let intent = (0, pda_1.getIntentPda)(basket.ownAddress, manager, editType);
     let globalConfig = (0, pda_1.getGlobalConfigPda)();
     let bountyVault = (0, pda_1.getBountyVaultPda)();
+    let bountyMint = constants_1.BOUNTY_MINT;
     let managerBountyATA = (0, pda_1.getAta)(manager, bountyMint);
     let bountyVaultATA = (0, pda_1.getAta)(bountyVault, bountyMint);
     const editTypeBuf = Buffer.from([editType]);
-    const editDataBuf = Buffer.alloc(260);
+    let editDataBuf = Buffer.alloc(260);
+    let additionalAccounts = [];
     switch (editType) {
         case intent_1.TaskType.EditSchedule: // 1
             config_1.ScheduleSettingsLayout.encode(editData, editDataBuf);
@@ -75,10 +78,22 @@ function createEditBasketIntentIx(params) {
             config_1.FeeSettingsLayout.encode(editData, editDataBuf);
             break;
         case intent_1.TaskType.EditManagerSettings: // 3
-            // TODO: ?????
-            intent_1.ManagerSettingsWithAuthorityBitmasksLayout.encode(editData, editDataBuf)(editData).managers.forEach((managerPubkey) => {
-                keys.push({ pubkey: managerPubkey, isWritable: true, isSigner: false });
-            });
+            let startIndex = 0;
+            for (let i = 0; i < config_1.MAX_MANAGERS_PER_BASKET; i++) {
+                let managerWeight = editData.managerSettings.managersWeightBps[i];
+                editDataBuf.writeUInt16LE(managerWeight, startIndex);
+                additionalAccounts.push({
+                    pubkey: editData.managerSettings.managers[i],
+                    isWritable: true,
+                    isSigner: false
+                });
+                startIndex += 2;
+            }
+            let authorityBitmasksBuffer = Buffer.alloc(intent_1.AuthorityBitmasksLayout.span);
+            intent_1.AuthorityBitmasksLayout.encode(editData.authorityBitmasks, authorityBitmasksBuffer);
+            editDataBuf.set(authorityBitmasksBuffer, startIndex);
+            startIndex += intent_1.AuthorityBitmasksLayout.span;
+            editDataBuf.writeBigUint64LE(editData.managerSettings.modificationDelay, startIndex);
             break;
         case intent_1.TaskType.EditAutomationSettings: // 4
             config_1.AutomationSettingsLayout.encode(editData, editDataBuf);
@@ -95,22 +110,34 @@ function createEditBasketIntentIx(params) {
         case intent_1.TaskType.EditUpdateWeightsDelay: // 8
             intent_1.UpdateWeightsDelayLayout.encode(editData, editDataBuf);
             break;
-        // case TaskType.AddToken: // 9
-        //     AddTokenLayout.encode(editData as AddToken, editDataBuf);
-        //     keys.push({pubkey: (editData as AddToken).tokenMint, isWritable: false, isSigner: false});
-        //     const basketNewTokenAta = getAssociatedTokenAddressSync(
-        //         (editData as AddToken).tokenMint,
-        //         basket,
-        //         true
-        //     );
-        //     keys.push({pubkey: basketNewTokenAta, isWritable: true, isSigner: false});
-        //     additionalAccounts.lookupTables.forEach((lookupTablePubkey) => {
-        //         keys.push({ pubkey: lookupTablePubkey, isWritable: true, isSigner: false });
-        //     });
-        //     additionalAccounts.additionalOracleAccounts.forEach((oraclePubkey) => {
-        //         keys.push({ pubkey: oraclePubkey, isWritable: false, isSigner: false });
-        //     });
-        //     break;
+        case intent_1.TaskType.AddToken: // 9
+            oracle_1.OracleAggregatorLayout.encode(editData.oracleAggregator, editDataBuf);
+            additionalAccounts.push({
+                pubkey: editData.tokenMint,
+                isWritable: false,
+                isSigner: false
+            });
+            additionalAccounts.push({
+                pubkey: (0, pda_1.getAta)(basket.ownAddress, editData.tokenMint),
+                isWritable: true,
+                isSigner: false
+            });
+            additionalAccounts.push({
+                pubkey: basket.lookupTables.active[0],
+                isWritable: true,
+                isSigner: false
+            });
+            additionalAccounts.push({
+                pubkey: basket.lookupTables.active[1],
+                isWritable: true,
+                isSigner: false
+            });
+            additionalAccounts.push({
+                pubkey: editData.oracleAccount,
+                isWritable: false,
+                isSigner: false
+            });
+            break;
         case intent_1.TaskType.UpdateWeights: // 10
             intent_1.UpdateWeightsLayout.encode(editData, editDataBuf);
             break;
@@ -119,7 +146,7 @@ function createEditBasketIntentIx(params) {
         default:
             break;
     }
-    const useBountyBuf = Buffer.from([useBounty]);
+    const useBountyBuf = Buffer.from([useBounty ? 1 : 0]);
     const data = Buffer.concat([
         CREATE_EDIT_BASKET_INTENT_DISCRIMINATOR,
         editTypeBuf,
@@ -128,7 +155,7 @@ function createEditBasketIntentIx(params) {
     ]);
     const keys = [
         { pubkey: manager, isSigner: true, isWritable: true },
-        { pubkey: basket, isSigner: false, isWritable: true },
+        { pubkey: basket.ownAddress, isSigner: false, isWritable: true },
         { pubkey: intent, isSigner: false, isWritable: true },
         { pubkey: globalConfig, isSigner: false, isWritable: false },
         { pubkey: bountyMint, isSigner: false, isWritable: false },
@@ -140,6 +167,7 @@ function createEditBasketIntentIx(params) {
         { pubkey: spl_token_1.TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
     ];
+    keys.push(...additionalAccounts);
     return new web3_js_1.TransactionInstruction({
         keys,
         programId: constants_1.BASKETS_V3_PROGRAM_ID,
@@ -147,9 +175,12 @@ function createEditBasketIntentIx(params) {
     });
 }
 function editBasketIx(params) {
-    const { keeper, basket, intent, bountyMint, manager } = params;
+    const { keeper, basket, manager, editType, } = params;
+    let intent = (0, pda_1.getIntentPda)(basket, manager, editType);
+    let metadataAccount = (0, pda_1.getMetadataAccount)(basket);
     let globalConfig = (0, pda_1.getGlobalConfigPda)();
     let bountyVault = (0, pda_1.getBountyVaultPda)();
+    let bountyMint = constants_1.BOUNTY_MINT;
     let keeperBountyATA = (0, pda_1.getAta)(keeper, bountyMint);
     let managerBountyATA = (0, pda_1.getAta)(manager, bountyMint);
     let bountyVaultATA = (0, pda_1.getAta)(bountyVault, bountyMint);
@@ -175,15 +206,10 @@ function editBasketIx(params) {
     // remaining accounts
     if (params.editType === intent_1.TaskType.EditMetadataSettings) {
         keys.push({ pubkey: params.basket, isSigner: true, isWritable: false });
-        keys.push({ pubkey: params.metadataAccount, isSigner: false, isWritable: true });
-        keys.push({ pubkey: pda_1.METADATA_PROGRAM_ID, isSigner: false, isWritable: false });
+        keys.push({ pubkey: metadataAccount, isSigner: false, isWritable: true });
+        keys.push({ pubkey: constants_1.METADATA_PROGRAM_ID, isSigner: false, isWritable: false });
     }
     ;
-    // if(params.editType === TaskType.AddToken){
-    //     params.lookupTables.forEach((lookupTablePubkey) => {
-    //         keys.push({ pubkey: lookupTablePubkey, isWritable: false, isSigner: false });
-    //     });
-    // };
     return new web3_js_1.TransactionInstruction({
         keys,
         programId: constants_1.BASKETS_V3_PROGRAM_ID,

package/dist/src/instructions/pda.d.ts

@@ -5,11 +5,6 @@ export declare const MINT_SEED: Buffer;
 export declare const RENT_PAYER_SEED: Buffer;
 export declare const BOUNTY_VAULT_SEED: Buffer;
 export declare const REBALANCE_INTENT_SEED: Buffer;
-export declare const WSOL_MINT: PublicKey;
-export declare const USDC_MINT: PublicKey;
-export declare const PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT: PublicKey;
-export declare const PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT: PublicKey;
-export declare const METADATA_PROGRAM_ID: PublicKey;
 export declare function serializeString(input: string): Uint8Array;
 export declare function getRandomSeed(): number[];
 export declare function getBasketState(seeds: number[]): PublicKey;