graphprotocol · gusinacio · Nov 13, 2024 · Oct 25, 2024 · Nov 5, 2024
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -18,8 +18,8 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     outputs:
-      indexer-service-rs: ${{ steps.release-please.outputs.service--tag_name }}
-      indexer-tap-agent: ${{ steps.release-please.outputs.tap-agent--tag_name }}
+      indexer-service-rs: ${{ steps.release-please.outputs.['crates/service--tag_name'] }}
+      indexer-tap-agent: ${{ steps.release-please.outputs.['crates/tap-agent--tag_name'] }}
     steps:
       - name: Release please
         id: release-please

diff --git a/.github/workflows/license_headers_check.yml b/.github/workflows/license_headers_check.yml
@@ -28,5 +28,5 @@ jobs:
             -ignore '.github/*.yml' \
             -ignore '.github/workflows/*.yaml' \
             -ignore '.github/*.yaml' \
-            -ignore 'migrations/*.sql' \
+            -ignore 'crates/migrations/*.sql' \
             .
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Install sqlx
         run: cargo install sqlx-cli --no-default-features --features postgres
       - name: Run the test sqlx migrations
-        run: cargo sqlx migrate run
+        run: cargo sqlx migrate run --source crates/migrations
       - name: Check that the sqlx prepared query metadata is up-to-date
         run: cargo sqlx prepare --workspace --check -- --all-targets --all-features
 
@@ -124,7 +124,7 @@ jobs:
       - name: Install sqlx
         run: cargo install sqlx-cli --no-default-features --features postgres
       - name: Run the test sqlx migrations
-        run: cargo sqlx migrate run
+        run: cargo sqlx migrate run --source crates/migrations
       - name: Run tests and generate coverage report
         run: cargo llvm-cov test --all-features --workspace --lcov --output-path lcov.info
       - name: Upload coverage to Coveralls
@@ -172,6 +172,6 @@ jobs:
       - name: Install sqlx
         run: cargo install sqlx-cli --no-default-features --features postgres
       - name: Run the test sqlx migrations
-        run: cargo sqlx migrate run
+        run: cargo sqlx migrate run --source crates/migrations
       - name: Test documentation code snippets
         run: cargo test --doc --all-features --workspace
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,6 +1,6 @@
 {
-  "tap-agent": "1.7.2",
-  "common": "1.4.0",
-  "config": "1.2.1",
-  "service": "1.3.2"
+  "crates/tap-agent": "1.7.2",
+  "crates/common": "1.4.0",
+  "crates/config": "1.2.1",
+  "crates/service": "1.3.2"
 }
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,20 +1,26 @@
 [workspace]
-members = ["common", "config", "dips", "service", "tap-agent"]
+members = [
+  "crates/common",
+  "crates/config",
+  "crates/dips",
+  "crates/service",
+  "crates/tap-agent",
+]
 resolver = "2"
 
 [profile.dev.package."*"]
 opt-level = 3
 
 [workspace.dependencies]
 alloy = { version = "=0.5.4", features = [
-    "kzg",
-    "signer-mnemonic",
-    "dyn-abi",
-    "sol-types",
-    "signer-local",
-    "eip712",
-    "rlp",
-    "signers",
+  "kzg",
+  "signer-mnemonic",
+  "dyn-abi",
+  "sol-types",
+  "signer-local",
+  "eip712",
+  "rlp",
+  "signers",
 ], default-features = false }
 clap = "4.4.3"
 lazy_static = "1.4.0"
@@ -27,21 +33,21 @@ async-trait = "0.1.72"
 eventuals = "0.6.7"
 base64 = "0.22.1"
 reqwest = { version = "0.12", features = [
-    "charset",
-    "h2",
+  "charset",
+  "h2",
 ], default-features = false }
 serde = { version = "1.0.206", default-features = false }
 serde_json = "1.0.124"
 sqlx = { version = "0.8.2", features = [
-    "bigdecimal",
-    "chrono",
-    "json",
-    "macros",
-    "migrate",
-    "postgres",
-    "runtime-tokio",
-    "rust_decimal",
-    "uuid",
+  "bigdecimal",
+  "chrono",
+  "json",
+  "macros",
+  "migrate",
+  "postgres",
+  "runtime-tokio",
+  "rust_decimal",
+  "uuid",
 ], default-features = false }
 uuid = { version = "1.11.0", features = ["v7"] }
 tracing = { version = "0.1.40", default-features = false }
