From 9a398166fc93a9b31c4d7c5b547867b4abea8432 Mon Sep 17 00:00:00 2001
From: Teddy Knox <teddyknox@gmail.com>
Date: Wed, 6 Dec 2023 08:25:21 -0500
Subject: [PATCH] Misc inabox improvements

---
 inabox/deploy/utils.go        | 36 +++++++++++++++--------------------
 retriever/eth/chain_client.go |  3 ++-
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/inabox/deploy/utils.go b/inabox/deploy/utils.go
index 245530b44f..a73813691e 100644
--- a/inabox/deploy/utils.go
+++ b/inabox/deploy/utils.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -103,17 +104,12 @@ func execYarnCmd(command string) {
 
 	cmd := exec.Command("yarn", command)
 
-	var out bytes.Buffer
-	var stderr bytes.Buffer
-	cmd.Stdout = &out
-	cmd.Stderr = &stderr
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 
 	err := cmd.Run()
 	if err != nil {
-		log.Print(fmt.Sprint(err) + ": " + stderr.String())
 		log.Panicf("Failed to execute yarn command (%s). Err: %s", command, err)
-	} else {
-		log.Print(out.String())
 	}
 
 	log.Print("yarn command ran succesfully")
@@ -154,17 +150,12 @@ func execForgeScript(script, privateKey string, deployer *ContractDeployer, extr
 		cmd = exec.Command("forge", args...)
 	}
 
-	var out bytes.Buffer
-	var stderr bytes.Buffer
-	cmd.Stdout = &out
-	cmd.Stderr = &stderr
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stdin
 
 	err := cmd.Run()
 	if err != nil {
-		log.Print(fmt.Sprint(err) + ": " + stderr.String())
 		log.Panicf("Failed to execute forge script. Err: %s", err)
-	} else {
-		log.Print(out.String())
 	}
 
 	log.Print("Forge script ran succesfully!")
@@ -301,16 +292,19 @@ func execCmd(name string, args []string, envVars []string) error {
 		cmd.Env = os.Environ()
 		cmd.Env = append(cmd.Env, envVars...)
 	}
-	var out bytes.Buffer
-	var stderr bytes.Buffer
-	// TODO: When these are uncommented, the deployer sometimes fails to start anvil
-	// cmd.Stdout = &out
-	// cmd.Stderr = &stderr
+
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 
 	err := cmd.Run()
 	if err != nil {
-		return fmt.Errorf("%s: %s", err.Error(), stderr.String())
+		return err
 	}
-	fmt.Print(out.String())
 	return nil
 }
+
+func removeANSIColorCodes(input []byte) []byte {
+	// Regular expression to match ANSI escape codes
+	re := regexp.MustCompile(`\x1b\[[0-9;]*m`)
+	return re.ReplaceAllLiteral(input, []byte(""))
+}
diff --git a/retriever/eth/chain_client.go b/retriever/eth/chain_client.go
index e1f2f9426a..8eaf2345cc 100644
--- a/retriever/eth/chain_client.go
+++ b/retriever/eth/chain_client.go
@@ -3,6 +3,7 @@ package eth
 import (
 	"bytes"
 	"context"
+	"encoding/hex"
 	"fmt"
 
 	"github.com/Layr-Labs/eigenda/common"
@@ -43,7 +44,7 @@ func (c *chainClient) FetchBatchHeader(ctx context.Context, serviceManagerAddres
 		return nil, err
 	}
 	if len(logs) == 0 {
-		return nil, fmt.Errorf("could not find confirmBatch events for batch header %s", string(batchHeaderHash))
+		return nil, fmt.Errorf("could not find confirmBatch events for batch header %s", hex.EncodeToString(batchHeaderHash))
 	}
 
 	if len(logs) > 1 {