From 135d31202d1357f612352034e35612e266429866 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+shaspitz@users.noreply.github.com>
Date: Wed, 20 Dec 2023 22:57:01 -0800
Subject: [PATCH] hyperlane v3.5 cli works

---
 geth-poa/hyperlane-deployer/Dockerfile    |  5 ++---
 geth-poa/hyperlane-deployer/entrypoint.sh | 20 ++++++++++++++++----
 geth-poa/util/test_bridge.sh              |  4 ++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/geth-poa/hyperlane-deployer/Dockerfile b/geth-poa/hyperlane-deployer/Dockerfile
index 5b0a04e7e9..dedfde0da6 100644
--- a/geth-poa/hyperlane-deployer/Dockerfile
+++ b/geth-poa/hyperlane-deployer/Dockerfile
@@ -4,11 +4,10 @@ RUN apk update && apk add --no-cache git yarn expect
 
 WORKDIR /
 
-# Hyperlane 3.3 release w/ https://github.com/hyperlane-xyz/hyperlane-monorepo/pull/3063 cherry-picked in.
-# See https://github.com/hyperlane-xyz/hyperlane-monorepo/compare/%40hyperlane-xyz/sdk%403.3.0...primevprotocol:hyperlane-monorepo:v3.3
+# Hyperlane 3.5 release w/ current primev changes in main
 RUN git clone https://github.com/primevprotocol/hyperlane-monorepo.git 
 WORKDIR /hyperlane-monorepo
-RUN git checkout b1c4064272af7f3382391e9f7c4ce67ac1b84976
+RUN git checkout 4f73750291e9afa249ffa4d2fe34227cc9f275a8
 
 RUN yarn install
 RUN yarn build
diff --git a/geth-poa/hyperlane-deployer/entrypoint.sh b/geth-poa/hyperlane-deployer/entrypoint.sh
index ebf3a8bc47..d3096322a2 100644
--- a/geth-poa/hyperlane-deployer/entrypoint.sh
+++ b/geth-poa/hyperlane-deployer/entrypoint.sh
@@ -7,7 +7,7 @@ sleep 10
 if test -f /hyperlane-monorepo/artifacts/done; then
   echo "Deploy artifacts already exist. Skipping deployment."
 else
-
+  echo "Deploying core contracts"
   # Define the expect script inline
   /usr/bin/expect <<EOF
   set timeout -1
@@ -42,13 +42,24 @@ fi
 if test -f artifacts/done-warp-route; then
   echo "Warp route already deployed. Skipping."
 else
-  echo "Deploying warp route."
-  hyperlane deploy warp \
+  echo "Deploying warp route"
+  # Define the expect script inline
+  /usr/bin/expect <<EOF
+  set timeout -1
+  spawn hyperlane deploy warp \
     --yes \
     --key $CONTRACT_DEPLOYER_PRIVATE_KEY \
     --chains /chain-config.yml \
     --config /warp-tokens.yml \
     --core /hyperlane-monorepo/artifacts/core-deployment.json
+  expect {
+    "*low balance on*" { 
+      send -- "Y\r"
+      exp_continue
+    }
+    eof
+  }
+EOF
 
   # Standardize artifact names
   for file in /hyperlane-monorepo/artifacts/warp-deployment-*.json; do
@@ -57,7 +68,8 @@ else
   for file in /hyperlane-monorepo/artifacts/warp-ui-token-config-*.json; do
     mv "$file" "/hyperlane-monorepo/artifacts/warp-ui-token-config.json"
   done
-  
+
+  # Signal done 
   touch artifacts/done-warp-route
 fi
 
diff --git a/geth-poa/util/test_bridge.sh b/geth-poa/util/test_bridge.sh
index 485addeedf..144fe16f6b 100755
--- a/geth-poa/util/test_bridge.sh
+++ b/geth-poa/util/test_bridge.sh
@@ -9,8 +9,8 @@ ADDRESS=0xa43b806D2f09AE94dfa38bc00d6F75426D274540
 PRIVATE_KEY=0x8b21e3bc5c26d3327109d341d121fbfb7cb79c95fba5eb2f8c064f87332df7dd
 
 # make print-warp-deploy prints these contract addrs
-SEPOLIA_ROUTER=0xA4707f60e0914850605d3a31470fBBe296F660d7
-SIDECHAIN_ROUTER=0xc9C155970C37e0343E88f0E239Bf28428943C1Fb
+SEPOLIA_ROUTER=0x11dE1a80570f36E57b3F15dAb008DFEAA4F1bf05
+SIDECHAIN_ROUTER=0xf46a69166dB5C2a7ff97D50Fc46B5fb663CeD4c3
 
 # Store initial sidechain ERC20 balance
 SIDECHAIN_ERC20_BALANCE=$(cast call $SIDECHAIN_ROUTER "balanceOf(address)" $ADDRESS)