diff --git a/.changeset/shaggy-gorillas-teach.md b/.changeset/shaggy-gorillas-teach.md new file mode 100644 index 000000000..26ee0092b --- /dev/null +++ b/.changeset/shaggy-gorillas-teach.md @@ -0,0 +1,5 @@ +--- +'@penumbra-zone/services': major +--- + +Drop /src/ requirement for imports and renaming diff --git a/.changeset/tiny-drinks-melt.md b/.changeset/tiny-drinks-melt.md new file mode 100644 index 000000000..4cff37517 --- /dev/null +++ b/.changeset/tiny-drinks-melt.md @@ -0,0 +1,5 @@ +--- +'@penumbra-zone/services-context': major +--- + +Drop /src/ requirement for imports and renaming diff --git a/apps/extension/package.json b/apps/extension/package.json index 2e117ad35..9cf3a63bd 100644 --- a/apps/extension/package.json +++ b/apps/extension/package.json @@ -19,8 +19,8 @@ "@penumbra-zone/crypto-web": "workspace:*", "@penumbra-zone/perspective": "workspace:*", "@penumbra-zone/query": "workspace:*", - "@penumbra-zone/router": "workspace:*", "@penumbra-zone/services": "workspace:*", + "@penumbra-zone/services-context": "workspace:*", "@penumbra-zone/storage": "workspace:*", "@penumbra-zone/transport-chrome": "workspace:*", "@penumbra-zone/transport-dom": "workspace:*", diff --git a/apps/extension/src/get-rpc-impls.ts b/apps/extension/src/get-rpc-impls.ts index bd0392c5d..cf496002d 100644 --- a/apps/extension/src/get-rpc-impls.ts +++ b/apps/extension/src/get-rpc-impls.ts @@ -16,10 +16,10 @@ import { QueryService as StakingService } from '@buf/penumbra-zone_penumbra.conn import { TendermintProxyService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/util/tendermint_proxy/v1/tendermint_proxy_connect'; import { CustodyService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/custody/v1/custody_connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { custodyImpl } from '@penumbra-zone/router/src/grpc/custody'; -import { sctImpl } from '@penumbra-zone/router/src/grpc/sct'; -import { stakingImpl } from '@penumbra-zone/router/src/grpc/staking'; -import { viewImpl } from '@penumbra-zone/router/src/grpc/view-protocol-server'; +import { custodyImpl } from '@penumbra-zone/services/custody-service'; +import { sctImpl } from '@penumbra-zone/services/sct-service'; +import { stakingImpl } from '@penumbra-zone/services/staking-service'; +import { viewImpl } from '@penumbra-zone/services/view-service'; import { localExtStorage } from '@penumbra-zone/storage/chrome/local'; import { ServiceType } from '@bufbuild/protobuf'; diff --git a/apps/extension/src/service-worker.ts b/apps/extension/src/service-worker.ts index 558e84ca0..93f98076d 100644 --- a/apps/extension/src/service-worker.ts +++ b/apps/extension/src/service-worker.ts @@ -12,7 +12,7 @@ import './listeners'; // services -import { Services } from '@penumbra-zone/services/src/index'; +import { Services } from '@penumbra-zone/services-context'; import { localExtStorage } from '@penumbra-zone/storage/chrome/local'; // adapter @@ -25,10 +25,10 @@ import { transportOptions } from '@penumbra-zone/types/src/registry'; // context import { CustodyService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/custody/v1/custody_connect'; import { QueryService as StakingService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/core/component/stake/v1/stake_connect'; -import { approverCtx } from '@penumbra-zone/router/src/ctx/approver'; -import { custodyCtx } from '@penumbra-zone/router/src/ctx/custody'; -import { servicesCtx } from '@penumbra-zone/router/src/ctx/prax'; -import { stakingClientCtx } from '@penumbra-zone/router/src/ctx/staking-client'; +import { approverCtx } from '@penumbra-zone/services/ctx/approver'; +import { custodyCtx } from '@penumbra-zone/services/ctx/custody'; +import { servicesCtx } from '@penumbra-zone/services/ctx/prax'; +import { stakingClientCtx } from '@penumbra-zone/services/ctx/staking-client'; import { approveTransaction } from './approve-transaction'; // all rpc implementations, local and proxy diff --git a/packages/router/package.json b/packages/router/package.json deleted file mode 100644 index 4b1503fda..000000000 --- a/packages/router/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "@penumbra-zone/router", - "version": "2.0.2", - "private": true, - "license": "MIT", - "type": "module", - "scripts": { - "lint": "eslint \"**/*.ts*\"", - "test": "vitest run" - }, - "dependencies": { - "@penumbra-zone/constants": "workspace:*", - "@penumbra-zone/crypto-web": "workspace:*", - "@penumbra-zone/getters": "workspace:*", - "@penumbra-zone/bech32": "workspace:*", - "@penumbra-zone/perspective": "workspace:*", - "@penumbra-zone/polyfills": "workspace:*", - "@penumbra-zone/query": "workspace:*", - "@penumbra-zone/services": "workspace:*", - "@penumbra-zone/storage": "workspace:*", - "@penumbra-zone/transport-dom": "workspace:*", - "@penumbra-zone/types": "workspace:*", - "@penumbra-zone/wasm": "workspace:*" - } -} diff --git a/packages/router/.eslintrc.cjs b/packages/services-context/.eslintrc.cjs similarity index 100% rename from packages/router/.eslintrc.cjs rename to packages/services-context/.eslintrc.cjs diff --git a/packages/router/CHANGELOG.md b/packages/services-context/CHANGELOG.md similarity index 64% rename from packages/router/CHANGELOG.md rename to packages/services-context/CHANGELOG.md index 20fa5086f..3fe02dc74 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/services-context/CHANGELOG.md @@ -1,4 +1,4 @@ -# @penumbra-zone/router +# @penumbra-zone/services ## 2.0.2 @@ -18,9 +18,7 @@ - Updated dependencies [66c2407] - @penumbra-zone/wasm@3.0.0 - @penumbra-zone/storage@2.0.1 - - @penumbra-zone/perspective@1.0.1 - @penumbra-zone/query@2.0.1 - - @penumbra-zone/services@2.0.1 ## 2.0.0 @@ -36,14 +34,7 @@ - @penumbra-zone/constants@2.0.0 - @penumbra-zone/storage@2.0.0 - @penumbra-zone/query@2.0.0 - - @penumbra-zone/perspective@1.0.0 - - @penumbra-zone/services@2.0.0 - - @penumbra-zone/getters@2.0.0 - - @penumbra-zone/bech32@2.0.0 - - @penumbra-zone/crypto-web@2.0.0 - @penumbra-zone/types@2.0.0 - - @penumbra-zone/polyfills@2.0.0 - - @penumbra-zone/transport-dom@2.0.0 ## 1.0.2 @@ -51,12 +42,7 @@ - Updated dependencies - @penumbra-zone/constants@1.1.0 - - @penumbra-zone/getters@1.1.0 - - @penumbra-zone/polyfills@1.1.0 - - @penumbra-zone/transport-dom@1.1.0 - @penumbra-zone/types@1.1.0 - @penumbra-zone/query@1.0.2 - - @penumbra-zone/services@1.0.2 - @penumbra-zone/storage@1.0.2 - - @penumbra-zone/crypto-web@1.0.1 - @penumbra-zone/wasm@1.0.2 diff --git a/packages/services-context/package.json b/packages/services-context/package.json new file mode 100644 index 000000000..7a1b1dba4 --- /dev/null +++ b/packages/services-context/package.json @@ -0,0 +1,27 @@ +{ + "name": "@penumbra-zone/services-context", + "version": "2.0.2", + "license": "MIT", + "type": "module", + "scripts": { + "lint": "eslint \"**/*.ts*\"" + }, + "files": [ + "src/", + "*.md" + ], + "exports": { + ".": "./src/index.ts" + }, + "dependencies": { + "@penumbra-zone/constants": "workspace:*", + "@penumbra-zone/query": "workspace:*", + "@penumbra-zone/storage": "workspace:*", + "@penumbra-zone/types": "workspace:*", + "@penumbra-zone/wasm": "workspace:*", + "exponential-backoff": "^3.1.1" + }, + "devDependencies": { + "@penumbra-zone/polyfills": "workspace:*" + } +} diff --git a/packages/services/src/index.ts b/packages/services-context/src/index.ts similarity index 100% rename from packages/services/src/index.ts rename to packages/services-context/src/index.ts diff --git a/packages/router/tsconfig.json b/packages/services-context/tsconfig.json similarity index 100% rename from packages/router/tsconfig.json rename to packages/services-context/tsconfig.json diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index 2b99a9ebe..6af32d369 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -1,4 +1,4 @@ -# @penumbra-zone/services +# @penumbra-zone/router ## 2.0.2 @@ -15,7 +15,9 @@ - Updated dependencies [66c2407] - @penumbra-zone/wasm@3.0.0 - @penumbra-zone/storage@2.0.1 + - @penumbra-zone/perspective@1.0.1 - @penumbra-zone/query@2.0.1 + - @penumbra-zone/services@2.0.1 ## 2.0.0 @@ -31,7 +33,14 @@ - @penumbra-zone/constants@2.0.0 - @penumbra-zone/storage@2.0.0 - @penumbra-zone/query@2.0.0 + - @penumbra-zone/perspective@1.0.0 + - @penumbra-zone/services@2.0.0 + - @penumbra-zone/getters@2.0.0 + - @penumbra-zone/bech32@2.0.0 + - @penumbra-zone/crypto-web@2.0.0 - @penumbra-zone/types@2.0.0 + - @penumbra-zone/polyfills@2.0.0 + - @penumbra-zone/transport-dom@2.0.0 ## 1.0.2 @@ -39,7 +48,12 @@ - Updated dependencies - @penumbra-zone/constants@1.1.0 + - @penumbra-zone/getters@1.1.0 + - @penumbra-zone/polyfills@1.1.0 + - @penumbra-zone/transport-dom@1.1.0 - @penumbra-zone/types@1.1.0 - @penumbra-zone/query@1.0.2 + - @penumbra-zone/services@1.0.2 - @penumbra-zone/storage@1.0.2 + - @penumbra-zone/crypto-web@1.0.1 - @penumbra-zone/wasm@1.0.2 diff --git a/packages/router/array-from-async.d.ts b/packages/services/array-from-async.d.ts similarity index 100% rename from packages/router/array-from-async.d.ts rename to packages/services/array-from-async.d.ts diff --git a/packages/services/package.json b/packages/services/package.json index d11e74b79..cd788429a 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,21 +1,42 @@ { "name": "@penumbra-zone/services", "version": "2.0.2", - "private": true, "license": "MIT", "type": "module", "scripts": { - "lint": "eslint \"**/*.ts*\"" + "lint": "eslint \"**/*.ts*\"", + "test": "vitest run" + }, + "files": [ + "src/", + "*.md", + "!**/*.test.ts", + "!test-utils.ts" + ], + "exports": { + "./ctx/*": "./src/ctx/*.ts", + "./custody-service": "./src/custody-service/index.ts", + "./custody-service/*": "./src/custody-service/*.ts", + "./sct-service": "./src/sct-service/index.ts", + "./sct-service/*": "./src/sct-service/*.ts", + "./staking-service": "./src/staking-service/index.ts", + "./staking-service/*": "./src/staking-service/*.ts", + "./view-service": "./src/view-service/index.ts", + "./view-service/*": "./src/view-service/*.ts", + "./offscreen-client": "./src/offscreen-client.ts" }, "dependencies": { "@penumbra-zone/constants": "workspace:*", + "@penumbra-zone/crypto-web": "workspace:*", + "@penumbra-zone/getters": "workspace:*", + "@penumbra-zone/bech32": "workspace:*", + "@penumbra-zone/perspective": "workspace:*", + "@penumbra-zone/polyfills": "workspace:*", "@penumbra-zone/query": "workspace:*", + "@penumbra-zone/services-context": "workspace:*", "@penumbra-zone/storage": "workspace:*", + "@penumbra-zone/transport-dom": "workspace:*", "@penumbra-zone/types": "workspace:*", - "@penumbra-zone/wasm": "workspace:*", - "exponential-backoff": "^3.1.1" - }, - "devDependencies": { - "@penumbra-zone/polyfills": "workspace:*" + "@penumbra-zone/wasm": "workspace:*" } } diff --git a/packages/router/src/ctx/approver.ts b/packages/services/src/ctx/approver.ts similarity index 100% rename from packages/router/src/ctx/approver.ts rename to packages/services/src/ctx/approver.ts diff --git a/packages/router/src/ctx/custody.ts b/packages/services/src/ctx/custody.ts similarity index 100% rename from packages/router/src/ctx/custody.ts rename to packages/services/src/ctx/custody.ts diff --git a/packages/router/src/ctx/prax.ts b/packages/services/src/ctx/prax.ts similarity index 100% rename from packages/router/src/ctx/prax.ts rename to packages/services/src/ctx/prax.ts diff --git a/packages/router/src/ctx/staking-client.ts b/packages/services/src/ctx/staking-client.ts similarity index 100% rename from packages/router/src/ctx/staking-client.ts rename to packages/services/src/ctx/staking-client.ts diff --git a/packages/router/src/grpc/custody/authorize/assert-swap-claim-addresses-belong-to-current-user.test.ts b/packages/services/src/custody-service/authorize/assert-swap-claim-addresses-belong-to-current-user.test.ts similarity index 100% rename from packages/router/src/grpc/custody/authorize/assert-swap-claim-addresses-belong-to-current-user.test.ts rename to packages/services/src/custody-service/authorize/assert-swap-claim-addresses-belong-to-current-user.test.ts diff --git a/packages/router/src/grpc/custody/authorize/assert-swap-claim-addresses-belong-to-current-user.ts b/packages/services/src/custody-service/authorize/assert-swap-claim-addresses-belong-to-current-user.ts similarity index 100% rename from packages/router/src/grpc/custody/authorize/assert-swap-claim-addresses-belong-to-current-user.ts rename to packages/services/src/custody-service/authorize/assert-swap-claim-addresses-belong-to-current-user.ts diff --git a/packages/router/src/grpc/custody/authorize/index.test.ts b/packages/services/src/custody-service/authorize/index.test.ts similarity index 97% rename from packages/router/src/grpc/custody/authorize/index.test.ts rename to packages/services/src/custody-service/authorize/index.test.ts index b70c00406..cf34f4ec8 100644 --- a/packages/router/src/grpc/custody/authorize/index.test.ts +++ b/packages/services/src/custody-service/authorize/index.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, Mock, test, vi } from 'vitest'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; -import { approverCtx } from '../../../ctx/approver'; -import { extLocalCtx, extSessionCtx, servicesCtx } from '../../../ctx/prax'; +import { approverCtx } from '../../ctx/approver'; +import { extLocalCtx, extSessionCtx, servicesCtx } from '../../ctx/prax'; import { IndexedDbMock, MockExtLocalCtx, MockExtSessionCtx, MockServices } from '../../test-utils'; import { authorize } from '.'; import { AuthorizeRequest } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/custody/v1/custody_pb'; @@ -10,7 +10,7 @@ import { AuthorizationData, TransactionPlan, } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/transaction/v1/transaction_pb'; -import { Services } from '@penumbra-zone/services/src/index'; +import { Services } from '@penumbra-zone/services-context'; import { Metadata } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/asset/v1/asset_pb'; import { UserChoice } from '@penumbra-zone/types/src/user-choice'; diff --git a/packages/router/src/grpc/custody/authorize/index.ts b/packages/services/src/custody-service/authorize/index.ts similarity index 96% rename from packages/router/src/grpc/custody/authorize/index.ts rename to packages/services/src/custody-service/authorize/index.ts index 66c088fb7..80b782bd9 100644 --- a/packages/router/src/grpc/custody/authorize/index.ts +++ b/packages/services/src/custody-service/authorize/index.ts @@ -1,6 +1,6 @@ import type { Impl } from '..'; -import { extLocalCtx, extSessionCtx, servicesCtx } from '../../../ctx/prax'; -import { approverCtx } from '../../../ctx/approver'; +import { extLocalCtx, extSessionCtx, servicesCtx } from '../../ctx/prax'; +import { approverCtx } from '../../ctx/approver'; import { generateSpendKey } from '@penumbra-zone/wasm/src/keys'; import { authorizePlan } from '@penumbra-zone/wasm/src/build'; import { Key } from '@penumbra-zone/crypto-web/encryption'; diff --git a/packages/router/src/grpc/custody/index.ts b/packages/services/src/custody-service/index.ts similarity index 100% rename from packages/router/src/grpc/custody/index.ts rename to packages/services/src/custody-service/index.ts diff --git a/packages/router/src/grpc/offscreen-client.ts b/packages/services/src/offscreen-client.ts similarity index 100% rename from packages/router/src/grpc/offscreen-client.ts rename to packages/services/src/offscreen-client.ts diff --git a/packages/router/src/grpc/sct/epoch-by-height.test.ts b/packages/services/src/sct-service/epoch-by-height.test.ts similarity index 97% rename from packages/router/src/grpc/sct/epoch-by-height.test.ts rename to packages/services/src/sct-service/epoch-by-height.test.ts index cbd6bde31..c73700432 100644 --- a/packages/router/src/grpc/sct/epoch-by-height.test.ts +++ b/packages/services/src/sct-service/epoch-by-height.test.ts @@ -3,7 +3,7 @@ import { epochByHeight } from './epoch-by-height'; import { IndexedDbMock, MockServices } from '../test-utils'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { QueryService as SctService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/core/component/sct/v1/sct_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Epoch, EpochByHeightRequest, diff --git a/packages/router/src/grpc/sct/epoch-by-height.ts b/packages/services/src/sct-service/epoch-by-height.ts similarity index 90% rename from packages/router/src/grpc/sct/epoch-by-height.ts rename to packages/services/src/sct-service/epoch-by-height.ts index 999686787..e7cdae673 100644 --- a/packages/router/src/grpc/sct/epoch-by-height.ts +++ b/packages/services/src/sct-service/epoch-by-height.ts @@ -1,6 +1,6 @@ import { EpochByHeightResponse } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/sct/v1/sct_pb'; import { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; export const epochByHeight: Impl['epochByHeight'] = async (req, ctx) => { const { height } = req; diff --git a/packages/router/src/grpc/sct/index.ts b/packages/services/src/sct-service/index.ts similarity index 100% rename from packages/router/src/grpc/sct/index.ts rename to packages/services/src/sct-service/index.ts diff --git a/packages/router/src/grpc/staking/index.ts b/packages/services/src/staking-service/index.ts similarity index 100% rename from packages/router/src/grpc/staking/index.ts rename to packages/services/src/staking-service/index.ts diff --git a/packages/router/src/grpc/staking/validator-info.test.ts b/packages/services/src/staking-service/validator-info.test.ts similarity index 98% rename from packages/router/src/grpc/staking/validator-info.test.ts rename to packages/services/src/staking-service/validator-info.test.ts index 853a1243f..eabb66274 100644 --- a/packages/router/src/grpc/staking/validator-info.test.ts +++ b/packages/services/src/staking-service/validator-info.test.ts @@ -3,7 +3,7 @@ import { validatorInfo } from './validator-info'; import { IndexedDbMock, MockServices } from '../test-utils'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { QueryService as StakingService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/core/component/stake/v1/stake_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { ValidatorInfoRequest, ValidatorInfoResponse, diff --git a/packages/router/src/grpc/staking/validator-info.ts b/packages/services/src/staking-service/validator-info.ts similarity index 94% rename from packages/router/src/grpc/staking/validator-info.ts rename to packages/services/src/staking-service/validator-info.ts index 7a603cd20..fd9dd6d08 100644 --- a/packages/router/src/grpc/staking/validator-info.ts +++ b/packages/services/src/staking-service/validator-info.ts @@ -1,5 +1,5 @@ import { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { ValidatorInfoResponse, ValidatorState_ValidatorStateEnum, diff --git a/packages/router/src/grpc/staking/validator-penalty.test.ts b/packages/services/src/staking-service/validator-penalty.test.ts similarity index 97% rename from packages/router/src/grpc/staking/validator-penalty.test.ts rename to packages/services/src/staking-service/validator-penalty.test.ts index a31bf0a63..bba5fbacf 100644 --- a/packages/router/src/grpc/staking/validator-penalty.test.ts +++ b/packages/services/src/staking-service/validator-penalty.test.ts @@ -3,7 +3,7 @@ import { validatorPenalty } from './validator-penalty'; import { MockServices } from '../test-utils'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { QueryService as StakingService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/core/component/stake/v1/stake_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { ValidatorPenaltyRequest, ValidatorPenaltyResponse, diff --git a/packages/router/src/grpc/staking/validator-penalty.ts b/packages/services/src/staking-service/validator-penalty.ts similarity index 82% rename from packages/router/src/grpc/staking/validator-penalty.ts rename to packages/services/src/staking-service/validator-penalty.ts index ba063fdca..fe58fd9c1 100644 --- a/packages/router/src/grpc/staking/validator-penalty.ts +++ b/packages/services/src/staking-service/validator-penalty.ts @@ -1,5 +1,5 @@ import { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; export const validatorPenalty: Impl['validatorPenalty'] = async (req, ctx) => { const services = ctx.values.get(servicesCtx); diff --git a/packages/router/src/grpc/test-utils.ts b/packages/services/src/test-utils.ts similarity index 100% rename from packages/router/src/grpc/test-utils.ts rename to packages/services/src/test-utils.ts diff --git a/packages/router/src/grpc/view-protocol-server/address-by-index.test.ts b/packages/services/src/view-service/address-by-index.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/address-by-index.test.ts rename to packages/services/src/view-service/address-by-index.test.ts index f45b8eea0..b840cbd26 100644 --- a/packages/router/src/grpc/view-protocol-server/address-by-index.test.ts +++ b/packages/services/src/view-service/address-by-index.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { addressByIndex } from './address-by-index'; import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb'; import type { ServicesInterface } from '@penumbra-zone/types/src/services'; diff --git a/packages/router/src/grpc/view-protocol-server/address-by-index.ts b/packages/services/src/view-service/address-by-index.ts similarity index 90% rename from packages/router/src/grpc/view-protocol-server/address-by-index.ts rename to packages/services/src/view-service/address-by-index.ts index c76999a43..3b8232e50 100644 --- a/packages/router/src/grpc/view-protocol-server/address-by-index.ts +++ b/packages/services/src/view-service/address-by-index.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { getAddressByIndex } from '@penumbra-zone/wasm/src/keys'; diff --git a/packages/router/src/grpc/view-protocol-server/app-parameters.test.ts b/packages/services/src/view-service/app-parameters.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/app-parameters.test.ts rename to packages/services/src/view-service/app-parameters.test.ts index adf0b794a..317e61eee 100644 --- a/packages/router/src/grpc/view-protocol-server/app-parameters.test.ts +++ b/packages/services/src/view-service/app-parameters.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { AppParameters } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/app/v1/app_pb'; import { appParameters } from './app-parameters'; import { IndexedDbMock, MockServices } from '../test-utils'; diff --git a/packages/router/src/grpc/view-protocol-server/app-parameters.ts b/packages/services/src/view-service/app-parameters.ts similarity index 93% rename from packages/router/src/grpc/view-protocol-server/app-parameters.ts rename to packages/services/src/view-service/app-parameters.ts index a4eac7ad6..240186848 100644 --- a/packages/router/src/grpc/view-protocol-server/app-parameters.ts +++ b/packages/services/src/view-service/app-parameters.ts @@ -1,6 +1,6 @@ import { AppParameters } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/app/v1/app_pb'; import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; export const appParameters: Impl['appParameters'] = async (_, ctx) => { const services = ctx.values.get(servicesCtx); diff --git a/packages/router/src/grpc/view-protocol-server/asset-metadata-by-id.test.ts b/packages/services/src/view-service/asset-metadata-by-id.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/asset-metadata-by-id.test.ts rename to packages/services/src/view-service/asset-metadata-by-id.test.ts index d0834148b..5a5bc1ef2 100644 --- a/packages/router/src/grpc/view-protocol-server/asset-metadata-by-id.test.ts +++ b/packages/services/src/view-service/asset-metadata-by-id.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices, ShieldedPoolMock } from '../test-utils'; import { AssetId, diff --git a/packages/router/src/grpc/view-protocol-server/asset-metadata-by-id.ts b/packages/services/src/view-service/asset-metadata-by-id.ts similarity index 93% rename from packages/router/src/grpc/view-protocol-server/asset-metadata-by-id.ts rename to packages/services/src/view-service/asset-metadata-by-id.ts index d9d5f2808..cd9bdea1a 100644 --- a/packages/router/src/grpc/view-protocol-server/asset-metadata-by-id.ts +++ b/packages/services/src/view-service/asset-metadata-by-id.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { getAssetMetadata } from './helpers'; export const assetMetadataById: Impl['assetMetadataById'] = async (req, ctx) => { diff --git a/packages/router/src/grpc/view-protocol-server/assets.test.ts b/packages/services/src/view-service/assets.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/assets.test.ts rename to packages/services/src/view-service/assets.test.ts index ca3e1a7b5..3ad2574b5 100644 --- a/packages/router/src/grpc/view-protocol-server/assets.test.ts +++ b/packages/services/src/view-service/assets.test.ts @@ -9,10 +9,10 @@ import { import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { beforeEach, describe, expect, test, vi } from 'vitest'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { assets } from './assets'; import { IndexedDbMock, MockServices } from '../test-utils'; -import { Services } from '@penumbra-zone/services/src/index'; +import { Services } from '@penumbra-zone/services-context/src/index'; describe('Assets request handler', () => { let req: AssetsRequest; diff --git a/packages/router/src/grpc/view-protocol-server/assets.ts b/packages/services/src/view-service/assets.ts similarity index 96% rename from packages/router/src/grpc/view-protocol-server/assets.ts rename to packages/services/src/view-service/assets.ts index 7da09ff9a..3be9caff6 100644 --- a/packages/router/src/grpc/view-protocol-server/assets.ts +++ b/packages/services/src/view-service/assets.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { assetPatterns, RegexMatcher } from '@penumbra-zone/constants/src/assets'; export const assets: Impl['assets'] = async function* (req, ctx) { diff --git a/packages/router/src/grpc/view-protocol-server/authorize-and-build.ts b/packages/services/src/view-service/authorize-and-build.ts similarity index 94% rename from packages/router/src/grpc/view-protocol-server/authorize-and-build.ts rename to packages/services/src/view-service/authorize-and-build.ts index 2fd805bbc..ae21c761d 100644 --- a/packages/router/src/grpc/view-protocol-server/authorize-and-build.ts +++ b/packages/services/src/view-service/authorize-and-build.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { optimisticBuild } from './util/build-tx'; import { custodyAuthorize } from './util/custody-authorize'; import { getWitness } from '@penumbra-zone/wasm/src/build'; diff --git a/packages/router/src/grpc/view-protocol-server/balances.test.ts b/packages/services/src/view-service/balances.test.ts similarity index 99% rename from packages/router/src/grpc/view-protocol-server/balances.test.ts rename to packages/services/src/view-service/balances.test.ts index 81c10d009..e46861c8d 100644 --- a/packages/router/src/grpc/view-protocol-server/balances.test.ts +++ b/packages/services/src/view-service/balances.test.ts @@ -1,4 +1,4 @@ -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { balances } from './balances'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; @@ -12,7 +12,7 @@ import { import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { beforeEach, describe, expect, test, vi } from 'vitest'; -import { Services } from '@penumbra-zone/services/src/index'; +import { Services } from '@penumbra-zone/services-context/src/index'; import { IndexedDbMock, MockServices, TendermintMock, testFullViewingKey } from '../test-utils'; import { AssetId, diff --git a/packages/router/src/grpc/view-protocol-server/balances.ts b/packages/services/src/view-service/balances.ts similarity index 99% rename from packages/router/src/grpc/view-protocol-server/balances.ts rename to packages/services/src/view-service/balances.ts index 82ed5823e..5f38ffbd9 100644 --- a/packages/router/src/grpc/view-protocol-server/balances.ts +++ b/packages/services/src/view-service/balances.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { getAmount } from '@penumbra-zone/getters/src/value-view'; import { getAssetIdFromRecord } from '@penumbra-zone/getters/src/spendable-note-record'; import { diff --git a/packages/router/src/grpc/view-protocol-server/broadcast-transaction.test.ts b/packages/services/src/view-service/broadcast-transaction.test.ts similarity index 99% rename from packages/router/src/grpc/view-protocol-server/broadcast-transaction.test.ts rename to packages/services/src/view-service/broadcast-transaction.test.ts index 8f23e8f32..f2be80e17 100644 --- a/packages/router/src/grpc/view-protocol-server/broadcast-transaction.test.ts +++ b/packages/services/src/view-service/broadcast-transaction.test.ts @@ -6,10 +6,10 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Transaction } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/transaction/v1/transaction_pb'; import { broadcastTransaction } from './broadcast-transaction'; -import type { Services } from '@penumbra-zone/services/src/index'; +import type { Services } from '@penumbra-zone/services-context/src/index'; import { TransactionId } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/txhash/v1/txhash_pb'; import { IndexedDbMock, MockServices, TendermintMock } from '../test-utils'; diff --git a/packages/router/src/grpc/view-protocol-server/broadcast-transaction.ts b/packages/services/src/view-service/broadcast-transaction.ts similarity index 97% rename from packages/router/src/grpc/view-protocol-server/broadcast-transaction.ts rename to packages/services/src/view-service/broadcast-transaction.ts index 1756732c9..2efa14ce8 100644 --- a/packages/router/src/grpc/view-protocol-server/broadcast-transaction.ts +++ b/packages/services/src/view-service/broadcast-transaction.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { TransactionId } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/txhash/v1/txhash_pb'; import { Code, ConnectError } from '@connectrpc/connect'; import { sha256Hash } from '@penumbra-zone/crypto-web/sha256'; diff --git a/packages/router/src/grpc/view-protocol-server/delegations-by-address-index.test.ts b/packages/services/src/view-service/delegations-by-address-index.test.ts similarity index 99% rename from packages/router/src/grpc/view-protocol-server/delegations-by-address-index.test.ts rename to packages/services/src/view-service/delegations-by-address-index.test.ts index 95ef748f1..23c82988a 100644 --- a/packages/router/src/grpc/view-protocol-server/delegations-by-address-index.test.ts +++ b/packages/services/src/view-service/delegations-by-address-index.test.ts @@ -7,7 +7,7 @@ import { HandlerContext, PromiseClient, } from '@connectrpc/connect'; -import { stakingClientCtx } from '../../ctx/staking-client'; +import { stakingClientCtx } from '../ctx/staking-client'; import { QueryService as StakingService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/core/component/stake/v1/stake_connect'; import { AssetMetadataByIdResponse, diff --git a/packages/router/src/grpc/view-protocol-server/delegations-by-address-index.ts b/packages/services/src/view-service/delegations-by-address-index.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/delegations-by-address-index.ts rename to packages/services/src/view-service/delegations-by-address-index.ts index 1259af5b3..bfd05d3ec 100644 --- a/packages/router/src/grpc/view-protocol-server/delegations-by-address-index.ts +++ b/packages/services/src/view-service/delegations-by-address-index.ts @@ -14,7 +14,7 @@ import { DelegationsByAddressIndexRequest_Filter, DelegationsByAddressIndexResponse, } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; -import { stakingClientCtx } from '../../ctx/staking-client'; +import { stakingClientCtx } from '../ctx/staking-client'; import { balances } from './balances'; import { Metadata, diff --git a/packages/router/src/grpc/view-protocol-server/ephemeral-address.test.ts b/packages/services/src/view-service/ephemeral-address.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/ephemeral-address.test.ts rename to packages/services/src/view-service/ephemeral-address.test.ts index 970e0f361..05c9aefcd 100644 --- a/packages/router/src/grpc/view-protocol-server/ephemeral-address.test.ts +++ b/packages/services/src/view-service/ephemeral-address.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb'; import { ephemeralAddress } from './ephemeral-address'; import type { ServicesInterface } from '@penumbra-zone/types/src/services'; diff --git a/packages/router/src/grpc/view-protocol-server/ephemeral-address.ts b/packages/services/src/view-service/ephemeral-address.ts similarity index 91% rename from packages/router/src/grpc/view-protocol-server/ephemeral-address.ts rename to packages/services/src/view-service/ephemeral-address.ts index 043b53b9c..684799f48 100644 --- a/packages/router/src/grpc/view-protocol-server/ephemeral-address.ts +++ b/packages/services/src/view-service/ephemeral-address.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { getEphemeralByIndex } from '@penumbra-zone/wasm/src/keys'; diff --git a/packages/router/src/grpc/view-protocol-server/fmd-parameters.test.ts b/packages/services/src/view-service/fmd-parameters.test.ts similarity index 97% rename from packages/router/src/grpc/view-protocol-server/fmd-parameters.test.ts rename to packages/services/src/view-service/fmd-parameters.test.ts index a7119ce1e..ad5ffd067 100644 --- a/packages/router/src/grpc/view-protocol-server/fmd-parameters.test.ts +++ b/packages/services/src/view-service/fmd-parameters.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices } from '../test-utils'; import { FmdParameters } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/shielded_pool/v1/shielded_pool_pb'; import { fMDParameters } from './fmd-parameters'; diff --git a/packages/router/src/grpc/view-protocol-server/fmd-parameters.ts b/packages/services/src/view-service/fmd-parameters.ts similarity index 90% rename from packages/router/src/grpc/view-protocol-server/fmd-parameters.ts rename to packages/services/src/view-service/fmd-parameters.ts index 4f728630a..cfbbe059e 100644 --- a/packages/router/src/grpc/view-protocol-server/fmd-parameters.ts +++ b/packages/services/src/view-service/fmd-parameters.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Code, ConnectError } from '@connectrpc/connect'; diff --git a/packages/router/src/grpc/view-protocol-server/gas-prices.test.ts b/packages/services/src/view-service/gas-prices.test.ts similarity index 97% rename from packages/router/src/grpc/view-protocol-server/gas-prices.test.ts rename to packages/services/src/view-service/gas-prices.test.ts index 1ebaf94a7..b00151a51 100644 --- a/packages/router/src/grpc/view-protocol-server/gas-prices.test.ts +++ b/packages/services/src/view-service/gas-prices.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices } from '../test-utils'; import { GasPrices } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/fee/v1/fee_pb'; import { gasPrices } from './gas-prices'; diff --git a/packages/router/src/grpc/view-protocol-server/gas-prices.ts b/packages/services/src/view-service/gas-prices.ts similarity index 96% rename from packages/router/src/grpc/view-protocol-server/gas-prices.ts rename to packages/services/src/view-service/gas-prices.ts index aa6385514..00ec147d0 100644 --- a/packages/router/src/grpc/view-protocol-server/gas-prices.ts +++ b/packages/services/src/view-service/gas-prices.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Code, ConnectError } from '@connectrpc/connect'; /** diff --git a/packages/router/src/grpc/view-protocol-server/helpers.ts b/packages/services/src/view-service/helpers.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/helpers.ts rename to packages/services/src/view-service/helpers.ts diff --git a/packages/router/src/grpc/view-protocol-server/index-by-address.test.ts b/packages/services/src/view-service/index-by-address.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/index-by-address.test.ts rename to packages/services/src/view-service/index-by-address.test.ts index a8376d378..63cc64042 100644 --- a/packages/router/src/grpc/view-protocol-server/index-by-address.test.ts +++ b/packages/services/src/view-service/index-by-address.test.ts @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, test } from 'vitest'; import { IndexByAddressRequest } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb'; import { indexByAddress } from './index-by-address'; import { getAddressByIndex, getEphemeralByIndex } from '@penumbra-zone/wasm/src/keys'; diff --git a/packages/router/src/grpc/view-protocol-server/index-by-address.ts b/packages/services/src/view-service/index-by-address.ts similarity index 93% rename from packages/router/src/grpc/view-protocol-server/index-by-address.ts rename to packages/services/src/view-service/index-by-address.ts index bcabbcee4..810606e32 100644 --- a/packages/router/src/grpc/view-protocol-server/index-by-address.ts +++ b/packages/services/src/view-service/index-by-address.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { getAddressIndexByAddress } from '@penumbra-zone/wasm/src/address'; diff --git a/packages/router/src/grpc/view-protocol-server/index.ts b/packages/services/src/view-service/index.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/index.ts rename to packages/services/src/view-service/index.ts diff --git a/packages/router/src/grpc/view-protocol-server/note-by-commitment.test.ts b/packages/services/src/view-service/note-by-commitment.test.ts similarity index 99% rename from packages/router/src/grpc/view-protocol-server/note-by-commitment.test.ts rename to packages/services/src/view-service/note-by-commitment.test.ts index fa255c72b..fd8609fd7 100644 --- a/packages/router/src/grpc/view-protocol-server/note-by-commitment.test.ts +++ b/packages/services/src/view-service/note-by-commitment.test.ts @@ -6,7 +6,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices } from '../test-utils'; import { StateCommitment } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/crypto/tct/v1/tct_pb'; import { noteByCommitment } from './note-by-commitment'; diff --git a/packages/router/src/grpc/view-protocol-server/note-by-commitment.ts b/packages/services/src/view-service/note-by-commitment.ts similarity index 95% rename from packages/router/src/grpc/view-protocol-server/note-by-commitment.ts rename to packages/services/src/view-service/note-by-commitment.ts index 49fe4650d..9ac7a058d 100644 --- a/packages/router/src/grpc/view-protocol-server/note-by-commitment.ts +++ b/packages/services/src/view-service/note-by-commitment.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { SpendableNoteRecord } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; diff --git a/packages/router/src/grpc/view-protocol-server/notes-for-voting.test.ts b/packages/services/src/view-service/notes-for-voting.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/notes-for-voting.test.ts rename to packages/services/src/view-service/notes-for-voting.test.ts index 6ae1b0743..3412af538 100644 --- a/packages/router/src/grpc/view-protocol-server/notes-for-voting.test.ts +++ b/packages/services/src/view-service/notes-for-voting.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices } from '../test-utils'; import { notesForVoting } from './notes-for-voting'; import type { ServicesInterface } from '@penumbra-zone/types/src/services'; diff --git a/packages/router/src/grpc/view-protocol-server/notes-for-voting.ts b/packages/services/src/view-service/notes-for-voting.ts similarity index 88% rename from packages/router/src/grpc/view-protocol-server/notes-for-voting.ts rename to packages/services/src/view-service/notes-for-voting.ts index 58d89d3e9..3176eac0f 100644 --- a/packages/router/src/grpc/view-protocol-server/notes-for-voting.ts +++ b/packages/services/src/view-service/notes-for-voting.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; export const notesForVoting: Impl['notesForVoting'] = async function* (req, ctx) { const services = ctx.values.get(servicesCtx); diff --git a/packages/router/src/grpc/view-protocol-server/notes.test.ts b/packages/services/src/view-service/notes.test.ts similarity index 99% rename from packages/router/src/grpc/view-protocol-server/notes.test.ts rename to packages/services/src/view-service/notes.test.ts index 5b90530bf..a1e611921 100644 --- a/packages/router/src/grpc/view-protocol-server/notes.test.ts +++ b/packages/services/src/view-service/notes.test.ts @@ -1,7 +1,7 @@ import { notes } from './notes'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; @@ -15,7 +15,7 @@ import { SpendableNoteRecord, } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { IndexedDbMock, MockServices } from '../test-utils'; -import { Services } from '@penumbra-zone/services/src/index'; +import { Services } from '@penumbra-zone/services-context/src/index'; describe('Notes request handler', () => { let mockServices: MockServices; diff --git a/packages/router/src/grpc/view-protocol-server/notes.ts b/packages/services/src/view-service/notes.ts similarity index 96% rename from packages/router/src/grpc/view-protocol-server/notes.ts rename to packages/services/src/view-service/notes.ts index 881d7a91c..08e20fdd0 100644 --- a/packages/router/src/grpc/view-protocol-server/notes.ts +++ b/packages/services/src/view-service/notes.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Amount } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/num/v1/num_pb'; import { addAmounts, joinLoHiAmount } from '@penumbra-zone/types/src/amount'; diff --git a/packages/router/src/grpc/view-protocol-server/nullifier-status.test.ts b/packages/services/src/view-service/nullifier-status.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/nullifier-status.test.ts rename to packages/services/src/view-service/nullifier-status.test.ts index b13bf2f73..f9053c748 100644 --- a/packages/router/src/grpc/view-protocol-server/nullifier-status.test.ts +++ b/packages/services/src/view-service/nullifier-status.test.ts @@ -1,10 +1,10 @@ import { nullifierStatus } from './nullifier-status'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; -import type { Services } from '@penumbra-zone/services/src/index'; +import type { Services } from '@penumbra-zone/services-context/src/index'; import { beforeEach, describe, expect, Mock, test, vi } from 'vitest'; diff --git a/packages/router/src/grpc/view-protocol-server/nullifier-status.ts b/packages/services/src/view-service/nullifier-status.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/nullifier-status.ts rename to packages/services/src/view-service/nullifier-status.ts index 79b62321a..f0b81e5e3 100644 --- a/packages/router/src/grpc/view-protocol-server/nullifier-status.ts +++ b/packages/services/src/view-service/nullifier-status.ts @@ -3,7 +3,7 @@ import { SwapRecord, } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Code, ConnectError } from '@connectrpc/connect'; diff --git a/packages/router/src/grpc/view-protocol-server/owned-position-ids.test.ts b/packages/services/src/view-service/owned-position-ids.test.ts similarity index 95% rename from packages/router/src/grpc/view-protocol-server/owned-position-ids.test.ts rename to packages/services/src/view-service/owned-position-ids.test.ts index f0d0878f4..c1d3bb997 100644 --- a/packages/router/src/grpc/view-protocol-server/owned-position-ids.test.ts +++ b/packages/services/src/view-service/owned-position-ids.test.ts @@ -1,5 +1,5 @@ import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; @@ -10,7 +10,7 @@ import { OwnedPositionIdsResponse, } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { IndexedDbMock, MockServices } from '../test-utils'; -import { Services } from '@penumbra-zone/services/src/index'; +import { Services } from '@penumbra-zone/services-context/src/index'; import { PositionId } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/dex/v1/dex_pb'; import { ownedPositionIds } from './owned-position-ids'; diff --git a/packages/router/src/grpc/view-protocol-server/owned-position-ids.ts b/packages/services/src/view-service/owned-position-ids.ts similarity index 89% rename from packages/router/src/grpc/view-protocol-server/owned-position-ids.ts rename to packages/services/src/view-service/owned-position-ids.ts index 658c45d38..143c07e23 100644 --- a/packages/router/src/grpc/view-protocol-server/owned-position-ids.ts +++ b/packages/services/src/view-service/owned-position-ids.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; export const ownedPositionIds: Impl['ownedPositionIds'] = async function* (req, ctx) { const services = ctx.values.get(servicesCtx); diff --git a/packages/router/src/grpc/view-protocol-server/status-stream.test.ts b/packages/services/src/view-service/status-stream.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/status-stream.test.ts rename to packages/services/src/view-service/status-stream.test.ts index 2ad0b60f0..54f978034 100644 --- a/packages/router/src/grpc/view-protocol-server/status-stream.test.ts +++ b/packages/services/src/view-service/status-stream.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices, TendermintMock } from '../test-utils'; import { statusStream } from './status-stream'; import type { ServicesInterface } from '@penumbra-zone/types/src/services'; diff --git a/packages/router/src/grpc/view-protocol-server/status-stream.ts b/packages/services/src/view-service/status-stream.ts similarity index 94% rename from packages/router/src/grpc/view-protocol-server/status-stream.ts rename to packages/services/src/view-service/status-stream.ts index 47bf83939..7e51fd9a4 100644 --- a/packages/router/src/grpc/view-protocol-server/status-stream.ts +++ b/packages/services/src/view-service/status-stream.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; export const statusStream: Impl['statusStream'] = async function* (_, ctx) { const services = ctx.values.get(servicesCtx); diff --git a/packages/router/src/grpc/view-protocol-server/status.test.ts b/packages/services/src/view-service/status.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/status.test.ts rename to packages/services/src/view-service/status.test.ts index 2aff09e41..a609df814 100644 --- a/packages/router/src/grpc/view-protocol-server/status.test.ts +++ b/packages/services/src/view-service/status.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices, TendermintMock } from '../test-utils'; import { status } from './status'; import type { ServicesInterface } from '@penumbra-zone/types/src/services'; diff --git a/packages/router/src/grpc/view-protocol-server/status.ts b/packages/services/src/view-service/status.ts similarity index 92% rename from packages/router/src/grpc/view-protocol-server/status.ts rename to packages/services/src/view-service/status.ts index c801b311f..866e60879 100644 --- a/packages/router/src/grpc/view-protocol-server/status.ts +++ b/packages/services/src/view-service/status.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; export const status: Impl['status'] = async (_, ctx) => { const services = ctx.values.get(servicesCtx); diff --git a/packages/router/src/grpc/view-protocol-server/swap-by-commitment.test.ts b/packages/services/src/view-service/swap-by-commitment.test.ts similarity index 99% rename from packages/router/src/grpc/view-protocol-server/swap-by-commitment.test.ts rename to packages/services/src/view-service/swap-by-commitment.test.ts index 96d5eed16..ab7bb7cb4 100644 --- a/packages/router/src/grpc/view-protocol-server/swap-by-commitment.test.ts +++ b/packages/services/src/view-service/swap-by-commitment.test.ts @@ -6,7 +6,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices } from '../test-utils'; import { StateCommitment } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/crypto/tct/v1/tct_pb'; import { swapByCommitment } from './swap-by-commitment'; diff --git a/packages/router/src/grpc/view-protocol-server/swap-by-commitment.ts b/packages/services/src/view-service/swap-by-commitment.ts similarity index 95% rename from packages/router/src/grpc/view-protocol-server/swap-by-commitment.ts rename to packages/services/src/view-service/swap-by-commitment.ts index 9a81d666b..61852f004 100644 --- a/packages/router/src/grpc/view-protocol-server/swap-by-commitment.ts +++ b/packages/services/src/view-service/swap-by-commitment.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { SwapRecord } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; diff --git a/packages/router/src/grpc/view-protocol-server/transaction-info-by-hash.test.ts b/packages/services/src/view-service/transaction-info-by-hash.test.ts similarity index 98% rename from packages/router/src/grpc/view-protocol-server/transaction-info-by-hash.test.ts rename to packages/services/src/view-service/transaction-info-by-hash.test.ts index 748164bb5..6613d3845 100644 --- a/packages/router/src/grpc/view-protocol-server/transaction-info-by-hash.test.ts +++ b/packages/services/src/view-service/transaction-info-by-hash.test.ts @@ -5,11 +5,11 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices, TendermintMock, ViewServerMock } from '../test-utils'; import { transactionInfoByHash } from './transaction-info-by-hash'; import { TransactionId } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/txhash/v1/txhash_pb'; -import type { Services } from '@penumbra-zone/services/src/index'; +import type { Services } from '@penumbra-zone/services-context/src/index'; import { Transaction, TransactionPerspective, diff --git a/packages/router/src/grpc/view-protocol-server/transaction-info-by-hash.ts b/packages/services/src/view-service/transaction-info-by-hash.ts similarity index 96% rename from packages/router/src/grpc/view-protocol-server/transaction-info-by-hash.ts rename to packages/services/src/view-service/transaction-info-by-hash.ts index 3001ce406..85a7305ff 100644 --- a/packages/router/src/grpc/view-protocol-server/transaction-info-by-hash.ts +++ b/packages/services/src/view-service/transaction-info-by-hash.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { Code, ConnectError } from '@connectrpc/connect'; import { generateTransactionInfo } from '@penumbra-zone/wasm/src/transaction'; import { TransactionInfo } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; diff --git a/packages/router/src/grpc/view-protocol-server/transaction-info.test.ts b/packages/services/src/view-service/transaction-info.test.ts similarity index 97% rename from packages/router/src/grpc/view-protocol-server/transaction-info.test.ts rename to packages/services/src/view-service/transaction-info.test.ts index 8402abfd8..1ecb2e537 100644 --- a/packages/router/src/grpc/view-protocol-server/transaction-info.test.ts +++ b/packages/services/src/view-service/transaction-info.test.ts @@ -1,5 +1,5 @@ import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; @@ -11,7 +11,7 @@ import { TransactionInfoResponse, } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { IndexedDbMock, MockServices, testFullViewingKey, ViewServerMock } from '../test-utils'; -import { Services } from '@penumbra-zone/services/src/index'; +import { Services } from '@penumbra-zone/services-context/src/index'; import { transactionInfo } from './transaction-info'; const mockTransactionInfo = vi.hoisted(() => vi.fn()); diff --git a/packages/router/src/grpc/view-protocol-server/transaction-info.ts b/packages/services/src/view-service/transaction-info.ts similarity index 96% rename from packages/router/src/grpc/view-protocol-server/transaction-info.ts rename to packages/services/src/view-service/transaction-info.ts index 34a95ad3b..931943b02 100644 --- a/packages/router/src/grpc/view-protocol-server/transaction-info.ts +++ b/packages/services/src/view-service/transaction-info.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { TransactionInfo } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { generateTransactionInfo } from '@penumbra-zone/wasm/src/transaction'; diff --git a/packages/router/src/grpc/view-protocol-server/transaction-planner/assert-swap-assets-are-not-the-same.test.ts b/packages/services/src/view-service/transaction-planner/assert-swap-assets-are-not-the-same.test.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/transaction-planner/assert-swap-assets-are-not-the-same.test.ts rename to packages/services/src/view-service/transaction-planner/assert-swap-assets-are-not-the-same.test.ts diff --git a/packages/router/src/grpc/view-protocol-server/transaction-planner/assert-swap-assets-are-not-the-same.ts b/packages/services/src/view-service/transaction-planner/assert-swap-assets-are-not-the-same.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/transaction-planner/assert-swap-assets-are-not-the-same.ts rename to packages/services/src/view-service/transaction-planner/assert-swap-assets-are-not-the-same.ts diff --git a/packages/router/src/grpc/view-protocol-server/transaction-planner/index.test.ts b/packages/services/src/view-service/transaction-planner/index.test.ts similarity index 97% rename from packages/router/src/grpc/view-protocol-server/transaction-planner/index.test.ts rename to packages/services/src/view-service/transaction-planner/index.test.ts index a144d64d9..195e1e154 100644 --- a/packages/router/src/grpc/view-protocol-server/transaction-planner/index.test.ts +++ b/packages/services/src/view-service/transaction-planner/index.test.ts @@ -2,9 +2,9 @@ import { beforeEach, describe, expect, test, vi } from 'vitest'; import { TransactionPlannerRequest } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../../ctx/prax'; +import { servicesCtx } from '../../ctx/prax'; import { IndexedDbMock, MockServices, testFullViewingKey, ViewServerMock } from '../../test-utils'; -import type { Services } from '@penumbra-zone/services/src/index'; +import type { Services } from '@penumbra-zone/services-context'; import { FmdParameters } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/shielded_pool/v1/shielded_pool_pb'; import { AppParameters } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/app/v1/app_pb'; import { SctParameters } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/sct/v1/sct_pb'; diff --git a/packages/router/src/grpc/view-protocol-server/transaction-planner/index.ts b/packages/services/src/view-service/transaction-planner/index.ts similarity index 97% rename from packages/router/src/grpc/view-protocol-server/transaction-planner/index.ts rename to packages/services/src/view-service/transaction-planner/index.ts index 6133389ac..4f427ec0d 100644 --- a/packages/router/src/grpc/view-protocol-server/transaction-planner/index.ts +++ b/packages/services/src/view-service/transaction-planner/index.ts @@ -1,5 +1,5 @@ import type { Impl } from '..'; -import { servicesCtx } from '../../../ctx/prax'; +import { servicesCtx } from '../../ctx/prax'; import { planTransaction } from '@penumbra-zone/wasm/src/planner'; import { Code, ConnectError } from '@connectrpc/connect'; import { assertSwapAssetsAreNotTheSame } from './assert-swap-assets-are-not-the-same'; diff --git a/packages/router/src/grpc/view-protocol-server/unbonding-tokens-by-address-index/helpers.test.ts b/packages/services/src/view-service/unbonding-tokens-by-address-index/helpers.test.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/unbonding-tokens-by-address-index/helpers.test.ts rename to packages/services/src/view-service/unbonding-tokens-by-address-index/helpers.test.ts diff --git a/packages/router/src/grpc/view-protocol-server/unbonding-tokens-by-address-index/helpers.ts b/packages/services/src/view-service/unbonding-tokens-by-address-index/helpers.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/unbonding-tokens-by-address-index/helpers.ts rename to packages/services/src/view-service/unbonding-tokens-by-address-index/helpers.ts diff --git a/packages/router/src/grpc/view-protocol-server/unbonding-tokens-by-address-index/index.test.ts b/packages/services/src/view-service/unbonding-tokens-by-address-index/index.test.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/unbonding-tokens-by-address-index/index.test.ts rename to packages/services/src/view-service/unbonding-tokens-by-address-index/index.test.ts diff --git a/packages/router/src/grpc/view-protocol-server/unbonding-tokens-by-address-index/index.ts b/packages/services/src/view-service/unbonding-tokens-by-address-index/index.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/unbonding-tokens-by-address-index/index.ts rename to packages/services/src/view-service/unbonding-tokens-by-address-index/index.ts diff --git a/packages/router/src/grpc/view-protocol-server/unclaimed-swaps.test.ts b/packages/services/src/view-service/unclaimed-swaps.test.ts similarity index 95% rename from packages/router/src/grpc/view-protocol-server/unclaimed-swaps.test.ts rename to packages/services/src/view-service/unclaimed-swaps.test.ts index 889ee938d..9f93e9f8e 100644 --- a/packages/router/src/grpc/view-protocol-server/unclaimed-swaps.test.ts +++ b/packages/services/src/view-service/unclaimed-swaps.test.ts @@ -1,5 +1,5 @@ import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; @@ -11,7 +11,7 @@ import { UnclaimedSwapsResponse, } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { IndexedDbMock, MockServices } from '../test-utils'; -import { Services } from '@penumbra-zone/services/src/index'; +import { Services } from '@penumbra-zone/services-context/src/index'; import { unclaimedSwaps } from './unclaimed-swaps'; describe('UnclaimedSwaps request handler', () => { diff --git a/packages/router/src/grpc/view-protocol-server/unclaimed-swaps.ts b/packages/services/src/view-service/unclaimed-swaps.ts similarity index 88% rename from packages/router/src/grpc/view-protocol-server/unclaimed-swaps.ts rename to packages/services/src/view-service/unclaimed-swaps.ts index 06d2d3129..ee9dfd10c 100644 --- a/packages/router/src/grpc/view-protocol-server/unclaimed-swaps.ts +++ b/packages/services/src/view-service/unclaimed-swaps.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; export const unclaimedSwaps: Impl['unclaimedSwaps'] = async function* (_, ctx) { const services = ctx.values.get(servicesCtx); diff --git a/packages/router/src/grpc/view-protocol-server/util/build-tx.ts b/packages/services/src/view-service/util/build-tx.ts similarity index 100% rename from packages/router/src/grpc/view-protocol-server/util/build-tx.ts rename to packages/services/src/view-service/util/build-tx.ts diff --git a/packages/router/src/grpc/view-protocol-server/util/custody-authorize.ts b/packages/services/src/view-service/util/custody-authorize.ts similarity index 92% rename from packages/router/src/grpc/view-protocol-server/util/custody-authorize.ts rename to packages/services/src/view-service/util/custody-authorize.ts index b1bdd0655..3257a6d10 100644 --- a/packages/router/src/grpc/view-protocol-server/util/custody-authorize.ts +++ b/packages/services/src/view-service/util/custody-authorize.ts @@ -3,7 +3,7 @@ import { TransactionPlan, } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/transaction/v1/transaction_pb'; import { HandlerContext, ConnectError, Code } from '@connectrpc/connect'; -import { custodyCtx } from '../../../ctx/custody'; +import { custodyCtx } from '../../ctx/custody'; export const custodyAuthorize = async ( ctx: HandlerContext, diff --git a/packages/router/src/grpc/view-protocol-server/wallet-id.test.ts b/packages/services/src/view-service/wallet-id.test.ts similarity index 97% rename from packages/router/src/grpc/view-protocol-server/wallet-id.test.ts rename to packages/services/src/view-service/wallet-id.test.ts index 1bdcad4b3..c3874c9a8 100644 --- a/packages/router/src/grpc/view-protocol-server/wallet-id.test.ts +++ b/packages/services/src/view-service/wallet-id.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { extLocalCtx } from '../../ctx/prax'; +import { extLocalCtx } from '../ctx/prax'; import { walletId } from './wallet-id'; import { MockExtLocalCtx } from '../test-utils'; diff --git a/packages/router/src/grpc/view-protocol-server/wallet-id.ts b/packages/services/src/view-service/wallet-id.ts similarity index 93% rename from packages/router/src/grpc/view-protocol-server/wallet-id.ts rename to packages/services/src/view-service/wallet-id.ts index 0ba383226..49f3a3730 100644 --- a/packages/router/src/grpc/view-protocol-server/wallet-id.ts +++ b/packages/services/src/view-service/wallet-id.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { extLocalCtx } from '../../ctx/prax'; +import { extLocalCtx } from '../ctx/prax'; import { WalletId } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb'; import { Code, ConnectError } from '@connectrpc/connect'; import { stringToUint8Array } from '@penumbra-zone/types/src/string'; diff --git a/packages/router/src/grpc/view-protocol-server/witness-and-build.ts b/packages/services/src/view-service/witness-and-build.ts similarity index 95% rename from packages/router/src/grpc/view-protocol-server/witness-and-build.ts rename to packages/services/src/view-service/witness-and-build.ts index b23cf3444..a1ae06069 100644 --- a/packages/router/src/grpc/view-protocol-server/witness-and-build.ts +++ b/packages/services/src/view-service/witness-and-build.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { optimisticBuild } from './util/build-tx'; diff --git a/packages/router/src/grpc/view-protocol-server/witness.test.ts b/packages/services/src/view-service/witness.test.ts similarity index 99% rename from packages/router/src/grpc/view-protocol-server/witness.test.ts rename to packages/services/src/view-service/witness.test.ts index 2e1d4b6b6..3c5f3fec0 100644 --- a/packages/router/src/grpc/view-protocol-server/witness.test.ts +++ b/packages/services/src/view-service/witness.test.ts @@ -5,7 +5,7 @@ import { } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/view/v1/view_pb'; import { createContextValues, createHandlerContext, HandlerContext } from '@connectrpc/connect'; import { ViewService } from '@buf/penumbra-zone_penumbra.connectrpc_es/penumbra/view/v1/view_connect'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { IndexedDbMock, MockServices } from '../test-utils'; import { witness } from './witness'; import { diff --git a/packages/router/src/grpc/view-protocol-server/witness.ts b/packages/services/src/view-service/witness.ts similarity index 92% rename from packages/router/src/grpc/view-protocol-server/witness.ts rename to packages/services/src/view-service/witness.ts index 90cfbf6e8..27126a15a 100644 --- a/packages/router/src/grpc/view-protocol-server/witness.ts +++ b/packages/services/src/view-service/witness.ts @@ -1,5 +1,5 @@ import type { Impl } from '.'; -import { servicesCtx } from '../../ctx/prax'; +import { servicesCtx } from '../ctx/prax'; import { getWitness } from '@penumbra-zone/wasm/src/build'; diff --git a/packages/router/tests-setup.js b/packages/services/tests-setup.js similarity index 100% rename from packages/router/tests-setup.js rename to packages/services/tests-setup.js diff --git a/packages/router/vitest.config.ts b/packages/services/vitest.config.ts similarity index 100% rename from packages/router/vitest.config.ts rename to packages/services/vitest.config.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 135cd5f77..a9d1c9084 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -162,12 +162,12 @@ importers: '@penumbra-zone/query': specifier: workspace:* version: link:../../packages/query - '@penumbra-zone/router': - specifier: workspace:* - version: link:../../packages/router '@penumbra-zone/services': specifier: workspace:* version: link:../../packages/services + '@penumbra-zone/services-context': + specifier: workspace:* + version: link:../../packages/services-context '@penumbra-zone/storage': specifier: workspace:* version: link:../../packages/storage @@ -540,7 +540,7 @@ importers: specifier: ^3.1.1 version: 3.1.1 - packages/router: + packages/services: dependencies: '@penumbra-zone/bech32': specifier: workspace:* @@ -563,9 +563,9 @@ importers: '@penumbra-zone/query': specifier: workspace:* version: link:../query - '@penumbra-zone/services': + '@penumbra-zone/services-context': specifier: workspace:* - version: link:../services + version: link:../services-context '@penumbra-zone/storage': specifier: workspace:* version: link:../storage @@ -579,7 +579,7 @@ importers: specifier: workspace:* version: link:../wasm - packages/services: + packages/services-context: dependencies: '@penumbra-zone/constants': specifier: workspace:*