program: refactor oracle map to allow same oracle w diff oracle sources #1346
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jordy25519
reviewed
Nov 22, 2024
wphan
reviewed
Nov 27, 2024
| @@ -0,0 +1,27 @@ | |||
| import { PublicKey } from '@solana/web3.js'; | |||
| import { OracleSource, OracleSourceNum } from '../types'; | |||
There was a problem hiding this comment.
doens't look like OracleSourceNum exists
| } | ||
|
|
||
| public getOraclePriceDataAndSlotForPerpMarket( | ||
| marketIndex: number | ||
| ): DataAndSlot<OraclePriceData> | undefined { | ||
| const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex); | ||
| const oracle = this.perpOracleMap.get(marketIndex); | ||
| const oracleString = this.perpOracleStringMap.get(marketIndex); | ||
| if (!perpMarketAccount || !oracle) { | ||
| const oracleId = this.perpOracleStringMap.get(marketIndex); |
There was a problem hiding this comment.
i think you need to populate this map with oracleId
| } | ||
|
|
||
| public getOraclePriceDataAndSlotForSpotMarket( | ||
| marketIndex: number | ||
| ): DataAndSlot<OraclePriceData> | undefined { | ||
| const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex); | ||
| const oracle = this.spotOracleMap.get(marketIndex); | ||
| const oracleString = this.spotOracleStringMap.get(marketIndex); | ||
| if (!spotMarketAccount || !oracle) { | ||
| const oracleId = this.spotOracleStringMap.get(marketIndex); |
There was a problem hiding this comment.
needa populate this map with oracleId
wphan
reviewed
Nov 27, 2024
sdk/src/accounts/utils.ts
Outdated
| @@ -31,7 +35,7 @@ export function findDelistedPerpMarketsAndOracles( | |||
| continue; | |||
| } | |||
|
|
|||
| if (spotMarket.data.oracle.equals(delistedOracle)) { | |||
| if (spotMarket.data.oracle.equals(delistedOracle.publicKey)) { | |||
There was a problem hiding this comment.
does it make sense to compare against oracleId instead of just the pubkey?
crispheaney
added a commit
that referenced
this pull request
Dec 2, 2024
…es (#1346) * program: refactor oracle map to allow same oracle w diff oracle sources * rm some code * rename get_oracle_id to oracle_id * start fixing tests * fix remainder of tests * add another test * more red diffs * fix a compiler warning * start adding ts changes * add ws drift client account sub * add grpc implementation * prettify:fix * check in missing OracleSourceNum * update some missing use of getOracleId * tweak findDelistedPerpMarketsAndOracles logic * add bankrun test * prettify:fix * fix findDelistedPerpMarketsAndOracles * update test * fix linters * CHANGELOG
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.