upgrade to version2 structure

Author: evan-gray

src/__tests__/Example.test.ts

@@ -2,7 +2,7 @@ import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
 import { parseMappingData, parsePriceData, parseProductData } from '../index'
 
 const SOLANA_CLUSTER_URL = clusterApiUrl('devnet')
-const ORACLE_MAPPING_PUBLIC_KEY = 'ArppEFcsybCLE8CRtQJLQ9tLv2peGmQoKWFuiUWm4KBP'
+const ORACLE_MAPPING_PUBLIC_KEY = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
 
 test('Mapping', (done) => {
   jest.setTimeout(60000)

src/__tests__/Mapping.test.ts

@@ -4,7 +4,7 @@ import { parseMappingData, Magic, Version } from '../index'
 test('Mapping', (done) => {
   jest.setTimeout(60000)
   const url = clusterApiUrl('devnet')
-  const oraclePublicKey = 'ArppEFcsybCLE8CRtQJLQ9tLv2peGmQoKWFuiUWm4KBP'
+  const oraclePublicKey = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
   const connection = new Connection(url)
   const publicKey = new PublicKey(oraclePublicKey)
   connection

src/__tests__/Price.test.ts

@@ -4,34 +4,33 @@ import { Magic, parseMappingData, parsePriceData, parseProductData, Version } fr
 test('Price', (done) => {
   jest.setTimeout(60000)
   const url = clusterApiUrl('devnet')
-  const oraclePublicKey = 'ArppEFcsybCLE8CRtQJLQ9tLv2peGmQoKWFuiUWm4KBP'
+  const oraclePublicKey = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
   const connection = new Connection(url)
   const publicKey = new PublicKey(oraclePublicKey)
   connection
     .getAccountInfo(publicKey)
     .then((accountInfo) => {
       if (accountInfo && accountInfo.data) {
         const mapping = parseMappingData(accountInfo.data)
-        connection
-          .getAccountInfo(mapping.productAccountKeys[mapping.productAccountKeys.length - 1])
-          .then((accountInfo) => {
-            if (accountInfo && accountInfo.data) {
-              const product = parseProductData(accountInfo.data)
-              connection.getAccountInfo(product.priceAccountKey).then((accountInfo) => {
-                if (accountInfo && accountInfo.data) {
-                  const price = parsePriceData(accountInfo.data)
-                  console.log(price)
-                  expect(price.magic).toBe(Magic)
-                  expect(price.version).toBe(Version)
-                  done()
-                } else {
-                  done('No price accountInfo')
-                }
-              })
-            } else {
-              done('No product accountInfo')
-            }
-          })
+        connection.getAccountInfo(mapping.productAccountKeys[0]).then((accountInfo) => {
+          if (accountInfo && accountInfo.data) {
+            const product = parseProductData(accountInfo.data)
+            connection.getAccountInfo(product.priceAccountKey).then((accountInfo) => {
+              if (accountInfo && accountInfo.data) {
+                const price = parsePriceData(accountInfo.data)
+                console.log(product.product.symbol)
+                console.log(price)
+                expect(price.magic).toBe(Magic)
+                expect(price.version).toBe(Version)
+                done()
+              } else {
+                done('No price accountInfo')
+              }
+            })
+          } else {
+            done('No product accountInfo')
+          }
+        })
       } else {
         done('No mapping accountInfo')
       }

src/__tests__/Product.ETH.test.ts

@@ -4,7 +4,7 @@ import { Magic, parseProductData, Version } from '../index'
 test('Product', (done) => {
   jest.setTimeout(60000)
   const url = clusterApiUrl('devnet')
-  const ethProductKey = 'HtwD2SutRJVatzAsnvRRjSujQFNdQodzF1FKo54NEzrs'
+  const ethProductKey = '2ciUuGZiee5macAMeQ7bHGTJtwcYTgnt6jdmQnnKZrfu'
   const connection = new Connection(url)
   const publicKey = new PublicKey(ethProductKey)
   connection

src/__tests__/Product.test.ts

@@ -4,7 +4,7 @@ import { parseMappingData, parseProductData, Magic, Version } from '../index'
 test('Product', (done) => {
   jest.setTimeout(60000)
   const url = clusterApiUrl('devnet')
-  const oraclePublicKey = 'ArppEFcsybCLE8CRtQJLQ9tLv2peGmQoKWFuiUWm4KBP'
+  const oraclePublicKey = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
   const connection = new Connection(url)
   const publicKey = new PublicKey(oraclePublicKey)
   connection

src/index.ts

@@ -3,11 +3,12 @@ import { Buffer } from 'buffer'
 import { readBigInt64LE, readBigUInt64LE } from './readBig'
 
 export const Magic = 0xa1b2c3d4
-export const Version1 = 1
-export const Version = Version1
+export const Version2 = 2
+export const Version = Version2
 export const PriceStatus = ['Unknown', 'Trading', 'Halted', 'Auction']
 export const CorpAction = ['NoCorpAct']
-export const PriceType = ['Unknown', 'Price', 'TWAP', 'Volatility']
+export const PriceType = ['Unknown', 'Price']
+export const DeriveType = ['Unknown', 'TWAP', 'Volatility']
 
 const empty32Buffer = Buffer.alloc(32)
 const PKorNull = (data: Buffer) => (data.equals(empty32Buffer) ? null : new PublicKey(data))
@@ -126,16 +127,21 @@ export const parsePriceData = (data: Buffer) => {
   const currentSlot = readBigUInt64LE(data, 32)
   // valid on-chain slot of aggregate price
   const validSlot = readBigUInt64LE(data, 40)
+  // calculated values derived from agg. price - up to 8
+  const derived = []
+  for (let d = 0; d < 8; d++) {
+    derived.push(readBigInt64LE(data, 48 + d * 8))
+  }
   // product id / reference account
-  const productAccountKey = new PublicKey(data.slice(48, 80))
+  const productAccountKey = new PublicKey(data.slice(112, 144))
   // next price account in list
-  const nextPriceAccountKey = PKorNull(data.slice(80, 112))
+  const nextPriceAccountKey = PKorNull(data.slice(144, 176))
   // aggregate price updater
-  const aggregatePriceUpdaterAccountKey = new PublicKey(data.slice(112, 144))
-  const aggregatePriceInfo = parsePriceInfo(data.slice(144, 176), exponent)
-  // price components - up to 16
+  const aggregatePriceUpdaterAccountKey = new PublicKey(data.slice(176, 208))
+  const aggregatePriceInfo = parsePriceInfo(data.slice(208, 240), exponent)
+  // price components - up to 32
   const priceComponents = []
-  let offset = 176
+  let offset = 240
   let shouldContinue = true
   while (offset < data.length && shouldContinue) {
     const publisher = PKorNull(data.slice(offset, offset + 32))
@@ -160,6 +166,7 @@ export const parsePriceData = (data: Buffer) => {
     numComponentPrices,
     currentSlot,
     validSlot,
+    derived,
     productAccountKey,
     nextPriceAccountKey,
     aggregatePriceUpdaterAccountKey,