Skip to content

Commit cebf47f

Browse files
committed
fix: resolve merge conflicts and align bps types after main merge
Aligned OffchainQuotedLinearFee bps field from bigint to number (ZBps) to match LinearFee after main's fractional bps support. Extracted shared BpsConfigSchema. Restored FEE_QUOTING docker image name and added forge build --sizes to test:ci.
1 parent 8c46163 commit cebf47f

5 files changed

Lines changed: 178 additions & 59 deletions

File tree

pnpm-lock.yaml

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

typescript/infra/config/docker.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export const DockerImageNames = {
44
AGENT: 'hyperlane-agent',
55
MONOREPO: 'hyperlane-monorepo',
66
NODE_SERVICES: 'hyperlane-node-services',
7+
FEE_QUOTING: 'hyperlane-fee-quoting',
78
} as const;
89

910
type DockerImageReposType = {

typescript/sdk/src/fee/EvmTokenFeeModule.hardhat-test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ describe('EvmTokenFeeModule', () => {
238238
onchainConfig.type === TokenFeeType.RoutingFee,
239239
`Must be ${TokenFeeType.RoutingFee}`,
240240
);
241-
expect(onchainConfig.feeContracts[test4Chain]?.bps).to.equal(BPS + 1n);
241+
expect(onchainConfig.feeContracts[test4Chain]?.bps).to.equal(BPS + 1);
242242
});
243243

244244
it('should transfer ownership if they are different', async () => {
@@ -348,7 +348,7 @@ describe('EvmTokenFeeModule', () => {
348348
onchainConfig.type === TokenFeeType.RoutingFee,
349349
`Must be ${TokenFeeType.RoutingFee}`,
350350
);
351-
expect(onchainConfig.feeContracts[test4Chain]?.bps).to.equal(BPS + 1n);
351+
expect(onchainConfig.feeContracts[test4Chain]?.bps).to.equal(BPS + 1);
352352
});
353353

354354
it('should forward token reader params when updating routing fees', async () => {
@@ -491,7 +491,7 @@ describe('EvmTokenFeeModule', () => {
491491
[DEFAULT_ROUTER_KEY]: {
492492
type: TokenFeeType.LinearFee,
493493
owner: signer.address,
494-
bps: BPS + 1n,
494+
bps: BPS + 1,
495495
},
496496
},
497497
},
@@ -521,7 +521,7 @@ describe('EvmTokenFeeModule', () => {
521521
);
522522
expect(
523523
onchainConfig.feeContracts[test4Chain]?.[DEFAULT_ROUTER_KEY]?.bps,
524-
).to.equal(BPS + 1n);
524+
).to.equal(BPS + 1);
525525
});
526526

527527
it('should redeploy an empty CCRF using explicitly resolved child tokens', async () => {
@@ -983,7 +983,7 @@ describe('EvmTokenFeeModule', () => {
983983
chain: test4Chain,
984984
config: offchainConfig,
985985
});
986-
const updatedConfig = { ...offchainConfig, bps: BPS + 1n };
986+
const updatedConfig = { ...offchainConfig, bps: BPS + 1 };
987987
await expectTxsAndUpdate(module, updatedConfig, 0);
988988
const onchainConfig = await module.read();
989989
assert(

0 commit comments

Comments
 (0)