Update deployment code for M2 mainnet contracts (#193)

Layr-Labs · Jan 25, 2024 · 8ccb524 · 8ccb524
1 parent 3c38f51
commit 8ccb524
Show file tree

Hide file tree

Showing 19 changed files with 10,528 additions and 1,482 deletions.
diff --git a/contracts/bindings/BLSApkRegistry/binding.go b/contracts/bindings/BLSApkRegistry/binding.go
diff --git a/contracts/bindings/BN254/binding.go b/contracts/bindings/BN254/binding.go
diff --git a/contracts/bindings/BitmapUtils/binding.go b/contracts/bindings/BitmapUtils/binding.go
diff --git a/contracts/bindings/DelegationManager/binding.go b/contracts/bindings/DelegationManager/binding.go
diff --git a/contracts/bindings/EigenDAServiceManager/binding.go b/contracts/bindings/EigenDAServiceManager/binding.go
diff --git a/contracts/bindings/IEigenDAServiceManager/binding.go b/contracts/bindings/IEigenDAServiceManager/binding.go
diff --git a/contracts/bindings/IndexRegistry/binding.go b/contracts/bindings/IndexRegistry/binding.go
diff --git a/contracts/bindings/MockRollup/binding.go b/contracts/bindings/MockRollup/binding.go
diff --git a/contracts/bindings/OperatorStateRetriever/binding.go b/contracts/bindings/OperatorStateRetriever/binding.go
diff --git a/contracts/bindings/RegistryCoordinator/binding.go b/contracts/bindings/RegistryCoordinator/binding.go
diff --git a/contracts/bindings/StakeRegistry/binding.go b/contracts/bindings/StakeRegistry/binding.go
diff --git a/contracts/compile.sh b/contracts/compile.sh
@@ -21,7 +21,7 @@ function create_binding {
 forge clean
 forge build
 
-contracts="BitmapUtils BLSOperatorStateRetriever BN254 BLSRegistryCoordinatorWithIndices BLSPublicKeyCompendium BLSPubkeyRegistry IBLSPubkeyRegistry IndexRegistry StakeRegistry EigenDAServiceManager IEigenDAServiceManager MockRollup"
+contracts="DelegationManager BitmapUtils OperatorStateRetriever RegistryCoordinator BLSApkRegistry IndexRegistry StakeRegistry BN254 EigenDAServiceManager IEigenDAServiceManager MockRollup"
 for contract in $contracts; do
     create_binding ./ $contract ./bindings
 done

diff --git 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
@@ -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();
         }
@@ -169,9 +175,9 @@ contract SetupEigenDA is EigenDADeployer, EigenLayerUtils {
 
         string memory output = "eigenDA deployment output";
         vm.serializeAddress(output, "eigenDAServiceManager", address(eigenDAServiceManager));
-        vm.serializeAddress(output, "blsOperatorStateRetriever", address(operatorStateRetriever));
+        vm.serializeAddress(output, "operatorStateRetriever", address(operatorStateRetriever));
         vm.serializeAddress(output, "blsApkRegistry" , address(apkRegistry));
-        vm.serializeAddress(output, "blsRegistryCoordinatorWithIndices", address(registryCoordinator));
+        vm.serializeAddress(output, "registryCoordinator", address(registryCoordinator));
 
         string memory finalJson = vm.serializeString(output, "object", output);
 

diff --git 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
@@ -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)
@@ -96,12 +98,11 @@ func (cfg *EigenDADeployConfig) MarshalJSON() ([]byte, error) {
 }
 
 type EigenDAContract struct {
-	Deployer                       string `yaml:"deployer"`
-	ServiceManager                 string `json:"eigenDAServiceManager"`
-	OperatorStateRetreiver         string `json:"blsOperatorStateRetriever"`
-	PubkeyRegistry                 string `json:"blsPubkeyRegistry"`
-	PubkeyCompendium               string `json:"pubkeyCompendium"`
-	RegistryCoordinatorWithIndices string `json:"blsRegistryCoordinatorWithIndices"`
+	Deployer               string `yaml:"deployer"`
+	ServiceManager         string `json:"eigenDAServiceManager"`
+	OperatorStateRetreiver string `json:"operatorStateRetriever"`
+	BlsApkRegistry         string `json:"blsApkRegistry"`
+	RegistryCoordinator    string `json:"registryCoordinator"`
 }
 
 type ServicesSpec struct {

diff --git 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 {

diff --git a/inabox/deploy/subgraph.go b/inabox/deploy/subgraph.go
@@ -73,35 +73,30 @@ type eigenDAOperatorStateSubgraphUpdater struct {
 }
 
 func (u eigenDAOperatorStateSubgraphUpdater) UpdateSubgraph(s *Subgraph, startBlock int) {
-	s.DataSources[0].Source.Address = strings.TrimPrefix(u.c.EigenDA.RegistryCoordinatorWithIndices, "0x")
+	s.DataSources[0].Source.Address = strings.TrimPrefix(u.c.EigenDA.RegistryCoordinator, "0x")
 	s.DataSources[0].Source.StartBlock = startBlock
-	s.DataSources[1].Source.Address = strings.TrimPrefix(u.c.EigenDA.PubkeyRegistry, "0x")
+	s.DataSources[1].Source.Address = strings.TrimPrefix(u.c.EigenDA.BlsApkRegistry, "0x")
 	s.DataSources[1].Source.StartBlock = startBlock
-	s.DataSources[2].Source.Address = strings.TrimPrefix(u.c.EigenDA.PubkeyCompendium, "0x")
+	s.DataSources[2].Source.Address = strings.TrimPrefix(u.c.EigenDA.BlsApkRegistry, "0x")
 	s.DataSources[2].Source.StartBlock = startBlock
-	s.DataSources[3].Source.Address = strings.TrimPrefix(u.c.EigenDA.PubkeyCompendium, "0x")
+	s.DataSources[3].Source.Address = strings.TrimPrefix(u.c.EigenDA.RegistryCoordinator, "0x")
 	s.DataSources[3].Source.StartBlock = startBlock
-	s.DataSources[4].Source.Address = strings.TrimPrefix(u.c.EigenDA.RegistryCoordinatorWithIndices, "0x")
+	s.DataSources[4].Source.Address = strings.TrimPrefix(u.c.EigenDA.BlsApkRegistry, "0x")
 	s.DataSources[4].Source.StartBlock = startBlock
-	s.DataSources[5].Source.Address = strings.TrimPrefix(u.c.EigenDA.PubkeyRegistry, "0x")
-	s.DataSources[5].Source.StartBlock = startBlock
 }
 
 func (u eigenDAOperatorStateSubgraphUpdater) UpdateNetworks(n Networks, startBlock int) {
-	n["devnet"]["BLSRegistryCoordinatorWithIndices"]["address"] = u.c.EigenDA.RegistryCoordinatorWithIndices
-	n["devnet"]["BLSRegistryCoordinatorWithIndices"]["startBlock"] = startBlock
-	n["devnet"]["BLSRegistryCoordinatorWithIndices_Operator"]["address"] = u.c.EigenDA.RegistryCoordinatorWithIndices
-	n["devnet"]["BLSRegistryCoordinatorWithIndices_Operator"]["startBlock"] = startBlock
-
-	n["devnet"]["BLSPubkeyRegistry"]["address"] = u.c.EigenDA.PubkeyRegistry
-	n["devnet"]["BLSPubkeyRegistry"]["startBlock"] = startBlock
-	n["devnet"]["BLSPubkeyRegistry_QuorumApkUpdates"]["address"] = u.c.EigenDA.PubkeyRegistry
-	n["devnet"]["BLSPubkeyRegistry_QuorumApkUpdates"]["startBlock"] = startBlock
-
-	n["devnet"]["BLSPubkeyCompendium"]["address"] = u.c.EigenDA.PubkeyCompendium
-	n["devnet"]["BLSPubkeyCompendium"]["startBlock"] = startBlock
-	n["devnet"]["BLSPubkeyCompendium_Operator"]["address"] = u.c.EigenDA.PubkeyCompendium
-	n["devnet"]["BLSPubkeyCompendium_Operator"]["startBlock"] = startBlock
+	n["devnet"]["RegistryCoordinator"]["address"] = u.c.EigenDA.RegistryCoordinator
+	n["devnet"]["RegistryCoordinator"]["startBlock"] = startBlock
+	n["devnet"]["RegistryCoordinator_Operator"]["address"] = u.c.EigenDA.RegistryCoordinator
+	n["devnet"]["RegistryCoordinator_Operator"]["startBlock"] = startBlock
+
+	n["devnet"]["BLSApkRegistry"]["address"] = u.c.EigenDA.BlsApkRegistry
+	n["devnet"]["BLSApkRegistry"]["startBlock"] = startBlock
+	n["devnet"]["BLSApkRegistry_Operator"]["address"] = u.c.EigenDA.BlsApkRegistry
+	n["devnet"]["BLSApkRegistry_Operator"]["startBlock"] = startBlock
+	n["devnet"]["BLSApkRegistry_QuorumApkUpdates"]["address"] = u.c.EigenDA.BlsApkRegistry
+	n["devnet"]["BLSApkRegistry_QuorumApkUpdates"]["startBlock"] = startBlock
 }
 
 type eigenDAUIMonitoringUpdater struct {

diff --git a/inabox/tests/integration_test.go b/inabox/tests/integration_test.go
@@ -148,7 +148,7 @@ func blobHeaderFromProto(blobHeader *disperserpb.BlobHeader) rollupbindings.IEig
 	}
 }
 
-func blobVerificationProofFromProto(verificationProof *disperserpb.BlobVerificationProof) rollupbindings.EigenDABlobUtilsBlobVerificationProof {
+func blobVerificationProofFromProto(verificationProof *disperserpb.BlobVerificationProof) rollupbindings.EigenDARollupUtilsBlobVerificationProof {
 	batchMetadataProto := verificationProof.GetBatchMetadata()
 	batchHeaderProto := verificationProof.GetBatchMetadata().GetBatchHeader()
 	var batchRoot [32]byte
@@ -168,7 +168,7 @@ func blobVerificationProofFromProto(verificationProof *disperserpb.BlobVerificat
 		Fee:                     fee,
 		ConfirmationBlockNumber: batchMetadataProto.GetConfirmationBlockNumber(),
 	}
-	return rollupbindings.EigenDABlobUtilsBlobVerificationProof{
+	return rollupbindings.EigenDARollupUtilsBlobVerificationProof{
 		BatchId:                verificationProof.GetBatchId(),
 		BlobIndex:              uint8(verificationProof.GetBlobIndex()),
 		BatchMetadata:          batchMetadata,