@@ -50,12 +56,12 @@ build-info = "0.0.39"
 tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "61b47b3", default-features = false }
 tap_aggregator = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "61b47b3", default-features = false }
 tracing-subscriber = { version = "0.3", features = [
-    "json",
-    "env-filter",
-    "ansi",
+  "json",
+  "env-filter",
+  "ansi",
 ], default-features = false }
 thegraph-core = { git = "https://github.com/edgeandnode/toolshed", rev = "1663534fc1738e2db1b11cb54b5bb478ee970d40", features = [
-    "subgraph-client",
+  "subgraph-client",
 ] }
 thegraph-graphql-http = "0.2.0"
 graphql_client = { version = "0.14.0", features = ["reqwest-rustls"] }
diff --git a/common/CHANGELOG.md → crates/common/CHANGELOG.md b/common/CHANGELOG.md → crates/common/CHANGELOG.md
diff --git a/common/Cargo.toml → crates/common/Cargo.toml b/common/Cargo.toml → crates/common/Cargo.toml
diff --git a/common/src/address.rs → crates/common/src/address.rs b/common/src/address.rs → crates/common/src/address.rs
diff --git a/common/src/allocations/mod.rs → crates/common/src/allocations/mod.rs b/common/src/allocations/mod.rs → crates/common/src/allocations/mod.rs
diff --git a/common/src/allocations/monitor.rs → crates/common/src/allocations/monitor.rs b/common/src/allocations/monitor.rs → crates/common/src/allocations/monitor.rs
diff --git a/common/src/attestations/dispute_manager.rs → ...ommon/src/attestations/dispute_manager.rs b/common/src/attestations/dispute_manager.rs → ...ommon/src/attestations/dispute_manager.rs
diff --git a/common/src/attestations/mod.rs → crates/common/src/attestations/mod.rs b/common/src/attestations/mod.rs → crates/common/src/attestations/mod.rs
diff --git a/common/src/attestations/signer.rs → crates/common/src/attestations/signer.rs b/common/src/attestations/signer.rs → crates/common/src/attestations/signer.rs
diff --git a/common/src/attestations/signers.rs → crates/common/src/attestations/signers.rs b/common/src/attestations/signers.rs → crates/common/src/attestations/signers.rs
diff --git a/common/src/cost_model.rs → crates/common/src/cost_model.rs b/common/src/cost_model.rs → crates/common/src/cost_model.rs
diff --git a/common/src/escrow_accounts.rs → crates/common/src/escrow_accounts.rs b/common/src/escrow_accounts.rs → crates/common/src/escrow_accounts.rs
diff --git a/common/src/graphql.rs → crates/common/src/graphql.rs b/common/src/graphql.rs → crates/common/src/graphql.rs
diff --git a/common/src/indexer_service/http/health.rs → ...common/src/indexer_service/http/health.rs b/common/src/indexer_service/http/health.rs → ...common/src/indexer_service/http/health.rs
diff --git a/...c/indexer_service/http/indexer_service.rs → ...c/indexer_service/http/indexer_service.rs b/...c/indexer_service/http/indexer_service.rs → ...c/indexer_service/http/indexer_service.rs
diff --git a/common/src/indexer_service/http/mod.rs → ...es/common/src/indexer_service/http/mod.rs b/common/src/indexer_service/http/mod.rs → ...es/common/src/indexer_service/http/mod.rs
diff --git a/...c/indexer_service/http/request_handler.rs → ...c/indexer_service/http/request_handler.rs b/...c/indexer_service/http/request_handler.rs → ...c/indexer_service/http/request_handler.rs
diff --git a/...c/indexer_service/http/static_subgraph.rs → ...c/indexer_service/http/static_subgraph.rs b/...c/indexer_service/http/static_subgraph.rs → ...c/indexer_service/http/static_subgraph.rs
diff --git a/...ndexer_service/http/tap_receipt_header.rs → ...ndexer_service/http/tap_receipt_header.rs b/...ndexer_service/http/tap_receipt_header.rs → ...ndexer_service/http/tap_receipt_header.rs
diff --git a/common/src/indexer_service/mod.rs → crates/common/src/indexer_service/mod.rs b/common/src/indexer_service/mod.rs → crates/common/src/indexer_service/mod.rs
diff --git a/common/src/lib.rs → crates/common/src/lib.rs b/common/src/lib.rs → crates/common/src/lib.rs
diff --git a/common/src/subgraph_client/client.rs → crates/common/src/subgraph_client/client.rs b/common/src/subgraph_client/client.rs → crates/common/src/subgraph_client/client.rs
diff --git a/common/src/subgraph_client/mod.rs → crates/common/src/subgraph_client/mod.rs b/common/src/subgraph_client/mod.rs → crates/common/src/subgraph_client/mod.rs
diff --git a/common/src/subgraph_client/monitor.rs → crates/common/src/subgraph_client/monitor.rs b/common/src/subgraph_client/monitor.rs → crates/common/src/subgraph_client/monitor.rs
diff --git a/common/src/tap.rs → crates/common/src/tap.rs b/common/src/tap.rs → crates/common/src/tap.rs
diff --git a/common/src/tap/checks.rs → crates/common/src/tap/checks.rs b/common/src/tap/checks.rs → crates/common/src/tap/checks.rs
diff --git a/common/src/tap/checks/allocation_eligible.rs → ...mon/src/tap/checks/allocation_eligible.rs b/common/src/tap/checks/allocation_eligible.rs → ...mon/src/tap/checks/allocation_eligible.rs
diff --git a/common/src/tap/checks/deny_list_check.rs → .../common/src/tap/checks/deny_list_check.rs b/common/src/tap/checks/deny_list_check.rs → .../common/src/tap/checks/deny_list_check.rs
diff --git a/...n/src/tap/checks/receipt_max_val_check.rs → ...n/src/tap/checks/receipt_max_val_check.rs b/...n/src/tap/checks/receipt_max_val_check.rs → ...n/src/tap/checks/receipt_max_val_check.rs
diff --git a/...on/src/tap/checks/sender_balance_check.rs → ...on/src/tap/checks/sender_balance_check.rs b/...on/src/tap/checks/sender_balance_check.rs → ...on/src/tap/checks/sender_balance_check.rs
diff --git a/common/src/tap/checks/timestamp_check.rs → .../common/src/tap/checks/timestamp_check.rs b/common/src/tap/checks/timestamp_check.rs → .../common/src/tap/checks/timestamp_check.rs
diff --git a/common/src/tap/checks/value_check.rs → crates/common/src/tap/checks/value_check.rs b/common/src/tap/checks/value_check.rs → crates/common/src/tap/checks/value_check.rs
diff --git a/common/src/tap/receipt_store.rs → crates/common/src/tap/receipt_store.rs b/common/src/tap/receipt_store.rs → crates/common/src/tap/receipt_store.rs
diff --git a/common/src/test_vectors.rs → crates/common/src/test_vectors.rs b/common/src/test_vectors.rs → crates/common/src/test_vectors.rs
diff --git a/common/src/watcher.rs → crates/common/src/watcher.rs b/common/src/watcher.rs → crates/common/src/watcher.rs
diff --git a/config/CHANGELOG.md → crates/config/CHANGELOG.md b/config/CHANGELOG.md → crates/config/CHANGELOG.md
diff --git a/config/Cargo.toml → crates/config/Cargo.toml b/config/Cargo.toml → crates/config/Cargo.toml
diff --git a/config/default_values.toml → crates/config/default_values.toml b/config/default_values.toml → crates/config/default_values.toml
diff --git a/config/maximal-config-example.toml → crates/config/maximal-config-example.toml b/config/maximal-config-example.toml → crates/config/maximal-config-example.toml
diff --git a/config/minimal-config-example.toml → crates/config/minimal-config-example.toml b/config/minimal-config-example.toml → crates/config/minimal-config-example.toml
diff --git a/config/src/config.rs → crates/config/src/config.rs b/config/src/config.rs → crates/config/src/config.rs
diff --git a/config/src/grt.rs → crates/config/src/grt.rs b/config/src/grt.rs → crates/config/src/grt.rs
diff --git a/config/src/lib.rs → crates/config/src/lib.rs b/config/src/lib.rs → crates/config/src/lib.rs
diff --git a/dips/Cargo.toml → crates/dips/Cargo.toml b/dips/Cargo.toml → crates/dips/Cargo.toml
diff --git a/dips/src/lib.rs → crates/dips/src/lib.rs b/dips/src/lib.rs → crates/dips/src/lib.rs
diff --git a/graphql/allocations.query.graphql → crates/graphql/allocations.query.graphql b/graphql/allocations.query.graphql → crates/graphql/allocations.query.graphql
diff --git a/graphql/closed_allocations.query.graphql → .../graphql/closed_allocations.query.graphql b/graphql/closed_allocations.query.graphql → .../graphql/closed_allocations.query.graphql
diff --git a/graphql/dispute.query.graphql → crates/graphql/dispute.query.graphql b/graphql/dispute.query.graphql → crates/graphql/dispute.query.graphql
diff --git a/graphql/epoch.query.graphql → crates/graphql/epoch.query.graphql b/graphql/epoch.query.graphql → crates/graphql/epoch.query.graphql
diff --git a/graphql/escrow_account.query.graphql → crates/graphql/escrow_account.query.graphql b/graphql/escrow_account.query.graphql → crates/graphql/escrow_account.query.graphql
diff --git a/graphql/indexing_status.schema.graphql → ...es/graphql/indexing_status.schema.graphql b/graphql/indexing_status.schema.graphql → ...es/graphql/indexing_status.schema.graphql
diff --git a/graphql/network.schema.graphql → crates/graphql/network.schema.graphql b/graphql/network.schema.graphql → crates/graphql/network.schema.graphql
diff --git a/graphql/subgraph_health.query.graphql → crates/graphql/subgraph_health.query.graphql b/graphql/subgraph_health.query.graphql → crates/graphql/subgraph_health.query.graphql
diff --git a/graphql/tap.schema.graphql → crates/graphql/tap.schema.graphql b/graphql/tap.schema.graphql → crates/graphql/tap.schema.graphql
diff --git a/graphql/test.schema.graphql → crates/graphql/test.schema.graphql b/graphql/test.schema.graphql → crates/graphql/test.schema.graphql
diff --git a/graphql/transactions.query.graphql → crates/graphql/transactions.query.graphql b/graphql/transactions.query.graphql → crates/graphql/transactions.query.graphql
diff --git a/graphql/unfinalized_tx.query.graphql → crates/graphql/unfinalized_tx.query.graphql b/graphql/unfinalized_tx.query.graphql → crates/graphql/unfinalized_tx.query.graphql
diff --git a/graphql/user.query.graphql → crates/graphql/user.query.graphql b/graphql/user.query.graphql → crates/graphql/user.query.graphql
diff --git a/...tions/20230901142040_cost_models.down.sql → ...tions/20230901142040_cost_models.down.sql b/...tions/20230901142040_cost_models.down.sql → ...tions/20230901142040_cost_models.down.sql
diff --git a/migrations/20230901142040_cost_models.up.sql → ...rations/20230901142040_cost_models.up.sql b/migrations/20230901142040_cost_models.up.sql → ...rations/20230901142040_cost_models.up.sql
diff --git a/...ions/20230912220523_tap_receipts.down.sql → ...ions/20230912220523_tap_receipts.down.sql b/...ions/20230912220523_tap_receipts.down.sql → ...ions/20230912220523_tap_receipts.down.sql
diff --git a/...ations/20230912220523_tap_receipts.up.sql → ...ations/20230912220523_tap_receipts.up.sql b/...ations/20230912220523_tap_receipts.up.sql → ...ations/20230912220523_tap_receipts.up.sql
diff --git a/migrations/20230915230734_tap_ravs.down.sql → ...grations/20230915230734_tap_ravs.down.sql b/migrations/20230915230734_tap_ravs.down.sql → ...grations/20230915230734_tap_ravs.down.sql
diff --git a/migrations/20230915230734_tap_ravs.up.sql → ...migrations/20230915230734_tap_ravs.up.sql b/migrations/20230915230734_tap_ravs.up.sql → ...migrations/20230915230734_tap_ravs.up.sql
diff --git a/...ions/20231118024433_tap_denylist.down.sql → ...ions/20231118024433_tap_denylist.down.sql b/...ions/20231118024433_tap_denylist.down.sql → ...ions/20231118024433_tap_denylist.down.sql
diff --git a/...ations/20231118024433_tap_denylist.up.sql → ...ations/20231118024433_tap_denylist.up.sql b/...ations/20231118024433_tap_denylist.up.sql → ...ations/20231118024433_tap_denylist.up.sql
diff --git a/...1258_add_cost_model_notification.down.sql → ...1258_add_cost_model_notification.down.sql b/...1258_add_cost_model_notification.down.sql → ...1258_add_cost_model_notification.down.sql
diff --git a/...191258_add_cost_model_notification.up.sql → ...191258_add_cost_model_notification.up.sql b/...191258_add_cost_model_notification.up.sql → ...191258_add_cost_model_notification.up.sql
diff --git a/migrations/20241030141929_dips.down.sql → ...s/migrations/20241030141929_dips.down.sql b/migrations/20241030141929_dips.down.sql → ...s/migrations/20241030141929_dips.down.sql
diff --git a/migrations/20241030141929_dips.up.sql → crates/migrations/20241030141929_dips.up.sql b/migrations/20241030141929_dips.up.sql → crates/migrations/20241030141929_dips.up.sql
diff --git a/migrations/README.md → crates/migrations/README.md b/migrations/README.md → crates/migrations/README.md
diff --git a/service/CHANGELOG.md → crates/service/CHANGELOG.md b/service/CHANGELOG.md → crates/service/CHANGELOG.md
diff --git a/service/Cargo.toml → crates/service/Cargo.toml b/service/Cargo.toml → crates/service/Cargo.toml
diff --git a/service/build.rs → crates/service/build.rs b/service/build.rs → crates/service/build.rs
diff --git a/service/src/cli.rs → crates/service/src/cli.rs b/service/src/cli.rs → crates/service/src/cli.rs
diff --git a/service/src/database/dips.rs → crates/service/src/database/dips.rs b/service/src/database/dips.rs → crates/service/src/database/dips.rs
diff --git a/service/src/database/mod.rs → crates/service/src/database/mod.rs b/service/src/database/mod.rs → crates/service/src/database/mod.rs
diff --git a/service/src/error.rs → crates/service/src/error.rs b/service/src/error.rs → crates/service/src/error.rs
diff --git a/service/src/lib.rs → crates/service/src/lib.rs b/service/src/lib.rs → crates/service/src/lib.rs
diff --git a/service/src/main.rs → crates/service/src/main.rs b/service/src/main.rs → crates/service/src/main.rs
diff --git a/service/src/routes/cost.rs → crates/service/src/routes/cost.rs b/service/src/routes/cost.rs → crates/service/src/routes/cost.rs
diff --git a/service/src/routes/dips.rs → crates/service/src/routes/dips.rs b/service/src/routes/dips.rs → crates/service/src/routes/dips.rs
diff --git a/service/src/routes/mod.rs → crates/service/src/routes/mod.rs b/service/src/routes/mod.rs → crates/service/src/routes/mod.rs
diff --git a/service/src/routes/status.rs → crates/service/src/routes/status.rs b/service/src/routes/status.rs → crates/service/src/routes/status.rs
diff --git a/service/src/service.rs → crates/service/src/service.rs b/service/src/service.rs → crates/service/src/service.rs
diff --git a/tap-agent/CHANGELOG.md → crates/tap-agent/CHANGELOG.md b/tap-agent/CHANGELOG.md → crates/tap-agent/CHANGELOG.md
diff --git a/tap-agent/Cargo.toml → crates/tap-agent/Cargo.toml b/tap-agent/Cargo.toml → crates/tap-agent/Cargo.toml
diff --git a/tap-agent/src/adaptative_concurrency.rs → ...s/tap-agent/src/adaptative_concurrency.rs b/tap-agent/src/adaptative_concurrency.rs → ...s/tap-agent/src/adaptative_concurrency.rs
diff --git a/tap-agent/src/agent.rs → crates/tap-agent/src/agent.rs b/tap-agent/src/agent.rs → crates/tap-agent/src/agent.rs
diff --git a/tap-agent/src/agent/sender_account.rs → crates/tap-agent/src/agent/sender_account.rs b/tap-agent/src/agent/sender_account.rs → crates/tap-agent/src/agent/sender_account.rs
diff --git a/...gent/src/agent/sender_accounts_manager.rs → ...gent/src/agent/sender_accounts_manager.rs b/...gent/src/agent/sender_accounts_manager.rs → ...gent/src/agent/sender_accounts_manager.rs
diff --git a/tap-agent/src/agent/sender_allocation.rs → .../tap-agent/src/agent/sender_allocation.rs b/tap-agent/src/agent/sender_allocation.rs → .../tap-agent/src/agent/sender_allocation.rs
diff --git a/tap-agent/src/agent/unaggregated_receipts.rs → ...-agent/src/agent/unaggregated_receipts.rs b/tap-agent/src/agent/unaggregated_receipts.rs → ...-agent/src/agent/unaggregated_receipts.rs
diff --git a/tap-agent/src/backoff.rs → crates/tap-agent/src/backoff.rs b/tap-agent/src/backoff.rs → crates/tap-agent/src/backoff.rs
diff --git a/tap-agent/src/cli.rs → crates/tap-agent/src/cli.rs b/tap-agent/src/cli.rs → crates/tap-agent/src/cli.rs
diff --git a/tap-agent/src/database.rs → crates/tap-agent/src/database.rs b/tap-agent/src/database.rs → crates/tap-agent/src/database.rs
diff --git a/tap-agent/src/lib.rs → crates/tap-agent/src/lib.rs b/tap-agent/src/lib.rs → crates/tap-agent/src/lib.rs
diff --git a/tap-agent/src/main.rs → crates/tap-agent/src/main.rs b/tap-agent/src/main.rs → crates/tap-agent/src/main.rs
diff --git a/tap-agent/src/metrics.rs → crates/tap-agent/src/metrics.rs b/tap-agent/src/metrics.rs → crates/tap-agent/src/metrics.rs
diff --git a/tap-agent/src/tap/context.rs → crates/tap-agent/src/tap/context.rs b/tap-agent/src/tap/context.rs → crates/tap-agent/src/tap/context.rs
diff --git a/tap-agent/src/tap/context/checks.rs → crates/tap-agent/src/tap/context/checks.rs b/tap-agent/src/tap/context/checks.rs → crates/tap-agent/src/tap/context/checks.rs
diff --git a/...t/src/tap/context/checks/allocation_id.rs → ...t/src/tap/context/checks/allocation_id.rs b/...t/src/tap/context/checks/allocation_id.rs → ...t/src/tap/context/checks/allocation_id.rs
diff --git a/...agent/src/tap/context/checks/signature.rs → ...agent/src/tap/context/checks/signature.rs b/...agent/src/tap/context/checks/signature.rs → ...agent/src/tap/context/checks/signature.rs
diff --git a/tap-agent/src/tap/context/checks/value.rs → ...tap-agent/src/tap/context/checks/value.rs b/tap-agent/src/tap/context/checks/value.rs → ...tap-agent/src/tap/context/checks/value.rs
diff --git a/tap-agent/src/tap/context/error.rs → crates/tap-agent/src/tap/context/error.rs b/tap-agent/src/tap/context/error.rs → crates/tap-agent/src/tap/context/error.rs
diff --git a/tap-agent/src/tap/context/escrow.rs → crates/tap-agent/src/tap/context/escrow.rs b/tap-agent/src/tap/context/escrow.rs → crates/tap-agent/src/tap/context/escrow.rs
diff --git a/tap-agent/src/tap/context/rav.rs → crates/tap-agent/src/tap/context/rav.rs b/tap-agent/src/tap/context/rav.rs → crates/tap-agent/src/tap/context/rav.rs
diff --git a/tap-agent/src/tap/context/receipt.rs → crates/tap-agent/src/tap/context/receipt.rs b/tap-agent/src/tap/context/receipt.rs → crates/tap-agent/src/tap/context/receipt.rs
diff --git a/tap-agent/src/tap/escrow_adapter.rs → crates/tap-agent/src/tap/escrow_adapter.rs b/tap-agent/src/tap/escrow_adapter.rs → crates/tap-agent/src/tap/escrow_adapter.rs
diff --git a/tap-agent/src/tap/mod.rs → crates/tap-agent/src/tap/mod.rs b/tap-agent/src/tap/mod.rs → crates/tap-agent/src/tap/mod.rs
diff --git a/tap-agent/src/tap/test_utils.rs → crates/tap-agent/src/tap/test_utils.rs b/tap-agent/src/tap/test_utils.rs → crates/tap-agent/src/tap/test_utils.rs
diff --git a/tap-agent/src/tracker.rs → crates/tap-agent/src/tracker.rs b/tap-agent/src/tracker.rs → crates/tap-agent/src/tracker.rs
diff --git a/tap-agent/src/tracker/extra_data.rs → crates/tap-agent/src/tracker/extra_data.rs b/tap-agent/src/tracker/extra_data.rs → crates/tap-agent/src/tracker/extra_data.rs
diff --git a/tap-agent/src/tracker/generic_tracker.rs → .../tap-agent/src/tracker/generic_tracker.rs b/tap-agent/src/tracker/generic_tracker.rs → .../tap-agent/src/tracker/generic_tracker.rs
diff --git a/tap-agent/src/tracker/global_tracker.rs → ...s/tap-agent/src/tracker/global_tracker.rs b/tap-agent/src/tracker/global_tracker.rs → ...s/tap-agent/src/tracker/global_tracker.rs
diff --git a/tap-agent/src/tracker/sender_fee_stats.rs → ...tap-agent/src/tracker/sender_fee_stats.rs b/tap-agent/src/tracker/sender_fee_stats.rs → ...tap-agent/src/tracker/sender_fee_stats.rs
diff --git a/tap-agent/src/tracker/tracker_tests.rs → ...es/tap-agent/src/tracker/tracker_tests.rs b/tap-agent/src/tracker/tracker_tests.rs → ...es/tap-agent/src/tracker/tracker_tests.rs
diff --git a/release-please-config.json b/release-please-config.json
@@ -4,9 +4,9 @@
   "release-type": "rust",
   "plugins": ["cargo-workspace"],
   "packages": {
-    "common": {},
-    "config": {},
-    "service": {},
-    "tap-agent": {}
+    "crates/common": {},
+    "crates/config": {},
+    "crates/service": {},
+    "crates/tap-agent": {}
   }
 }