trade/trade-drift-dlob
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
wphan
2024-01-02 10:59:01 -08:00
parent 9bc52e6fb6 98484cff64
commit 14eb7dcd4f
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
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.53.0-beta.8", "@drift-labs/sdk": "2.54.0-beta.2",
"@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",

2
src/grpc/OrderSubscriberGRPC.ts
View File

@@ -215,7 +215,7 @@ export class GeyserOrderSubscriber {
for (const [key, { userAccount }] of this.usersAccounts.entries()) { for (const [key, { userAccount }] of this.usersAccounts.entries()) {
const userAccountPubkey = new PublicKey(key); const userAccountPubkey = new PublicKey(key);
for (const order of userAccount.orders) { for (const order of userAccount.orders) {
dlob.insertOrder(order, userAccountPubkey, slot); dlob.insertOrder(order, userAccountPubkey.toBase58(), slot);
} }
} }
return dlob; return dlob;

10
src/index.ts
View File

@@ -236,7 +236,7 @@ const initializeAllMarketSubscribers = async (driftClient: DriftClient) => {
return markets; return markets;
}; };
const main = async () => { const main = async (): Promise<void> => {
const wallet = new Wallet(new Keypair()); const wallet = new Wallet(new Keypair());
const clearingHousePublicKey = new PublicKey(sdkConfig.DRIFT_PROGRAM_ID); const clearingHousePublicKey = new PublicKey(sdkConfig.DRIFT_PROGRAM_ID);
@@ -687,13 +687,13 @@ const main = async () => {
break; break;
} }
if (side.userAccount) { if (side.userAccount) {
const maker = side.userAccount.toBase58(); const maker = side.userAccount;
if (topMakers.has(maker)) { if (topMakers.has(maker)) {
continue; continue;
} else { } else {
if (`${includeUserStats}`.toLowerCase() === 'true') { if (`${includeUserStats}`.toLowerCase() === 'true') {
const userAccount = dlobProvider.getUserAccount( const userAccount = dlobProvider.getUserAccount(
side.userAccount new PublicKey(side.userAccount)
); );
topMakers.add([ topMakers.add([
userAccount, userAccount,
@@ -703,7 +703,7 @@ const main = async () => {
), ),
]); ]);
} else { } else {
topMakers.add(side.userAccount.toBase58()); topMakers.add(side.userAccount);
} }
foundMakers++; foundMakers++;
} }
@@ -1217,7 +1217,7 @@ const main = async () => {
}); });
}; };
async function recursiveTryCatch(f: () => void) { async function recursiveTryCatch(f: () => Promise<void>) {
try { try {
await f(); await f();
} catch (e) { } catch (e) {

8
yarn.lock
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.53.0-beta.8": "@drift-labs/sdk@2.54.0-beta.2":
version "2.53.0-beta.8" version "2.54.0-beta.2"
resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.53.0-beta.8.tgz#bc12747a8f2c4fa26b979fa6a8202a3bd3f52b2b" resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.54.0-beta.2.tgz#3b7cce3abf9f24a7e7e2af959a953ee9c7d14cdc"
integrity sha512-R2OPzgWjEVrJMeSwXa/UiquM6c72iOnFdoHbXJ4JJPd/KJDvghjOIXshF+7ttf80Uwswrox0sEhCJOYcYZOMIQ== integrity sha512-ilUoVtWYPw7nKzuohfgmb1CBwg5tvL/fctdOiIG1izku1jMqNL4D19zr/uNUSpCwbRVnZy0F/8AX/3UKju85iw==
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"