From c41345c64f80922624a17e6aacd7a9773e7e0ebd Mon Sep 17 00:00:00 2001
From: Trevor Porter <trkporter@ucdavis.edu>
Date: Wed, 22 Nov 2023 11:44:46 +0000
Subject: [PATCH 1/2] 1k block chunk for scroll indexing (#2956)

### Description

RPC URLs on scroll max out at 1k

### Drive-by changes

<!--
Are there any minor or drive-by changes also included?
-->

### Related issues

<!--
- Fixes #[issue number here]
-->

### Backward compatibility

<!--
Are these changes backward compatible? Are there any infrastructure
implications, e.g. changes that would prohibit deploying older commits
using this infra tooling?

Yes/No
-->

### Testing

<!--
What kind of testing have these changes undergone?

None/Manual/Unit Tests
-->
---
 rust/config/mainnet3_config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rust/config/mainnet3_config.json b/rust/config/mainnet3_config.json
index fc06c4c8d5..6b36f35fbe 100644
--- a/rust/config/mainnet3_config.json
+++ b/rust/config/mainnet3_config.json
@@ -625,7 +625,8 @@
       "mailbox": "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7",
       "validatorAnnounce": "0xd83A4F747fE80Ed98839e05079B1B7Fe037b1638",
       "index": {
-        "from": 426670
+        "from": 426670,
+        "chunk": 999
       }
     }
   },

From 8db8fcd46e568f7c53a669b4fc0a090b9d6c7748 Mon Sep 17 00:00:00 2001
From: Trevor Porter <trkporter@ucdavis.edu>
Date: Wed, 22 Nov 2023 13:45:59 +0000
Subject: [PATCH 2/2] Deploy testnet4 & mainnet3 agents with image that
 includes merkle tree indexing fix (#2957)

### Description

Image from the latest PR to trevor/new-featv3-cosmos-oct-28, which is
https://github.com/hyperlane-xyz/hyperlane-monorepo/pull/2912

This includes a fix to merkle tree indexing so it indexes it in the same
way as messages

### Drive-by changes

<!--
Are there any minor or drive-by changes also included?
-->

### Related issues

<!--
- Fixes #[issue number here]
-->

### Backward compatibility

<!--
Are these changes backward compatible? Are there any infrastructure
implications, e.g. changes that would prohibit deploying older commits
using this infra tooling?

Yes/No
-->

### Testing

<!--
What kind of testing have these changes undergone?

None/Manual/Unit Tests
-->
---
 typescript/infra/config/environments/mainnet3/agent.ts | 6 +++---
 typescript/infra/config/environments/testnet4/agent.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/typescript/infra/config/environments/mainnet3/agent.ts b/typescript/infra/config/environments/mainnet3/agent.ts
index d2922ebc96..f190ad7731 100644
--- a/typescript/infra/config/environments/mainnet3/agent.ts
+++ b/typescript/infra/config/environments/mainnet3/agent.ts
@@ -42,14 +42,14 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: '2e1db12-20231025-013013',
+      tag: '1bee32a-20231121-121303',
     },
     gasPaymentEnforcement,
   },
   validators: {
     docker: {
       repo,
-      tag: '2e1db12-20231025-013013',
+      tag: '1bee32a-20231121-121303',
     },
     rpcConsensusType: RpcConsensusType.Quorum,
     chains: validatorChainConfig(Contexts.Hyperlane),
@@ -58,7 +58,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: '2e1db12-20231025-013013',
+      tag: '1bee32a-20231121-121303',
     },
   },
 };
diff --git a/typescript/infra/config/environments/testnet4/agent.ts b/typescript/infra/config/environments/testnet4/agent.ts
index f3406d1421..4d1019d648 100644
--- a/typescript/infra/config/environments/testnet4/agent.ts
+++ b/typescript/infra/config/environments/testnet4/agent.ts
@@ -49,7 +49,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: 'fd890d2-20231024-132022',
+      tag: '1bee32a-20231121-121303',
     },
     blacklist: [
       ...releaseCandidateHelloworldMatchingList,
@@ -66,7 +66,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: 'fd890d2-20231024-132022',
+      tag: '1bee32a-20231121-121303',
     },
     chains: validatorChainConfig(Contexts.Hyperlane),
   },
@@ -74,7 +74,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: 'fd890d2-20231024-132022',
+      tag: '1bee32a-20231121-121303',
     },
   },
 };