Merge pull request #1 from pyth-network/main

aUsABuisnessman · web-flow · commit 6632ccb72da8 · 2024-11-13T23:15:53.000-08:00
PYcharm
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/client",
-  "version": "2.21.0",
+  "version": "2.22.0",
   "description": "Client for consuming Pyth price data",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
diff --git a/src/__tests__/Anchor.test.ts b/src/__tests__/Anchor.test.ts
@@ -1,16 +1,17 @@
 import { AnchorProvider, Wallet } from '@coral-xyz/anchor'
 import { Connection, Keypair, PublicKey } from '@solana/web3.js'
 import { BN } from 'bn.js'
+import { getPythClusterApiUrl } from '../cluster'
 import { getPythProgramKeyForCluster, pythOracleProgram, pythOracleCoder } from '../index'
 
 test('Anchor', (done) => {
   jest.setTimeout(60000)
   const provider = new AnchorProvider(
-    new Connection('https://api.mainnet-beta.solana.com'),
+    new Connection(getPythClusterApiUrl('pythnet')),
     new Wallet(new Keypair()),
     AnchorProvider.defaultOptions(),
   )
-  const pythOracle = pythOracleProgram(getPythProgramKeyForCluster('mainnet-beta'), provider)
+  const pythOracle = pythOracleProgram(getPythProgramKeyForCluster('pythnet'), provider)
   pythOracle.methods
     .initMapping()
     .accounts({ fundingAccount: PublicKey.unique(), freshMappingAccount: PublicKey.unique() })
@@ -202,5 +203,30 @@ test('Anchor', (done) => {
       expect(decoded?.data.securityAuthority.equals(new PublicKey(8))).toBeTruthy()
     })
 
+  pythOracle.methods
+    .setMaxLatency(1, [0, 0, 0])
+    .accounts({ fundingAccount: PublicKey.unique(), priceAccount: PublicKey.unique() })
+    .instruction()
+    .then((instruction) => {
+      expect(instruction.data).toStrictEqual(Buffer.from([2, 0, 0, 0, 18, 0, 0, 0, 1, 0, 0, 0]))
+      const decoded = pythOracleCoder().instruction.decode(instruction.data)
+      expect(decoded?.name).toBe('setMaxLatency')
+      expect(decoded?.data.maxLatency === 1).toBeTruthy()
+    })
+
+  pythOracle.methods
+    .initPriceFeedIndex()
+    .accounts({
+      fundingAccount: PublicKey.unique(),
+      priceAccount: PublicKey.unique(),
+    })
+    .instruction()
+    .then((instruction) => {
+      expect(instruction.data).toStrictEqual(Buffer.from([2, 0, 0, 0, 19, 0, 0, 0]))
+      const decoded = pythOracleCoder().instruction.decode(instruction.data)
+      expect(decoded?.name).toBe('initPriceFeedIndex')
+      expect(decoded?.data).toStrictEqual({})
+    })
+
   done()
 })
diff --git a/src/__tests__/Example.test.ts b/src/__tests__/Example.test.ts
@@ -1,7 +1,7 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
-import { parseMappingData, parsePriceData, parseProductData } from '../index'
+import { Connection, PublicKey } from '@solana/web3.js'
+import { getPythClusterApiUrl, parseMappingData, parsePriceData, parseProductData } from '../index'
 
