@kamino-finance/klend-sdk 5.2.14 → 5.4.0

package/src/utils/oracle.ts

@@ -1,4 +1,3 @@
-import { parsePriceData } from '@pythnetwork/client';
 import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import { OraclePrices, Scope } from '@kamino-finance/scope-sdk';
@@ -8,6 +7,7 @@ import SwitchboardProgram from '@switchboard-xyz/sbv2-lite';
 import { Reserve } from '../lib';
 import { batchFetch } from '@kamino-finance/kliquidity-sdk';
 import BN from 'bn.js';
+import { PriceUpdateV2 } from '../pyth/accounts';
 
 const SWITCHBOARD_V2_PROGRAM_ID = new PublicKey('SW1TCH7qEPTdLsDHRgPuMQjbQxKdH2aBStViMFnt64f');
 
@@ -166,27 +166,21 @@ export function cacheOrGetPythPrices(
     const result = oracleAccounts.get(oracle);
     if (result) {
       try {
-        const { price, timestamp, emaPrice, previousPrice, previousTimestamp, confidence } = parsePriceData(
-          result.data
-        );
+        const { priceMessage } = PriceUpdateV2.decode(result.data);
+        const { price, exponent, conf: confidence, publishTime: timestamp, emaPrice } = priceMessage;
         if (price) {
-          const px = new Decimal(price);
+          const px = new Decimal(price.toString()).div(10 ** Math.abs(exponent));
           prices.spot = {
             price: px,
-            timestamp,
-            valid: validatePythPx(px, confidence),
-          };
-        } else {
-          prices.spot = {
-            price: new Decimal(previousPrice),
-            timestamp: previousTimestamp,
-            valid: false,
+            timestamp: BigInt(timestamp.toString()),
+            valid: validatePythPx(px, confidence.toNumber()),
           };
         }
         if (emaPrice !== undefined && emaPrice !== null) {
+          const emaPx = new Decimal(emaPrice.toString()).div(10 ** Math.abs(exponent));
           prices.twap = {
-            price: new Decimal(emaPrice.value),
-            timestamp,
+            price: emaPx,
+            timestamp: BigInt(timestamp.toString()),
             valid: true,
           };
         }

package/src/utils/rpc.ts

@@ -9,11 +9,12 @@ import {
 } from '@solana/web3.js';
 import { Buffer } from 'buffer';
 import axios from 'axios';
-import { init, decompress } from '@bokuweb/zstd-wasm';
 import { v4 as uuidv4 } from 'uuid';
+import { ZSTDDecoder } from 'zstddec';
 
+const decoder = new ZSTDDecoder();
 (async () => {
-  await init();
+  await decoder.init();
 })();
 
 /**
@@ -21,11 +22,13 @@ import { v4 as uuidv4 } from 'uuid';
  * Uses axios instead of node-fetch to work around a bug in node-fetch that causes subsequent requests with different encoding to fail
  * @param connection
  * @param programId
+ * @param structSize - the size of the decompressed account data struct
  * @param configOrCommitment
  */
 export async function getProgramAccounts(
   connection: Connection,
   programId: PublicKey,
+  structSize: number,
   configOrCommitment?: GetProgramAccountsConfig | Commitment
 ): Promise<GetProgramAccountsResponse> {
   const programIdStr = programId.toBase58();
@@ -65,7 +68,7 @@ export async function getProgramAccounts(
 
   const res = unsafeRes as RpcResult;
   const deser = res.result.map(async (account) => ({
-    account: await deserializeAccountInfo(account.account),
+    account: await deserializeAccountInfo(account.account, structSize),
     pubkey: new PublicKey(account.pubkey),
   }));
   const x = await Promise.all(deser);
@@ -80,8 +83,8 @@ export async function getAccountOwner(connection: Connection, address: PublicKey
   return acc.owner;
 }
 
-async function deserializeAccountInfo(accountInfo: AccountInfo<string[]>): Promise<AccountInfo<Buffer>> {
-  const data = decompress(Buffer.from(accountInfo.data[0], 'base64'));
+async function deserializeAccountInfo(accountInfo: AccountInfo<string[]>, size: number): Promise<AccountInfo<Buffer>> {
+  const data = decoder.decode(Buffer.from(accountInfo.data[0], 'base64'), size);
   return {
     owner: accountInfo.owner,
     lamports: accountInfo.lamports,