Merge pull request #238 from drift-labs/master

update non-cached to use safeguards for include vamm
This commit is contained in:
moosecat
2024-08-13 14:13:22 -07:00
committed by GitHub

View File

@@ -774,11 +774,18 @@ const main = async (): Promise<void> => {
} }
} }
let validateIncludeVamm = false;
if (!isSpot && `${includeVamm}`.toLowerCase() === 'true') {
const perpMarket = driftClient.getPerpMarketAccount(normedMarketIndex);
validateIncludeVamm =
!isVariant(perpMarket.status, 'ammPaused') &&
!isVariant(perpMarket.status, 'initialized');
}
const l2 = dlobSubscriber.getL2({ const l2 = dlobSubscriber.getL2({
marketIndex: normedMarketIndex, marketIndex: normedMarketIndex,
marketType: normedMarketType, marketType: normedMarketType,
depth: parseInt(adjustedDepth as string), depth: parseInt(adjustedDepth as string),
includeVamm: isSpot ? false : `${includeVamm}`.toLowerCase() === 'true', includeVamm: validateIncludeVamm,
numVammOrders: parseInt((numVammOrders ?? '100') as string), numVammOrders: parseInt((numVammOrders ?? '100') as string),
fallbackL2Generators: isSpot fallbackL2Generators: isSpot
? [ ? [
@@ -938,13 +945,19 @@ const main = async (): Promise<void> => {
} }
} }
let validateIncludeVamm = false;
if (!isSpot && `${includeVamm}`.toLowerCase() === 'true') {
const perpMarket =
driftClient.getPerpMarketAccount(normedMarketIndex);
validateIncludeVamm =
!isVariant(perpMarket.status, 'ammPaused') &&
!isVariant(perpMarket.status, 'initialized');
}
const l2 = dlobSubscriber.getL2({ const l2 = dlobSubscriber.getL2({
marketIndex: normedMarketIndex, marketIndex: normedMarketIndex,
marketType: normedMarketType, marketType: normedMarketType,
depth: parseInt(adjustedDepth as string), depth: parseInt(adjustedDepth as string),
includeVamm: isSpot includeVamm: validateIncludeVamm,
? false
: `${normedParam['includeVamm']}`.toLowerCase() === 'true',
fallbackL2Generators: isSpot fallbackL2Generators: isSpot
? [ ? [
`${normedParam['includePhoenix']}`.toLowerCase() === 'true' && `${normedParam['includePhoenix']}`.toLowerCase() === 'true' &&