@symmetry-hq/temp-v3-sdk 0.0.49 → 0.0.50

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

@@ -0,0 +1,11 @@
+import { BN } from '@coral-xyz/anchor';
+import { PublicKey, TransactionInstruction } from '@solana/web3.js';
+export declare function rebalanceSwapIx(params: {
+    keeper: PublicKey;
+    basket: PublicKey;
+    mintFrom: PublicKey;
+    mintTo: PublicKey;
+    amountIn: BN;
+    amountOut: BN;
+    mode: number;
+}): TransactionInstruction;

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

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rebalanceSwapIx = rebalanceSwapIx;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("../../constants");
+const pda_1 = require("../pda");
+const REBALANCE_SWAP_DISCRIMINATOR = Buffer.from([101, 122, 61, 201, 21, 165, 177, 213]);
+function rebalanceSwapIx(params) {
+    const { keeper, basket, mintFrom, mintTo, amountIn, amountOut, mode } = params;
+    let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, keeper); // TODO: incorrect. Pass intent as func param
+    let keeperFromATA = (0, pda_1.getAta)(keeper, mintFrom);
+    let keeperToATA = (0, pda_1.getAta)(keeper, mintTo);
+    let basketFromATA = (0, pda_1.getAta)(basket, mintFrom);
+    let basketToATA = (0, pda_1.getAta)(basket, mintTo);
+    const keys = [
+        { pubkey: params.keeper, isWritable: true, isSigner: true },
+        { pubkey: params.basket, isWritable: true, isSigner: false },
+        { pubkey: rebalanceIntent, isWritable: true, isSigner: false },
+        { pubkey: params.mintFrom, isWritable: false, isSigner: false },
+        { pubkey: params.mintTo, isWritable: false, isSigner: false },
+        { pubkey: keeperFromATA, isWritable: true, isSigner: false },
+        { pubkey: keeperToATA, isWritable: true, isSigner: false },
+        { pubkey: basketFromATA, isWritable: true, isSigner: false },
+        { pubkey: basketToATA, isWritable: true, isSigner: false },
+        { pubkey: (0, pda_1.getGlobalConfigPda)(), isWritable: false, isSigner: false },
+        { pubkey: web3_js_1.SystemProgram.programId, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
+    ];
+    const discriminator = REBALANCE_SWAP_DISCRIMINATOR;
+    const amountInBuffer = Buffer.from(amountIn.toArray("le", 8));
+    const amountOutBuffer = Buffer.from(amountOut.toArray("le", 8));
+    const modeBuffer = Buffer.from([mode]);
+    const data = Buffer.concat([discriminator, amountInBuffer, amountOutBuffer, modeBuffer]);
+    return new web3_js_1.TransactionInstruction({
+        keys,
+        programId: constants_1.BASKETS_V3_PROGRAM_ID,
+        data,
+    });
+}

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

