pyth-network · Reisen · Apr 15, 2024 · Apr 15, 2024 · Apr 15, 2024 · Apr 15, 2024
@@ -2,10 +2,10 @@ name: Check Hermes
 
 on:
   pull_request:
-    paths: [hermes/**]
+    paths: [apps/hermes/**]
   push:
     branches: [main]
-    paths: [hermes/**]
+    paths: [apps/hermes/**]
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -20,4 +20,4 @@ jobs:
       - name: Install protoc
         uses: arduino/setup-protoc@v3
       - name: Run executor tests
-        run: cargo test --manifest-path ./hermes/Cargo.toml
+        run: cargo test --manifest-path ./apps/hermes/Cargo.toml
@@ -37,7 +37,7 @@ jobs:
         env:
           AWS_REGION: us-east-1
       - run: |
-          DOCKER_BUILDKIT=1 docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f hermes/Dockerfile .
+          DOCKER_BUILDKIT=1 docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f apps/hermes/Dockerfile .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
         env:
           ECR_REGISTRY: public.ecr.aws

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -47,15 +47,15 @@ repos:
       - id: cargo-fmt-hermes
         name: Cargo format for Hermes
         language: "rust"
-        entry: cargo +nightly-2024-03-26 fmt --manifest-path ./hermes/Cargo.toml --all -- --config-path rustfmt.toml
+        entry: cargo +nightly-2024-03-26 fmt --manifest-path ./apps/hermes/Cargo.toml --all -- --config-path rustfmt.toml
         pass_filenames: false
-        files: hermes
+        files: apps/hermes
       - id: cargo-clippy-hermes
         name: Cargo clippy for Hermes
         language: "rust"
-        entry: cargo +nightly-2024-03-26 clippy --manifest-path ./hermes/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
+        entry: cargo +nightly-2024-03-26 clippy --manifest-path ./apps/hermes/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
         pass_filenames: false
-        files: hermes
+        files: apps/hermes
       # Hooks for Fortuna
       - id: cargo-fmt-fortuna
         name: Cargo format for Fortuna

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ contracts, SDKs, and examples.
 
 ## Hermes
 
-> [hermes](./hermes/)
+> [hermes](./apps/hermes/)
 
 Hermes is an off-chain service which constantly observes Pythnet and the
 Wormhole network watching for price updates emitted from the Pyth contract. It

diff --git a/hermes/.envrc.sample → apps/hermes/.envrc.sample b/hermes/.envrc.sample → apps/hermes/.envrc.sample
diff --git a/hermes/.gitignore → apps/hermes/.gitignore b/hermes/.gitignore → apps/hermes/.gitignore
diff --git a/hermes/Cargo.lock → apps/hermes/Cargo.lock b/hermes/Cargo.lock → apps/hermes/Cargo.lock
diff --git a/hermes/Cargo.toml → apps/hermes/Cargo.toml b/hermes/Cargo.toml → apps/hermes/Cargo.toml
@@ -31,7 +31,7 @@ prometheus-client  = { version = "0.21.2" }
 prost              = { version = "0.12.1" }
 pyth-sdk           = { version = "0.8.0" }
 pyth-sdk-solana    = { version = "0.9.0" }
-pythnet-sdk        = { path = "../pythnet/pythnet_sdk/", version = "2.0.0", features = ["strum"] }
+pythnet-sdk        = { path = "../../pythnet/pythnet_sdk/", version = "2.0.0", features = ["strum"] }
 rand               = { version = "0.8.5" }
 reqwest            = { version = "0.11.14", features = ["blocking", "json"] }
 secp256k1          = { version = "0.27.0", features = ["rand", "recovery", "serde"] }

diff --git a/hermes/Dockerfile → apps/hermes/Dockerfile b/hermes/Dockerfile → apps/hermes/Dockerfile
@@ -12,15 +12,15 @@ RUN rustup default nightly-2024-03-26
 
 # Build
 WORKDIR /src
-COPY hermes hermes
+COPY apps/hermes apps/hermes
 COPY pythnet/pythnet_sdk pythnet/pythnet_sdk
 
 
-WORKDIR /src/hermes
+WORKDIR /src/apps/hermes
 
 RUN --mount=type=cache,target=/root/.cargo/registry cargo build --release
 
 FROM rust:1.77.0
 
 # Copy artifacts from other images
-COPY --from=build /src/hermes/target/release/hermes /usr/local/bin/
+COPY --from=build /src/apps/hermes/target/release/hermes /usr/local/bin/
diff --git a/hermes/README.md → apps/hermes/README.md b/hermes/README.md → apps/hermes/README.md
@@ -35,14 +35,14 @@ To set up and run a Hermes node, follow the steps below:
    ```
 4. **Build the project**: Navigate to the project directory and run the following command to build the project:
    ```bash
-   cd hermes
+   cd apps/hermes
    cargo build --release
    ```
    This will create a binary in the target/release directory.
 5. **Run the node**: To run Hermes for Pythnet, use the following command:
 
    ```bash
-   ./target/release/hermes run \
+   cargo run --release -- run \
      --pythnet-http-addr https://pythnet-rpc/ \
      --pythnet-ws-addr wss://pythnet-rpc/ \
      --wormhole-spy-rpc-addr https://wormhole-spy-rpc/

diff --git a/hermes/build.rs → apps/hermes/build.rs b/hermes/build.rs → apps/hermes/build.rs
diff --git a/hermes/rust-toolchain → apps/hermes/rust-toolchain b/hermes/rust-toolchain → apps/hermes/rust-toolchain
diff --git a/hermes/src/aggregate.rs → apps/hermes/src/aggregate.rs b/hermes/src/aggregate.rs → apps/hermes/src/aggregate.rs
diff --git a/hermes/src/aggregate/metrics.rs → apps/hermes/src/aggregate/metrics.rs b/hermes/src/aggregate/metrics.rs → apps/hermes/src/aggregate/metrics.rs
diff --git a/hermes/src/aggregate/wormhole_merkle.rs → apps/hermes/src/aggregate/wormhole_merkle.rs b/hermes/src/aggregate/wormhole_merkle.rs → apps/hermes/src/aggregate/wormhole_merkle.rs
diff --git a/hermes/src/api.rs → apps/hermes/src/api.rs b/hermes/src/api.rs → apps/hermes/src/api.rs
diff --git a/hermes/src/api/doc_examples.rs → apps/hermes/src/api/doc_examples.rs b/hermes/src/api/doc_examples.rs → apps/hermes/src/api/doc_examples.rs
diff --git a/hermes/src/api/metrics_middleware.rs → apps/hermes/src/api/metrics_middleware.rs b/hermes/src/api/metrics_middleware.rs → apps/hermes/src/api/metrics_middleware.rs
diff --git a/hermes/src/api/rest.rs → apps/hermes/src/api/rest.rs b/hermes/src/api/rest.rs → apps/hermes/src/api/rest.rs
diff --git a/hermes/src/api/rest/get_price_feed.rs → apps/hermes/src/api/rest/get_price_feed.rs b/hermes/src/api/rest/get_price_feed.rs → apps/hermes/src/api/rest/get_price_feed.rs
diff --git a/hermes/src/api/rest/get_vaa.rs → apps/hermes/src/api/rest/get_vaa.rs b/hermes/src/api/rest/get_vaa.rs → apps/hermes/src/api/rest/get_vaa.rs
diff --git a/hermes/src/api/rest/get_vaa_ccip.rs → apps/hermes/src/api/rest/get_vaa_ccip.rs b/hermes/src/api/rest/get_vaa_ccip.rs → apps/hermes/src/api/rest/get_vaa_ccip.rs
diff --git a/hermes/src/api/rest/index.rs → apps/hermes/src/api/rest/index.rs b/hermes/src/api/rest/index.rs → apps/hermes/src/api/rest/index.rs
diff --git a/hermes/src/api/rest/latest_price_feeds.rs → ...hermes/src/api/rest/latest_price_feeds.rs b/hermes/src/api/rest/latest_price_feeds.rs → ...hermes/src/api/rest/latest_price_feeds.rs
diff --git a/hermes/src/api/rest/latest_vaas.rs → apps/hermes/src/api/rest/latest_vaas.rs b/hermes/src/api/rest/latest_vaas.rs → apps/hermes/src/api/rest/latest_vaas.rs
diff --git a/hermes/src/api/rest/live.rs → apps/hermes/src/api/rest/live.rs b/hermes/src/api/rest/live.rs → apps/hermes/src/api/rest/live.rs
diff --git a/hermes/src/api/rest/price_feed_ids.rs → apps/hermes/src/api/rest/price_feed_ids.rs b/hermes/src/api/rest/price_feed_ids.rs → apps/hermes/src/api/rest/price_feed_ids.rs
diff --git a/hermes/src/api/rest/ready.rs → apps/hermes/src/api/rest/ready.rs b/hermes/src/api/rest/ready.rs → apps/hermes/src/api/rest/ready.rs
diff --git a/...s/src/api/rest/v2/latest_price_updates.rs → ...s/src/api/rest/v2/latest_price_updates.rs b/...s/src/api/rest/v2/latest_price_updates.rs → ...s/src/api/rest/v2/latest_price_updates.rs
diff --git a/hermes/src/api/rest/v2/mod.rs → apps/hermes/src/api/rest/v2/mod.rs b/hermes/src/api/rest/v2/mod.rs → apps/hermes/src/api/rest/v2/mod.rs
diff --git a/...s/src/api/rest/v2/price_feeds_metadata.rs → ...s/src/api/rest/v2/price_feeds_metadata.rs b/...s/src/api/rest/v2/price_feeds_metadata.rs → ...s/src/api/rest/v2/price_feeds_metadata.rs
diff --git a/hermes/src/api/rest/v2/sse.rs → apps/hermes/src/api/rest/v2/sse.rs b/hermes/src/api/rest/v2/sse.rs → apps/hermes/src/api/rest/v2/sse.rs
diff --git a/...rc/api/rest/v2/timestamp_price_updates.rs → ...rc/api/rest/v2/timestamp_price_updates.rs b/...rc/api/rest/v2/timestamp_price_updates.rs → ...rc/api/rest/v2/timestamp_price_updates.rs
diff --git a/hermes/src/api/types.rs → apps/hermes/src/api/types.rs b/hermes/src/api/types.rs → apps/hermes/src/api/types.rs
diff --git a/hermes/src/api/ws.rs → apps/hermes/src/api/ws.rs b/hermes/src/api/ws.rs → apps/hermes/src/api/ws.rs
diff --git a/hermes/src/config.rs → apps/hermes/src/config.rs b/hermes/src/config.rs → apps/hermes/src/config.rs
diff --git a/hermes/src/config/benchmarks.rs → apps/hermes/src/config/benchmarks.rs b/hermes/src/config/benchmarks.rs → apps/hermes/src/config/benchmarks.rs
diff --git a/hermes/src/config/metrics.rs → apps/hermes/src/config/metrics.rs b/hermes/src/config/metrics.rs → apps/hermes/src/config/metrics.rs
diff --git a/hermes/src/config/pythnet.rs → apps/hermes/src/config/pythnet.rs b/hermes/src/config/pythnet.rs → apps/hermes/src/config/pythnet.rs
diff --git a/hermes/src/config/rpc.rs → apps/hermes/src/config/rpc.rs b/hermes/src/config/rpc.rs → apps/hermes/src/config/rpc.rs
diff --git a/hermes/src/config/wormhole.rs → apps/hermes/src/config/wormhole.rs b/hermes/src/config/wormhole.rs → apps/hermes/src/config/wormhole.rs
diff --git a/hermes/src/main.rs → apps/hermes/src/main.rs b/hermes/src/main.rs → apps/hermes/src/main.rs
diff --git a/hermes/src/metrics_server.rs → apps/hermes/src/metrics_server.rs b/hermes/src/metrics_server.rs → apps/hermes/src/metrics_server.rs
diff --git a/hermes/src/network.rs → apps/hermes/src/network.rs b/hermes/src/network.rs → apps/hermes/src/network.rs
diff --git a/hermes/src/network/pythnet.rs → apps/hermes/src/network/pythnet.rs b/hermes/src/network/pythnet.rs → apps/hermes/src/network/pythnet.rs
diff --git a/hermes/src/network/wormhole.rs → apps/hermes/src/network/wormhole.rs b/hermes/src/network/wormhole.rs → apps/hermes/src/network/wormhole.rs
diff --git a/hermes/src/price_feeds_metadata.rs → apps/hermes/src/price_feeds_metadata.rs b/hermes/src/price_feeds_metadata.rs → apps/hermes/src/price_feeds_metadata.rs
diff --git a/hermes/src/serde.rs → apps/hermes/src/serde.rs b/hermes/src/serde.rs → apps/hermes/src/serde.rs
diff --git a/hermes/src/state.rs → apps/hermes/src/state.rs b/hermes/src/state.rs → apps/hermes/src/state.rs
diff --git a/hermes/src/state/benchmarks.rs → apps/hermes/src/state/benchmarks.rs b/hermes/src/state/benchmarks.rs → apps/hermes/src/state/benchmarks.rs
diff --git a/hermes/src/state/cache.rs → apps/hermes/src/state/cache.rs b/hermes/src/state/cache.rs → apps/hermes/src/state/cache.rs
diff --git a/price_pusher/README.md b/price_pusher/README.md
@@ -150,7 +150,7 @@ npm run start -- near \
 docker run public.ecr.aws/pyth-network/xc-price-pusher:v<version> -- <above-arguments>
 ```
 
-[hermes]: https://github.com/pyth-network/pyth-crosschain/tree/main/hermes
+[hermes]: https://github.com/pyth-network/pyth-crosschain/tree/main/apps/hermes
 
 ### Command Line Arguments
 

diff --git a/price_service/client/js/README.md b/price_service/client/js/README.md
@@ -1,7 +1,7 @@
 # Price Service Client
 
 [Pyth Network](https://pyth.network/) provides real-time pricing data in a variety of asset classes, including cryptocurrency, equities, FX and commodities.
-These prices are available either via HTTP or WebSocket from [Hermes](/hermes).
+These prices are available either via HTTP or WebSocket from [Hermes](/apps/hermes).
 This library is a client for interacting with Hermes, allowing your application to consume Pyth real-time prices in on- and off-chain Javascript/Typescript applications.
 
 ## Installation