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

package/dist/src/index.d.ts

@@ -56,6 +56,7 @@ export declare class SymmetryCore {
             amount: number;
         }[];
         rebalanceSlippageBps?: number;
+        perTradeRebalanceSlippageBps?: number;
         executionStartTime?: number;
     }): Promise<VersionedTxs>;
     updateTokenPricesTx(params: {
@@ -63,6 +64,27 @@ export declare class SymmetryCore {
         rebalanceIntent: RebalanceIntent;
         basket: Basket;
     }): Promise<VersionedTxs>;
+    executeSwap(params: {
+        keeper: PublicKey;
+        rebalanceIntent: RebalanceIntent;
+        mintFrom: PublicKey;
+        mintTo: PublicKey;
+        amount: number;
+        side: number;
+    }): Promise<VersionedTxs>;
+    mintTx(params: {
+        keeper: PublicKey;
+        buyer: PublicKey;
+        basket: PublicKey;
+    }): Promise<VersionedTxs>;
+    redeemTokensTx(params: {
+        keeper: PublicKey;
+        rebalanceIntent: RebalanceIntent;
+    }): Promise<VersionedTxs>;
+    claimBountyTx(params: {
+        keeper: PublicKey;
+        rebalanceIntent: RebalanceIntent;
+    }): Promise<VersionedTxs>;
     signAndSendVersionedTxs(params: {
         vtxs: VersionedTxs;
         wallet: Wallet;

package/dist/src/index.js

@@ -28,6 +28,9 @@ 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");
+const rebalanceSwap_1 = require("./instructions/automation/rebalanceSwap");
+const withdraw_1 = require("./instructions/user/withdraw");
+const claimBounty_1 = require("./instructions/automation/claimBounty");
 exports.COMPUTE_UNITS = 1000000;
 exports.PRIORITY_FEE = 100000;
 exports.JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
@@ -169,9 +172,11 @@ class SymmetryCore {
     }
     depositTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { buyer, basket, contributions, rebalanceSlippageBps, executionStartTime } = params;
+            let { buyer, basket, contributions, rebalanceSlippageBps, perTradeRebalanceSlippageBps, executionStartTime } = params;
             if (!rebalanceSlippageBps)
                 rebalanceSlippageBps = 100;
+            if (!perTradeRebalanceSlippageBps)
+                perTradeRebalanceSlippageBps = 100;
             if (!executionStartTime)
                 executionStartTime = 0;
             let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, buyer);
@@ -187,7 +192,8 @@ class SymmetryCore {
                         basket,
                         bountyMint: constants_1.BOUNTY_MINT,
                         rebalanceIntentRentPayer: buyer,
-                        rebalanceSlippageBps: rebalanceSlippageBps,
+                        rebalanceSlippageBps,
+                        perTradeRebalanceSlippageBps,
                         executionStartTime: executionStartTime,
                     }),
                 ]
@@ -205,6 +211,11 @@ class SymmetryCore {
                     owner: buyer,
                     basket: basket,
                 }),
+                (0, priceUpdate_1.startPriceUpdatesIx)({
+                    keeper: buyer,
+                    basket: basket,
+                    rebalanceIntent: rebalanceIntent,
+                }),
             ]);
             let signers = [];
             let multipleLookupTableAddresses = [];
@@ -230,8 +241,7 @@ class SymmetryCore {
             let ixs = [];
             let signers = [];
             let multipleLookupTableAddresses = [];
-            let batches = [];
-            let batchSize = 5;
+            let batchSize = 7;
             for (let batchStart = 0; batchStart < basket.numTokens; batchStart += batchSize) {
                 let allKeys = [];
                 let tokenIndices = [];
@@ -265,8 +275,141 @@ class SymmetryCore {
                     }),
                 ]);
                 signers.push([]);