@@ -97,7 +97,7 @@ function createEditBasketIntentIx(params) {
             let startIndex = 0;
             for (let i = 0; i < config_1.MAX_MANAGERS_PER_BASKET; i++) {
                 editDataBuf.writeUInt16LE(managersWeights[i], startIndex);
-                if (managers[i] !== web3_js_1.PublicKey.default) {
+                if (!managers[i].equals(web3_js_1.PublicKey.default)) {
                     additionalAccounts.push({
                         pubkey: managers[i],
                         isWritable: true,
@@ -360,6 +360,7 @@ function createEditBasketIntentIx(params) {
                 amountFrom: new anchor_1.BN(makeDirectSwapData.amount_from),
                 amountTo: new anchor_1.BN(makeDirectSwapData.amount_to),
             };
+            config_1.MakeDirectSwapLayout.encode(makeDirectSwap, editDataBuf);
             break;
         default:
             break;

package/dist/src/layouts/intents/intent.js

@@ -11,13 +11,6 @@ exports.INTENT_STATUS_STRINGS = new Map([
     [3, "completed"],
 ]);
 exports.TASK_TYPE_STRINGS = new Map([
-    [0, "unknown"],
-    [1, "edit_creator"],
-    [2, "edit_manager_settings"],
-    [3, "edit_fee_settings"],
-    [4, "edit_schedule_settings"],
-    [5, "edit_automation_settings"],
-    [6, "edit_lp_settings"],
     [0, "unknown"],
     [1, "edit_creator"],
     [2, "edit_manager_settings"],
@@ -29,12 +22,12 @@ exports.TASK_TYPE_STRINGS = new Map([
     [8, "edit_deposits_settings"],
     [9, "edit_force_rebalance_settings"],
     [10, "edit_custom_rebalance_settings"],
-    [101, "edit_add_token_delay"],
-    [102, "edit_update_weights_delay"],
-    [103, "edit_make_direct_swap_delay"],
-    [201, "add_token"],
-    [202, "update_weights"],
-    [203, "make_direct_swap"],
+    [11, "edit_add_token_delay"],
+    [12, "edit_update_weights_delay"],
+    [13, "edit_make_direct_swap_delay"],
+    [14, "add_token"],
+    [15, "update_weights"],
+    [16, "make_direct_swap"],
 ]);
 exports.INTENT_TASK_DATA_SIZE = 600;
 var IntentStatus;

package/dist/src/states/intents/intent.js

@@ -24,7 +24,6 @@ const fraction_1 = require("../../layouts/fraction");
 function decodeTaskDataForType(intent) {
     let taskType = (0, intent_1.taskTypeFromU8)(intent.taskType);
     let taskData = intent.taskData;
-    console.log("intent: ", intent);
     switch (taskType) {
         case intent_1.TaskType.EditCreator:
             let editCreator = config_1.EditCreatorLayout.decode(Buffer.from(taskData.slice(0, config_1.EditCreatorLayout.getSpan())));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symmetry-hq/temp-v3-sdk",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "description": "Symmetry Baskets V3 SDK",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/src/instructions/management/edit.ts

@@ -15,7 +15,7 @@ import {
     AuthorityBitmasks,
     AuthorityBitmasksLayout,
     AutomationSettings, AutomationSettingsLayout, EditAddTokenDelay, EditAddTokenDelayLayout, EditCreator, EditCreatorLayout, EditMakeDirectSwapDelay, EditMakeDirectSwapDelayLayout, EditUpdateWeightsDelay, EditUpdateWeightsDelayLayout, FeeSettings, FeeSettingsLayout, LpSettings,
-    LpSettingsLayout, MakeDirectSwap, ManagerSettings, ManagerSettingsLayout, MAX_MANAGERS_PER_BASKET,
+    LpSettingsLayout, MakeDirectSwap, MakeDirectSwapLayout, ManagerSettings, ManagerSettingsLayout, MAX_MANAGERS_PER_BASKET,
     MetadataParams,
     MetadataSettings, MetadataSettingsLayout, ScheduleSettings, ScheduleSettingsLayout,
     UpdateWeights,
@@ -164,7 +164,7 @@ export function createEditBasketIntentIx(params: {
             let startIndex = 0;
             for (let i = 0; i < MAX_MANAGERS_PER_BASKET; i++) {
                 editDataBuf.writeUInt16LE(managersWeights[i], startIndex);
-                if (managers[i] !== PublicKey.default) {
+                if (!managers[i].equals(PublicKey.default)) {
                     additionalAccounts.push({
                         pubkey: managers[i],
                         isWritable: true,
@@ -443,6 +443,7 @@ export function createEditBasketIntentIx(params: {
                 amountFrom: new BN(makeDirectSwapData.amount_from),
                 amountTo: new BN(makeDirectSwapData.amount_to),
             }
+            MakeDirectSwapLayout.encode(makeDirectSwap, editDataBuf);
             break;
 
         default:

package/src/layouts/intents/intent.ts

@@ -15,13 +15,6 @@ export const INTENT_STATUS_STRINGS: Map<number, FormattedIntentStatus> = new Map
 
 export type FormattedTaskType = "unknown" | "edit_creator" | "edit_manager_settings" | "edit_fee_settings" | "edit_schedule_settings" | "edit_automation_settings" | "edit_lp_settings" | "edit_metadata_settings" | "edit_deposits_settings" | "edit_force_rebalance_settings" | "edit_custom_rebalance_settings" | "edit_add_token_delay" | "edit_update_weights_delay" | "edit_make_direct_swap_delay" | "add_token" | "update_weights" | "make_direct_swap";
 export const TASK_TYPE_STRINGS: Map<number, FormattedTaskType> = new Map([
-    [0, "unknown"],
-    [1, "edit_creator"],
-    [2, "edit_manager_settings"],
-    [3, "edit_fee_settings"],
-    [4, "edit_schedule_settings"],
-    [5, "edit_automation_settings"],
-    [6, "edit_lp_settings"],
     [0, "unknown"],
     [1, "edit_creator"],
     [2, "edit_manager_settings"],
@@ -33,12 +26,12 @@ export const TASK_TYPE_STRINGS: Map<number, FormattedTaskType> = new Map([
     [8, "edit_deposits_settings"],
     [9, "edit_force_rebalance_settings"],
     [10, "edit_custom_rebalance_settings"],
-    [101, "edit_add_token_delay"],
-    [102, "edit_update_weights_delay"],
-    [103, "edit_make_direct_swap_delay"],
-    [201, "add_token"],
-    [202, "update_weights"],
-    [203, "make_direct_swap"],
+    [11, "edit_add_token_delay"],
+    [12, "edit_update_weights_delay"],
+    [13, "edit_make_direct_swap_delay"],
+    [14, "add_token"],
+    [15, "update_weights"],
+    [16, "make_direct_swap"],
 ]);
 
 export interface FormattedBountySchedule {

package/src/states/intents/intent.ts

@@ -16,7 +16,6 @@ import { fractionToDecimal } from '../../layouts/fraction';
 function decodeTaskDataForType(intent: Intent): Settings {
     let taskType = taskTypeFromU8(intent.taskType);
     let taskData = intent.taskData;
-    console.log("intent: ", intent);
     switch (taskType) {
         case TaskType.EditCreator:
             let editCreator: EditCreator = EditCreatorLayout.decode(Buffer.from(taskData.slice(0, EditCreatorLayout.getSpan())));