@symmetry-hq/sdk 1.0.19 → 1.0.21

package/dist/index.js

@@ -695,6 +695,16 @@ class SymmetryCore {
             let expirationTimestamp = new bn_js_1.default((_b = params.context.expiration_timestamp) !== null && _b !== void 0 ? _b : 0);
             let editType = params.type;
             let editData = params.settings;
+            let poolInfos = [];
+            if (params.type === intent_1.TaskType.AddToken) {
+                let allAccounts = [];
+                let addTokenData = editData;
+                for (let i = 0; i < addTokenData.oracles.length; i++)
+                    allAccounts.push(new web3_js_1.PublicKey(addTokenData.oracles[i].account));
+                let infos = yield (0, txUtils_1.getMultipleAccountsInfoBatched)(this.sdkParams.connection, allAccounts);
+                for (let i = 0; i < allAccounts.length; i++)
+                    poolInfos[i] = infos.get(allAccounts[i].toBase58());
+            }
             let modificationDelay = (() => {
                 switch (editType) {
                     case intent_1.TaskType.EditCreator: return new bn_js_1.default(0);
@@ -760,6 +770,9 @@ class SymmetryCore {
                     if (oracle.oracle_type == "pyth")
                         continue;
                     if (oracle.oracle_type == "raydium_cpmm") {
+                        let parsedPool = raydiumCpmmOracle_1.RaydiumCpmmPoolState.decode(poolInfos[i].data, 8);
+                        additionalOracleAccounts.push(parsedPool.token0Vault);
+                        additionalOracleAccounts.push(parsedPool.token1Vault);
                         let observationKey = raydiumCpmmOracle_1.RaydiumCPMMOracle.deriveObservationKey(oracleAccount, this.sdkParams.network);
                         additionalOracleAccounts.push(observationKey[0]);
                     }

package/dist/instructions/management/edit.js

@@ -356,14 +356,25 @@ function createEditVaultIntentIx(params) {
             break;
         case intent_1.TaskType.UpdateWeights: { // 15 - 202
             const updateWeightsData = editData;
-            const weights = updateWeightsData.token_weights.slice(0, constants_1.MAX_SUPPORTED_TOKENS_PER_VAULT);
-            while (weights.length < constants_1.MAX_SUPPORTED_TOKENS_PER_VAULT)
-                weights.push({ mint: '', weight_bps: 0 });
+            const weights = updateWeightsData.token_weights;
             let tokenMintsHash = (_e = updateWeightsData.token_mints_hash) !== null && _e !== void 0 ? _e : (0, basket_1.computeTokenMintsHash)(vault.composition.slice(0, vault.numTokens)
                 .filter((asset) => asset.active === 1)
                 .map((asset) => asset.mint.toBase58()));
+            let tokenWeights = [];
+            for (let i = 0; i < constants_1.MAX_SUPPORTED_TOKENS_PER_VAULT; i++) {
+                if (i >= vault.numTokens || vault.composition[i].active === 0) {
+                    tokenWeights.push(0);
+                    continue;
+                }
+                let mint = vault.composition[i].mint.toBase58();
+                let weight = 0;
+                for (let j = 0; j < weights.length; j++)
+                    if (weights[j].mint === mint)
+                        weight = weights[j].weight_bps;
+                tokenWeights.push(weight);
+            }
             let updateWeights = {
-                tokenWeights: weights.map((weight) => weight.weight_bps),
+                tokenWeights: tokenWeights,
                 tokenMintsHash: tokenMintsHash,
             };
             config_1.UpdateWeightsLayout.encode(updateWeights, editDataBuf);

package/dist/states/oracles/raydiumCpmmOracle.d.ts

@@ -92,6 +92,7 @@ export declare class RaydiumCpmmPoolState {
     static decode(data: Buffer, offset?: number): RaydiumCpmmPoolState;
 }
 export declare class RaydiumCPMMOracle {
+    static deriveVaultAta(poolId: PublicKey, tokenMint: PublicKey, network: "mainnet" | "devnet"): [PublicKey, number];
     static deriveObservationKey(poolId: PublicKey, network: "mainnet" | "devnet"): [PublicKey, number];
     static getObservationAtIndex(observations: Observation[], index: number): Observation;
     static getObservationAtTimestamp(timestamp: BN, observations: Observation[], startIndex: number): Observation;

package/dist/states/oracles/raydiumCpmmOracle.js

@@ -278,6 +278,14 @@ class RaydiumCPMMOracle {
     //     this.vault0 = cpmmParams.vault0;
     //     this.vault1 = cpmmParams.vault1;
     // }
+    static deriveVaultAta(poolId, tokenMint, network) {
+        const seeds = [
+            Buffer.from("pool_vault"),
+            poolId.toBuffer(),
+            tokenMint.toBuffer(),
+        ];
+        return web3_js_1.PublicKey.findProgramAddressSync(seeds, network === "mainnet" ? CPMM_PROGRAM_ID : DEV_CPMM_PROGRAM_ID);
+    }
     static deriveObservationKey(poolId, network) {
         const seeds = [
             Buffer.from("observation"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symmetry-hq/sdk",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Symmetry V3 SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -91,7 +91,7 @@ import {
     getMultipleAccountsInfoBatched
 } from './txUtils';
 import { RaydiumCLMMOracle } from './states/oracles/raydiumClmmOracle';
-import { RaydiumCPMMOracle } from './states/oracles/raydiumCpmmOracle';
+import { RaydiumCPMMOracle, RaydiumCpmmPoolState } from './states/oracles/raydiumCpmmOracle';
 
 export class SymmetryCore {
 
@@ -728,6 +728,16 @@ export class SymmetryCore {
         let expirationTimestamp = new BN(params.context.expiration_timestamp ?? 0);
         let editType = params.type;
         let editData = params.settings;
+        let poolInfos = [];
+        if (params.type === TaskType.AddToken) {
+            let allAccounts = [];
+            let addTokenData = (editData as AddOrEditTokenInput);
+            for (let i = 0; i < addTokenData.oracles.length; i++)
+                allAccounts.push(new PublicKey(addTokenData.oracles[i].account));
+            let infos = await getMultipleAccountsInfoBatched(this.sdkParams.connection, allAccounts);
+            for (let i = 0; i < allAccounts.length; i++)
+                poolInfos[i] = infos.get(allAccounts[i].toBase58());
+        }
         let modificationDelay = (() => {
             switch(editType) {
                 case TaskType.EditCreator: return new BN(0);
@@ -801,6 +811,9 @@ export class SymmetryCore {
                 if (oracle.oracle_type == "example") continue;
                 if (oracle.oracle_type == "pyth") continue;
                 if (oracle.oracle_type == "raydium_cpmm") {
+                    let parsedPool = RaydiumCpmmPoolState.decode(poolInfos[i]!.data, 8);
+                    additionalOracleAccounts.push(parsedPool.token0Vault);
+                    additionalOracleAccounts.push(parsedPool.token1Vault);
                     let observationKey = RaydiumCPMMOracle.deriveObservationKey(oracleAccount, this.sdkParams.network);
                     additionalOracleAccounts.push(observationKey[0]);
                 }

package/src/instructions/management/edit.ts

@@ -442,16 +442,27 @@ export function createEditVaultIntentIx(params: {
 
         case TaskType.UpdateWeights: { // 15 - 202
             const updateWeightsData = (editData as UpdateWeightsInput);
-            const weights = updateWeightsData.token_weights.slice(0, MAX_SUPPORTED_TOKENS_PER_VAULT);
-            while (weights.length < MAX_SUPPORTED_TOKENS_PER_VAULT) weights.push({ mint: '', weight_bps: 0 });
-
+            const weights = updateWeightsData.token_weights;
             let tokenMintsHash = updateWeightsData.token_mints_hash ?? computeTokenMintsHash(
                 vault.composition.slice(0, vault.numTokens)
                     .filter((asset) => asset.active === 1)
                     .map((asset) => asset.mint.toBase58())
             );
+            let tokenWeights = [];
+            for (let i = 0; i < MAX_SUPPORTED_TOKENS_PER_VAULT; i++) {
+                if (i >= vault.numTokens || vault.composition[i].active === 0) {
+                    tokenWeights.push(0);
+                    continue;
+                }
+                let mint = vault.composition[i].mint.toBase58();
+                let weight = 0;
+                for (let j = 0; j < weights.length; j++)
+                    if (weights[j].mint === mint)
+                        weight = weights[j].weight_bps;
+                tokenWeights.push(weight);
+            }
             let updateWeights: UpdateWeights = {
-                tokenWeights: weights.map((weight) => weight.weight_bps),
+                tokenWeights: tokenWeights,
                 tokenMintsHash: tokenMintsHash,
             }
             UpdateWeightsLayout.encode(updateWeights, editDataBuf);

package/src/states/oracles/raydiumCpmmOracle.ts

@@ -429,6 +429,15 @@ export class RaydiumCPMMOracle {
         
     // }
 
+    static deriveVaultAta(poolId: PublicKey, tokenMint: PublicKey, network: "mainnet" | "devnet"): [PublicKey, number] {
+        const seeds = [
+            Buffer.from("pool_vault"),
+            poolId.toBuffer(),
+            tokenMint.toBuffer(),
+        ];
+        return PublicKey.findProgramAddressSync(seeds, network === "mainnet" ? CPMM_PROGRAM_ID : DEV_CPMM_PROGRAM_ID);
+    }
+
     static deriveObservationKey(poolId: PublicKey, network: "mainnet" | "devnet"): [PublicKey, number] {
         const seeds = [
             Buffer.from("observation"),

package/test.ts

@@ -322,7 +322,7 @@ async function testStates() {
 
     if (tests.addOrEditToken) {
         let add_token: AddOrEditTokenInput = {
-            token_mint: "XsoCS1TfEyfFhfvj8EtZ528L3CaKBDBRqRapnBbDF2W",
+            token_mint: "CLWeikxiw8pC9JEtZt14fqDzYfXF7uVwLuvnJPkrE7av",
             active: true,
             min_oracles_thresh: 1,
             min_conf_bps: 50,
@@ -330,14 +330,14 @@ async function testStates() {
             conf_multiplier: 1,
             oracles: [
                 {
-                    oracle_type: "raydium_clmm",
+                    oracle_type: "raydium_cpmm",
                     account_lut_id: 0,
                     account_lut_index: 0,
-                    account: "6truu3rZuiB9rKQg4VYC3Dt3QwV7DgwGqXrYUcrvnDDE",
+                    account: "7QBNJCYb6ktWwFsCR2w9SQ1C7ZKog5eGgiirLetSeh9",
                     weight_bps: 5000,
                     is_required: false,
-                    conf_thresh_bps: 200,
-                    volatility_thresh_bps: 200,
+                    conf_thresh_bps: 100,
+                    volatility_thresh_bps: 100,
                     max_slippage_bps: 100,
                     min_liquidity: 0,
                     staleness_thresh: 120,
@@ -348,10 +348,10 @@ async function testStates() {
                     quote_token: "wsol",
                 },
                 {
-                    oracle_type: "raydium_clmm",
+                    oracle_type: "pyth",
                     account_lut_id: 0,
                     account_lut_index: 0,
-                    account: "4pCZCVEiYyT4efNdXUdL2tJF8VGMgiMXrZWq6FiNXhRw",
+                    account: "AxaxyeDT8JnWERSaTKvFXvPKkEdxnamKSqpWbsSjYg1g",
                     weight_bps: 5000,
                     is_required: false,
                     conf_thresh_bps: 200,
@@ -363,13 +363,13 @@ async function testStates() {
                     token_decimals: 9,
                     twap_seconds_ago: 50,
                     twap_secondary_seconds_ago: 100,
-                    quote_token: "wsol",
+                    quote_token: "usd",
                 },
             ],
         };
         let tx = await sdk.addOrEditTokenTx(task_context, add_token);
-        let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
-        console.log(res);
+        // let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+        // console.log(res);
     }
 
     if (tests.updateWeights) {
@@ -377,11 +377,24 @@ async function testStates() {
             token_weights: [
                 {
                     mint: "So11111111111111111111111111111111111111112",
-                    weight_bps: 100,
+                    weight_bps: 2000,
                 },
-            ],
-            token_mints_hash: [
-                0, 0, 0, 0,
+                {
+                    mint: "cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij",
+                    weight_bps: 2500,
+                },
+                {
+                    mint: "XsoCS1TfEyfFhfvj8EtZ528L3CaKBDBRqRapnBbDF2W",
+                    weight_bps: 2500,
+                },
+                {
+                    mint: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+                    weight_bps: 1000,
+                },
+                {
+                    mint: "J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn",
+                    weight_bps: 2000,
+                }
             ],
         };
         let tx = await sdk.updateWeightsTx(task_context, update_weights);