test file changes

geth-poa/util/test_bridge.sh

@@ -2,30 +2,41 @@
 set -x
 set -e
 
+read -p "Has the whitelist contract been deployed, updated with hypERC20 addr, and have router addresss been pasted into this file? (y/n): " answer
+if [ "$answer" = "y" ]; then
+    echo "Continuing with bridging process..."
+else
+    echo "Exiting..."
+    exit 1
+fi
+
 # Test account, this must be funded on Sepolia
 # Address:     0xa43b806D2f09AE94dfa38bc00d6F75426D274540
 # Private key: 0x8b21e3bc5c26d3327109d341d121fbfb7cb79c95fba5eb2f8c064f87332df7dd
 ADDRESS=0xa43b806D2f09AE94dfa38bc00d6F75426D274540
 PRIVATE_KEY=0x8b21e3bc5c26d3327109d341d121fbfb7cb79c95fba5eb2f8c064f87332df7dd
 
-# make print-warp-deploy prints these contract addrs
-SEPOLIA_ROUTER=0x11dE1a80570f36E57b3F15dAb008DFEAA4F1bf05
-SIDECHAIN_ROUTER=0xf46a69166dB5C2a7ff97D50Fc46B5fb663CeD4c3
+# "make print-warp-deploy" prints these contract addrs
+SEPOLIA_ROUTER=0xdFB826f7F5E8d4843f54792369F64eF633E5c4cF
+SIDECHAIN_ROUTER=0x79Df08515c2b88daa9C407271844afFD31A4c979
 
-# Store initial sidechain ERC20 balance
-SIDECHAIN_ERC20_BALANCE=$(cast call $SIDECHAIN_ROUTER "balanceOf(address)" $ADDRESS)
+SEPOLIA_URL=https://ethereum-sepolia.publicnode.com
+SIDECHAIN_URL=http://localhost:8545
+
+# Store initial sidechain native balance
+SIDECHAIN_BALANCE=$(cast balance --rpc-url $SIDECHAIN_URL $ADDRESS)
 
 # sepolia -> dest chain (account must be funded on sepolia)
-cast call --rpc-url https://ethereum-sepolia.publicnode.com $SEPOLIA_ROUTER "quoteGasPayment(uint32)" "17864" 
+cast call --rpc-url $SEPOLIA_URL $SEPOLIA_ROUTER "quoteGasPayment(uint32)" "17864" 
 # Above returns 1 wei, therefore ether value is 1 wei larger than value function argument
-cast send --rpc-url https://ethereum-sepolia.publicnode.com --private-key $PRIVATE_KEY $SEPOLIA_ROUTER "transferRemote(uint32,bytes32,uint256)" "17864" "0x000000000000000000000000a43b806d2f09ae94dfa38bc00d6f75426d274540" "5000000000000000" --value 5000000000000001wei
+cast send --rpc-url $SEPOLIA_URL --private-key $PRIVATE_KEY $SEPOLIA_ROUTER "transferRemote(uint32,bytes32,uint256)" "17864" "0x000000000000000000000000a43b806d2f09ae94dfa38bc00d6f75426d274540" "5000000000000000" --value 5000000000000001wei
 
-# Block until ERC20 balance is incremented
+# Block until native balance is incremented
 MAX_RETRIES=20
 RETRY_COUNT=0
-while [ $(printf '%d' $(cast call $SIDECHAIN_ROUTER "balanceOf(address)" $ADDRESS)) -eq $(printf '%d' $SIDECHAIN_ERC20_BALANCE) ]
+while [ $(printf '%d' $(cast balance --rpc-url $SIDECHAIN_URL $ADDRESS)) -eq $(printf '%d' $SIDECHAIN_ERC20_BALANCE) ]
 do
-    echo "Waiting for ERC20 balance to increment..."
+    echo "Waiting for native balance to increment..."
     sleep 5
 
     RETRY_COUNT=$((RETRY_COUNT + 1))
@@ -37,22 +48,29 @@ do
 done
 
 # Store sepolia balance