-                multipleLookupTableAddresses.push([]);
-                batches.push(1);
+                multipleLookupTableAddresses.push([basket.lookupTables.active[0], basket.lookupTables.active[1]]);
+                break;
+            }
+            let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
+                connection: this.sdkParams.connection,
+                payer: keeper,
+                priorityFee: this.sdkParams.priorityFee,
+                multipleIxs: ixs,
+                multipleLookupTableAddresses: multipleLookupTableAddresses,
+                signers: signers,
+                batches: [ixs.length],
+            });
+            return vtxs;
+        });
+    }
+    executeSwap(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { keeper, rebalanceIntent, mintFrom, mintTo, amount, side } = params;
+            let ix = (0, rebalanceSwap_1.rebalanceSwapIx)({
+                keeper: keeper,
+                basket: rebalanceIntent.basket,
+                mintFrom: mintFrom,
+                mintTo: mintTo,
+                amount: amount,
+                side: side,
+            });
+            let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
+                connection: this.sdkParams.connection,
+                payer: keeper,
+                priorityFee: this.sdkParams.priorityFee,
+                multipleIxs: [[ix]],
+                multipleLookupTableAddresses: [],
+                signers: [[]],
+                batches: [1],
+            });
+            return vtxs;
+        });
+    }
+    mintTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { keeper, buyer, basket } = params;
+            let ix = (0, deposit_1.mintBasketIx)({
+                keeper: keeper,
+                basket: basket,
+                buyer: buyer,
+            });
+            let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
+                connection: this.sdkParams.connection,
+                payer: keeper,
+                priorityFee: this.sdkParams.priorityFee,
+                multipleIxs: [[ix]],
+                multipleLookupTableAddresses: [],
+                signers: [[]],
+                batches: [1],
+            });
+            return vtxs;
+        });
+    }
+    redeemTokensTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { keeper, rebalanceIntent } = params;
+            let batchSize = 7;
+            let ixs = [];
+            let signers = [];
+            let multipleLookupTableAddresses = [];
+            for (let batchStart = 0; batchStart < rebalanceIntent.tokens.length; batchStart += batchSize) {
+                let tokenMints = [];
+                for (let i = batchStart; i < rebalanceIntent.tokens.length && i < batchStart + batchSize; i++)
+                    if (rebalanceIntent.tokens[i].amount.gt(new anchor_1.BN(0)))
+                        tokenMints.push(rebalanceIntent.tokens[i].mint);
+                if (tokenMints.length > 0) {
+                    ixs.push([
+                        (0, withdraw_1.redeemTokensIx)({
+                            keeper: keeper,
+                            basket: rebalanceIntent.basket,
+                            owner: rebalanceIntent.owner,
+                            tokenMints: tokenMints,
+                        })
+                    ]);
+                    signers.push([]);
+                    multipleLookupTableAddresses.push([]);
+                }
+            }
+            let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
+                connection: this.sdkParams.connection,
+                payer: keeper,
+                priorityFee: this.sdkParams.priorityFee,
+                multipleIxs: ixs,
+                multipleLookupTableAddresses: multipleLookupTableAddresses,
+                signers: signers,
+                batches: [ixs.length],
+            });
+            return vtxs;
+        });
+    }
+    claimBountyTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { keeper, rebalanceIntent } = params;
+            let keepersArray = [];
+            if (!rebalanceIntent.startPriceUpdateTask.completedBy.equals(web3_js_1.PublicKey.default))
+                keepersArray.push(rebalanceIntent.startPriceUpdateTask.completedBy);
+            if (!rebalanceIntent.finishPriceUpdateTask.completedBy.equals(web3_js_1.PublicKey.default))
+                keepersArray.push(rebalanceIntent.finishPriceUpdateTask.completedBy);
+            if (!rebalanceIntent.mintBasketTask.completedBy.equals(web3_js_1.PublicKey.default))
+                keepersArray.push(rebalanceIntent.mintBasketTask.completedBy);
+            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);
+            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 = Array.from(new Set(keepersArray));
+            let batchSize = 10;
+            let ixs = [];
+            let signers = [];
+            let multipleLookupTableAddresses = [];
+            for (let batchStart = 0; batchStart < keepersArray.length; batchStart += batchSize) {
+                let keepers = [];
+                for (let i = batchStart; i < keepersArray.length && i < batchStart + batchSize; i++)
+                    keepers.push(keepersArray[i]);
+                if (keepers.length > 0) {
+                    ixs.push([
+                        (0, claimBounty_1.claimBountyIx)({
+                            keeper: keeper,
+                            basket: rebalanceIntent.basket, //@ts-ignore
+                            intent: rebalanceIntent.ownAddress,
+                            bountyMint: rebalanceIntent.bounty.bountyMint,
+                            bountyDepositor: rebalanceIntent.bounty.bountyDepositor,
+                            rentPayer: rebalanceIntent.rentPayer,
+                            keepers: keepers,
+                        })
+                    ]);
+                    signers.push([]);
+                    multipleLookupTableAddresses.push([]);
+                }
             }
             let vtxs = yield (0, txUtils_1.prepareV0Transactions)({
                 connection: this.sdkParams.connection,
@@ -275,7 +418,7 @@ class SymmetryCore {
                 multipleIxs: ixs,
                 multipleLookupTableAddresses: multipleLookupTableAddresses,
                 signers: signers,
-                batches: batches,
+                batches: [ixs.length],
             });
             return vtxs;
         });

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

