Update with testing fixes and code rabbit suggestions

Author: reednaa

script/pioneer/PioneerQA.sol

@@ -13,7 +13,6 @@ contract PioneerQA is Script {
         bytes32 transactionId;
         address sendingAssetId;
         address receiver;
-        uint256 inputAmount;
         uint256 minAmount;
         uint256 destinationChainId;
     }
@@ -47,15 +46,15 @@ contract PioneerQA is Script {
 
             if (LibAsset.isNativeAsset(param.sendingAssetId)) {
                 PioneerFacet(diamond).startBridgeTokensViaPioneer{
-                    value: param.inputAmount
+                    value: param.minAmount
                 }(_bridgeData, _pioneerData);
             } else {
                 // Set allowance
                 LibAsset.approveERC20(
                     IERC20(param.sendingAssetId),
                     diamond,
-                    param.inputAmount,
-                    param.inputAmount
+                    param.minAmount,
+                    param.minAmount
                 );
 
                 PioneerFacet(diamond).startBridgeTokensViaPioneer(

script/pioneer/pioneer-qa-full.sh

@@ -1,26 +1,29 @@
+#!/usr/bin/env bash
+
 ## Load env
 source .env
 
 # This script is created to assist with throughput testing of Pioneer through the LI.FI diamond.
 
-# Get from network.
-NETWORK=$1  # ["optimism", "arbitrum", "polygon"]
-# Get to networks
-TO_NETWORKS=$2  # ["optimism", "arbitrum", "polygon"]
-# Get the token
-TOKEN=$3  # 0x...
-NUM_TRANSACTIONS=$4 # 10
-NUM_RUNS=5 # 5
+# Get from networks (JSON-like list or comma-separated)
+SRC_NETWORKS=${1:?Usage: $0 SRC_NETWORKS TO_NETWORKS TOKEN NUM_TRANSACTIONS NUM_RUNS}
+
+# Get to networks "[optimism, arbitrum, polygon]"
+TO_NETWORKS=${2:?missing TO_NETWORKS}
+
+TOKEN=${3:?missing TOKEN}
+NUM_TRANSACTIONS=${4:?missing NUM_TRANSACTIONS}
+NUM_RUNS=${5:-5}
 
 
 # For each network provided, run the qa script in parallel and then wait for all to finish.
 for RUN in $(seq 1 $NUM_RUNS);
 do
   echo "Starting run $RUN of $NUM_RUNS"
-  for NETWORK in $(echo $NETWORK | tr -d '[]"' | tr ',' '\n');
+  for NET in $(echo $SRC_NETWORKS | tr -d '[]"' | tr ',' '\n');
   do
-    echo "Starting QA for network: $NETWORK"
-    bash script/pioneer/pioneer-qa.sh "$NETWORK" "$TO_NETWORKS" "$TOKEN" "$NUM_TRANSACTIONS" &
+    echo "Starting QA for network: $NET"
+    bash script/pioneer/pioneer-qa.sh "$NET" "$TO_NETWORKS" "$TOKEN" "$NUM_TRANSACTIONS" &
   done
   # Wait for all background processes to finish
   wait

script/pioneer/pioneer-qa.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 ## Load env
 source .env
 
@@ -16,23 +18,32 @@ NETWORK=$(echo $NETWORK | tr '[:upper:]' '[:lower:]')
 UPPER_NETWORK=$(echo $NETWORK | tr '[:lower:]' '[:upper:]')
 
 # Get the diamond address for the network (stored at ./deployments/<network>.json)
-DIAMOND=$(jq -r '.LiFiDiamond' ./deployments/$NETWORK.staging.json)
+DEPLOY_FILE="./deployments/${NETWORK}.staging.json"
+test -f "$DEPLOY_FILE" || { echo "Missing $DEPLOY_FILE"; exit 1; }
+DIAMOND=$(jq -r '.LiFiDiamond' "$DEPLOY_FILE")
 echo "Using LiFi Diamond at $DIAMOND"
 
 # Get the RPC_URL for the network ($ETH_NODE_URI_<NETWORK>)
-RPC_URL=$(eval echo \$ETH_NODE_URI_$UPPER_NETWORK)
+RPC_ENV="ETH_NODE_URI_${UPPER_NETWORK}"
+RPC_URL=$(eval "echo \${$RPC_ENV:-}")
+[ -n "$RPC_URL" ] || { echo "Missing $RPC_ENV"; exit 1; }
 
 # Get from network id.
-FROM_NETWORK_ID=$(cast chain-id --rpc-url $RPC_URL)
+FROM_NETWORK_ID=$(cast chain-id --rpc-url "$RPC_URL")
 
 # Convert to_networks to array of ids.
 TO_NETWORKS_IDS=()
 for NET in $(echo $TO_NETWORKS | tr -d '[]"' | tr ',' '\n');
 do
-  NET_ID=$(cast chain-id --rpc-url $(eval echo \$ETH_NODE_URI_$(echo $NET | tr '[:lower:]' '[:upper:]')))
-  TO_NETWORKS_IDS+=($NET_ID)
+  UPPER_NET=$(echo "$NET" | tr '[:lower:]' '[:upper:]')
+  NET_RPC_ENV="ETH_NODE_URI_${UPPER_NET}"
+  NET_RPC=$(eval "echo \${$NET_RPC_ENV:-}")
+  [ -n "$NET_RPC" ] || { echo "Missing $NET_RPC_ENV"; exit 1; }
+  NET_ID=$(cast chain-id --rpc-url "$NET_RPC")
+  TO_NETWORKS_IDS+=("$NET_ID")
 done
 
+[[ -n "${PRIVATE_KEY:-}" ]] || { echo "Missing PRIVATE_KEY in env" >&2; exit 1; }
 # Compute the user's address
 USER_ADDRESS=$(cast wallet address $PRIVATE_KEY)
 
@@ -49,11 +60,12 @@ USER_BALANCE=$(cast balance $USER_ADDRESS --rpc-url $RPC_URL)
 USER_BALANCE=$((USER_BALANCE / 10))
 
 # Compute the amount we want to use, 10000000000000000 or user balance / 10 whatever is smallest.
-OP_AMOUNT=10000000000000000
+OP_AMOUNT=100000000000000000
 if [ "$USER_BALANCE" -lt "$OP_AMOUNT" ]; then
   OP_AMOUNT=$USER_BALANCE
 fi
 echo "Operating Amount: $OP_AMOUNT"
+[ "$OP_AMOUNT" -gt 0 ] || { echo "OP_AMOUNT computed as 0"; exit 1; }
 
 # Collect quotes from Pioneer
 # Initialize an empty array to hold responses
@@ -73,6 +85,7 @@ do
   TO_ADDRESS="$USER_ADDRESS"
   # Divide the OP_AMOUNT by number of operations
   FROM_AMOUNT=$(($OP_AMOUNT / $NUM_TRANSACTIONS))
+  [ "$FROM_AMOUNT" -gt 0 ] || { echo "Per-tx FROM_AMOUNT computed as 0" >&2; exit 1; }
   SLIPPAGE="0"
   EXTERNAL_ID="$TRANSACTION_ID"
 
@@ -90,6 +103,9 @@ do
   # Fetch quote from Pioneer
   RESPONSE=$(curl -s -G "$PIONEER_ENDPOINT/quote?$QUERY_STRING" -H "Content-Type: application/json")
 
+  echo "$PIONEER_ENDPOINT/quote?$QUERY_STRING"
+  echo "Response: $RESPONSE"
+
   # # Check if the response is valid
   if [ -z "$RESPONSE" ] || echo "$RESPONSE" | grep -q '"error"'; then
     echo "Quote request failed: $RESPONSE"
@@ -98,9 +114,8 @@ do
 
   # Extract necessary fields from the response
   TO_CHAIN_ID=$(echo "$RESPONSE" | jq -r '.toChainId')
-  TO_AMOUNT_MIN=$(echo "$RESPONSE" | jq -r '.toAmountMin')
 
-  RESPONSES+=("$(echo "$TRANSACTION_ID, $TOKEN, $USER_ADDRESS, $OP_AMOUNT, $TO_AMOUNT_MIN, $TO_CHAIN_ID")")
+  RESPONSES+=("$(echo "$TRANSACTION_ID, $TOKEN, $USER_ADDRESS, $FROM_AMOUNT, $TO_CHAIN_ID")")
 done
 
 echo "All quote responses collected."
@@ -111,4 +126,4 @@ FLATTENED_RESPONSES=$(printf "(%s)," "${RESPONSES[@]}")
 FLATTENED_RESPONSES="[${FLATTENED_RESPONSES%,}]"
 
 # Execute transactions:
-forge script PioneerQA --sig "run(address,address,(bytes32,address,address,uint256,uint256,uint256)[])" "$DIAMOND" "$USER_ADDRESS" "$FLATTENED_RESPONSES" --private-key $PRIVATE_KEY --rpc-url $RPC_URL --broadcast -vvvv
+forge script PioneerQA --sig "run(address,address,(bytes32,address,address,uint256,uint256)[])" "$DIAMOND" "$USER_ADDRESS" "$FLATTENED_RESPONSES" --private-key "$PRIVATE_KEY" --rpc-url "$RPC_URL" --broadcast -vvvv