Skip to content

Commit 2c57510

Browse files
committed
fix: ccip read origin_tx_hash as query parameter
1 parent f2797f8 commit 2c57510

3 files changed

Lines changed: 24 additions & 15 deletions

File tree

rust/main/agents/relayer/src/msg/metadata/ccip_read/mod.rs

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,6 @@ async fn metadata_build(
225225
.call_get_offchain_verify_info(ism, message)
226226
.await?;
227227

228-
let origin_tx_hash = ism_builder
229-
.base
230-
.base_builder()
231-
.retrieve_origin_tx_hash_by_message_id(message.id())
232-
.await
233-
.ok()
234-
.flatten()
235-
.map(|h| bytes_to_hex(&h512_to_bytes(&h)));
236-
237228
let ccip_url_regex = create_ccip_url_regex();
238229

239230
for url in info.urls.iter() {
@@ -244,7 +235,21 @@ async fn metadata_build(
244235

245236
let deadline = Instant::now() + FETCH_RETRY_BUDGET;
246237
loop {
247-
match fetch_offchain_data(ism_builder, &info, url, origin_tx_hash.clone()).await {
238+
let origin_tx_hash = ism_builder
239+
.base
240+
.base_builder()
241+
.retrieve_origin_tx_hash_by_message_id(message.id())
242+
.await
243+
.ok()
244+
.flatten()
245+
.map(|h| bytes_to_hex(&h512_to_bytes(&h)));
246+
info!(
247+
?ism_address,
248+
message_id = ?message.id(),
249+
?origin_tx_hash,
250+
"Retrieved origin tx hash from db for offchain lookup"
251+
);
252+
match fetch_offchain_data(ism_builder, &info, url, origin_tx_hash).await {
248253
Ok(data) => return Ok(data),
249254
Err(err) => {
250255
if Instant::now() >= deadline {
@@ -305,7 +310,11 @@ async fn fetch_offchain_data(
305310
data: data_as_bytes,
306311
signature: maybe_signature_hex,
307312
};
308-
info!(url, ?body, "Sending POST offchain lookup request");
313+
info!(
314+
interpolated_url,
315+
?body,
316+
"Sending POST offchain lookup request"
317+
);
309318
Client::new()
310319
.request(Method::POST, interpolated_url)
311320
.header(CONTENT_TYPE, "application/json")
@@ -319,7 +328,7 @@ async fn fetch_offchain_data(
319328
MetadataBuildError::FailedToBuild(msg)
320329
})?
321330
} else {
322-
info!(url, "Sending GET offchain lookup request");
331+
info!(interpolated_url, "Sending GET offchain lookup request");
323332
Client::new()
324333
.request(Method::GET, interpolated_url)
325334
.timeout(Duration::from_secs(DEFAULT_TIMEOUT))

typescript/infra/config/docker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const mainnetDockerTags: MainnetDockerTags = {
5454

5555
export const testnetDockerTags: BaseDockerTags = {
5656
// rust agents
57-
relayer: 'f0b8427-20260406-083303',
57+
relayer: 'f2797f8-20260406-090955',
5858
relayerRC: '1663fd7-20260327-165421',
5959
relayerFastPath: '1663fd7-20260327-165421',
6060
validator: '910e8e8-20260318-204227',

typescript/infra/helm/offchain-lookup-server/values-testnet.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ image:
66
# Modify this tag to deploy a new revision.
77
# Images can be found here:
88
# https://github.com/orgs/hyperlane-xyz/packages/container/package/hyperlane-node-services
9-
tag: ac531f8-20260406-085645
9+
tag: f2797f8-20260406-090954
1010

1111
# In Google Cloud Secret Manager, all secrets need to have a certain prefix in order to be accessible by
1212
# the Cluster Secret Store. For testnet this prefix is "hyperlane-testnet4"
@@ -20,7 +20,7 @@ ingress:
2020

2121
env:
2222
- name: ENABLED_MODULES
23-
value: 'cctp,callCommitments'
23+
value: 'cctp'
2424
- name: HYPERLANE_EXPLORER_URL
2525
value: 'https://api.hyperlane.xyz/v1/graphql'
2626
- name: CCTP_ATTESTATION_URL

0 commit comments

Comments
 (0)