[wormhole-attester] Move p2w-sdk inside wormhole_attester directory (#534)

* Move p2w-sdk to wormhole_attester

* Update references to the sdk

Author: ali-behjati

.github/workflows/pyth-cosmwasm-contract.yml

@@ -4,13 +4,13 @@ on:
   pull_request:
     paths:
       - target_chains/cosmwasm/**
-      - third_party/pyth/p2w-sdk/rust/**
+      - wormhole_attester/sdk/rust/**
   push:
     branches:
       - main
     paths:
       - target_chains/cosmwasm/**
-      - third_party/pyth/p2w-sdk/rust/**
+      - wormhole_attester/sdk/rust/**
 
 env:
   CARGO_TERM_COLOR: always

.pre-commit-config.yaml

@@ -58,16 +58,3 @@ repos:
         entry: cargo +nightly clippy --manifest-path ./target_chains/cosmwasm/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
         pass_filenames: false
         files: target_chains/cosmwasm
-      # Hooks for p2w-sdk/rust
-      - id: cargo-fmt-p2w-sdk
-        name: Cargo format for p2w-sdk
-        language: "rust"
-        entry: cargo +nightly fmt --manifest-path ./third_party/pyth/p2w-sdk/rust/Cargo.toml --all -- --config-path rustfmt.toml
-        pass_filenames: false
-        files: third_party/pyth/p2w-sdk/rust
-      - id: cargo-clippy-p2w-sdk
-        name: Cargo clippy for p2w-sdk
-        language: "rust"
-        entry: cargo +nightly clippy --manifest-path ./third_party/pyth/p2w-sdk/rust/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
-        pass_filenames: false
-        files: third_party/pyth/p2w-sdk/rust

price_service/server/Dockerfile

@@ -4,10 +4,10 @@ ARG BASE_PATH=/usr/src/pyth2wormhole
 RUN addgroup -S pyth -g 10001 && adduser -S pyth -G pyth -u 10001
 USER pyth
 
-# Adds p2w-sdk/js dependency
-ARG P2W_SDK_REL_PATH=third_party/pyth/p2w-sdk/js
-WORKDIR ${BASE_PATH}/${P2W_SDK_REL_PATH}
-COPY --chown=pyth:pyth ${P2W_SDK_REL_PATH} .
+# 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
 
 ARG PRICE_SERVICE_REL_PATH=price_service/server

price_service/server/README.md

@@ -46,14 +46,14 @@ price service you should:
 
 ## Build an image
 
-First, build the wasm files from [the repo root](../../../) like below. This command generates the wasm files necessary
-for parsing Pyth messages coming from Wormhole and stores them on [this](../p2w-sdk/js/src/solana/p2w-core) directory.
+First, build the wasm files from [the repo root](../../) like below. This command generates the wasm files necessary
+for parsing Pyth messages coming from Wormhole and stores them on [this](../../wormhole_attester/sdk/js) directory.
 
 ```
-docker buildx build -f Dockerfile.wasm -o type=local,dest=. .
+docker buildx build -f tilt_devnet/docker_images/Dockerfile.wasm -o type=local,dest=. .
 ```
 
-Then, build the image from [the repo root](../../../) like below. It will create a
+Then, build the image from [the repo root](../../) like below. It will create a
 local image named `pyth_price_server`.
 
 ```

price_service/server/package-lock.json

@@ -31,8 +31,8 @@
   "dependencies": {
     "@certusone/wormhole-sdk": "^0.9.9",
     "@certusone/wormhole-spydk": "^0.0.1",
-    "@pythnetwork/p2w-sdk-js": "file:../../third_party/pyth/p2w-sdk/js",
     "@pythnetwork/pyth-sdk-js": "^1.1.0",
+    "@pythnetwork/wormhole-attester-sdk": "file:../../wormhole_attester/sdk/js",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "@types/morgan": "^1.9.3",

price_service/server/package.json

@@ -14,7 +14,7 @@ import {
   getBatchSummary,
   parseBatchPriceAttestation,
   priceAttestationToPriceFeed,
-} from "@pythnetwork/p2w-sdk-js";
+} from "@pythnetwork/wormhole-attester-sdk";
 import { HexString, PriceFeed } from "@pythnetwork/pyth-sdk-js";
 import LRUCache from "lru-cache";
 import { DurationInSec, sleep, TimestampInSec } from "./helpers";

price_service/server/src/listen.ts

@@ -13,7 +13,10 @@ export function initLogger(config?: { logLevel?: string }) {
 
   let transport: any;
   // tslint:disable:no-console
-  console.log("p2w_api is logging to the console at level [%s]", logLevel);
+  console.log(
+    "price_service is logging to the console at level [%s]",
+    logLevel
+  );
 
   transport = new winston.transports.Console({
     level: logLevel,

price_service/server/src/logging.ts

@@ -28,7 +28,7 @@ generic-array = { version = "0.14.4" }
 hex = "0.4.2"
 lazy_static = "1.4.0"
 bigint = "4"
-p2w-sdk = { path = "../../../../third_party/pyth/p2w-sdk/rust" }
+pyth-wormhole-attester-sdk = { path = "../../../../wormhole_attester/sdk/rust" }
 pyth-sdk = "0.7.0"
 byteorder = "1.4.3"
 cosmwasm-schema = "1.1.9"