@@ -10,7 +10,7 @@ const UPDATE_TOKEN_PRICES_DISCRIMINATOR = Buffer.from([147, 87, 140, 33, 214, 18
 function startPriceUpdatesIx(params) {
     const keys = [
         { pubkey: params.keeper, isSigner: true, isWritable: true },
-        { pubkey: params.basket, isSigner: false, isWritable: false },
+        { pubkey: params.basket, isSigner: false, isWritable: true },
         { pubkey: params.rebalanceIntent, isSigner: false, isWritable: true },
     ];
     const data = START_PRICE_UPDATES_DISCRIMINATOR;

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

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.editPrivateBasketSettingsIx = editPrivateBasketSettingsIx;
 exports.createEditBasketIntentIx = createEditBasketIntentIx;
 exports.editBasketIx = editBasketIx;
-const intent_1 = require("../../layouts/intents/intent");
 const web3_js_1 = require("@solana/web3.js");
+const intent_1 = require("../../layouts/intents/intent");
+const web3_js_2 = require("@solana/web3.js");
 const constants_1 = require("../../constants");
 const pda_1 = require("../pda");
 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 web3_js_3 = 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]);
@@ -53,7 +54,7 @@ function editPrivateBasketSettingsIx(params) {
         { pubkey: globalConfig, isSigner: false, isWritable: false },
         { pubkey: constants_1.METADATA_PROGRAM_ID, isSigner: false, isWritable: false }
     ];
-    return new web3_js_1.TransactionInstruction({
+    return new web3_js_2.TransactionInstruction({
         keys,
         programId: constants_1.BASKETS_V3_PROGRAM_ID,
         data
@@ -79,6 +80,10 @@ function createEditBasketIntentIx(params) {
             break;
         case intent_1.TaskType.EditManagerSettings: // 3
             let startIndex = 0;
+            while (editData.managerSettings.managersWeightBps.length < config_1.MAX_MANAGERS_PER_BASKET) {
+                editData.managerSettings.managersWeightBps.push(0);
+                editData.managerSettings.managers.push(web3_js_1.PublicKey.default);
+            }
             for (let i = 0; i < config_1.MAX_MANAGERS_PER_BASKET; i++) {
                 let managerWeight = editData.managerSettings.managersWeightBps[i];
                 editDataBuf.writeUInt16LE(managerWeight, startIndex);
@@ -93,7 +98,9 @@ function createEditBasketIntentIx(params) {
             intent_1.AuthorityBitmasksLayout.encode(editData.authorityBitmasks, authorityBitmasksBuffer);
             editDataBuf.set(authorityBitmasksBuffer, startIndex);
             startIndex += intent_1.AuthorityBitmasksLayout.span;
-            editDataBuf.writeBigUint64LE(editData.managerSettings.modificationDelay, startIndex);
+            let modificationDelayBN = editData.managerSettings.modificationDelay;
+            editDataBuf.writeBigUint64LE(BigInt(modificationDelayBN.toString()), startIndex);
+            startIndex += 8;
             break;
         case intent_1.TaskType.EditAutomationSettings: // 4
             config_1.AutomationSettingsLayout.encode(editData, editDataBuf);
@@ -111,7 +118,21 @@ function createEditBasketIntentIx(params) {
             intent_1.UpdateWeightsDelayLayout.encode(editData, editDataBuf);
             break;
         case intent_1.TaskType.AddToken: // 9
-            oracle_1.OracleAggregatorLayout.encode(editData.oracleAggregator, editDataBuf);
+            let data = editData.oracleAggregator;
+            while (data.oracles.length < constants_1.MAX_ORACLES_PER_TOKEN) {
+                data.oracles.push({
+                    oracleSettings: oracle_1.DEFAULT_ORACLE_SETTINGS,
+                    accountsToLoadLutIds: [],
+                    accountsToLoadLutIndices: [],
+                });
+            }
+            for (let i = 0; i < data.oracles.length; i++) {
+                while (data.oracles[i].accountsToLoadLutIds.length < oracle_1.MAX_ACCOUNTS_PER_ORACLE) {
+                    data.oracles[i].accountsToLoadLutIds.push(0);
+                    data.oracles[i].accountsToLoadLutIndices.push(0);
+                }
+            }
+            oracle_1.OracleAggregatorLayout.encode(data, editDataBuf);
             additionalAccounts.push({
                 pubkey: editData.tokenMint,
                 isWritable: false,
@@ -132,14 +153,21 @@ function createEditBasketIntentIx(params) {
                 isWritable: true,
                 isSigner: false
             });
-            additionalAccounts.push({
-                pubkey: editData.oracleAccount,
-                isWritable: false,
-                isSigner: false
-            });
+            for (let i = 0; i < editData.oracleAccounts.length; i++) {
+                additionalAccounts.push({
+                    pubkey: editData.oracleAccounts[i],
+                    isWritable: false,
+                    isSigner: false
+                });
+            }
             break;
         case intent_1.TaskType.UpdateWeights: // 10
-            intent_1.UpdateWeightsLayout.encode(editData, editDataBuf);
+            let updateWeightsData = editData;
+            while (updateWeightsData.tokenMintsHash.length < 32)
+                updateWeightsData.tokenMintsHash.push(0);
+            while (updateWeightsData.tokenWeights.length < constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET)
+                updateWeightsData.tokenWeights.push(0);
+            intent_1.UpdateWeightsLayout.encode(updateWeightsData, editDataBuf);
             break;
         case intent_1.TaskType.Swap: // 11
             break;
@@ -162,13 +190,13 @@ function createEditBasketIntentIx(params) {
         { pubkey: managerBountyATA, isSigner: false, isWritable: true },
         { pubkey: bountyVault, isSigner: false, isWritable: true },
         { pubkey: bountyVaultATA, isSigner: false, isWritable: true },
-        { pubkey: web3_js_2.SystemProgram.programId, isSigner: false, isWritable: false },
+        { pubkey: web3_js_3.SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { 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({
+    return new web3_js_2.TransactionInstruction({
         keys,
         programId: constants_1.BASKETS_V3_PROGRAM_ID,
         data,
@@ -198,7 +226,7 @@ function editBasketIx(params) {
         { pubkey: managerBountyATA, isSigner: false, isWritable: true },
         { pubkey: bountyVault, isSigner: false, isWritable: true },
         { pubkey: bountyVaultATA, isSigner: false, isWritable: true },
-        { pubkey: web3_js_2.SystemProgram.programId, isSigner: false, isWritable: false },
+        { pubkey: web3_js_3.SystemProgram.programId, isSigner: false, isWritable: false },
         { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: spl_token_1.TOKEN_2022_PROGRAM_ID, isSigner: false, isWritable: false },
         { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
@@ -210,7 +238,7 @@ function editBasketIx(params) {
         keys.push({ pubkey: constants_1.METADATA_PROGRAM_ID, isSigner: false, isWritable: false });
     }
     ;
-    return new web3_js_1.TransactionInstruction({
+    return new web3_js_2.TransactionInstruction({
         keys,
         programId: constants_1.BASKETS_V3_PROGRAM_ID,
         data,

package/dist/src/instructions/user/deposit.d.ts

@@ -11,6 +11,7 @@ export declare function depositStateIx(params: {
     bountyMint: PublicKey;
     rebalanceIntentRentPayer: PublicKey;
     rebalanceSlippageBps: number;
+    perTradeRebalanceSlippageBps: number;
     executionStartTime: number;
 }): TransactionInstruction;
 export declare function depositTokensIx(params: {

package/dist/src/instructions/user/deposit.js

@@ -53,7 +53,7 @@ function resizeRebalanceIntentIx(rebalanceIntent) {
     });
 }
 function depositStateIx(params) {
-    const { buyer, basket, bountyMint, rebalanceIntentRentPayer, rebalanceSlippageBps, executionStartTime, } = params;
+    const { buyer, basket, bountyMint, rebalanceIntentRentPayer, rebalanceSlippageBps, perTradeRebalanceSlippageBps, executionStartTime, } = params;
     let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, buyer);
     let basketTokenMint = (0, pda_1.getBasketTokenMintPda)(basket);
     let globalConfig = (0, pda_1.getGlobalConfigPda)();
@@ -64,11 +64,13 @@ function depositStateIx(params) {
     let buyerBasketAta = (0, pda_1.getAta)(buyer, basketTokenMint);
     const rebalanceIntentRentPayerBuf = rebalanceIntentRentPayer.toBuffer();
     const rebalanceSlippageBuf = Buffer.from(new anchor_1.BN(rebalanceSlippageBps).toArray("le", 2));
+    const perTradeRebalanceSlippageBuf = Buffer.from(new anchor_1.BN(perTradeRebalanceSlippageBps).toArray("le", 2));
     const executionStartBuf = Buffer.from(new anchor_1.BN(executionStartTime).toArray("le", 8));
     const data = Buffer.concat([
         CREATE_DEPOSIT_STATE_DISCRIMINATOR,
         rebalanceIntentRentPayerBuf,
         rebalanceSlippageBuf,
+        perTradeRebalanceSlippageBuf,
         executionStartBuf
     ]);
     const keys = [

package/dist/src/instructions/user/withdraw.d.ts

@@ -5,6 +5,7 @@ export declare function createWithdrawStateIx(params: {
     basket: PublicKey;
     withdrawAmount: number;
     rebalanceSlippageBps: number;
+    perTradeRebalanceSlippageBps: number;
     executionStartTime: number;
     bountyMint: PublicKey;
 }): TransactionInstruction;

package/dist/src/instructions/user/withdraw.js

@@ -11,7 +11,7 @@ const web3_js_2 = require("@solana/web3.js");
 const CREATE_WITHDRAW_STATE_DISCRIMINATOR = Buffer.from([161, 45, 253, 59, 110, 240, 65, 3]);
 const REDEEM_TOKENS_DISCRIMINATOR = Buffer.from([83, 49, 112, 2, 105, 193, 106, 126]);
 function createWithdrawStateIx(params) {
-    const { seller, basket, withdrawAmount, rebalanceSlippageBps, executionStartTime, bountyMint, } = params;
+    const { seller, basket, withdrawAmount, rebalanceSlippageBps, perTradeRebalanceSlippageBps, executionStartTime, bountyMint, } = params;
     let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, seller);
     let rentPayerPda = (0, pda_1.getRentPayerPda)();
     let basketTokenMint = (0, pda_1.getBasketTokenMintPda)(basket);
@@ -25,6 +25,7 @@ function createWithdrawStateIx(params) {
         CREATE_WITHDRAW_STATE_DISCRIMINATOR,
         Buffer.from(new anchor_1.BN(withdrawAmount).toArray("le", 8)),
         Buffer.from(new anchor_1.BN(rebalanceSlippageBps).toArray("le", 2)),
+        Buffer.from(new anchor_1.BN(perTradeRebalanceSlippageBps).toArray("le", 2)),
         Buffer.from(new anchor_1.BN(executionStartTime).toArray("le", 8)),
     ]);
     const keys = [
@@ -67,10 +68,8 @@ function redeemTokensIx(params) {
     // remaining accounts
     params.tokenMints.forEach((mint) => {
         keys.push({ pubkey: mint, isWritable: false, isSigner: false });
-        const ownerAta = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, owner);
-        keys.push({ pubkey: ownerAta, isWritable: true, isSigner: false });
-        const basketAta = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, basket);
-        keys.push({ pubkey: basketAta, isWritable: true, isSigner: false });
+        keys.push({ pubkey: (0, pda_1.getAta)(owner, mint), isWritable: true, isSigner: false });
+        keys.push({ pubkey: (0, pda_1.getAta)(basket, mint), isWritable: true, isSigner: false });
     });
     const discriminator = REDEEM_TOKENS_DISCRIMINATOR;
     const data = discriminator;

package/dist/src/layouts/basket.d.ts

@@ -22,6 +22,7 @@ export interface Asset {
     mint: PublicKey;
     amount: BN;
     weight: number;
+    active: number;
     oracleAggregator: OracleAggregator;
     price?: OraclePrice;
     value?: Decimal;
@@ -43,7 +44,6 @@ export interface Basket {
     settings: BasketSettings;
     accumulatedFees: BasketFees;
     lookupTables: LookupTables;
-    writeVersion: BN;
     numTokens: number;
     composition: Asset[];
     lutPubkeys?: AddressLookupTableAccount[];

package/dist/src/layouts/basket.js

@@ -23,6 +23,7 @@ exports.AssetLayout = (0, borsh_1.struct)([
     (0, borsh_1.publicKey)('mint'),
     (0, borsh_1.u64)('amount'),
     (0, borsh_1.u16)('weight'),
+    (0, borsh_1.u8)('active'),
     oracle_1.OracleAggregatorLayout.replicate('oracleAggregator'),
 ]);
 ;
@@ -37,7 +38,6 @@ exports.BasketLayout = (0, borsh_1.struct)([
     config_1.BasketSettingsLayout.replicate('settings'),
     exports.BasketFeesLayout.replicate('accumulatedFees'),
     exports.LookupTablesLayout.replicate('lookupTables'),
-    (0, borsh_1.u64)('writeVersion'),
     (0, borsh_1.u8)('numTokens'),
     (0, borsh_1.array)(exports.AssetLayout, exports.MAX_SUPPORTED_TOKENS_PER_BASKET, 'composition'),
 ]);

package/dist/src/layouts/config.d.ts

@@ -11,6 +11,7 @@ export declare enum BasketType {
     Public = 1
 }
 export interface ScheduleSettings {
+    cycleStartTime: BN;
     cycleDuration: BN;
     depositsStart: BN;
     depositsEnd: BN;
@@ -23,16 +24,20 @@ export interface ScheduleSettings {
 export declare const ScheduleSettingsLayout: any;
 export interface FeeSettings {
     hostDepositFeeBps: number;
+    hostWithdrawFeeBps: number;
     hostManagementFeeBps: number;
     hostPerformanceFeeBps: number;
     creatorDepositFeeBps: number;
+    creatorWithdrawFeeBps: number;
     creatorManagementFeeBps: number;
     creatorPerformanceFeeBps: number;
     managersDepositFeeBps: number;
+    managerWithdrawFeeBps: number;
     managersManagementFeeBps: number;
     managersPerformanceFeeBps: number;
     basketDepositFeeBps: number;
     basketWithdrawFeeBps: number;
+    extraData: number[];
     modificationDelay: BN;
 }
 export declare const FeeSettingsLayout: any;
@@ -44,15 +49,19 @@ export interface ManagerSettings {
 export declare const ManagerSettingsLayout: any;
 export interface AutomationSettings {
     allowAutomation: number;
-    rebalanceSlippageBps: number;
-    rebalanceThresholdBps: number;
-    rebalanceIntervalSeconds: BN;
+    rebalanceSlippageThresholdBps: number;
+    perTradeRebalanceSlippageThresholdBps: number;
+    rebalanceActivationThresholdAbsBps: number;
+    rebalanceActivationThresholdRelBps: number;
+    rebalanceActivationCooldown: BN;
+    extraData: PublicKey[];
     modificationDelay: BN;
 }
 export declare const AutomationSettingsLayout: any;
 export interface LpSettings {
-    lpThresholdBps: number;
     allowLp: number;
+    lpThresholdBps: number;
+    extraData: number[];
     modificationDelay: BN;
 }
 export declare const LpSettingsLayout: any;
@@ -98,6 +107,7 @@ export declare const BasketSettingsLayout: any;
 export interface GlobalConfig {
     admin: PublicKey;
     owners: PublicKey[];
+    allowInteractions: number;
     allowCreation: number;
     allowManagement: number;
     allowAutomation: number;
@@ -109,10 +119,16 @@ export interface GlobalConfig {
     maxPerformanceFeeBps: number;
     symmetryFeeCollector: PublicKey;
     symmetryDepositFeeBps: number;
+    symmetryDepositFeeShareBps: number;
     symmetryWithdrawFeeBps: number;
-    symmetryRebalanceFeeBps: number;
+    symmetryWithdrawFeeShareBps: number;
     symmetryManagementFeeBps: number;
+    symmetryManagementFeeShareBps: number;
     symmetryPerformanceFeeBps: number;
+    symmetryPerformanceFeeShareBps: number;
+    symmetryTradeFeeBps: number;
+    symmetryLimitOrderFeeBps: number;
+    symmetryFeesExtraData: number[];
     bountyMint: PublicKey;
     minBountyForBasketAutomation: BN;
     bountyBondAmount: BN;
@@ -128,5 +144,6 @@ export interface GlobalConfig {
     priceUpdateDelayAfterCreation: BN;
     priceUpdateLifetime: BN;
     priceUpdateReexecutionDelay: BN;
+    extraData: BN[];
 }
 export declare const GlobalConfigLayout: any;

package/dist/src/layouts/config.js

@@ -16,6 +16,7 @@ var BasketType;
 ;
 ;
 exports.ScheduleSettingsLayout = (0, borsh_1.struct)([
+    (0, borsh_1.u64)('cycleStartTime'),
     (0, borsh_1.u64)('cycleDuration'),
     (0, borsh_1.u64)('depositsStart'),
     (0, borsh_1.u64)('depositsEnd'),
@@ -28,16 +29,20 @@ exports.ScheduleSettingsLayout = (0, borsh_1.struct)([
 ;
 exports.FeeSettingsLayout = (0, borsh_1.struct)([
     (0, borsh_1.u16)('hostDepositFeeBps'),
+    (0, borsh_1.u16)('hostWithdrawFeeBps'),
     (0, borsh_1.u16)('hostManagementFeeBps'),
     (0, borsh_1.u16)('hostPerformanceFeeBps'),
     (0, borsh_1.u16)('creatorDepositFeeBps'),
+    (0, borsh_1.u16)('creatorWithdrawFeeBps'),
     (0, borsh_1.u16)('creatorManagementFeeBps'),
     (0, borsh_1.u16)('creatorPerformanceFeeBps'),
     (0, borsh_1.u16)('managersDepositFeeBps'),
+    (0, borsh_1.u16)('managerWithdrawFeeBps'),
     (0, borsh_1.u16)('managersManagementFeeBps'),
     (0, borsh_1.u16)('managersPerformanceFeeBps'),
     (0, borsh_1.u16)('basketDepositFeeBps'),
     (0, borsh_1.u16)('basketWithdrawFeeBps'),
+    (0, borsh_1.array)((0, borsh_1.u8)(), 32, 'extraData'),
     (0, borsh_1.u64)('modificationDelay'),
 ]);
 exports.ManagerSettingsLayout = (0, borsh_1.struct)([
@@ -48,15 +53,19 @@ exports.ManagerSettingsLayout = (0, borsh_1.struct)([
 ;
 exports.AutomationSettingsLayout = (0, borsh_1.struct)([
     (0, borsh_1.u8)('allowAutomation'),
-    (0, borsh_1.u16)('rebalanceSlippageBps'),
-    (0, borsh_1.u16)('rebalanceThresholdBps'),
-    (0, borsh_1.u64)('rebalanceIntervalSeconds'),
+    (0, borsh_1.u16)('rebalanceSlippageThresholdBps'),
+    (0, borsh_1.u16)('perTradeRebalanceSlippageThresholdBps'),
+    (0, borsh_1.u16)('rebalanceActivationThresholdAbsBps'),
+    (0, borsh_1.u16)('rebalanceActivationThresholdRelBps'),
+    (0, borsh_1.u64)('rebalanceActivationCooldown'),
+    (0, borsh_1.array)((0, borsh_1.publicKey)(), 4, 'extraData'),
     (0, borsh_1.u64)('modificationDelay'),
 ]);
 ;
 exports.LpSettingsLayout = (0, borsh_1.struct)([
-    (0, borsh_1.u16)('lpThresholdBps'),
     (0, borsh_1.u8)('allowLp'),
+    (0, borsh_1.u16)('lpThresholdBps'),
+    (0, borsh_1.array)((0, borsh_1.u8)(), 32, 'extraData'),
     (0, borsh_1.u64)('modificationDelay'),
 ]);
 ;
@@ -101,6 +110,7 @@ exports.BasketSettingsLayout = (0, borsh_1.struct)([
 exports.GlobalConfigLayout = (0, borsh_1.struct)([
     (0, borsh_1.publicKey)('admin'),
     (0, borsh_1.array)((0, borsh_1.publicKey)(), 3, 'owners'),
+    (0, borsh_1.u8)('allowInteractions'),
     (0, borsh_1.u8)('allowCreation'),
     (0, borsh_1.u8)('allowManagement'),
     (0, borsh_1.u8)('allowAutomation'),
@@ -112,10 +122,16 @@ exports.GlobalConfigLayout = (0, borsh_1.struct)([
     (0, borsh_1.u16)('maxPerformanceFeeBps'),
     (0, borsh_1.publicKey)('symmetryFeeCollector'),
     (0, borsh_1.u16)('symmetryDepositFeeBps'),
+    (0, borsh_1.u16)('symmetryDepositFeeShareBps'),
     (0, borsh_1.u16)('symmetryWithdrawFeeBps'),
-    (0, borsh_1.u16)('symmetryRebalanceFeeBps'),
+    (0, borsh_1.u16)('symmetryWithdrawFeeShareBps'),
     (0, borsh_1.u16)('symmetryManagementFeeBps'),
+    (0, borsh_1.u16)('symmetryManagementFeeShareBps'),
     (0, borsh_1.u16)('symmetryPerformanceFeeBps'),
+    (0, borsh_1.u16)('symmetryPerformanceFeeShareBps'),
+    (0, borsh_1.u16)('symmetryTradeFeeBps'),
+    (0, borsh_1.u16)('symmetryLimitOrderFeeBps'),
+    (0, borsh_1.array)((0, borsh_1.u16)(), 16, 'symmetryFeesExtraData'),
     (0, borsh_1.publicKey)('bountyMint'),
     (0, borsh_1.u64)('minBountyForBasketAutomation'),
     (0, borsh_1.u64)('bountyBondAmount'),
@@ -131,4 +147,5 @@ exports.GlobalConfigLayout = (0, borsh_1.struct)([
     (0, borsh_1.u64)('priceUpdateDelayAfterCreation'),
     (0, borsh_1.u64)('priceUpdateLifetime'),
     (0, borsh_1.u64)('priceUpdateReexecutionDelay'),
+    (0, borsh_1.array)((0, borsh_1.u64)(), 32, 'extraData'),
 ]);