Merge branch 'master' into mainnet-beta

This commit is contained in:
wphan
2024-04-10 13:38:25 -07:00
3 changed files with 15 additions and 7 deletions

View File

@@ -6,7 +6,7 @@
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@coral-xyz/anchor": "^0.29.0", "@coral-xyz/anchor": "^0.29.0",
"@drift-labs/sdk": "2.76.0-beta.10", "@drift-labs/sdk": "2.77.0-beta.3",
"@opentelemetry/api": "^1.1.0", "@opentelemetry/api": "^1.1.0",
"@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/auto-instrumentations-node": "^0.31.1",
"@opentelemetry/exporter-prometheus": "^0.31.0", "@opentelemetry/exporter-prometheus": "^0.31.0",

View File

@@ -464,7 +464,11 @@ const main = async (): Promise<void> => {
parseInt(process.env.HELIUS_REDIS_HOST_INDEX) ?? 0 parseInt(process.env.HELIUS_REDIS_HOST_INDEX) ?? 0
].client.get(`priorityFees_${marketType}_${marketIndex}`); ].client.get(`priorityFees_${marketType}_${marketIndex}`);
if (fees) { if (fees) {
res.status(200).json(JSON.parse(fees)); res.status(200).json({
...JSON.parse(fees),
marketType,
marketIndex,
});
return; return;
} else { } else {
res.writeHead(404); res.writeHead(404);
@@ -500,7 +504,11 @@ const main = async (): Promise<void> => {
].client.get( ].client.get(
`priorityFees_${normedParam['marketType']}_${normedParam['marketIndex']}` `priorityFees_${normedParam['marketType']}_${normedParam['marketIndex']}`
); );
return JSON.parse(fees); return {
...JSON.parse(fees),
marketType,
marketIndex,
};
}) })
); );

View File

@@ -115,10 +115,10 @@
enabled "2.0.x" enabled "2.0.x"
kuler "^2.0.0" kuler "^2.0.0"
"@drift-labs/sdk@2.76.0-beta.10": "@drift-labs/sdk@2.77.0-beta.3":
version "2.76.0-beta.10" version "2.77.0-beta.3"
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.76.0-beta.10.tgz#c41cefec1bad15b72156248b26dad1644a457d89" resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.77.0-beta.3.tgz#e40b0733a73013654a2dc05e2b5ecb67921709ef"
integrity sha512-7OpPzZ3JNS6nsfPwXBeBZQmvXHAeVXgQW0vb2M4xbaii58hcCc3Y3sAQ6Mwy+8oKSnmWxCyHckBzBVgTD299uQ== integrity sha512-Hm7lPm/fWJVGdYPxfas+jur+9iHb85igFcI/scDKlEPi24fylkqThXo1aWL3AigwX0FMiof64101w+ovQqpXbw==
dependencies: dependencies:
"@coral-xyz/anchor" "0.28.1-beta.2" "@coral-xyz/anchor" "0.28.1-beta.2"
"@ellipsis-labs/phoenix-sdk" "^1.4.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2"