Skip to content

Commit

Permalink
Cascade Pyth SDK JS update to downstream packages (#326)
Browse files Browse the repository at this point in the history
* Fix annoying ethereum problem

* Update p2w-sdk

* rename + lint + format + bump to 1.0.0

* Update price service

* Bump version + format + add lint

* Fix price service linting issues

* Fix package rename issue

* Update package lock of dependencies

local dependency is aweful!

* Fix exclusion bug
  • Loading branch information
ali-bahjati authored Oct 6, 2022
1 parent 5ff2449 commit d7f436a
Show file tree
Hide file tree
Showing 21 changed files with 340 additions and 287 deletions.
3 changes: 1 addition & 2 deletions Dockerfile.ethereum
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ WORKDIR /home/node/ethereum
# Only invalidate the npm install step if package.json changed
ADD --chown=node:node ethereum/package.json .
ADD --chown=node:node ethereum/package-lock.json .
ADD --chown=node:node ethereum/.env.test .env

# We want to cache node_modules *and* incorporate it into the final image.
RUN --mount=type=cache,uid=1000,gid=1000,target=/home/node/.npm \
Expand All @@ -37,4 +36,4 @@ RUN --mount=type=cache,uid=1000,gid=1000,target=/home/node/.npm \
RUN rm -rf node_modules && mv node_modules_cache node_modules

ADD --chown=node:node ethereum/ .

ADD --chown=node:node ethereum/.env.test .env
52 changes: 26 additions & 26 deletions third_party/pyth/p2w-relay/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-relay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"typescript": "^4.3.5"
},
"dependencies": {
"@certusone/p2w-sdk": "file:../p2w-sdk/js",
"@pythnetwork/p2w-sdk-js": "file:../p2w-sdk/js",
"@certusone/wormhole-sdk": "^0.1.4",
"@certusone/wormhole-spydk": "^0.0.1",
"@solana/spl-token": "^0.1.8",
Expand Down
2 changes: 1 addition & 1 deletion third_party/pyth/p2w-relay/src/listen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
subscribeSignedVAA,
} from "@certusone/wormhole-spydk";

import { parseBatchPriceAttestation, getBatchSummary } from "@certusone/p2w-sdk";
import { parseBatchPriceAttestation, getBatchSummary } from "@pythnetwork/p2w-sdk-js";

import { importCoreWasm } from "@certusone/wormhole-sdk/lib/cjs/solana/wasm";

Expand Down
2 changes: 1 addition & 1 deletion third_party/pyth/p2w-relay/src/relay/evm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { hexToUint8Array } from "@certusone/wormhole-sdk";
import { importCoreWasm } from "@certusone/wormhole-sdk/lib/cjs/solana/wasm";

import { PythUpgradable__factory, PythUpgradable } from "../evm/bindings/";
import { parseBatchPriceAttestation } from "@certusone/p2w-sdk";
import { parseBatchPriceAttestation } from "@pythnetwork/p2w-sdk-js";

let WH_WASM: any = null;

Expand Down
2 changes: 1 addition & 1 deletion third_party/pyth/p2w-relay/src/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Relay, RelayResult, RelayRetcode } from "./relay/iface";
import * as helpers from "./helpers";
import { logger } from "./helpers";
import { PromHelper } from "./promHelpers";
import { BatchPriceAttestation, getBatchAttestationHashKey, getBatchSummary } from "@certusone/p2w-sdk";
import { BatchPriceAttestation, getBatchAttestationHashKey, getBatchSummary } from "@pythnetwork/p2w-sdk-js";

const mutex = new Mutex();
let condition = new CondVar();
Expand Down
22 changes: 11 additions & 11 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.

7 changes: 4 additions & 3 deletions third_party/pyth/p2w-sdk/js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@certusone/p2w-sdk",
"version": "0.1.0",
"name": "@pythnetwork/p2w-sdk-js",
"version": "1.0.0",
"description": "TypeScript library for interacting with Pyth2Wormhole",
"types": "lib/index.d.ts",
"main": "lib/index.js",
Expand All @@ -11,6 +11,7 @@
"build": "npm run build-lib",
"build-lib": "npm run copy-artifacts && tsc",
"build-watch": "npm run copy-artifacts && tsc --watch",
"format": "prettier --write \"src/**/*.ts\"",
"copy-artifacts": "node scripts/copyWasm.cjs",
"lint": "tslint -p tsconfig.json",
"postversion": "git push && git push --tags",
Expand Down Expand Up @@ -41,7 +42,7 @@
"dependencies": {
"@certusone/wormhole-sdk": "0.2.1",
"@improbable-eng/grpc-web-node-http-transport": "^0.14.1",
"@pythnetwork/pyth-sdk-js": "^0.3.0"
"@pythnetwork/pyth-sdk-js": "^1.0.0"
},
"bugs": {
"url": "https://github.com/pyth-network/pyth-crosschain/issues"
Expand Down
Loading

0 comments on commit d7f436a

Please sign in to comment.