@symmetry-hq/sdk 1.0.20 → 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/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.20",
+  "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/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: "J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn",
+            token_mint: "CLWeikxiw8pC9JEtZt14fqDzYfXF7uVwLuvnJPkrE7av",
             active: true,
             min_oracles_thresh: 1,
             min_conf_bps: 50,
@@ -330,10 +330,10 @@ async function testStates() {
             conf_multiplier: 1,
             oracles: [
                 {
-                    oracle_type: "lst",
+                    oracle_type: "raydium_cpmm",
                     account_lut_id: 0,
                     account_lut_index: 0,
-                    account: "Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb",
+                    account: "7QBNJCYb6ktWwFsCR2w9SQ1C7ZKog5eGgiirLetSeh9",
                     weight_bps: 5000,
                     is_required: false,
                     conf_thresh_bps: 100,
@@ -368,8 +368,8 @@ async function testStates() {
             ],
         };
         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) {