@symmetry-hq/temp-v3-sdk 0.0.29 → 0.0.31

package/dist/src/layouts/intents/intent.d.ts

@@ -61,12 +61,12 @@ export declare enum TaskType {
     EditDepositsSettings = 8,
     EditForceRebalanceSettings = 9,
     EditCustomRebalanceSettings = 10,
-    EditAddTokenDelay = 11,
-    EditUpdateWeightsDelay = 12,
-    EditMakeDirectSwapDelay = 13,
-    AddToken = 14,
-    UpdateWeights = 15,
-    MakeDirectSwap = 16
+    EditAddTokenDelay = 101,
+    EditUpdateWeightsDelay = 102,
+    EditMakeDirectSwapDelay = 103,
+    AddToken = 201,
+    UpdateWeights = 202,
+    MakeDirectSwap = 203
 }
 export declare function taskTypeFromU8(value: number): TaskType;
 export interface TaskContext {
@@ -165,6 +165,8 @@ export interface EditMakeDirectSwapSettings {
 }
 export interface OracleInput {
     oracle_type: FormattedOracleType;
+    account_lut_id: number;
+    account_lut_index: number;
     account: string;
     num_required_accounts: number;
     weight: number;

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

@@ -38,13 +38,16 @@ var TaskType;
     TaskType[TaskType["EditDepositsSettings"] = 8] = "EditDepositsSettings";
     TaskType[TaskType["EditForceRebalanceSettings"] = 9] = "EditForceRebalanceSettings";
     TaskType[TaskType["EditCustomRebalanceSettings"] = 10] = "EditCustomRebalanceSettings";
-    TaskType[TaskType["EditAddTokenDelay"] = 11] = "EditAddTokenDelay";
-    TaskType[TaskType["EditUpdateWeightsDelay"] = 12] = "EditUpdateWeightsDelay";
-    TaskType[TaskType["EditMakeDirectSwapDelay"] = 13] = "EditMakeDirectSwapDelay";
-    TaskType[TaskType["AddToken"] = 14] = "AddToken";
-    TaskType[TaskType["UpdateWeights"] = 15] = "UpdateWeights";
-    TaskType[TaskType["MakeDirectSwap"] = 16] = "MakeDirectSwap";
+    TaskType[TaskType["EditAddTokenDelay"] = 101] = "EditAddTokenDelay";
+    TaskType[TaskType["EditUpdateWeightsDelay"] = 102] = "EditUpdateWeightsDelay";
+    TaskType[TaskType["EditMakeDirectSwapDelay"] = 103] = "EditMakeDirectSwapDelay";
+    TaskType[TaskType["AddToken"] = 201] = "AddToken";
+    TaskType[TaskType["UpdateWeights"] = 202] = "UpdateWeights";
+    TaskType[TaskType["MakeDirectSwap"] = 203] = "MakeDirectSwap";
 })(TaskType || (exports.TaskType = TaskType = {}));
