Skip to content

Commit fc0a1cf

Browse files
authored
fix: token deploy tx overrides (#8526)
1 parent cd15afd commit fc0a1cf

2 files changed

Lines changed: 32 additions & 8 deletions

File tree

.changeset/smooth-radios-agree.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hyperlane-xyz/sdk": patch
3+
---
4+
5+
Fixed tx overrides in token deploys

typescript/sdk/src/token/deploy.ts

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,10 @@ abstract class TokenDeployer<
345345
this.logger.info(`Mapping Circle domains on ${chain}`, {
346346
remoteDomains,
347347
});
348+
const overrides = this.multiProvider.getTransactionOverrides(chain);
348349
await this.multiProvider.handleTx(
349350
chain,
350-
tokenBridge.addDomains(remoteDomains),
351+
tokenBridge.addDomains(remoteDomains, overrides),
351352
);
352353
}),
353354
);
@@ -408,10 +409,11 @@ abstract class TokenDeployer<
408409
`Setting maxFeePpm on ${chain} from ${currentFeeBps} bps to ${config.maxFeeBps} bps${usesPpmStorage ? ' (stored as ppm)' : ''}`,
409410
);
410411
// >= 11.0.0 uses setMaxFeePpm(), older uses setMaxFeeBps()
412+
const overrides = this.multiProvider.getTransactionOverrides(chain);
411413
if (usesPpmName) {
412414
await this.multiProvider.handleTx(
413415
chain,
414-
tokenBridgeV2.setMaxFeePpm(targetFee),
416+
tokenBridgeV2.setMaxFeePpm(targetFee, overrides),
415417
);
416418
} else {
417419
await this.multiProvider.handleTx(
@@ -425,6 +427,7 @@ abstract class TokenDeployer<
425427
.toHexString()
426428
.slice(2)
427429
.padStart(64, '0'),
430+
...overrides,
428431
}),
429432
);
430433
}
@@ -512,17 +515,19 @@ abstract class TokenDeployer<
512515
hyperlaneDomain: domainId,
513516
lzEid,
514517
});
518+
const overrides = this.multiProvider.getTransactionOverrides(chain);
515519
await this.multiProvider.handleTx(
516520
chain,
517-
tokenBridge.addDomain(Number(domainId), lzEid),
521+
tokenBridge.addDomain(Number(domainId), lzEid, overrides),
518522
);
519523
}
520524

521525
if (config.extraOptions) {
522526
this.logger.info(`Setting OFT extra options on ${chain}`);
527+
const overrides = this.multiProvider.getTransactionOverrides(chain);
523528
await this.multiProvider.handleTx(
524529
chain,
525-
tokenBridge.setExtraOptions(config.extraOptions),
530+
tokenBridge.setExtraOptions(config.extraOptions, overrides),
526531
);
527532
}
528533
}),
@@ -546,10 +551,11 @@ abstract class TokenDeployer<
546551
);
547552

548553
const rebalancers = Array.from(config.allowedRebalancers ?? []);
554+
const overrides = this.multiProvider.getTransactionOverrides(chain);
549555
for (const rebalancer of rebalancers) {
550556
await this.multiProvider.handleTx(
551557
chain,
552-
movableToken.addRebalancer(rebalancer),
558+
movableToken.addRebalancer(rebalancer, overrides),
553559
);
554560
}
555561
}),
@@ -591,10 +597,15 @@ abstract class TokenDeployer<
591597
const bridgesToAllowOnRouter = bridgesToAllow.filter(({ domain }) =>
592598
routerDomains.includes(domain),
593599
);
600+
const overrides = this.multiProvider.getTransactionOverrides(chain);
594601
for (const bridgeConfig of bridgesToAllowOnRouter) {
595602
await this.multiProvider.handleTx(
596603
chain,
597-
movableToken.addBridge(bridgeConfig.domain, bridgeConfig.bridge),
604+
movableToken.addBridge(
605+
bridgeConfig.domain,
606+
bridgeConfig.bridge,
607+
overrides,
608+
),
598609
);
599610
}
600611
}),
@@ -664,12 +675,14 @@ abstract class TokenDeployer<
664675
!bridgesWithAllowanceAlreadySet[token].has(bridge),
665676
);
666677

678+
const overrides = this.multiProvider.getTransactionOverrides(chain);
667679
for (const bridgeConfig of filteredTokenApprovalTxs) {
668680
await this.multiProvider.handleTx(
669681
chain,
670682
movableToken.approveTokenForBridge(
671683
bridgeConfig.token,
672684
bridgeConfig.bridge,
685+
overrides,
673686
),
674687
);
675688
}
@@ -698,6 +711,7 @@ abstract class TokenDeployer<
698711
config.everclearFeeParams,
699712
);
700713

714+
const overrides = this.multiProvider.getTransactionOverrides(chain);
701715
for (const [domainId, feeConfig] of Object.entries(
702716
resolvedFeeParamsConfig,
703717
)) {
@@ -708,6 +722,7 @@ abstract class TokenDeployer<
708722
feeConfig.fee,
709723
feeConfig.deadline,
710724
feeConfig.signature,
725+
overrides,
711726
),
712727
);
713728
}
@@ -746,9 +761,10 @@ abstract class TokenDeployer<
746761
}),
747762
);
748763

764+
const overrides = this.multiProvider.getTransactionOverrides(chain);
749765
await this.multiProvider.handleTx(
750766
chain,
751-
everclearTokenBridge.setOutputAssetsBatch(assets),
767+
everclearTokenBridge.setOutputAssetsBatch(assets, overrides),
752768
);
753769
}),
754770
);
@@ -796,11 +812,13 @@ abstract class TokenDeployer<
796812
this.logger.info(
797813
`Batch enrolling ${domains.length} routers for ${chain}`,
798814
);
815+
const overrides = this.multiProvider.getTransactionOverrides(chain);
799816
await this.multiProvider.handleTx(
800817
chain,
801818
crossCollateralRouter.enrollCrossCollateralRouters(
802819
domains,
803820
routers,
821+
overrides,
804822
),
805823
);
806824
}
@@ -1026,7 +1044,8 @@ export class HypERC20Deployer extends TokenDeployer<HypERC20Factories> {
10261044
});
10271045

10281046
const { deployedFee } = module.serialize();
1029-
const tx = await router.setFeeRecipient(deployedFee);
1047+
const overrides = this.multiProvider.getTransactionOverrides(chain);
1048+
const tx = await router.setFeeRecipient(deployedFee, overrides);
10301049
await this.multiProvider.handleTx(chain, tx);
10311050
}),
10321051
);

0 commit comments

Comments
 (0)