Merge pull request #94 from drift-labs/master
switching to confirmed + trades resource reduction
This commit is contained in:
@@ -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.65.0-beta.5",
|
"@drift-labs/sdk": "2.65.0-beta.6",
|
||||||
"@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",
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ const commitHash = process.env.COMMIT;
|
|||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
const sdkConfig = initialize({ env: process.env.ENV });
|
const sdkConfig = initialize({ env: process.env.ENV });
|
||||||
|
|
||||||
const stateCommitment: Commitment = 'processed';
|
const stateCommitment: Commitment = 'confirmed';
|
||||||
const serverPort = process.env.PORT || 6969;
|
const serverPort = process.env.PORT || 6969;
|
||||||
export const ORDERBOOK_UPDATE_INTERVAL = 1000;
|
export const ORDERBOOK_UPDATE_INTERVAL = 1000;
|
||||||
const WS_FALLBACK_FETCH_INTERVAL = ORDERBOOK_UPDATE_INTERVAL * 10;
|
const WS_FALLBACK_FETCH_INTERVAL = ORDERBOOK_UPDATE_INTERVAL * 10;
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ import FEATURE_FLAGS from '../utils/featureFlags';
|
|||||||
import { GeyserOrderSubscriber } from '../grpc/OrderSubscriberGRPC';
|
import { GeyserOrderSubscriber } from '../grpc/OrderSubscriberGRPC';
|
||||||
|
|
||||||
require('dotenv').config();
|
require('dotenv').config();
|
||||||
const stateCommitment: Commitment = 'processed';
|
const stateCommitment: Commitment = 'confirmed';
|
||||||
const driftEnv = (process.env.ENV || 'devnet') as DriftEnv;
|
const driftEnv = (process.env.ENV || 'devnet') as DriftEnv;
|
||||||
const commitHash = process.env.COMMIT;
|
const commitHash = process.env.COMMIT;
|
||||||
const REDIS_HOST = process.env.REDIS_HOST || 'localhost';
|
const REDIS_HOST = process.env.REDIS_HOST || 'localhost';
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ import {
|
|||||||
initialize,
|
initialize,
|
||||||
DriftEnv,
|
DriftEnv,
|
||||||
SlotSubscriber,
|
SlotSubscriber,
|
||||||
UserMap,
|
|
||||||
Wallet,
|
Wallet,
|
||||||
BulkAccountLoader,
|
|
||||||
EventSubscriber,
|
EventSubscriber,
|
||||||
OrderAction,
|
OrderAction,
|
||||||
convertToNumber,
|
convertToNumber,
|
||||||
@@ -38,9 +36,7 @@ const REDIS_PASSWORD = process.env.REDIS_PASSWORD;
|
|||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
const sdkConfig = initialize({ env: process.env.ENV });
|
const sdkConfig = initialize({ env: process.env.ENV });
|
||||||
|
|
||||||
const stateCommitment: Commitment = 'processed';
|
const stateCommitment: Commitment = 'confirmed';
|
||||||
const ORDERBOOK_UPDATE_INTERVAL = 1000;
|
|
||||||
|
|
||||||
let driftClient: DriftClient;
|
let driftClient: DriftClient;
|
||||||
|
|
||||||
const opts = program.opts();
|
const opts = program.opts();
|
||||||
@@ -62,19 +58,14 @@ const main = async () => {
|
|||||||
commitment: stateCommitment,
|
commitment: stateCommitment,
|
||||||
});
|
});
|
||||||
|
|
||||||
const bulkAccountLoader = new BulkAccountLoader(
|
|
||||||
connection,
|
|
||||||
stateCommitment,
|
|
||||||
ORDERBOOK_UPDATE_INTERVAL
|
|
||||||
);
|
|
||||||
|
|
||||||
driftClient = new DriftClient({
|
driftClient = new DriftClient({
|
||||||
connection,
|
connection,
|
||||||
wallet,
|
wallet,
|
||||||
programID: clearingHousePublicKey,
|
programID: clearingHousePublicKey,
|
||||||
accountSubscription: {
|
accountSubscription: {
|
||||||
type: 'polling',
|
type: 'websocket',
|
||||||
accountLoader: bulkAccountLoader,
|
commitment: stateCommitment,
|
||||||
|
resubTimeoutMs: 30_000,
|
||||||
},
|
},
|
||||||
env: driftEnv,
|
env: driftEnv,
|
||||||
});
|
});
|
||||||
@@ -96,18 +87,6 @@ const main = async () => {
|
|||||||
|
|
||||||
await slotSubscriber.subscribe();
|
await slotSubscriber.subscribe();
|
||||||
|
|
||||||
const userMap = new UserMap({
|
|
||||||
driftClient,
|
|
||||||
subscriptionConfig: {
|
|
||||||
type: 'websocket',
|
|
||||||
resubTimeoutMs: 30_000,
|
|
||||||
commitment: stateCommitment,
|
|
||||||
},
|
|
||||||
skipInitialLoad: false,
|
|
||||||
includeIdle: false,
|
|
||||||
});
|
|
||||||
await userMap.subscribe();
|
|
||||||
|
|
||||||
const redisClient = new RedisClient(REDIS_HOST, REDIS_PORT, REDIS_PASSWORD);
|
const redisClient = new RedisClient(REDIS_HOST, REDIS_PORT, REDIS_PASSWORD);
|
||||||
await redisClient.connect();
|
await redisClient.connect();
|
||||||
|
|
||||||
|
|||||||
@@ -115,10 +115,10 @@
|
|||||||
enabled "2.0.x"
|
enabled "2.0.x"
|
||||||
kuler "^2.0.0"
|
kuler "^2.0.0"
|
||||||
|
|
||||||
"@drift-labs/sdk@2.65.0-beta.5":
|
"@drift-labs/sdk@2.65.0-beta.6":
|
||||||
version "2.65.0-beta.5"
|
version "2.65.0-beta.6"
|
||||||
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.65.0-beta.5.tgz#3980886957cda76e80a8982a4363647711f223bb"
|
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.65.0-beta.6.tgz#7da1434ce04142f4adca573baf44dc3539303a0f"
|
||||||
integrity sha512-M95F/R4fXNLvL0GkhoDQvfXLe+UpWPgvLWrJNnFR0j6WMS+IyJTykiZSBI0n/EqTI78AnA+nvbV0GVcFfpZnrA==
|
integrity sha512-ENnkk1o1wahXoT3F1svjiHzVdSrxlVZ7NfUXmrtyQEqbcZtbUyoS6CqL9f7aC273ydw7xC0a3jrxEH0yMOrcVQ==
|
||||||
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"
|
||||||
|
|||||||
Reference in New Issue
Block a user