-SEPOLIA_BALANCE=$(cast balance --rpc-url https://ethereum-sepolia.publicnode.com $ADDRESS)
+SEPOLIA_BALANCE=$(cast balance --rpc-url $SEPOLIA_URL $ADDRESS)
 
 # Send some sidechain ether from genesis funded account to pay for tx fees on sidechain
-cast send --private-key 0xc065f4c9a6dda0785e2224f5af8e473614de1c029acf094f03d5830e2dd5b0ea $ADDRESS --value 0.1ether 
+cast send --rpc-url $SIDECHAIN_URL --private-key 0xc065f4c9a6dda0785e2224f5af8e473614de1c029acf094f03d5830e2dd5b0ea $ADDRESS --value 0.1ether 
 
 sleep 5
 
 # dest chain -> sepolia (account must be funded on dest chain)
-cast call $SIDECHAIN_ROUTER "quoteGasPayment(uint32)" "11155111" 
+cast call --rpc-url $SIDECHAIN_URL $SIDECHAIN_ROUTER "quoteGasPayment(uint32)" "11155111" 
 # Above returns 0 wei, therefore ether value is same as function argument
-cast send --private-key $PRIVATE_KEY $SIDECHAIN_ROUTER "transferRemote(uint32,bytes32,uint256)" "11155111" "0x000000000000000000000000a43b806d2f09ae94dfa38bc00d6f75426d274540" "5000000000000000" --value 500000000000000wei
+cast send \
+    --rpc-url $SIDECHAIN_URL \
+    --private-key $PRIVATE_KEY \
+    $SIDECHAIN_ROUTER "transferRemote(uint32,bytes32,uint256)" \
+     "11155111" \
+     "0x000000000000000000000000a43b806d2f09ae94dfa38bc00d6f75426d274540" \
+     "5000000000000000" \
+     --value 500000000000000wei
 
 # Block until sepolia balance is incremented
 MAX_RETRIES=30
 RETRY_COUNT=0
-while [ $(cast balance --rpc-url https://ethereum-sepolia.publicnode.com $ADDRESS) -eq $SEPOLIA_BALANCE ]
+while [ $(cast balance --rpc-url $SEPOLIA_URL $ADDRESS) -eq $SEPOLIA_BALANCE ]
 do
     echo "Waiting for sepolia balance to increment..."
     sleep 5

geth-poa/util/test_whitelist.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+if [ -z "$1" ]; then
+    echo "Usage: $0 <HYP_ERC20_ADDR>"
+    exit 1
+fi
+HYP_ERC20_ADDR="$1"  
+
+# Make sure whitelist deployer is 0xBcA333b67fb805aB18B4Eb7aa5a0B09aB25E5ce2 to produce this addr
+WHITELIST_ADDR=0xaE476470bfc00B8a0e8531133bE621e87a981ec8
+RPC_URL=http://localhost:8545
+
+# Checks that contract deployed to expected address
+DATA='{"jsonrpc":"2.0","method":"eth_getCode","params":["'$WHITELIST_ADDR'", "latest"],"id":1}'
+RESPONSE=$(curl -s -X POST --data "$DATA" -H "Content-Type: application/json" $RPC_URL)
+CODE=$(echo $RESPONSE | jq -r '.result')
+if [ -z "$RESPONSE" ] || [ "$RESPONSE" == "null" ]; then
+    echo "Error: No response from JSON RPC at $RPC_URL"
+    exit 1
+fi
+if [ "$CODE" != "0x" ]; then
+    echo "Contract deployed at $WHITELIST_ADDR"
+else
+    echo "No contract deployed at $WHITELIST_ADDR! geth and hyperlane hardcodes will not work"
+    exit 0
+fi
+
+IS_WHITELISTED=$(cast call $WHITELIST_ADDR \
+    "isWhitelisted(address)(bool)" $HYP_ERC20_ADDR \
+    --rpc-url $RPC_URL)
+if [ "$IS_WHITELISTED" == "false" ]; then
+    echo "Error: HYP_ERC20_ADDR $HYP_ERC20_ADDR not whitelisted"
+    exit 1
+fi
+echo "HYP_ERC20_ADDR $HYP_ERC20_ADDR is whitelisted"
+
+OWNER=$(cast call $WHITELIST_ADDR \
+    "owner()(address)" \
+    --rpc-url $RPC_URL)
+if [ "$OWNER" != "0xBcA333b67fb805aB18B4Eb7aa5a0B09aB25E5ce2" ]; then
+    echo "Error: Whitelist owner is not 0xBcA333b67fb805aB18B4Eb7aa5a0B09aB25E5ce2"
+    exit 1
+fi
+echo "Whitelist owner is 0xBcA333b67fb805aB18B4Eb7aa5a0B09aB25E5ce2"