diff --git a/rust/main/agents/relayer/src/msg/op_queue.rs b/rust/main/agents/relayer/src/msg/op_queue.rs index 95025d391c..99c9dde39f 100644 --- a/rust/main/agents/relayer/src/msg/op_queue.rs +++ b/rust/main/agents/relayer/src/msg/op_queue.rs @@ -29,10 +29,8 @@ impl OpQueue { /// it's very likely that its status has just changed, so this forces the caller to consider the new status #[instrument(skip(self), ret, fields(queue_label=%self.queue_metrics_label), level = "trace")] pub async fn push(&self, mut op: QueueOperation, new_status: Option) { - op.set_status_and_update_metrics( - new_status, - Arc::new(self.get_operation_metric(op.as_ref())), - ); + let new_metric = Arc::new(self.get_new_operation_metric(op.as_ref(), new_status.clone())); + op.set_status_and_update_metrics(new_status, new_metric); self.queue.lock().await.push(Reverse(op)); } @@ -99,12 +97,17 @@ impl OpQueue { } /// Get the metric associated with this operation - fn get_operation_metric(&self, operation: &dyn PendingOperation) -> IntGauge { + fn get_new_operation_metric( + &self, + operation: &dyn PendingOperation, + new_status: Option, + ) -> IntGauge { let (destination, app_context) = operation.get_operation_labels(); + let new_metric_status = new_status.unwrap_or(operation.status()); self.metrics.with_label_values(&[ &destination, &self.queue_metrics_label, - &operation.status().to_string(), + &new_metric_status.to_string(), &app_context, ]) } diff --git a/typescript/infra/config/environments/mainnet3/agent.ts b/typescript/infra/config/environments/mainnet3/agent.ts index 95dc71fb8d..29366ebcf0 100644 --- a/typescript/infra/config/environments/mainnet3/agent.ts +++ b/typescript/infra/config/environments/mainnet3/agent.ts @@ -546,7 +546,7 @@ const hyperlane: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '16d5869-20241217-160358', + tag: '7c0c967-20241218-173053', }, blacklist, gasPaymentEnforcement: gasPaymentEnforcement, @@ -566,7 +566,7 @@ const hyperlane: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '05e90bc-20241216-180035', + tag: 'd84d8da-20241217-172447', }, resources: scraperResources, }, @@ -581,7 +581,7 @@ const releaseCandidate: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '16d5869-20241217-160358', + tag: '7c0c967-20241218-173053', }, blacklist, // We're temporarily (ab)using the RC relayer as a way to increase diff --git a/typescript/infra/config/environments/mainnet3/chains.ts b/typescript/infra/config/environments/mainnet3/chains.ts index b5119aa440..62c5dffdad 100644 --- a/typescript/infra/config/environments/mainnet3/chains.ts +++ b/typescript/infra/config/environments/mainnet3/chains.ts @@ -85,6 +85,12 @@ export const chainMetadataOverrides: ChainMap> = { // gasPrice: 20 * 10 ** 9, // 20 gwei // }, // }, + // degenchain: { + // transactionOverrides: { + // maxFeePerGas: 100 * 10 ** 9, // 100 gwei + // maxPriorityFeePerGas: 10 * 10 ** 9, // 10 gwei + // }, + // }, }; export const getRegistry = async ( diff --git a/typescript/infra/config/environments/mainnet3/funding.ts b/typescript/infra/config/environments/mainnet3/funding.ts index c03400bc10..81d1251723 100644 --- a/typescript/infra/config/environments/mainnet3/funding.ts +++ b/typescript/infra/config/environments/mainnet3/funding.ts @@ -76,7 +76,7 @@ export const keyFunderConfig: KeyFunderConfig< ink: '0.05', kaia: '250', kroma: '0.05', - linea: '0.2', + linea: '1', lisk: '0.05', lukso: '20', lumia: '1', @@ -89,12 +89,12 @@ export const keyFunderConfig: KeyFunderConfig< mint: '0.05', mode: '0.2', molten: '3', - moonbeam: '5', + moonbeam: '100', morph: '0.05', oortmainnet: '2000', optimism: '0.5', orderly: '0.05', - polygon: '20', + polygon: '40', polygonzkevm: '0.5', polynomialfi: '0.05', prom: '5', @@ -119,7 +119,7 @@ export const keyFunderConfig: KeyFunderConfig< taiko: '0.2', tangle: '2', telos: '100', - treasure: '100', + treasure: '800', unichain: '0.05', // temporarily low until we're able to fund more vana: '0.001', diff --git a/typescript/infra/config/environments/mainnet3/owners.ts b/typescript/infra/config/environments/mainnet3/owners.ts index 6d10cf5323..01fe1e84b5 100644 --- a/typescript/infra/config/environments/mainnet3/owners.ts +++ b/typescript/infra/config/environments/mainnet3/owners.ts @@ -62,7 +62,7 @@ export const safes: ChainMap
= { export const icaOwnerChain = 'ethereum'; // Found by running: -// yarn tsx ./scripts/get-owner-ica.ts -e mainnet3 --ownerChain ethereum --destinationChains ... +// yarn tsx ./scripts/keys/get-owner-ica.ts -e mainnet3 --ownerChain ethereum --destinationChains ... export const icas: Partial< Record<(typeof supportedChainNames)[number], Address> > = { diff --git a/typescript/infra/config/environments/testnet4/agent.ts b/typescript/infra/config/environments/testnet4/agent.ts index efe21db9ce..d34e53657d 100644 --- a/typescript/infra/config/environments/testnet4/agent.ts +++ b/typescript/infra/config/environments/testnet4/agent.ts @@ -113,7 +113,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig< alephzeroevmtestnet: true, alfajores: true, arbitrumsepolia: true, - arcadiatestnet2: true, + arcadiatestnet2: false, basesepolia: true, berabartio: true, bsctestnet: true, @@ -219,7 +219,7 @@ const hyperlane: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '16d5869-20241217-160358', + tag: '7c0c967-20241218-173053', }, blacklist: [...releaseCandidateHelloworldMatchingList, ...relayBlacklist], gasPaymentEnforcement, @@ -250,7 +250,7 @@ const hyperlane: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '4b280cd-20241206-130519', + tag: 'd84d8da-20241217-172447', }, resources: scraperResources, }, @@ -265,7 +265,7 @@ const releaseCandidate: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '16d5869-20241217-160358', + tag: '7c0c967-20241218-173053', }, whitelist: [...releaseCandidateHelloworldMatchingList], blacklist: relayBlacklist, diff --git a/typescript/infra/scripts/warp-routes/monitor/monitor-warp-route-balances.ts b/typescript/infra/scripts/warp-routes/monitor/monitor-warp-route-balances.ts index 1591d92b3d..4eecc1f736 100644 --- a/typescript/infra/scripts/warp-routes/monitor/monitor-warp-route-balances.ts +++ b/typescript/infra/scripts/warp-routes/monitor/monitor-warp-route-balances.ts @@ -160,7 +160,7 @@ async function getTokenBridgedBalance( const adapter = token.getHypAdapter(warpCore.multiProvider); const bridgedSupply = await adapter.getBridgedSupply(); - if (!bridgedSupply) { + if (bridgedSupply === undefined) { logger.warn('Bridged supply not found for token', token); return undefined; } @@ -273,7 +273,7 @@ async function tryGetTokenPrice( // We only get a price if the token defines a CoinGecko ID. // This way we can ignore values of certain types of collateralized warp routes, // e.g. Native warp routes on rollups that have been pre-funded. - let coinGeckoId = token.coinGeckoId; + const coinGeckoId = token.coinGeckoId; if (!coinGeckoId) { logger.warn('CoinGecko ID missing for token', token.symbol);