serum-vial
Advanced tools
Comparing version 1.6.1 to 1.7.0
@@ -243,3 +243,2 @@ "use strict"; | ||
const makerFillOrderId = matchingMakerFill !== undefined ? matchingMakerFill.orderId : undefined; | ||
const makerFillAccount = matchingMakerFill !== undefined ? matchingMakerFill.account : undefined; | ||
if (makerFillOrderId === undefined) { | ||
@@ -265,3 +264,9 @@ logger_1.logger.log('warn', 'Trade without matching maker fill order', { | ||
takerAccount: message.account, | ||
makerAccount: makerFillAccount | ||
makerAccount: matchingMakerFill?.account, | ||
takerOrderId: message.orderId, | ||
makerOrderId: matchingMakerFill?.orderId, | ||
takerClientId: message.clientId, | ||
makerClientId: matchingMakerFill?.clientId, | ||
takerFeeCost: message.feeCost, | ||
makerFeeCost: matchingMakerFill?.feeCost | ||
}; | ||
@@ -268,0 +273,0 @@ yield this._putInEnvelope(tradeMessage, true); |
"use strict"; | ||
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { | ||
if (k2 === undefined) k2 = k; | ||
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); | ||
var desc = Object.getOwnPropertyDescriptor(m, k); | ||
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { | ||
desc = { enumerable: true, get: function() { return m[k]; } }; | ||
} | ||
Object.defineProperty(o, k2, desc); | ||
}) : (function(o, m, k, k2) { | ||
@@ -6,0 +10,0 @@ if (k2 === undefined) k2 = k; |
@@ -54,2 +54,8 @@ import { Op, Channel, MessageType } from './consts'; | ||
readonly makerAccount: string; | ||
readonly takerOrderId: string; | ||
readonly makerOrderId: string; | ||
readonly takerClientId: string; | ||
readonly makerClientId: string; | ||
readonly takerFeeCost: number; | ||
readonly makerFeeCost: number; | ||
} | ||
@@ -56,0 +62,0 @@ export interface Fill extends DataMessage, OrderItem { |
{ | ||
"name": "serum-vial", | ||
"version": "1.6.1", | ||
"version": "1.7.0", | ||
"engines": { | ||
@@ -41,5 +41,5 @@ "node": ">=15" | ||
"dependencies": { | ||
"@blockworks-foundation/mango-client": "^3.2.25", | ||
"@blockworks-foundation/mango-client": "^3.3.18", | ||
"@project-serum/serum": "^0.13.61", | ||
"@solana/web3.js": "^1.31.0", | ||
"@solana/web3.js": "^1.36.0", | ||
"@types/bintrees": "^1.0.3", | ||
@@ -54,18 +54,18 @@ "@types/bn.js": "^5.1.0", | ||
"uWebSockets.js": "git+https://git@github.com/uNetworking/uWebSockets.js.git#v20.6.0", | ||
"winston": "^3.3.3", | ||
"ws": "^8.3.0", | ||
"yargs": "^17.3.0" | ||
"winston": "^3.6.0", | ||
"ws": "^8.5.0", | ||
"yargs": "^17.3.1" | ||
}, | ||
"devDependencies": { | ||
"@types/jest": "^27.0.3", | ||
"@types/node": "^17.0.0", | ||
"@types/node-fetch": "^2.5.12", | ||
"@types/ws": "^8.2.2", | ||
"@types/jest": "^27.4.1", | ||
"@types/node": "^17.0.21", | ||
"@types/node-fetch": "^2.6.1", | ||
"@types/ws": "^8.5.2", | ||
"cross-var": "^1.1.0", | ||
"husky": "^7.0.4", | ||
"jest": "^27.4.5", | ||
"lint-staged": "^12.1.2", | ||
"jest": "^27.5.1", | ||
"lint-staged": "^12.3.5", | ||
"prettier": "^2.5.1", | ||
"ts-jest": "^27.1.1", | ||
"typescript": "^4.5.4" | ||
"ts-jest": "^27.1.3", | ||
"typescript": "^4.6.2" | ||
}, | ||
@@ -72,0 +72,0 @@ "lint-staged": { |
@@ -394,3 +394,9 @@ <img src="https://raw.githubusercontent.com/tardis-dev/serum-vial/master/logo.svg"> | ||
"takerAccount": "AAddgLu9reZCUWW1bNQFaXrCMAtwQpMRvmeusgk4pCM6", | ||
"makerAccount": "EpAdzaqV13Es3x4dukfjFoCrKVXnZ7y9Y76whgMHo5qx" | ||
"makerAccount": "EpAdzaqV13Es3x4dukfjFoCrKVXnZ7y9Y76whgMHo5qx", | ||
"takerOrderId": "3313016788894161792503559", | ||
"makerOrderId": "3313035235638235438412464", | ||
"takerClientId": "875345", | ||
"makerClientId": "875345", | ||
"takerFeeCost": -3.2, | ||
"makerFeeCost": 15.4 | ||
} | ||
@@ -411,4 +417,2 @@ ] | ||
- `takerAccount` and `makerAccount` fields are available since version `1.5.0` and provide info regarding maker and taker open account addresses that constitute the trade | ||
```ts | ||
@@ -424,5 +428,11 @@ { | ||
"price": string, | ||
"size": string | ||
"takerAccount": string | ||
"makerAccount": string | ||
"size": string, | ||
"takerAccount": string, | ||
"makerAccount": string, | ||
"takerOrderId": string, | ||
"makerOrderId": string, | ||
"takerClientId": string, | ||
"makerClientId": string, | ||
"takerFeeCost": number, | ||
"makerFeeCost": number | ||
} | ||
@@ -445,3 +455,9 @@ ``` | ||
"takerAccount": "AAddgLu9reZCUWW1bNQFaXrCMAtwQpMRvmeusgk4pCM6", | ||
"makerAccount": "EpAdzaqV13Es3x4dukfjFoCrKVXnZ7y9Y76whgMHo5qx" | ||
"makerAccount": "EpAdzaqV13Es3x4dukfjFoCrKVXnZ7y9Y76whgMHo5qx", | ||
"takerOrderId": "3313016788894161792503559", | ||
"makerOrderId": "3313035235638235438412464", | ||
"takerClientId": "875345", | ||
"makerClientId": "875345", | ||
"takerFeeCost": -3.2, | ||
"makerFeeCost": 15.4 | ||
} | ||
@@ -448,0 +464,0 @@ ``` |
@@ -351,4 +351,2 @@ import { EVENT_QUEUE_LAYOUT, Market, Orderbook, getLayoutVersion } from '@project-serum/serum' | ||
const makerFillAccount = matchingMakerFill !== undefined ? matchingMakerFill.account : undefined | ||
if (makerFillOrderId === undefined) { | ||
@@ -376,3 +374,9 @@ logger.log('warn', 'Trade without matching maker fill order', { | ||
takerAccount: message.account, | ||
makerAccount: makerFillAccount! | ||
makerAccount: matchingMakerFill?.account!, | ||
takerOrderId: message.orderId, | ||
makerOrderId: matchingMakerFill?.orderId!, | ||
takerClientId: message.clientId, | ||
makerClientId: matchingMakerFill?.clientId!, | ||
takerFeeCost: message.feeCost!, | ||
makerFeeCost: matchingMakerFill?.feeCost! | ||
} | ||
@@ -379,0 +383,0 @@ |
@@ -65,2 +65,8 @@ import { Op, Channel, MessageType } from './consts' | ||
readonly makerAccount: string | ||
readonly takerOrderId: string | ||
readonly makerOrderId: string | ||
readonly takerClientId: string | ||
readonly makerClientId: string | ||
readonly takerFeeCost: number | ||
readonly makerFeeCost: number | ||
} | ||
@@ -67,0 +73,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
310339
4584
929
Updated@solana/web3.js@^1.36.0
Updatedwinston@^3.6.0
Updatedws@^8.5.0
Updatedyargs@^17.3.1