From de0dc268f3731263cd595b207b9958189826c856 Mon Sep 17 00:00:00 2001
From: Robert Raynor <35671663+mooselumph@users.noreply.github.com>
Date: Fri, 19 Jan 2024 21:20:49 +0000
Subject: [PATCH] Enable batcher to confirm

---
 contracts/script/EigenDADeployer.s.sol |  1 +
 contracts/script/SetUpEigenDA.s.sol    |  6 ++++++
 inabox/Makefile                        |  5 +++++
 inabox/deploy/config_types.go          | 10 ++++++----
 inabox/deploy/deploy.go                |  3 ++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/contracts/script/EigenDADeployer.s.sol b/contracts/script/EigenDADeployer.s.sol
index dfbb51d9b..5f64b7d91 100644
--- a/contracts/script/EigenDADeployer.s.sol
+++ b/contracts/script/EigenDADeployer.s.sol
@@ -53,6 +53,7 @@ contract EigenDADeployer is DeployOpenEigenLayer {
         address eigenDAPauser;
         address churner;
         address ejector;
+        address confirmer;
     }
     
     function _deployEigenDAAndEigenLayerContracts(
diff --git a/contracts/script/SetUpEigenDA.s.sol b/contracts/script/SetUpEigenDA.s.sol
index d2dcbbfbb..fe9ca71de 100644
--- a/contracts/script/SetUpEigenDA.s.sol
+++ b/contracts/script/SetUpEigenDA.s.sol
@@ -45,6 +45,7 @@ contract SetupEigenDA is EigenDADeployer, EigenLayerUtils {
             addressConfig.eigenDAPauser = msg.sender;
             addressConfig.churner = msg.sender;
             addressConfig.ejector = msg.sender;
+            addressConfig.confirmer = msg.sender;
 
             uint256 initialSupply = 1000 ether;
             address tokenOwner = msg.sender;
@@ -65,6 +66,9 @@ contract SetupEigenDA is EigenDADeployer, EigenLayerUtils {
                 maxOperatorCount = stdJson.readUint(config_data, ".maxOperatorCount");
             }
 
+            
+            addressConfig.confirmer = vm.addr(stdJson.readUint(config_data, ".confirmerPrivateKey"));
+
 
             vm.startBroadcast();
 
@@ -75,6 +79,8 @@ contract SetupEigenDA is EigenDADeployer, EigenLayerUtils {
                 tokenOwner,
                 maxOperatorCount
             );
+            
+            eigenDAServiceManager.setBatchConfirmer(addressConfig.confirmer);
 
             vm.stopBroadcast();
         }
diff --git a/inabox/Makefile b/inabox/Makefile
index 9caab4d99..637453177 100644
--- a/inabox/Makefile
+++ b/inabox/Makefile
@@ -19,6 +19,11 @@ new-anvil:
 	mkdir -p "testdata/$(dt)"
 	cp ./templates/testconfig-anvil.yaml "testdata/$(dt)/config.yaml"
 
+new-anvil-nochurner:
+	mkdir -p "testdata/$(dt)"
+	cp ./templates/testconfig-anvil-nochurner.yaml "testdata/$(dt)/config.yaml"
+
+
 new-docker-anvil:
 	mkdir -p "testdata/$(dt)"
 	cp ./templates/testconfig-anvil-docker.yaml "testdata/$(dt)/config.yaml"
diff --git a/inabox/deploy/config_types.go b/inabox/deploy/config_types.go
index 6d8ef1834..347a2174f 100644
--- a/inabox/deploy/config_types.go
+++ b/inabox/deploy/config_types.go
@@ -53,6 +53,7 @@ type EigenDADeployConfig struct {
 	NumStrategies       int        `json:"numStrategies"`
 	MaxOperatorCount    int        `json:"maxOperatorCount"`
 	StakerPrivateKeys   []string   `json:"stakerPrivateKeys"`
+	ConfirmerPrivateKey string     `json:"confirmerPrivateKey"`
 	StakerTokenAmounts  [][]string `json:"-"`
 	OperatorPrivateKeys []string   `json:"-"`
 }
@@ -79,10 +80,11 @@ func (cfg *EigenDADeployConfig) MarshalJSON() ([]byte, error) {
 
 	// Marshal the remaining fields
 	remainingFields := map[string]interface{}{
-		"useDefaults":       cfg.UseDefaults,
-		"numStrategies":     cfg.NumStrategies,
-		"maxOperatorCount":  cfg.MaxOperatorCount,
-		"stakerPrivateKeys": cfg.StakerPrivateKeys,
+		"useDefaults":         cfg.UseDefaults,
+		"numStrategies":       cfg.NumStrategies,
+		"maxOperatorCount":    cfg.MaxOperatorCount,
+		"stakerPrivateKeys":   cfg.StakerPrivateKeys,
+		"confirmerPrivateKey": cfg.ConfirmerPrivateKey,
 	}
 
 	remainingJSON, err := json.Marshal(remainingFields)
diff --git a/inabox/deploy/deploy.go b/inabox/deploy/deploy.go
index 1d3d9dc30..3271a6655 100644
--- a/inabox/deploy/deploy.go
+++ b/inabox/deploy/deploy.go
@@ -66,6 +66,7 @@ func (env *Config) generateEigenDADeployConfig() EigenDADeployConfig {
 		StakerPrivateKeys:   stakers,
 		StakerTokenAmounts:  stakes,
 		OperatorPrivateKeys: operators,
+		ConfirmerPrivateKey: env.getKeyString("batcher0"),
 	}
 
 	return config
@@ -219,7 +220,7 @@ func (env *Config) RunNodePluginBinary(operation string, operator OperatorVars)
 		"NODE_CHURNER_URL=" + operator.NODE_CHURNER_URL,
 		"NODE_NUM_CONFIRMATIONS=0",
 	}
-	
+
 	err := execCmd("./node-plugin.sh", []string{}, envVars)
 
 	if err != nil {