Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions third_party/pyth/p2w-sdk/js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion third_party/pyth/p2w-sdk/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@certusone/wormhole-sdk": "0.2.1",
"@improbable-eng/grpc-web-node-http-transport": "^0.14.1",
"@pythnetwork/pyth-sdk-js": "^1.0.0"
"@pythnetwork/pyth-sdk-js": "^1.1.0"
},
"bugs": {
"url": "https://github.com/pyth-network/pyth-crosschain/issues"
Expand Down
18 changes: 9 additions & 9 deletions third_party/pyth/price-service/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions third_party/pyth/price-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pythnetwork/pyth-price-service",
"version": "2.0.0",
"version": "2.1.0",
"description": "Pyth Price Service",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -28,10 +28,10 @@
"typescript": "^4.3.5"
},
"dependencies": {
"@pythnetwork/p2w-sdk-js": "file:../p2w-sdk/js",
"@certusone/wormhole-sdk": "^0.1.4",
"@certusone/wormhole-spydk": "^0.0.1",
"@pythnetwork/pyth-sdk-js": "^1.0.0",
"@pythnetwork/p2w-sdk-js": "file:../p2w-sdk/js",
"@pythnetwork/pyth-sdk-js": "^1.1.0",
"@types/cors": "^2.8.12",
"@types/express": "^4.17.13",
"@types/morgan": "^1.9.3",
Expand Down
1 change: 1 addition & 0 deletions third_party/pyth/price-service/src/__tests__/rest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ function dummyPriceInfoPair(
seqNum,
vaaBytes: Buffer.from(vaa, "hex").toString("binary"),
emitterChainId: 0,
priceServiceReceiveTime: 0,
},
];
}
Expand Down
8 changes: 6 additions & 2 deletions third_party/pyth/price-service/src/__tests__/ws.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { HexString, PriceFeed } from "@pythnetwork/pyth-sdk-js";
import { Server } from "http";
import { number } from "joi";
import { WebSocket, WebSocketServer } from "ws";
import { sleep } from "../helpers";
import { PriceInfo, PriceStore } from "../listen";
Expand All @@ -21,12 +22,14 @@ function expandTo64Len(id: string): string {
function dummyPriceMetadata(
attestationTime: number,
emitterChainId: number,
seqNum: number
seqNum: number,
priceServiceReceiveTime: number
): any {
return {
attestation_time: attestationTime,
emitter_chain: emitterChainId,
sequence_number: seqNum,
price_service_receive_time: priceServiceReceiveTime,
};
}

Expand All @@ -41,6 +44,7 @@ function dummyPriceInfo(
emitterChainId: dummyPriceMetadataValue.emitter_chain,
priceFeed: dummyPriceFeed(id),
vaaBytes: Buffer.from(vaa, "hex").toString("binary"),
priceServiceReceiveTime: dummyPriceMetadataValue.price_service_receive_time,
};
}

Expand Down Expand Up @@ -92,7 +96,7 @@ async function createSocketClient(): Promise<[WebSocket, any[]]> {
}

beforeAll(async () => {
priceMetadata = dummyPriceMetadata(0, 0, 0);
priceMetadata = dummyPriceMetadata(0, 0, 0, 0);
priceInfos = [
dummyPriceInfo(expandTo64Len("abcd"), "a1b2c3d4", priceMetadata),
dummyPriceInfo(expandTo64Len("ef01"), "a1b2c3d4", priceMetadata),
Expand Down
2 changes: 2 additions & 0 deletions third_party/pyth/price-service/src/listen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export type PriceInfo = {
attestationTime: TimestampInSec;
priceFeed: PriceFeed;
emitterChainId: number;
priceServiceReceiveTime: number;
};

export interface PriceStore {
Expand Down Expand Up @@ -198,6 +199,7 @@ export class Listener implements PriceStore {
attestationTime: priceAttestation.attestationTime,
priceFeed,
emitterChainId: parsedVAA.emitter_chain,
priceServiceReceiveTime: Math.floor(new Date().getTime() / 1000),
};
this.priceFeedVaaMap.set(key, priceInfo);

Expand Down
2 changes: 2 additions & 0 deletions third_party/pyth/price-service/src/rest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ export class RestAPI {
emitter_chain: latestPriceInfo.emitterChainId,
attestation_time: latestPriceInfo.attestationTime,
sequence_number: latestPriceInfo.seqNum,
price_service_receive_time:
latestPriceInfo.priceServiceReceiveTime,
},
});
} else {
Expand Down
1 change: 1 addition & 0 deletions third_party/pyth/price-service/src/ws.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export class WebSocketAPI {
emitter_chain: priceInfo.emitterChainId,
attestation_time: priceInfo.attestationTime,
sequence_number: priceInfo.seqNum,
price_service_receive_time: priceInfo.priceServiceReceiveTime,
},
},
}
Expand Down