+// Maps raw u8 values from on-chain Borsh-serialized storage to TaskType enum.
+// The on-chain program uses sequential Borsh discriminants (11-16) for storage,
+// but the SDK enum uses non-sequential values (101-103, 201-203) for instruction input.
 function taskTypeFromU8(value) {
     switch (value) {
         case 1: return TaskType.EditCreator;
@@ -57,12 +60,12 @@ function taskTypeFromU8(value) {
         case 8: return TaskType.EditDepositsSettings;
         case 9: return TaskType.EditForceRebalanceSettings;
         case 10: return TaskType.EditCustomRebalanceSettings;
-        case 11: return TaskType.EditAddTokenDelay;
-        case 12: return TaskType.EditUpdateWeightsDelay;
-        case 13: return TaskType.EditMakeDirectSwapDelay;
-        case 14: return TaskType.AddToken;
-        case 15: return TaskType.UpdateWeights;
-        case 16: return TaskType.MakeDirectSwap;
+        case 101: return TaskType.EditAddTokenDelay;
+        case 102: return TaskType.EditUpdateWeightsDelay;
+        case 103: return TaskType.EditMakeDirectSwapDelay;
+        case 201: return TaskType.AddToken;
+        case 202: return TaskType.UpdateWeights;
+        case 203: return TaskType.MakeDirectSwap;
         default: return TaskType.Unknown;
     }
 }

package/dist/src/states/basket.js

@@ -220,6 +220,8 @@ function addFieldsToBasket(basket) {
             oracles: asset.oracleAggregator.oracles.map(oracle => ({
                 oracle_settings: {
                     oracle_type: oracle_1.ORACLE_TYPES_STRINGS[oracle.oracleSettings.oracleType],
+                    account_lut_id: oracle.accountsToLoadLutIds[0],
+                    account_lut_index: oracle.accountsToLoadLutIndices[0],
                     account: lookup_tables.active[oracle.accountsToLoadLutIds[0]].contents[oracle.accountsToLoadLutIndices[0]],
                     num_required_accounts: oracle.oracleSettings.numRequiredAccounts,
                     weight: oracle.oracleSettings.weight,

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

@@ -22,7 +22,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const oracle_1 = require("../../layouts/oracle");
 const fraction_1 = require("../../layouts/fraction");
 function decodeTaskDataForType(intent) {
-    let taskType = intent.taskType;
+    let taskType = (0, intent_1.taskTypeFromU8)(intent.taskType);
     let taskData = intent.taskData;
     switch (taskType) {
         case intent_1.TaskType.EditCreator:
@@ -185,6 +185,8 @@ function decodeTaskDataForType(intent) {
                 conf_multiplier: (0, fraction_1.fractionToDecimal)(oracleAggregator.confMultiplier).toNumber(),
                 oracles: oracleAggregator.oracles.slice(0, oracleAggregator.numOracles).map(oracle => ({
                     oracle_type: oracle_1.ORACLE_TYPES_STRINGS[oracle.oracleSettings.oracleType],
+                    account_lut_id: oracle.accountsToLoadLutIds[0],
+                    account_lut_index: oracle.accountsToLoadLutIndices[0],
                     account: "",
                     num_required_accounts: oracle.oracleSettings.numRequiredAccounts,
                     weight: oracle.oracleSettings.weight,

package/dist/test.js

@@ -12,11 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const src_1 = require("./src");
+let kp = Array.from(web3_js_1.Keypair.generate().secretKey);
 let connection = new web3_js_1.Connection("https://api.devnet.solana.com");
 function testStates() {
     return __awaiter(this, void 0, void 0, function* () {
         return;
-        let kp = Array.from(web3_js_1.Keypair.generate().secretKey);
         let wallet = new anchor_1.Wallet(web3_js_1.Keypair.fromSecretKey(new Uint8Array(kp)));
         console.log(wallet.publicKey.toBase58());
         let sdk = new src_1.SymmetryCore({
@@ -248,6 +248,8 @@ function testStates() {
                 oracles: [
                     {
                         oracle_type: "pyth",
+                        account_lut_id: 0,
+                        account_lut_index: 0,
                         account: "So11111111111111111111111111111111111111112",
                         num_required_accounts: 1,
                         weight: 100,

package/package.json

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

package/src/layouts/intents/intent.ts

@@ -81,15 +81,18 @@ export enum TaskType {
     EditForceRebalanceSettings = 9,
     EditCustomRebalanceSettings = 10,
   
-    EditAddTokenDelay = 11,
-    EditUpdateWeightsDelay = 12,
-    EditMakeDirectSwapDelay = 13,
+    EditAddTokenDelay = 101,
+    EditUpdateWeightsDelay = 102,
+    EditMakeDirectSwapDelay = 103,
   
-    AddToken = 14,
-    UpdateWeights = 15,
-    MakeDirectSwap = 16,
+    AddToken = 201,
+    UpdateWeights = 202,
+    MakeDirectSwap = 203,
   }
 
+  // Maps raw u8 values from on-chain Borsh-serialized storage to TaskType enum.
+  // The on-chain program uses sequential Borsh discriminants (11-16) for storage,
+  // but the SDK enum uses non-sequential values (101-103, 201-203) for instruction input.
   export function taskTypeFromU8(value: number): TaskType {
     switch (value) {
       case 1: return TaskType.EditCreator;
@@ -103,13 +106,13 @@ export enum TaskType {
       case 9: return TaskType.EditForceRebalanceSettings;
       case 10: return TaskType.EditCustomRebalanceSettings;
 
-      case 11: return TaskType.EditAddTokenDelay;
-      case 12: return TaskType.EditUpdateWeightsDelay;
-      case 13: return TaskType.EditMakeDirectSwapDelay;
+      case 101: return TaskType.EditAddTokenDelay;
+      case 102: return TaskType.EditUpdateWeightsDelay;
+      case 103: return TaskType.EditMakeDirectSwapDelay;
 
-      case 14: return TaskType.AddToken;
-      case 15: return TaskType.UpdateWeights;
-      case 16: return TaskType.MakeDirectSwap;
+      case 201: return TaskType.AddToken;
+      case 202: return TaskType.UpdateWeights;
+      case 203: return TaskType.MakeDirectSwap;
 
       default: return TaskType.Unknown;
     }
@@ -230,6 +233,8 @@ export interface EditMakeDirectSwapSettings {
 
 export interface OracleInput {
     oracle_type: FormattedOracleType,
+    account_lut_id: number,
+    account_lut_index: number,
     account: string,
     num_required_accounts: number,
     weight: number,

package/src/states/basket.ts

@@ -219,7 +219,7 @@ export function addFieldsToBasket(basket: Basket): Basket {
             },
         ],
     };
-    let composition: FormattedAsset[] =basket.composition.map(asset => ({
+    let composition: FormattedAsset[] = basket.composition.map(asset => ({
         mint: asset.mint.toBase58(),
         amount: parseInt(asset.amount.toString()),
         weight: asset.weight,
@@ -230,6 +230,8 @@ export function addFieldsToBasket(basket: Basket): Basket {
             oracles: asset.oracleAggregator.oracles.map(oracle => ({
                 oracle_settings: {
                     oracle_type: ORACLE_TYPES_STRINGS[oracle.oracleSettings.oracleType],
+                    account_lut_id: oracle.accountsToLoadLutIds[0],
+                    account_lut_index: oracle.accountsToLoadLutIndices[0],
                     account: lookup_tables.active[oracle.accountsToLoadLutIds[0]].contents[oracle.accountsToLoadLutIndices[0]],
                     num_required_accounts: oracle.oracleSettings.numRequiredAccounts,
                     weight: oracle.oracleSettings.weight,

package/src/states/intents/intent.ts

@@ -6,15 +6,15 @@ import {
 } from '@solana/web3.js';
 
 import { BASKETS_V3_PROGRAM_ID, MAX_MANAGERS_PER_BASKET } from '../../constants';
-import { AddOrEditTokenInput, EditAddTokenSettings, EditAutomationSettings, EditCreatorSettings, EditCustomRebalanceSettings, EditDepositsSettings, EditFeeSettings, EditForceRebalanceSettings, EditLpSettings, EditMakeDirectSwapSettings, EditManagerSettings, EditMetadataSettings, EditScheduleSettings, EditUpdateWeightsSettings, FormattedIntent, Intent, INTENT_STATUS_STRINGS, IntentLayout, IntentStatus, MakeDirectSwapInput, Settings, TASK_TYPE_STRINGS, TaskType, UpdateWeightsInput } from '../../layouts/intents/intent';
+import { AddOrEditTokenInput, EditAddTokenSettings, EditAutomationSettings, EditCreatorSettings, EditCustomRebalanceSettings, EditDepositsSettings, EditFeeSettings, EditForceRebalanceSettings, EditLpSettings, EditMakeDirectSwapSettings, EditManagerSettings, EditMetadataSettings, EditScheduleSettings, EditUpdateWeightsSettings, FormattedIntent, Intent, INTENT_STATUS_STRINGS, IntentLayout, IntentStatus, MakeDirectSwapInput, Settings, TASK_TYPE_STRINGS, TaskType, taskTypeFromU8, UpdateWeightsInput } from '../../layouts/intents/intent';
 import { getMultipleAccountsInfoBatched } from '../../txUtils';
-import { AuthorityBitmasks, AuthorityBitmasksLayout, AutomationSettings, AutomationSettingsLayout, EditAddTokenDelay, EditAddTokenDelayLayout, EditCreator, EditCreatorLayout, EditMakeDirectSwapDelay, EditMakeDirectSwapDelayLayout, EditUpdateWeightsDelay, EditUpdateWeightsDelayLayout, FeeSettings, FeeSettingsLayout, LpSettings, LpSettingsLayout, MakeDirectSwap, MakeDirectSwapLayout, MetadataSettings, MetadataSettingsLayout, ScheduleSettings, ScheduleSettingsLayout, UpdateWeights, UpdateWeightsLayout } from '../../layouts/config';
+import { AuthorityBitmasks, AuthorityBitmasksLayout, AutomationSettings, AutomationSettingsLayout, EditAddTokenDelay, EditAddTokenDelayLayout, EditCreator, EditCreatorLayout, EditMakeDirectSwapDelay, EditMakeDirectSwapDelayLayout, EditUpdateWeightsDelay, EditUpdateWeightsDelayLayout, FeeSettings, FeeSettingsLayout, LpSettings, LpSettingsLayout, MakeDirectSwap, MakeDirectSwapLayout, ManagerSettings, ManagerSettingsLayout, MetadataSettings, MetadataSettingsLayout, ScheduleSettings, ScheduleSettingsLayout, UpdateWeights, UpdateWeightsLayout } from '../../layouts/config';
 import { BN } from '@coral-xyz/anchor';
 import { ORACLE_TYPES_STRINGS, OracleAggregator, OracleAggregatorLayout } from '../../layouts/oracle';
 import { fractionToDecimal } from '../../layouts/fraction';
 
 function decodeTaskDataForType(intent: Intent): Settings {
-    let taskType = intent.taskType;
+    let taskType = taskTypeFromU8(intent.taskType);
     let taskData = intent.taskData;
     switch (taskType) {
         case TaskType.EditCreator:
@@ -177,6 +177,8 @@ function decodeTaskDataForType(intent: Intent): Settings {
                 conf_multiplier: fractionToDecimal(oracleAggregator.confMultiplier).toNumber(),
                 oracles: oracleAggregator.oracles.slice(0, oracleAggregator.numOracles).map(oracle => ({
                     oracle_type: ORACLE_TYPES_STRINGS[oracle.oracleSettings.oracleType],
+                    account_lut_id: oracle.accountsToLoadLutIds[0],
+                    account_lut_index: oracle.accountsToLoadLutIndices[0],
                     account: "",
                     num_required_accounts: oracle.oracleSettings.numRequiredAccounts,
                     weight: oracle.oracleSettings.weight,

package/test.ts

@@ -6,11 +6,13 @@ import { AddOrEditTokenInput, UpdateWeightsInput, MakeDirectSwapInput } from "./
 import { EditCreatorSettings, EditManagerSettings, EditFeeSettings, EditScheduleSettings, EditAutomationSettings, EditLpSettings, EditMetadataSettings, EditDepositsSettings, EditForceRebalanceSettings, EditCustomRebalanceSettings, EditAddTokenSettings, EditUpdateWeightsSettings, EditMakeDirectSwapSettings } from "./src";
 
 
+let kp = Array.from(Keypair.generate().secretKey);
+
 let connection = new Connection("https://api.devnet.solana.com");
 
+
 async function testStates() {
     return;
-    let kp = Array.from(Keypair.generate().secretKey);
     let wallet = new Wallet(Keypair.fromSecretKey(new Uint8Array(kp)));
     console.log(wallet.publicKey.toBase58());
 
@@ -273,6 +275,8 @@ async function testStates() {
             oracles: [
                 {
                     oracle_type: "pyth",
+                    account_lut_id: 0,
+                    account_lut_index: 0,
                     account: "So11111111111111111111111111111111111111112",
                     num_required_accounts: 1,
                     weight: 100,