[refactor] Add global lerna (#546)

* Move lerna to the top * Set version to independent Packages are versioned independently * Update packages and the lock * Add build cache and better reference * Add lerna docker base * Add wormhole_attester sdk and some minor impr * Update tsconfig to fix outDir impact by composite * Update eth package * Update p2w to use solidity-sdk * Change xc-admin CI to lerna CI action * Add more packages to the list + bugfixes * Update dockerfiles to have tilt working * Format the code * Fix some issues * Fix the change of usePyth.ts * lerna build fix * Fix foundry
2023-01-31 17:09:31 +01:00 · 2023-01-31 17:09:31 +01:00 · 4c5d0d5e1b
parent 2e63f9a2c4
commit 4c5d0d5e1b
63 changed files with 85649 additions and 192777 deletions
--- a/.github/workflows/lerna.yaml
+++ b/.github/workflows/lerna.yaml
@ -0,0 +1,20 @@
+name: Lerna build & test
+on:
+  pull_request:
+  push:
+    branches: [main]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "npm"
+      - name: Install deps
+        run: npm ci
+      - name: Run lerna build
+        run: npx lerna run build
+      - name: Run lerna tests
+        run: npx lerna run test
--- a/.github/workflows/xc-admin.yaml
+++ b/.github/workflows/xc-admin.yaml
@ -1,18 +0,0 @@
-name: Check Xc Admin
-on:
-  pull_request:
-    paths: [governance/xc-admin/**]
-  push:
-    branches: [main]
-    paths: [governance/xc-admin/**]
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: governance/xc-admin/
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run xc-admin tests
-        run: |
-          npm ci && npm run test
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,4 @@ bigtable-writer.json
 .vscode
 .dccache
 .aptos
+tsconfig.tsbuildinfo
--- a/7
+++ b/7
@ -62,6 +62,13 @@ if not ci:
 def k8s_yaml_with_ns(objects):
    return k8s_yaml(namespace_inject(objects, namespace))

+# Build lerna docker base for npm project
+docker_build(
+    ref = "lerna",
+    context = ".",
+    dockerfile = "tilt_devnet/docker_images/Dockerfile.lerna",
+)
+
 def build_node_yaml():
    node_yaml = read_yaml_stream("tilt_devnet/k8s/node.yaml")

--- a/governance/multisig_wh_message_builder/package.json
+++ b/governance/multisig_wh_message_builder/package.json
@ -14,8 +14,7 @@
    "build": "tsc",
    "format": "prettier --write \"src/**/*.ts\"",
    "lint": "eslint src/",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm test && npm run lint",
+    "prepublishOnly": "npm run build && npm test && npm run lint",
    "preversion": "npm run lint",
    "version": "npm run format && git add -A src",
    "start": "node lib/index.js"
--- a/governance/multisig_wh_message_builder/tsconfig.json
+++ b/governance/multisig_wh_message_builder/tsconfig.json
@ -1,6 +1,9 @@
 {
  "compilerOptions": {
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "target": "es2016",
    "module": "commonjs",
    "outDir": "lib",
@ -9,7 +12,8 @@
    "strict": true,
    "skipLibCheck": true,
    "resolveJsonModule": true,
-    "noErrorTruncation": true
+    "noErrorTruncation": true,
+    "rootDir": "src/"
  },
  "include": ["src/**/*.ts"]
 }
--- a/governance/xc-admin/.gitignore
+++ b/governance/xc-admin/.gitignore
@ -1 +1,2 @@
 node_modules/
+lib/
--- a/governance/xc-admin/package-lock.json
+++ b/governance/xc-admin/package-lock.json
--- a/governance/xc-admin/package.json
+++ b/governance/xc-admin/package.json
@ -1,13 +0,0 @@
-{
-  "name": "xc-admin",
-  "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
-  "scripts": {
-    "test": "cd packages/xc-admin-common && npm run test"
-  },
-  "devDependencies": {
-    "lerna": "^6.3.0"
-  }
-}
--- a/governance/xc-admin/packages/crank-executor/tsconfig.json
+++ b/governance/xc-admin/packages/crank-executor/tsconfig.json
@ -1,6 +1,9 @@
 {
  "compilerOptions": {
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "target": "es2016",
    "module": "commonjs",
    "outDir": "lib",
@ -9,7 +12,8 @@
    "strict": true,
    "skipLibCheck": true,
    "resolveJsonModule": true,
-    "noErrorTruncation": true
+    "noErrorTruncation": true,
+    "rootDir": "src/"
  },
  "include": ["src/**/*.ts"],
  "exclude": ["src/__tests__/"]
--- a/governance/xc-admin/packages/xc-admin-cli/tsconfig.json
+++ b/governance/xc-admin/packages/xc-admin-cli/tsconfig.json
@ -1,6 +1,9 @@
 {
  "compilerOptions": {
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "target": "es2016",
    "module": "commonjs",
    "outDir": "lib",
@ -9,7 +12,8 @@
    "strict": true,
    "skipLibCheck": true,
    "resolveJsonModule": true,
-    "noErrorTruncation": true
+    "noErrorTruncation": true,
+    "rootDir": "src/"
  },
  "include": ["src/**/*.ts"],
  "exclude": ["src/__tests__/"]
--- a/governance/xc-admin/packages/xc-admin-common/tsconfig.json
+++ b/governance/xc-admin/packages/xc-admin-common/tsconfig.json
@ -1,6 +1,9 @@
 {
  "compilerOptions": {
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "target": "es2016",
    "module": "commonjs",
    "outDir": "lib",
@ -9,7 +12,8 @@
    "strict": true,
    "skipLibCheck": true,
    "resolveJsonModule": true,
-    "noErrorTruncation": true
+    "noErrorTruncation": true,
+    "rootDir": "src/"
  },
  "include": ["src/**/*.ts"],
  "exclude": ["src/__tests__/"]
--- a/governance/xc-admin/packages/xc-admin-frontend/hooks/usePyth.ts
+++ b/governance/xc-admin/packages/xc-admin-frontend/hooks/usePyth.ts
@ -110,21 +110,23 @@ const usePyth = (): PythHookData => {
            case AccountType.Product:
              const parsed = parseProductData(allPythAccounts[i].account.data)

-              if (parsed.priceAccountKey.toBase58() == ONES) {
+              if (parsed.priceAccountKey?.toBase58() == ONES) {
                productRawConfigs[allPythAccounts[i].pubkey.toBase58()] = {
                  priceAccounts: [],
                  metadata: parsed.product,
                  address: allPythAccounts[i].pubkey,
                }
              } else {
-                let priceAccountKey: string | null =
-                  parsed.priceAccountKey.toBase58()
+                let priceAccountKey: string | undefined =
+                  parsed.priceAccountKey?.toBase58()
                let priceAccounts = []
                while (priceAccountKey) {
                  const toAdd: PriceRawConfig = priceRawConfigs[priceAccountKey]
                  priceAccounts.push(toAdd)
                  delete priceRawConfigs[priceAccountKey]
-                  priceAccountKey = toAdd.next ? toAdd.next.toBase58() : null
+                  priceAccountKey = toAdd.next
+                    ? toAdd.next.toBase58()
+                    : undefined
                }
                productRawConfigs[allPythAccounts[i].pubkey.toBase58()] = {
                  priceAccounts,
--- a/governance/xc_governance_sdk_js/package-lock.json
+++ b/governance/xc_governance_sdk_js/package-lock.json
--- a/governance/xc_governance_sdk_js/package.json
+++ b/governance/xc_governance_sdk_js/package.json
@ -14,8 +14,7 @@
    "build": "tsc",
    "format": "prettier --write \"src/**/*.ts\"",
    "lint": "eslint src/",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm test && npm run lint",
+    "prepublishOnly": "npm run build && npm test && npm run lint",
    "preversion": "npm run lint",
    "version": "npm run format && git add -A src"
  },
--- a/governance/xc_governance_sdk_js/tsconfig.json
+++ b/governance/xc_governance_sdk_js/tsconfig.json
@ -1,6 +1,9 @@
 {
  "compilerOptions": {
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "target": "es2016",
    "module": "commonjs",
    "outDir": "lib",
@ -9,7 +12,8 @@
    "strict": true,
    "skipLibCheck": true,
    "resolveJsonModule": true,
-    "noErrorTruncation": true
+    "noErrorTruncation": true,
+    "rootDir": "src/"
  },
  "include": ["src/**/*.ts"]
 }
--- a/governance/xc-admin/lerna.json
+++ b/governance/xc-admin/lerna.json
@ -1,5 +1,5 @@
 {
  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
  "useWorkspaces": true,
-  "version": "0.0.0"
+  "version": "independent"
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -0,0 +1,17 @@
+{
+  "name": "root",
+  "workspaces": [
+    "governance/xc-admin/packages/*",
+    "governance/xc_governance_sdk_js",
+    "governance/multisig_wh_message_builder",
+    "price_service/server",
+    "price_service/sdk/js",
+    "price_service/client/js",
+    "target_chains/ethereum",
+    "third_party/pyth/p2w-relay",
+    "wormhole_attester/sdk/js"
+  ],
+  "devDependencies": {
+    "lerna": "^6.4.1"
+  }
+}
--- a/price_service/client/js/package-lock.json
+++ b/price_service/client/js/package-lock.json
--- a/price_service/client/js/package.json
+++ b/price_service/client/js/package.json
@ -18,8 +18,7 @@
    "example": "npm run build && node lib/examples/PriceServiceClient.js",
    "format": "prettier --write \"src/**/*.ts\"",
    "lint": "eslint src/",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm test && npm run lint",
+    "prepublishOnly": "npm run build && npm test && npm run lint",
    "preversion": "npm run lint",
    "version": "npm run format && git add -A src"
  },
@ -29,22 +28,22 @@
  ],
  "license": "Apache-2.0",
  "devDependencies": {
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^29.4.0",
    "@types/yargs": "^17.0.10",
    "@typescript-eslint/eslint-plugin": "^5.21.0",
    "@typescript-eslint/parser": "^5.21.0",
    "eslint": "^8.14.0",
-    "jest": "^27.5.1",
+    "jest": "^29.4.0",
    "prettier": "^2.6.2",
-    "ts-jest": "^27.1.4",
+    "ts-jest": "^29.0.5",
    "typescript": "^4.6.3",
    "yargs": "^17.4.1"
  },
  "dependencies": {
-    "@pythnetwork/pyth-sdk-js": "^1.2.0",
+    "@pythnetwork/price-service-sdk": "*",
    "@types/ws": "^8.5.3",
-    "axios": "^0.26.1",
-    "axios-retry": "^3.2.4",
+    "axios": "^1.2.5",
+    "axios-retry": "^3.4.0",
    "isomorphic-ws": "^4.0.1",
    "ts-log": "^2.2.4",
    "ws": "^8.6.0"
--- a/price_service/client/js/src/PriceServiceConnection.ts
+++ b/price_service/client/js/src/PriceServiceConnection.ts
@ -1,4 +1,4 @@
-import { HexString, PriceFeed } from "@pythnetwork/pyth-sdk-js";
+import { HexString, PriceFeed } from "@pythnetwork/price-service-sdk";
 import axios, { AxiosInstance } from "axios";
 import axiosRetry from "axios-retry";
 import * as WebSocket from "isomorphic-ws";
--- a/price_service/client/js/src/index.ts
+++ b/price_service/client/js/src/index.ts
@ -9,4 +9,4 @@ export {
  PriceFeed,
  Price,
  UnixTimestamp,
-} from "@pythnetwork/pyth-sdk-js";
+} from "@pythnetwork/price-service-sdk";
--- a/price_service/client/js/src/utils.ts
+++ b/price_service/client/js/src/utils.ts
@ -1,4 +1,4 @@
-import { HexString } from "@pythnetwork/pyth-sdk-js";
+import { HexString } from "@pythnetwork/price-service-sdk";

 /**
 * Convert http(s) endpoint to ws(s) endpoint.
--- a/price_service/client/js/tsconfig.json
+++ b/price_service/client/js/tsconfig.json
@ -3,8 +3,12 @@
    "target": "esnext",
    "module": "commonjs",
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "outDir": "./lib",
-    "strict": true
+    "strict": true,
+    "rootDir": "src/"
  },
  "include": ["src"],
  "exclude": ["node_modules", "**/__tests__/*"]
--- a/price_service/sdk/js/package-lock.json
+++ b/price_service/sdk/js/package-lock.json
--- a/price_service/sdk/js/package.json
+++ b/price_service/sdk/js/package.json
@ -15,8 +15,7 @@
    "format": "prettier --write \"src/**/*.ts\"",
    "gen-ts-schema": "quicktype --src-lang schema src/schemas/price_feed.json -o src/schemas/PriceFeed.ts --raw-type any --converters all-objects && prettier --write \"src/schemas/*.ts\"",
    "lint": "eslint src/",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm test && npm run lint",
+    "prepublishOnly": "npm run build && npm test && npm run lint",
    "preversion": "npm run lint",
    "version": "npm run format && git add -A src"
  },
@ -26,14 +25,14 @@
  ],
  "license": "Apache-2.0",
  "devDependencies": {
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^29.4.0",
    "@typescript-eslint/eslint-plugin": "^5.20.0",
    "@typescript-eslint/parser": "^5.20.0",
    "eslint": "^8.13.0",
-    "jest": "^27.5.1",
+    "jest": "^29.4.0",
    "prettier": "^2.6.2",
    "quicktype": "^15.0.261",
-    "ts-jest": "^27.1.4",
+    "ts-jest": "^29.0.5",
    "typescript": "^4.6.3"
  }
 }
--- a/price_service/sdk/js/tsconfig.json
+++ b/price_service/sdk/js/tsconfig.json
@ -3,8 +3,12 @@
    "target": "esnext",
    "module": "commonjs",
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "outDir": "./lib",
-    "strict": true
+    "strict": true,
+    "rootDir": "src/"
  },
  "include": ["src"],
  "exclude": ["node_modules", "**/__tests__/*"]
--- a/price_service/server/Dockerfile
+++ b/price_service/server/Dockerfile
@ -1,23 +1,18 @@
-FROM node:16-alpine@sha256:72a490e7ed8aed68e16b8dc8f37b5bcc35c5b5c56ee3256effcdee63e2546f93
+# Defined in tilt_devnet/docker_images/Dockerfile.lerna
+FROM lerna

-ARG BASE_PATH=/usr/src/pyth2wormhole
-RUN addgroup -S pyth -g 10001 && adduser -S pyth -G pyth -u 10001
-USER pyth
+USER root
+RUN apt-get update && apt-get install -y ncat

-# Adds wormhole_attester/sdk/js dependency
-ARG ATTESTER_SDK_REL_PATH=wormhole_attester/sdk/js
-WORKDIR ${BASE_PATH}/${ATTESTER_SDK_REL_PATH}
-COPY --chown=pyth:pyth ${ATTESTER_SDK_REL_PATH} .
-RUN npm ci && npm run build && npm cache clean --force
+WORKDIR /home/node/
+USER 1000

-ARG PRICE_SERVICE_REL_PATH=price_service/server
-WORKDIR ${BASE_PATH}/${PRICE_SERVICE_REL_PATH}
-COPY --chown=pyth:pyth ${PRICE_SERVICE_REL_PATH} .
-RUN npm ci && npm run build && npm cache clean --force
+COPY --chown=1000:1000 price_service/server price_service/server
+COPY --chown=1000:1000 price_service/sdk/js price_service/sdk/js
+COPY --chown=1000:1000 wormhole_attester/sdk/js wormhole_attester/sdk/js

-# If you are building for production
-# RUN npm ci --only=production
+RUN npx lerna run build --scope="@pythnetwork/price-service-server" --include-dependencies

-RUN mkdir -p ${BASE_PATH}/${PRICE_SERVICE_REL_PATH}/logs
+WORKDIR /home/node/price_service/server

 CMD [ "npm", "run", "start" ]
--- a/price_service/server/package-lock.json
+++ b/price_service/server/package-lock.json
--- a/price_service/server/package.json
+++ b/price_service/server/package.json
@ -15,15 +15,15 @@
  "author": "",
  "license": "Apache-2.0",
  "devDependencies": {
-    "@types/jest": "^27.5.0",
+    "@types/jest": "^29.4.0",
    "@types/long": "^4.0.1",
    "@types/node": "^16.6.1",
    "@types/node-fetch": "^2.6.2",
    "@types/supertest": "^2.0.12",
-    "jest": "^28.0.3",
+    "jest": "^29.4.0",
    "prettier": "^2.3.2",
    "supertest": "^6.2.3",
-    "ts-jest": "^28.0.1",
+    "ts-jest": "^29.0.5",
    "tslint": "^6.1.3",
    "tslint-config-prettier": "^1.18.0",
    "typescript": "^4.3.5"
@ -31,8 +31,8 @@
  "dependencies": {
    "@certusone/wormhole-sdk": "^0.9.9",
    "@certusone/wormhole-spydk": "^0.0.1",
-    "@pythnetwork/pyth-sdk-js": "^1.1.0",
-    "@pythnetwork/wormhole-attester-sdk": "file:../../wormhole_attester/sdk/js",
+    "@pythnetwork/price-service-sdk": "*",
+    "@pythnetwork/wormhole-attester-sdk": "*",
    "@types/cors": "^2.8.12",
    "@types/express": "^4.17.13",
    "@types/morgan": "^1.9.3",
@ -52,7 +52,7 @@
    "response-time": "^2.3.2",
    "ts-retry-promise": "^0.7.0",
    "winston": "^3.3.3",
-    "ws": "^8.6.0"
+    "ws": "^8.12.0"
  },
  "directories": {
    "lib": "lib"
--- a/price_service/server/src/tests/rest.test.ts
+++ b/price_service/server/src/tests/rest.test.ts
@ -3,7 +3,7 @@ import {
  Price,
  PriceFeed,
  PriceFeedMetadata,
-} from "@pythnetwork/pyth-sdk-js";
+} from "@pythnetwork/price-service-sdk";
 import express, { Express } from "express";
 import { StatusCodes } from "http-status-codes";
 import request from "supertest";
--- a/price_service/server/src/tests/ws.test.ts
+++ b/price_service/server/src/tests/ws.test.ts
@ -3,7 +3,7 @@ import {
  Price,
  PriceFeed,
  PriceFeedMetadata,
-} from "@pythnetwork/pyth-sdk-js";
+} from "@pythnetwork/price-service-sdk";
 import { Server } from "http";
 import { WebSocket, WebSocketServer } from "ws";
 import { sleep } from "../helpers";
--- a/price_service/server/src/listen.ts
+++ b/price_service/server/src/listen.ts
@ -15,7 +15,7 @@ import {
  parseBatchPriceAttestation,
  priceAttestationToPriceFeed,
 } from "@pythnetwork/wormhole-attester-sdk";
-import { HexString, PriceFeed } from "@pythnetwork/pyth-sdk-js";
+import { HexString, PriceFeed } from "@pythnetwork/price-service-sdk";
 import LRUCache from "lru-cache";
 import { DurationInSec, sleep, TimestampInSec } from "./helpers";
 import { logger } from "./logging";
--- a/price_service/server/src/rest.ts
+++ b/price_service/server/src/rest.ts
@ -1,4 +1,4 @@
-import { HexString } from "@pythnetwork/pyth-sdk-js";
+import { HexString } from "@pythnetwork/price-service-sdk";
 import cors from "cors";
 import express, { NextFunction, Request, Response } from "express";
 import { Joi, schema, validate, ValidationError } from "express-validation";
--- a/price_service/server/src/ws.ts
+++ b/price_service/server/src/ws.ts
@ -1,4 +1,4 @@
-import { HexString } from "@pythnetwork/pyth-sdk-js";
+import { HexString } from "@pythnetwork/price-service-sdk";
 import * as http from "http";
 import Joi from "joi";
 import WebSocket, { RawData, WebSocketServer } from "ws";
--- a/price_service/server/tsconfig.json
+++ b/price_service/server/tsconfig.json
@ -9,12 +9,17 @@
    "allowJs": true,
    "alwaysStrict": true,
    "strict": true,
+    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "forceConsistentCasingInFileNames": true,
    "noFallthroughCasesInSwitch": true,
    "resolveJsonModule": true,
    "isolatedModules": true,
    "downlevelIteration": true,
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "rootDir": "src/"
  },
  "include": ["src"],
  "exclude": ["node_modules"]
--- a/target_chains/cosmwasm/tools/tsconfig.json
+++ b/target_chains/cosmwasm/tools/tsconfig.json
@ -1,6 +1,9 @@
 {
  "compilerOptions": {
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "target": "es2020",
    "module": "CommonJS",
    "moduleResolution": "node",
@ -11,7 +14,8 @@
    "skipLibCheck": true,
    "noErrorTruncation": true,
    "sourceMap": true,
-    "lib": ["es2021"]
+    "lib": ["es2021"],
+    "rootDir": "src/"
  },
  "include": ["src/**/*.ts"]
 }
--- a/target_chains/ethereum/README.md
+++ b/target_chains/ethereum/README.md
@ -4,14 +4,11 @@ This directory contains The Pyth contract on Ethereum and utilities to deploy it

 ## Installation

-Run the following command to install required dependencies for the contract:
+Run the following command on the repo root to install required dependencies for the contract:

 ```
-# xc_governance_sdk_js is a local dependency that should be built
-# it is used in deployment (truffle migrations) to generate/sanity check
-# the governance VAAs
-pushd ../../governance/xc_governance_sdk_js && npm ci && popd
 npm ci
+npx lerna run build --scope="@pythnetwork/pyth-evm-contract" --include-dependencies
 ```

 ## Deployment
--- a/target_chains/ethereum/foundry.toml
+++ b/target_chains/ethereum/foundry.toml
@ -9,5 +9,5 @@ test = 'forge-test'

 libs = [
    'lib',
-    'node_modules',
+    '../../node_modules',
 ]
--- a/target_chains/ethereum/package-lock.json
+++ b/target_chains/ethereum/package-lock.json
--- a/target_chains/ethereum/package.json
+++ b/target_chains/ethereum/package.json
@ -3,47 +3,42 @@
  "version": "1.2.0",
  "description": "",
  "devDependencies": {
-    "@chainsafe/truffle-plugin-abigen": "0.0.1",
-    "@openzeppelin/cli": "^2.8.2",
-    "@openzeppelin/test-environment": "^0.1.9",
    "@openzeppelin/test-helpers": "^0.5.15",
    "@openzeppelin/truffle-upgrades": "^1.14.0",
-    "@poanet/solidity-flattener": "^3.0.6",
-    "@truffle/hdwallet-provider": "^1.7.0",
+    "@truffle/hdwallet-provider": "^2.1.5",
    "chai": "^4.2.0",
    "mocha": "^8.2.1",
-    "truffle": "^5.5.5",
-    "truffle-assertions": "^0.9.2",
+    "truffle": "^5.7.4",
    "truffle-deploy-registry": "^0.5.1",
-    "truffle-plugin-verify": "^0.5.11"
+    "truffle-plugin-verify": "^0.6.1"
  },
  "scripts": {
-    "build": "truffle compile",
-    "test": "truffle test",
-    "migrate": "mkdir -p build/contracts && cp node_modules/@openzeppelin/contracts/build/contracts/* build/contracts/ && truffle migrate",
+    "build": "rm -rf build && npx truffle compile --all",
+    "test-contract": "truffle test",
+    "migrate": "truffle migrate",
    "receiver-submit-guardian-sets": "truffle exec scripts/receiverSubmitGuardianSetUpgrades.js",
-    "verify": "patch -u -f node_modules/truffle-plugin-verify/constants.js -i truffle-verify-constants.patch; truffle run verify $npm_config_module@$npm_config_contract_address --network $npm_config_network",
+    "verify": "truffle run verify $npm_config_module@$npm_config_contract_address --network $npm_config_network",
    "install-forge-deps": "forge install foundry-rs/forge-std@2c7cbfc6fbede6d7c9e6b17afe997e3fdfe22fef --no-git --no-commit"
  },
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "@certusone/wormhole-sdk": "^0.8.0",
-    "@certusone/wormhole-sdk-wasm": "^0.0.1",
+    "@certusone/wormhole-sdk": "^0.9.9",
    "@matterlabs/hardhat-zksync-deploy": "^0.6.1",
    "@matterlabs/hardhat-zksync-solc": "^0.3.13",
    "@openzeppelin/contracts": "^4.5.0",
    "@openzeppelin/contracts-upgradeable": "^4.5.2",
+    "@pythnetwork/pyth-multisig-wh-message-builder": "*",
    "@pythnetwork/pyth-sdk-solidity": "^2.2.0",
-    "@pythnetwork/xc-governance-sdk": "file:../../governance/xc_governance_sdk_js",
+    "@pythnetwork/xc-governance-sdk": "*",
    "dotenv": "^10.0.0",
    "elliptic": "^6.5.2",
    "ethers": "^5.7.2",
-    "ganache-cli": "^6.12.1",
+    "ganache": "^7.7.3",
    "hardhat": "^2.12.5",
    "jsonfile": "^4.0.0",
    "lodash": "^4.17.21",
-    "solc": "^0.8.4",
+    "solc": "0.8.4",
    "truffle-contract-size": "^2.0.1",
    "ts-node": "^10.9.1",
    "typescript": "^4.9.4",
--- a/target_chains/ethereum/remappings.txt
+++ b/target_chains/ethereum/remappings.txt
@ -1,6 +1,6 @@
-@ensdomains/=node_modules/@ensdomains/
-@openzeppelin/=node_modules/@openzeppelin/
-@pythnetwork/=node_modules/@pythnetwork/
+@ensdomains/=../../node_modules/@ensdomains/
+@openzeppelin/=../../node_modules/@openzeppelin/
+@pythnetwork/=../../node_modules/@pythnetwork/
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
-truffle/=node_modules/truffle/
+truffle/=../../node_modules/truffle/
--- a/target_chains/ethereum/scripts/assertVaaPayloadEquals.js
+++ b/target_chains/ethereum/scripts/assertVaaPayloadEquals.js
@ -1,8 +1,4 @@
-const {
-  importCoreWasm,
-  setDefaultWasm,
-} = require("@certusone/wormhole-sdk-wasm");
-setDefaultWasm("node");
+const { parseVaa } = require("@certusone/wormhole-sdk");
 const { assert } = require("chai");

 /**
@ -14,13 +10,11 @@ module.exports = async function assertVaaPayloadEquals(
  vaaHex,
  expectedPayload
 ) {
-  const { parse_vaa } = await importCoreWasm();
-
  if (vaaHex.startsWith("0x")) {
    vaaHex = vaaHex.substring(2);
  }

-  const vaaPayload = Buffer.from(parse_vaa(Buffer.from(vaaHex, "hex")).payload);
+  const vaaPayload = Buffer.from(parseVaa(Buffer.from(vaaHex, "hex")).payload);

  assert(
    expectedPayload.equals(vaaPayload),
--- a/target_chains/ethereum/test/pyth.js
+++ b/target_chains/ethereum/test/pyth.js
@ -1,10 +1,6 @@
-const jsonfile = require("jsonfile");
 const elliptic = require("elliptic");
-const BigNumber = require("bignumber.js");
 const governance = require("@pythnetwork/xc-governance-sdk");

-const PythStructs = artifacts.require("PythStructs");
-
 const { deployProxy, upgradeProxy } = require("@openzeppelin/truffle-upgrades");
 const {
  expectRevert,
@ -12,9 +8,6 @@ const {
  time,
 } = require("@openzeppelin/test-helpers");
 const { assert, expect } = require("chai");
-const {
-  deployProxyImpl,
-} = require("@openzeppelin/truffle-upgrades/dist/utils");

 // Use "WormholeReceiver" if you are testing with Wormhole Receiver
 const Wormhole = artifacts.require("Wormhole");
@ -954,14 +947,8 @@ contract("Pyth", function () {
      2
    );

-    // This test fails without the hard coded gas limit.
-    // Without gas limit, it fails on a random place (in wormhole sig verification) which
-    // is probably because truffle cannot estimate the gas usage correctly. So the gas is
-    // hard-coded to a high value of 6.7m gas (close to ganache limit).
    await expectRevertCustomError(
-      this.pythProxy.executeGovernanceInstruction(transferBackVaaWrong, {
-        gas: 6700000,
-      }),
+      this.pythProxy.executeGovernanceInstruction(transferBackVaaWrong),
      "OldGovernanceMessage"
    );
  });
--- a/target_chains/ethereum/truffle-config.js
+++ b/target_chains/ethereum/truffle-config.js
@ -302,11 +302,7 @@ module.exports = {
    },
  },

-  plugins: [
-    "@chainsafe/truffle-plugin-abigen",
-    "truffle-plugin-verify",
-    "truffle-contract-size",
-  ],
+  plugins: ["truffle-plugin-verify", "truffle-contract-size"],

  api_keys: {
    etherscan: process.env.ETHERSCAN_KEY,
--- a/target_chains/ethereum/truffle-verify-constants.patch
+++ b/target_chains/ethereum/truffle-verify-constants.patch
@ -1,53 +0,0 @@
--- node_modules/truffle-plugin-verify/contants-old.js	2022-01-28 12:44:53.140709519 +0000
-+++ node_modules/truffle-plugin-verify/constants.js	2022-01-28 12:45:16.800710171 +0000
-@@ -3,13 +3,23 @@
-   3: 'https://api-ropsten.etherscan.io/api',
-   4: 'https://api-rinkeby.etherscan.io/api',
-   5: 'https://api-goerli.etherscan.io/api',
-+  10: 'https://api-optimistic.etherscan.io/api',
-   42: 'https://api-kovan.etherscan.io/api',
-   56: 'https://api.bscscan.com/api',
-+  69: 'https://api-kovan-optimistic.etherscan.io/api',
-   97: 'https://api-testnet.bscscan.com/api',
-   128: 'https://api.hecoinfo.com/api',
-   137: 'https://api.polygonscan.com/api',
-   250: 'https://api.ftmscan.com/api',
-   256: 'https://api-testnet.hecoinfo.com/api',
-+  1284: 'https://api-moonbeam.moonscan.io/api',
-+  1285: 'https://api-moonriver.moonscan.io/api',
-+  1287: 'https://api-moonbase.moonscan.io/api',
-+  4002: 'https://api-testnet.ftmscan.com/api',
-+  42161: 'https://api.arbiscan.io/api',
-+  43113: 'https://api-testnet.snowtrace.io/api',
-+  43114: 'https://api.snowtrace.io/api',
-+  421611: 'https://api-testnet.arbiscan.io/api',
-   80001: 'https://api-testnet.polygonscan.com/api'
- }
-
-@@ -18,16 +28,25 @@
-   3: 'https://ropsten.etherscan.io/address',
-   4: 'https://rinkeby.etherscan.io/address',
-   5: 'https://goerli.etherscan.io/address',
-+  10: 'https://optimistic.etherscan.io/address',
-   42: 'https://kovan.etherscan.io/address',
-   56: 'https://bscscan.com/address',
-+  69: 'https://kovan-optimistic.etherscan.io/address',
-   97: 'https://testnet.bscscan.com/address',
-   128: 'https://hecoinfo.com/address',
-   137: 'https://polygonscan.com/address',
-   250: 'https://ftmscan.com/address',
-   256: 'https://testnet.hecoinfo.com/address',
-+  1284: 'https://moonbeam.moonscan.io/address',
-+  1285: 'https://moonriver.moonscan.io/address',
-+  1287: 'https://moonbase.moonscan.io/address',
-+  4002: 'https://testnet.ftmscan.com/address',
-+  42161: 'https://arbiscan.io/address',
-+  43113: 'https://testnet.snowtrace.io/address',
-+  43114: 'https://snowtrace.io/address',
-+  421611: 'https://testnet.arbiscan.io/address',
-   80001: 'https://mumbai.polygonscan.com/address'
- }
-
- const RequestStatus = {
-   OK: '1',
-   NOTOK: '0'
--- a/third_party/pyth/p2w-relay/Dockerfile.pyth_relay
+++ b/third_party/pyth/p2w-relay/Dockerfile.pyth_relay
@ -1,40 +1,15 @@
-FROM node:16-alpine@sha256:72a490e7ed8aed68e16b8dc8f37b5bcc35c5b5c56ee3256effcdee63e2546f93
+# Defined in tilt_devnet/docker_images/Dockerfile.lerna
+FROM lerna

-ARG BASE_PATH=/usr/src
+WORKDIR /home/node/
+USER 1000

-RUN apk --no-cache --update add python3 build-base  # Needed by the Ethereum build
+COPY --chown=1000:1000 price_service/sdk/js price_service/sdk/js
+COPY --chown=1000:1000 third_party/pyth/p2w-relay third_party/pyth/p2w-relay
+COPY --chown=1000:1000 wormhole_attester/sdk/js wormhole_attester/sdk/js

-WORKDIR ${BASE_PATH}
-RUN addgroup -S pyth -g 10001 && adduser -S pyth -G pyth -u 10001
-RUN chown -R pyth:pyth .
-USER pyth
+RUN npx lerna run build --scope="pyth_relay" --include-dependencies

-WORKDIR ${BASE_PATH}/target_chains/ethereum
-ADD --chown=pyth:pyth target_chains/ethereum/ .
-RUN npm install && npm run build
+WORKDIR /home/node/third_party/pyth/p2w-relay

-USER root
-RUN apk del build-base # No longer needed after EVM build
-
-USER pyth
-
-# Adds wormhole_attester/sdk/js dependency
-ARG P2W_SDK_REL_PATH=wormhole_attester/sdk/js
-
-WORKDIR ${BASE_PATH}/${P2W_SDK_REL_PATH}
-ADD --chown=pyth:pyth ${P2W_SDK_REL_PATH} .
-
-RUN npm ci && npm run build && npm cache clean --force
-
-# Add the code and compile
-ARG P2W_RELAY_REL_PATH=third_party/pyth/p2w-relay
-
-WORKDIR ${BASE_PATH}/${P2W_RELAY_REL_PATH}
-ADD --chown=pyth:pyth ${P2W_RELAY_REL_PATH} .
-
-RUN npm ci && npm run build && npm cache clean --force
-
-# If you are building for production
-# RUN npm ci --only=production
-
-RUN mkdir -p ${BASE_PATH}/${P2W_RELAY_REL_PATH}/logs
+CMD [ "npm", "run", "start" ]
--- a/third_party/pyth/p2w-relay/package-lock.json
+++ b/third_party/pyth/p2w-relay/package-lock.json
--- a/third_party/pyth/p2w-relay/package.json
+++ b/third_party/pyth/p2w-relay/package.json
@ -5,11 +5,10 @@
  "main": "index.js",
  "scripts": {
    "build": "npm run build-evm && npm run build-lib",
-    "build-evm": "npm run build-evm-contract && npm run copy-evm-abis && npm run build-evm-bindings",
+    "build-evm": "npm run copy-evm-abis && npm run build-evm-bindings",
    "build-lib": "tsc",
-    "build-evm-contract": "cd ../../../target_chains/ethereum/ && (npm run build || npm ci && npm run build)",
-    "copy-evm-abis": "mkdir -p ./src/evm/abis && cp -r ../../../target_chains/ethereum/build/contracts/* ./src/evm/abis/",
-    "build-evm-bindings": "mkdir -p ./src/evm/bindings/ && typechain --target=ethers-v5 --out-dir=src/evm/bindings/ src/evm/abis/Pyth*.json",
+    "copy-evm-abis": "mkdir -p ./src/evm/abis && cp -r ../../../node_modules/@pythnetwork/pyth-sdk-solidity/abis ./src/evm/",
+    "build-evm-bindings": "mkdir -p ./src/evm/bindings/ && typechain --target=ethers-v5 --out-dir=src/evm/bindings/ src/evm/abis/*Pyth*.json",
    "start": "node lib/index.js",
    "listen_only": "node lib/index.js --listen_only"
  },
@ -32,7 +31,8 @@
  "dependencies": {
    "@certusone/wormhole-sdk": "^0.1.4",
    "@certusone/wormhole-spydk": "^0.0.1",
-    "@pythnetwork/wormhole-attester-sdk": "file:../../../wormhole_attester/sdk/js",
+    "@pythnetwork/pyth-sdk-solidity": "^2.2.0",
+    "@pythnetwork/wormhole-attester-sdk": "*",
    "@solana/spl-token": "^0.1.8",
    "@solana/web3.js": "^1.24.0",
    "@terra-money/terra.js": "^3.1.3",
--- a/third_party/pyth/p2w-relay/src/relay/evm.ts
+++ b/third_party/pyth/p2w-relay/src/relay/evm.ts
@ -4,7 +4,7 @@ import { logger } from "../helpers";
 import { hexToUint8Array } from "@certusone/wormhole-sdk";
 import { importCoreWasm } from "@certusone/wormhole-sdk/lib/cjs/solana/wasm";

-import { PythUpgradable__factory, PythUpgradable } from "../evm/bindings/";
+import { AbstractPyth__factory, AbstractPyth } from "../evm/bindings/";
 import { parseBatchPriceAttestation } from "@pythnetwork/wormhole-attester-sdk";

 let WH_WASM: any = null;
@ -19,7 +19,7 @@ async function whWasm(): Promise<any> {

 export class EvmRelay implements Relay {
  payerWallet: ethers.Wallet;
-  p2wContract: PythUpgradable;
+  p2wContract: AbstractPyth;
  // p2w contract sanity check; If set to true, we log query() results
  // on all prices in a batch before and after relaying.
  verifyPriceFeeds: boolean;
@ -46,9 +46,7 @@ export class EvmRelay implements Relay {
        : null;

      const updateData = ["0x" + signedVAAs[i]];
-      const updateFee = await this.p2wContract["getUpdateFee(bytes[])"](
-        updateData
-      );
+      const updateFee = await this.p2wContract.getUpdateFee(updateData);

      let tx = this.p2wContract
        .updatePriceFeeds(updateData, { gasLimit: 2000000, value: updateFee })
@ -175,8 +173,10 @@ export class EvmRelay implements Relay {
    );

    this.payerWallet = new ethers.Wallet(wallet.privateKey, provider);
-    let factory = new PythUpgradable__factory(this.payerWallet);
-    this.p2wContract = factory.attach(cfg.p2wContractAddress);
+    this.p2wContract = AbstractPyth__factory.connect(
+      cfg.p2wContractAddress,
+      this.payerWallet
+    );
    this.verifyPriceFeeds = cfg.verifyPriceFeeds;

    // This promise and throw exist because of constructor() limitations.
--- a/third_party/pyth/p2w-relay/tsconfig.json
+++ b/third_party/pyth/p2w-relay/tsconfig.json
@ -4,6 +4,10 @@
    "target": "esnext",
    "module": "commonjs",
    "moduleResolution": "node",
+    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "lib": ["es2019"],
    "skipLibCheck": true,
    "allowJs": true,
@ -13,7 +17,8 @@
    "noFallthroughCasesInSwitch": true,
    "resolveJsonModule": true,
    "isolatedModules": true,
-    "downlevelIteration": true
+    "downlevelIteration": true,
+    "rootDir": "src/"
  },
  "include": ["src"],
  "exclude": ["node_modules", "**/__tests__/*"]
--- a/third_party/pyth/prepare_multisig.py
+++ b/third_party/pyth/prepare_multisig.py
@ -7,9 +7,9 @@ import sys
 from pyth_utils import *

 MULTISIG_SCRIPT_CMD_PREFIX = "npm run start --".split(" ")
-MULTISIG_SCRIPT_DIR = os.environ.get("MULTISIG_SCRIPT_DIR", "/root/pyth/multisig_wh_message_builder")
+MULTISIG_SCRIPT_DIR = os.environ.get("MULTISIG_SCRIPT_DIR", "/home/node/governance/multisig_wh_message_builder")

-MESH_KEY_DIR = "/solana-secrets/squads/"
+MESH_KEY_DIR = "/home/node/tilt_devnet/secrets/solana/squads/"
 MESH_PROGRAM_ADDR = "SMPLVC8MxZ5Bf5EfF7PaMiTCxoBAcmkbM2vkrvMK8ho"
 MESH_VAULT_EXT_AUTHORITY_KEY_PATH = MESH_KEY_DIR + "external_authority.json"

--- a/tilt_devnet/docker_images/Dockerfile.ethereum
+++ b/tilt_devnet/docker_images/Dockerfile.ethereum
@ -1,39 +1,17 @@
-# syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
-FROM node:lts-alpine@sha256:2ae9624a39ce437e7f58931a5747fdc60224c6e40f8980db90728de58e22af7c
+# Defined in tilt_devnet/docker_images/Dockerfile.lerna
+FROM lerna

-# npm wants to clone random Git repositories - lovely.
-RUN apk add git python make build-base
+USER root
+RUN apt-get update && apt-get install -y ncat

-# Run as user, otherwise, npx explodes.
+# Run as node, otherwise, npx explodes.
 USER 1000
-RUN mkdir -p /home/node/ethereum
-RUN mkdir -p /home/node/.npm
-
-WORKDIR /home/node/governance/xc_governance_sdk_js/
-ADD --chown=node:node governance/xc_governance_sdk_js/ .
-
-RUN --mount=type=cache,uid=1000,gid=1000,target=/home/node/.npm \
-  --mount=type=cache,uid=1000,gid=1000,target=xc_gc_node_modules \
-  npm install && \
-  cp -r node_modules node_modules_cache
+WORKDIR /home/node
+COPY --chown=1000:1000 governance/multisig_wh_message_builder governance/multisig_wh_message_builder
+COPY --chown=1000:1000 governance/xc_governance_sdk_js governance/xc_governance_sdk_js
+COPY --chown=1000:1000 target_chains/ethereum target_chains/ethereum

+RUN npx lerna run build --scope="@pythnetwork/pyth-evm-contract" --include-dependencies

 WORKDIR /home/node/target_chains/ethereum
-
-# Only invalidate the npm install step if package.json changed
-ADD --chown=node:node target_chains/ethereum/package.json .
-ADD --chown=node:node target_chains/ethereum/package-lock.json .
-
-# 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 \
-  --mount=type=cache,uid=1000,gid=1000,target=node_modules \
-  npm install && \
-  cp -r node_modules node_modules_cache
-
-# Amusingly, Debian's coreutils version has a bug where mv believes that
-# the target is on a different fs and does a full recursive copy for what
-# could be a renameat syscall. Alpine does not have this bug.
-RUN rm -rf node_modules && mv node_modules_cache node_modules
-
-ADD --chown=node:node target_chains/ethereum/ .
-ADD --chown=node:node target_chains/ethereum/.env.test .env
+COPY --chown=1000:1000 target_chains/ethereum/.env.test .env
--- a/tilt_devnet/docker_images/Dockerfile.lerna
+++ b/tilt_devnet/docker_images/Dockerfile.lerna
@ -0,0 +1,35 @@
+# The aim for the base image here is to only keep package*.json files while having the
+# same directory structure to be able to have lerna dependencies installed once and cached
+# as long as the package*.json files have not changed. In the future, we can further optimize
+# it by creating slim package files that only contain *dependencies and name keys.
+
+FROM node:18.13.0@sha256:d9061fd0205c20cd47f70bdc879a7a84fb472b822d3ad3158aeef40698d2ce36 as base
+
+WORKDIR /home/node
+COPY --chown=1000:1000 ./ ./
+
+# Remove files that are not json packages
+RUN find . -type f ! -name 'package*.json' -delete
+# Remove directories that are empty now
+RUN find . -type d -empty -delete
+
+COPY ./lerna.json ./
+
+FROM node:18.13.0@sha256:d9061fd0205c20cd47f70bdc879a7a84fb472b822d3ad3158aeef40698d2ce36 as lerna
+
+# 1000 is the uid and gid of the node user
+USER 1000
+RUN mkdir -p /home/node/.npm
+RUN mkdir -p /home/node/node_modules
+
+WORKDIR /home/node
+COPY --from=base --chown=1000:1000 /home/node ./
+
+RUN --mount=type=cache,uid=1000,gid=1000,id=lerna,target=/home/node/.npm \
+  --mount=type=cache,uid=1000,gid=1000,id=lerna,target=/home/node/node_modules \
+  npm ci && cp -r node_modules node_modules_cache
+
+# Folders in the cache are not visible in the container that's why we copy
+# them and then move them back.
+
+RUN rm -rf node_modules && mv node_modules_cache node_modules
--- a/tilt_devnet/docker_images/Dockerfile.multisig
+++ b/tilt_devnet/docker_images/Dockerfile.multisig
@ -1,37 +1,15 @@
-#syntax=docker/dockerfile:1.2@sha256:e2a8561e419ab1ba6b2fe6cbdf49fd92b95912df1cf7d313c3e2230a333fdbcc
-FROM ghcr.io/certusone/solana:1.10.31
+# Defined in tilt_devnet/docker_images/Dockerfile.lerna
+FROM lerna

-# This image builds an environment to initialize and use a local
-# devnet multisig. It uses Pyth's Mesh client.
+WORKDIR /home/node/
+USER 1000

-RUN apt-get update && apt-get install -yq python3 libudev-dev ncat
+RUN sh -c "$(curl -sSfL https://release.solana.com/v1.10.31/install)"
+ENV PATH="/home/node/.local/share/solana/install/active_release/bin:$PATH"

-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
+COPY --chown=1000:1000 governance/multisig_wh_message_builder governance/multisig_wh_message_builder
+COPY --chown=1000:1000 third_party/pyth/prepare_multisig.py third_party/pyth/pyth_utils.py third_party/pyth/
+COPY --chown=1000:1000 tilt_devnet/secrets/solana tilt_devnet/secrets/solana
+ENV SOL_PAYER_KEYPAIR /home/node/tilt_devnet/secrets/solana/solana-devnet.json

-WORKDIR /root
-
-# Also used by the multisig provisioning script
-ENV MULTISIG_SCRIPT_DIR=/root/pyth/multisig_wh_message_builder
-
-WORKDIR $MULTISIG_SCRIPT_DIR
-
-ENV LOCAL_MULTISIG_SCRIPT_DIR=governance/multisig_wh_message_builder
-
-# Add a barebones representation of our deps for Docker layer caching
-ADD $LOCAL_MULTISIG_SCRIPT_DIR/package.json \
-    $LOCAL_MULTISIG_SCRIPT_DIR/package-lock.json \
-    $LOCAL_MULTISIG_SCRIPT_DIR/tsconfig.json \
-    ./
-
-RUN mkdir src # tsc is run as part of the install, add minimal placeholders to satisfy it
-RUN touch src/index.ts
-
-RUN --mount=type=cache,target=/home/node/.cache \
-    npm ci && cp -r node_modules node_modules_cached
-RUN rm -rf node_modules && mv node_modules_cached node_modules
-
-# Add the rest of the code. This ensures that real code changes do not affect the layer caching of `npm ci`
-ADD third_party/pyth /root/pyth
-ADD tilt_devnet/secrets/solana/ /solana-secrets
-
-RUN npm install
+RUN npx lerna run build --scope="@pythnetwork/pyth-multisig-wh-message-builder" --include-dependencies
--- a/tilt_devnet/k8s/eth-devnet.yaml
+++ b/tilt_devnet/k8s/eth-devnet.yaml
@ -75,7 +75,7 @@ spec:
            - -c
            - "npm run migrate -- --network development &&
              npx truffle test test/pyth.js 2>&1 &&
-              nc -lkp 2000 0.0.0.0"
+              nc -lk 0.0.0.0 2000"
          readinessProbe:
            periodSeconds: 1
            failureThreshold: 300
@ -114,7 +114,7 @@ spec:
            - --deterministic
            - --time="1970-01-01T00:00:00+00:00"
            - --host=0.0.0.0
-            - --chainId=1397
+            - --chain.chainId=1397
          ports:
            - containerPort: 8545
              name: rpc
@ -129,7 +129,7 @@ spec:
            - /bin/sh
            - -c
            - "npm run migrate -- --network development &&
-              nc -lkp 2000 0.0.0.0"
+              nc -lk 0.0.0.0 2000"
          readinessProbe:
            periodSeconds: 1
            failureThreshold: 300
--- a/tilt_devnet/k8s/multisig.yaml
+++ b/tilt_devnet/k8s/multisig.yaml
@ -36,4 +36,4 @@ spec:
            failureThreshold: 300
          command:
            - python3
-            - /root/pyth/prepare_multisig.py
+            - /home/node/third_party/pyth/prepare_multisig.py
--- a/tilt_devnet/k8s/pyth-price-server.yaml
+++ b/tilt_devnet/k8s/pyth-price-server.yaml
@ -81,7 +81,7 @@ spec:
          command:
            - /bin/sh
            - -c
-            - "npm run test && nc -lkp 2358 0.0.0.0"
+            - "npm run test && nc -lk 0.0.0.0 2358"
          readinessProbe:
            periodSeconds: 5
            failureThreshold: 300
--- a/wormhole_attester/sdk/js/package-lock.json
+++ b/wormhole_attester/sdk/js/package-lock.json
--- a/wormhole_attester/sdk/js/package.json
+++ b/wormhole_attester/sdk/js/package.json
@ -35,11 +35,11 @@
    "tslint-config-prettier": "^1.18.0",
    "typescript": "^4.3.5"
  },
-  "dependencies": {
-    "@pythnetwork/pyth-sdk-js": "^1.1.0"
-  },
  "bugs": {
    "url": "https://github.com/pyth-network/pyth-crosschain/issues"
  },
-  "homepage": "https://github.com/pyth-network/pyth-crosschain#readme"
+  "homepage": "https://github.com/pyth-network/pyth-crosschain#readme",
+  "dependencies": {
+    "@pythnetwork/price-service-sdk": "*"
+  }
 }
--- a/wormhole_attester/sdk/js/src/index.ts
+++ b/wormhole_attester/sdk/js/src/index.ts
@ -1,5 +1,14 @@
-import { PriceFeed, Price, UnixTimestamp } from "@pythnetwork/pyth-sdk-js";
-export { PriceFeed, Price, UnixTimestamp } from "@pythnetwork/pyth-sdk-js";
+import {
+  PriceFeed,
+  Price,
+  UnixTimestamp,
+} from "@pythnetwork/price-service-sdk";
+
+export {
+  PriceFeed,
+  Price,
+  UnixTimestamp,
+} from "@pythnetwork/price-service-sdk";

 export enum PriceAttestationStatus {
  Unknown = 0,
--- a/wormhole_attester/sdk/js/tsconfig.json
+++ b/wormhole_attester/sdk/js/tsconfig.json
@ -4,12 +4,16 @@
    "module": "commonjs",
    "moduleResolution": "node",
    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "incremental": true,
    "outDir": "./lib",
    "strict": true,
    "skipLibCheck": true,
    "esModuleInterop": true,
    "downlevelIteration": true,
-    "allowJs": true
+    "allowJs": true,
+    "rootDir": "src/"
  },
  "types": [],
  "include": ["src", "types"],