Skip to content

Commit 26d682b

Browse files
authored
chore: tidy up fee-quoting service (#8539)
1 parent 8a30745 commit 26d682b

18 files changed

Lines changed: 107 additions & 112 deletions

File tree

.changeset/fee-quoting-private.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@hyperlane-xyz/sdk': patch
3+
'@hyperlane-xyz/cli': patch
4+
---
5+
6+
Fee quoting client and shared types were moved from @hyperlane-xyz/fee-quoting into @hyperlane-xyz/sdk. The fee-quoting package was marked as private since it is a deployable service, not a published library.

.github/workflows/node-services-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
|-------|-----|
129129
| hyperlane-node-services | \`${TAG_SHA_DATE}\` |
130130
131-
**Services included:** rebalancer, warp-monitor, ccip-server, keyfunder, relayer
131+
**Services included:** rebalancer, warp-monitor, ccip-server, keyfunder, relayer, fee-quoting
132132
133133
**Full image path:**
134134
\`\`\`

pnpm-lock.yaml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

solidity/zk-hardhat.config.cts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ import { rootHardhatConfig } from './rootHardhatConfig.cjs';
1010
*/
1111
module.exports = {
1212
...rootHardhatConfig,
13+
// Override solidity version — era-solidity only supports up to 0.8.30
14+
// https://github.com/matter-labs/era-solidity/releases
15+
solidity: {
16+
...rootHardhatConfig.solidity,
17+
version: '0.8.30',
18+
},
1319
zksolc: {
1420
version: '1.5.12',
1521
compilerSource: 'binary',

typescript/Dockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# SERVICE_VERSION - Image version label
77
#
88
# Runtime env:
9-
# SERVICE_NAME - One of: rebalancer, warp-monitor, ccip-server, keyfunder, relayer
9+
# SERVICE_NAME - One of: rebalancer, warp-monitor, ccip-server, keyfunder, relayer, fee-quoting
1010

1111
FROM node:24-slim AS builder
1212

@@ -41,6 +41,7 @@ COPY typescript/warp-monitor/package.json ./typescript/warp-monitor/
4141
COPY typescript/ccip-server/package.json ./typescript/ccip-server/
4242
COPY typescript/keyfunder/package.json ./typescript/keyfunder/
4343
COPY typescript/relayer/package.json ./typescript/relayer/
44+
COPY typescript/fee-quoting/package.json ./typescript/fee-quoting/
4445
COPY typescript/metrics/package.json ./typescript/metrics/
4546
COPY typescript/deploy-sdk/package.json ./typescript/deploy-sdk/
4647
COPY typescript/sdk/package.json ./typescript/sdk/
@@ -111,14 +112,16 @@ COPY typescript/warp-monitor ./typescript/warp-monitor
111112
COPY typescript/ccip-server ./typescript/ccip-server
112113
COPY typescript/keyfunder ./typescript/keyfunder
113114
COPY typescript/relayer ./typescript/relayer
115+
COPY typescript/fee-quoting ./typescript/fee-quoting
114116

115117
# Bundle all services in a single turbo invocation
116118
RUN pnpm turbo run bundle \
117119
--filter=@hyperlane-xyz/rebalancer \
118120
--filter=@hyperlane-xyz/warp-monitor \
119121
--filter=@hyperlane-xyz/ccip-server \
120122
--filter=@hyperlane-xyz/keyfunder \
121-
--filter=@hyperlane-xyz/relayer
123+
--filter=@hyperlane-xyz/relayer \
124+
--filter=@hyperlane-xyz/fee-quoting
122125

123126
# Deduplicate identical NCC assets across bundles.
124127
# NCC produces byte-identical copies of WASM files (~18MB each), workers,
@@ -127,12 +130,12 @@ RUN pnpm turbo run bundle \
127130
# deduped result is COPY'd into the runner stage.
128131
RUN SERVICES_DIR=/hyperlane-monorepo/services && \
129132
mkdir -p $SERVICES_DIR && \
130-
for svc in rebalancer warp-monitor ccip-server keyfunder relayer; do \
133+
for svc in rebalancer warp-monitor ccip-server keyfunder relayer fee-quoting; do \
131134
cp -a typescript/${svc}/bundle $SERVICES_DIR/${svc}; \
132135
done && \
133136
CANONICAL=rebalancer && \
134137
cd $SERVICES_DIR && \
135-
for svc in warp-monitor ccip-server keyfunder relayer; do \
138+
for svc in warp-monitor ccip-server keyfunder relayer fee-quoting; do \
136139
for file in ${CANONICAL}/*; do \
137140
fname=$(basename "$file") && \
138141
target="${svc}/${fname}" && \
@@ -181,7 +184,7 @@ ENV NODE_ENV=production
181184
ENV LOG_LEVEL=info
182185
ENV SERVICE_VERSION=${SERVICE_VERSION}
183186

184-
# SERVICE_NAME must be set at runtime (rebalancer, warp-monitor, ccip-server, keyfunder, relayer)
187+
# SERVICE_NAME must be set at runtime (rebalancer, warp-monitor, ccip-server, keyfunder, relayer, fee-quoting)
185188
ENV SERVICE_NAME=""
186189

187190
# Expose metrics port (9090) and optional service port (e.g. 3000 for ccip-server)

typescript/cli/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
"@hyperlane-xyz/core": "workspace:*",
5656
"@hyperlane-xyz/cosmos-sdk": "workspace:*",
5757
"@hyperlane-xyz/deploy-sdk": "workspace:*",
58-
"@hyperlane-xyz/fee-quoting": "workspace:*",
5958
"@hyperlane-xyz/http-registry-server": "workspace:*",
6059
"@hyperlane-xyz/provider-sdk": "workspace:*",
6160
"@hyperlane-xyz/radix-sdk": "workspace:*",

typescript/cli/src/send/transfer.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ import { type TransactionReceipt } from '@ethersproject/providers';
44
import { stringify as yamlStringify } from 'yaml';
55
import { type Address, type Hex } from 'viem';
66

7-
import {
8-
FeeQuotingClient,
9-
QuotedCallsCommand as FeeQuotingCommand,
10-
} from '@hyperlane-xyz/fee-quoting';
117
import { GasAction } from '@hyperlane-xyz/provider-sdk';
128
import {
139
type AnnotatedTx,
@@ -17,6 +13,8 @@ import {
1713
type ChainMap,
1814
type ChainName,
1915
type CoreAddresses,
16+
FeeQuotingClient,
17+
FeeQuotingCommand,
2018
HyperlaneCore,
2119
MultiProtocolCore,
2220
ProviderType,

typescript/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
VALID_SERVICES="rebalancer warp-monitor ccip-server keyfunder relayer"
4+
VALID_SERVICES="rebalancer warp-monitor ccip-server keyfunder relayer fee-quoting"
55

66
if [ -z "$SERVICE_NAME" ]; then
77
echo "ERROR: SERVICE_NAME env var is required." >&2

typescript/fee-quoting/index.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

typescript/fee-quoting/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "@hyperlane-xyz/fee-quoting",
33
"version": "27.2.0",
4+
"private": true,
45
"description": "Offchain fee quoting service and client for Hyperlane",
56
"license": "Apache-2.0",
67
"repository": "https://github.com/hyperlane-xyz/hyperlane-monorepo",
78
"files": [
89
"/dist"
910
],
1011
"type": "module",
11-
"types": "./dist/index.d.ts",
12+
"types": "./dist/server.d.ts",
1213
"exports": {
13-
".": "./dist/index.js",
1414
"./server": "./dist/server.js"
1515
},
1616
"scripts": {

0 commit comments

Comments
 (0)