-const SOLANA_CLUSTER_URL = clusterApiUrl('devnet')
+const SOLANA_CLUSTER_URL = getPythClusterApiUrl('pythtest-crosschain')
 const ORACLE_MAPPING_PUBLIC_KEY = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
 
 test('Mapping', (done) => {
diff --git a/src/__tests__/Mapping.test.ts b/src/__tests__/Mapping.test.ts
@@ -1,9 +1,9 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
-import { parseMappingData, Magic, Version } from '../index'
+import { Connection, PublicKey } from '@solana/web3.js'
+import { parseMappingData, Magic, Version, getPythClusterApiUrl } from '../index'
 
 test('Mapping', (done) => {
   jest.setTimeout(60000)
-  const url = clusterApiUrl('devnet')
+  const url = getPythClusterApiUrl('pythtest-crosschain')
   const oraclePublicKey = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
   const connection = new Connection(url)
   const publicKey = new PublicKey(oraclePublicKey)
diff --git a/src/__tests__/Price.test.ts b/src/__tests__/Price.test.ts
diff --git a/src/__tests__/Product.ETH.test.ts b/src/__tests__/Product.ETH.test.ts
@@ -1,9 +1,9 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
-import { Magic, parseProductData, Version } from '../index'
+import { Connection, PublicKey } from '@solana/web3.js'
+import { getPythClusterApiUrl, Magic, parseProductData, Version } from '../index'
 
 test('Product', (done) => {
   jest.setTimeout(60000)
-  const url = clusterApiUrl('devnet')
+  const url = getPythClusterApiUrl('pythtest-crosschain')
   const ethProductKey = '2ciUuGZiee5macAMeQ7bHGTJtwcYTgnt6jdmQnnKZrfu'
   const connection = new Connection(url)
   const publicKey = new PublicKey(ethProductKey)
diff --git a/src/__tests__/Product.test.ts b/src/__tests__/Product.test.ts
@@ -1,9 +1,10 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
+import { Connection, PublicKey } from '@solana/web3.js'
+import { getPythClusterApiUrl } from '../cluster'
 import { parseMappingData, parseProductData, Magic, Version } from '../index'
 
 test('Product', (done) => {
   jest.setTimeout(60000)
-  const url = clusterApiUrl('devnet')
+  const url = getPythClusterApiUrl('pythtest-crosschain')
   const oraclePublicKey = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
   const connection = new Connection(url)
   const publicKey = new PublicKey(oraclePublicKey)
diff --git a/src/__tests__/PythNetworkRestClient.test.ts b/src/__tests__/PythNetworkRestClient.test.ts
@@ -1,11 +1,12 @@
-import { clusterApiUrl, Connection, PublicKey, SystemProgram } from '@solana/web3.js'
+import { Connection, PublicKey, SystemProgram } from '@solana/web3.js'
 import { getPythProgramKeyForCluster, parseProductData, PythHttpClient } from '..'
+import { getPythClusterApiUrl } from '../cluster'
 
 test('PythHttpClientCall: getData', (done) => {
-  jest.setTimeout(20000)
+  jest.setTimeout(60000)
   try {
-    const programKey = getPythProgramKeyForCluster('testnet')
-    const currentConnection = new Connection(clusterApiUrl('testnet'))
+    const programKey = getPythProgramKeyForCluster('pythtest-conformance')
+    const currentConnection = new Connection(getPythClusterApiUrl('pythtest-conformance'))
     const pyth_client = new PythHttpClient(currentConnection, programKey)
     pyth_client.getData().then(
       (result) => {
@@ -30,7 +31,7 @@ test('PythHttpClientCall: getAssetPricesFromAccounts for one account', (done) =>
   const solUSDKey = new PublicKey('7VJsBtJzgTftYzEeooSDYyjKXvYRWJHdwvbwfBvTg9K')
   try {
     const programKey = getPythProgramKeyForCluster('testnet')
-    const currentConnection = new Connection(clusterApiUrl('testnet'))
+    const currentConnection = new Connection(getPythClusterApiUrl('pythtest-conformance'))
     const pyth_client = new PythHttpClient(currentConnection, programKey)
     pyth_client
       .getAssetPricesFromAccounts([solUSDKey])
@@ -66,7 +67,7 @@ test('PythHttpClientCall: getAssetPricesFromAccounts for multiple accounts', (do
 
   try {
     const programKey = getPythProgramKeyForCluster('testnet')
-    const currentConnection = new Connection(clusterApiUrl('testnet'))
+    const currentConnection = new Connection(getPythClusterApiUrl('pythtest-conformance'))
     const pyth_client = new PythHttpClient(currentConnection, programKey)
     pyth_client
       .getAssetPricesFromAccounts([solUSDKey, bonkUSDKey, usdcUSDKey])
@@ -106,7 +107,7 @@ test('PythHttpClientCall: getAssetPricesFromAccounts should throw for invalid ac
 
   try {
     const programKey = getPythProgramKeyForCluster('testnet')
-    const currentConnection = new Connection(clusterApiUrl('testnet'))
+    const currentConnection = new Connection(getPythClusterApiUrl('pythtest-conformance'))
     const pyth_client = new PythHttpClient(currentConnection, programKey)
     pyth_client
       .getAssetPricesFromAccounts([solUSDKey, systemProgram, usdcUSDKey])
diff --git a/src/anchor/coder/instructions.ts b/src/anchor/coder/instructions.ts
@@ -93,9 +93,9 @@ export class PythOracleInstructionCoder implements InstructionCoder {
     if (methodName === 'updProduct' || methodName === 'addProduct') {
       let offset = 0
       for (const key of Object.keys(ix.productMetadata)) {
-        offset += buffer.subarray(offset).writeInt8(key.length)
+        offset += buffer.subarray(offset).writeUInt8(key.length)
         offset += buffer.subarray(offset).write(key)
-        offset += buffer.subarray(offset).writeInt8(ix.productMetadata[key].length)
+        offset += buffer.subarray(offset).writeUInt8(ix.productMetadata[key].length)
         offset += buffer.subarray(offset).write(ix.productMetadata[key])
       }
       if (offset > MAX_METADATA_SIZE) {
diff --git a/src/anchor/idl.json b/src/anchor/idl.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.20.0",
+  "version": "2.33.0",
   "name": "pyth_oracle",
   "instructions": [
     {
@@ -171,7 +171,7 @@
         },
         {
           "name": "permissionsAccount",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false,
           "pda": {
             "seeds": [
@@ -640,6 +640,37 @@
           }
         }
       ]
+    },
+    {
+      "name": "initPriceFeedIndex",
+      "discriminant": { "value": [2, 0, 0, 0, 19, 0, 0, 0] },
+      "accounts": [
+        {
+          "name": "fundingAccount",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "priceAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "permissionsAccount",
+          "isMut": true,
+          "isSigner": false,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "type": "string",
+                "value": "permissions"
+              }
+            ]
+          }
+        }
+      ],
+      "args": []
     }
   ],
   "types": [
diff --git a/src/anchor/program.ts b/src/anchor/program.ts
@@ -19,7 +19,7 @@ export function pythOracleCoder(): PythOracleCoder {
 export { default as pythIdl } from './idl.json'
 
 export type PythOracle = {
-  version: '2.20.0'
+  version: '2.33.0'
   name: 'pyth_oracle'
   instructions: [
     {
@@ -191,7 +191,7 @@ export type PythOracle = {
         },
         {
           name: 'permissionsAccount'
-          isMut: false
+          isMut: true
           isSigner: false
           pda: {
             seeds: [
@@ -661,6 +661,37 @@ export type PythOracle = {
         },
       ]
     },
+    {
+      name: 'initPriceFeedIndex'
+      discriminant: { value: [2, 0, 0, 0, 19, 0, 0, 0] }
+      accounts: [
+        {
+          name: 'fundingAccount'
+          isMut: true
+          isSigner: true
+        },
+        {
+          name: 'priceAccount'
+          isMut: true
+          isSigner: false
+        },
+        {
+          name: 'permissionsAccount'
+          isMut: true
+          isSigner: false
+          pda: {
+            seeds: [
+              {
+                kind: 'const'
+                type: 'string'
+                value: 'permissions'
+              },
+            ]
+          }
+        },
+      ]
+      args: []
+    },
   ]
   types: [
     {
diff --git a/src/cluster.ts b/src/cluster.ts
@@ -32,7 +32,7 @@ export function getPythClusterApiUrl(cluster: PythCluster): string {
   if (cluster === 'pythtest-conformance' || cluster === 'pythtest-crosschain') {
     return 'https://api.pythtest.pyth.network'
   } else if (cluster === 'pythnet') {
-    return 'https://pythnet.rpcpool.com'
+    return 'https://api2.pythnet.pyth.network'
   } else if (cluster === 'localnet') {
     return 'http://localhost:8899'
   } else {
diff --git a/src/index.ts b/src/index.ts
@@ -41,6 +41,11 @@ export enum AccountType {
   Permission,
 }
 
+export type Flags = {
+  accumulatorV2: boolean,
+  messageBufferCleared: boolean,
+}
+
 const empty32Buffer = Buffer.alloc(32)
 const PKorNull = (data: Buffer) => (data.equals(empty32Buffer) ? null : new PublicKey(data))
 
@@ -105,8 +110,8 @@ export interface PriceData extends Base {
   minPublishers: number
   messageSent: number
   maxLatency: number
-  drv3: number
-  drv4: number
+  flags: Flags,
+  feedIndex: number
   productAccountKey: PublicKey
   nextPriceAccountKey: PublicKey | null
   previousSlot: bigint
@@ -290,10 +295,18 @@ export const parsePriceData = (data: Buffer, currentSlot?: number): PriceData =>
   const messageSent = data.readUInt8(105)
   // configurable max latency in slots between send and receive
   const maxLatency = data.readUInt8(106)
-  // space for future derived values
-  const drv3 = data.readInt8(107)
-  // space for future derived values
-  const drv4 = data.readInt32LE(108)
+  // Various flags (used for operations)
+  const flagBits = data.readInt8(107)
+
+  /* tslint:disable:no-bitwise */
+  const flags = {
+    accumulatorV2: (flagBits & (1<<0)) !== 0,
+    messageBufferCleared: (flagBits & (1<<1)) !== 0,
+  }
+  /* tslint:enable:no-bitwise */
+
+  // Globally immutable unique price feed index used for publishing.
+  const feedIndex = data.readInt32LE(108)
   // product id / reference account
   const productAccountKey = new PublicKey(data.slice(112, 144))
   // next price account in list
@@ -355,8 +368,8 @@ export const parsePriceData = (data: Buffer, currentSlot?: number): PriceData =>
     minPublishers,
     messageSent,
     maxLatency,
-    drv3,
-    drv4,
+    flags,
+    feedIndex,
     productAccountKey,
     nextPriceAccountKey,
     previousSlot,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pythnetwork/client",`
`3`		`- "version": "2.21.0",`
	`3`	`+ "version": "2.22.0",`
`4`	`4`	`"description": "Client for consuming Pyth price data",`
`5`	`5`	`"homepage": "https://pyth.network",`
`6`	`6`	`"main": "lib/index.js",`