Make Churner work on v2 smart contracts (#213)

api/proto/churner/churner.proto

@@ -33,6 +33,8 @@ message ChurnRequest {
 	//   - If any of the quorum fails to register, this entire request will fail.
 	// The IDs must be in range [0, 255].
 	repeated uint32 quorum_ids = 5;
+	// The Ethereum address (in hex like "0x123abcdef...") of the operator.
+	string operator_address = 6;
 }
 
 message ChurnReply {

churner/churner.go

@@ -25,6 +25,7 @@ var (
 )
 
 type ChurnRequest struct {
+	OperatorAddress            gethcommon.Address
 	OperatorToRegisterPubkeyG1 *core.G1Point
 	OperatorToRegisterPubkeyG2 *core.G2Point
 	OperatorRequestSignature   *core.Signature
@@ -78,14 +79,7 @@ func NewChurner(
 }
 
 func (c *churner) VerifyRequestSignature(ctx context.Context, churnRequest *ChurnRequest) (gethcommon.Address, error) {
-	operatorToRegisterAddress, err := c.Transactor.OperatorIDToAddress(ctx, churnRequest.OperatorToRegisterPubkeyG1.GetOperatorID())
-	if err != nil {
-		return gethcommon.Address{}, err
-	}
-	if operatorToRegisterAddress == gethcommon.HexToAddress(zeroAddressString) {
-		return gethcommon.Address{}, errors.New("operatorToRegisterPubkey is not registered with bls pubkey compendium")
-	}
-
+	operatorToRegisterAddress := churnRequest.OperatorAddress
 	isEqual, err := churnRequest.OperatorToRegisterPubkeyG1.VerifyEquivalence(churnRequest.OperatorToRegisterPubkeyG2)
 	if err != nil {
 		return gethcommon.Address{}, err
@@ -121,7 +115,7 @@ func (c *churner) ProcessChurnRequest(ctx context.Context, operatorToRegisterAdd
 		}
 	}
 
-	return c.createChurnResponse(ctx, operatorToRegisterId, operatorToRegisterAddress, churnRequest.QuorumIDs)
+	return c.createChurnResponse(ctx, operatorToRegisterAddress, operatorToRegisterId, churnRequest.QuorumIDs)
 }
 
 func (c *churner) UpdateQuorumCount(ctx context.Context) error {
@@ -142,8 +136,8 @@ func (c *churner) UpdateQuorumCount(ctx context.Context) error {
 
 func (c *churner) createChurnResponse(
 	ctx context.Context,
-	operatorToRegisterId core.OperatorID,
 	operatorToRegisterAddress gethcommon.Address,
+	operatorToRegisterId core.OperatorID,
 	quorumIDs []core.QuorumID,
 ) (*ChurnResponse, error) {
 	currentBlockNumber, err := c.Transactor.GetCurrentBlockNumber(ctx)
@@ -163,7 +157,7 @@ func (c *churner) createChurnResponse(
 		return nil, err
 	}
 
-	signatureWithSaltAndExpiry, err := c.sign(ctx, operatorToRegisterId, operatorsToChurn)
+	signatureWithSaltAndExpiry, err := c.sign(ctx, operatorToRegisterAddress, operatorToRegisterId, operatorsToChurn)
 	if err != nil {
 		return nil, err
 	}
@@ -256,7 +250,7 @@ func (c *churner) getOperatorsToChurn(ctx context.Context, quorumIDs []uint8, op
 	return operatorsToChurn, nil
 }
 
-func (c *churner) sign(ctx context.Context, operatorToRegisterId core.OperatorID, operatorsToChurn []core.OperatorToChurn) (*SignatureWithSaltAndExpiry, error) {
+func (c *churner) sign(ctx context.Context, operatorToRegisterAddress gethcommon.Address, operatorToRegisterId core.OperatorID, operatorsToChurn []core.OperatorToChurn) (*SignatureWithSaltAndExpiry, error) {
 	now := time.Now()
 	privateKeyBytes := crypto.FromECDSA(c.privateKey)
 	saltKeccak256 := crypto.Keccak256([]byte("churn"), []byte(now.String()), operatorToRegisterId[:], privateKeyBytes)
@@ -268,7 +262,7 @@ func (c *churner) sign(ctx context.Context, operatorToRegisterId core.OperatorID
 	expiry := big.NewInt(now.Add(secondsTillExpiry).Unix())
 
 	// sign and return signature
-	hashToSign, err := c.Transactor.CalculateOperatorChurnApprovalDigestHash(ctx, operatorToRegisterId, operatorsToChurn, salt, expiry)
+	hashToSign, err := c.Transactor.CalculateOperatorChurnApprovalDigestHash(ctx, operatorToRegisterAddress, operatorToRegisterId, operatorsToChurn, salt, expiry)
 	if err != nil {
 		return nil, err
 	}
@@ -290,6 +284,7 @@ func CalculateRequestHash(churnRequest *ChurnRequest) [32]byte {
 	var requestHash [32]byte
 	requestHashBytes := crypto.Keccak256(
 		[]byte("ChurnRequest"),
+		[]byte(churnRequest.OperatorAddress.Hex()),
 		churnRequest.OperatorToRegisterPubkeyG1.Serialize(),
 		churnRequest.OperatorToRegisterPubkeyG2.Serialize(),
 		churnRequest.Salt[:],

churner/server.go

@@ -8,6 +8,7 @@ import (
 	pb "github.com/Layr-Labs/eigenda/api/grpc/churner"
 	"github.com/Layr-Labs/eigenda/common"
 	"github.com/Layr-Labs/eigenda/core"
+	gethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -161,6 +162,8 @@ func (s *Server) validateChurnRequest(ctx context.Context, req *pb.ChurnRequest)
 func createChurnRequest(req *pb.ChurnRequest) *ChurnRequest {
 	signature := &core.Signature{G1Point: new(core.G1Point).Deserialize(req.GetOperatorRequestSignature())}
 
+	address := gethcommon.HexToAddress(req.GetOperatorAddress())
+
 	salt := [32]byte{}
 	copy(salt[:], req.GetSalt())
 
@@ -170,6 +173,7 @@ func createChurnRequest(req *pb.ChurnRequest) *ChurnRequest {
 	}
 
 	return &ChurnRequest{
+		OperatorAddress:            address,
 		OperatorToRegisterPubkeyG1: new(core.G1Point).Deserialize(req.GetOperatorToRegisterPubkeyG1()),
 		OperatorToRegisterPubkeyG2: new(core.G2Point).Deserialize(req.GetOperatorToRegisterPubkeyG2()),
 		OperatorRequestSignature:   signature,

core/eth/tx.go

@@ -570,6 +570,7 @@ func (t *Transactor) WeightOfOperatorForQuorum(ctx context.Context, quorumID cor
 
 func (t *Transactor) CalculateOperatorChurnApprovalDigestHash(
 	ctx context.Context,
+	operatorAddress gethcommon.Address,
 	operatorId core.OperatorID,
 	operatorsToChurn []core.OperatorToChurn,
 	salt [32]byte,
@@ -585,7 +586,7 @@ func (t *Transactor) CalculateOperatorChurnApprovalDigestHash(
 	}
 	return t.Bindings.RegistryCoordinator.CalculateOperatorChurnApprovalDigestHash(&bind.CallOpts{
 		Context: ctx,
-	}, operatorId, opKickParams, salt, expiry)
+	}, operatorAddress, operatorId, opKickParams, salt, expiry)
 }
 
 func (t *Transactor) GetCurrentBlockNumber(ctx context.Context) (uint32, error) {

core/mock/tx.go

@@ -136,6 +136,7 @@ func (t *MockTransactor) WeightOfOperatorForQuorum(ctx context.Context, quorumID
 
 func (t *MockTransactor) CalculateOperatorChurnApprovalDigestHash(
 	ctx context.Context,
+	operatorAddress gethcommon.Address,
 	operatorId core.OperatorID,
 	operatorsToChurn []core.OperatorToChurn,
 	salt [32]byte,

core/tx.go

@@ -110,6 +110,7 @@ type Transactor interface {
 	// CalculateOperatorChurnApprovalDigestHash returns calculated operator churn approval digest hash.
 	CalculateOperatorChurnApprovalDigestHash(
 		ctx context.Context,
+		operatorAddress gethcommon.Address,
 		operatorId OperatorID,
 		operatorsToChurn []OperatorToChurn,
 		salt [32]byte,

node/operator.go

@@ -20,6 +20,7 @@ import (
 )
 
 type Operator struct {
+	Address    string
 	Socket     string
 	Timeout    time.Duration
 	PrivKey    *ecdsa.PrivateKey
@@ -140,14 +141,15 @@ func requestChurnApproval(ctx context.Context, operator *Operator, churnerUrl st
 	ctx, cancel := context.WithTimeout(ctx, operator.Timeout)
 	defer cancel()
 
-	request := newChurnRequest(operator.KeyPair, operator.QuorumIDs)
+	request := newChurnRequest(operator.Address, operator.KeyPair, operator.QuorumIDs)
 	opt := grpc.MaxCallSendMsgSize(1024 * 1024 * 300)
 
 	return gc.Churn(ctx, request, opt)
 }
 
-func newChurnRequest(KeyPair *core.KeyPair, QuorumIDs []core.QuorumID) *grpcchurner.ChurnRequest {
+func newChurnRequest(address string, KeyPair *core.KeyPair, QuorumIDs []core.QuorumID) *grpcchurner.ChurnRequest {
 	churnRequest := &churner.ChurnRequest{
+		OperatorAddress:            address,
 		OperatorToRegisterPubkeyG1: KeyPair.PubKey,
 		OperatorToRegisterPubkeyG2: KeyPair.GetPubKeyG2(),
 		QuorumIDs:                  QuorumIDs,

node/plugin/cmd/main.go

@@ -116,6 +116,7 @@ func pluginOps(ctx *cli.Context) {
 	}
 
 	operator := &node.Operator{
+		Address:    config.Address,
 		Socket:     socket,
 		Timeout:    10 * time.Second,
 		PrivKey:    sk.PrivateKey,

node/plugin/config.go

@@ -57,6 +57,14 @@ var (
 		EnvVar:   common.PrefixEnvVar(flags.EnvVarPrefix, "BLS_KEY_PASSWORD"),
 	}
 
+	// The address of the operator.
+	AddressFlag = cli.StringFlag{
+		Name:     "address",
+		Required: true,
+		Usage:    "The address of the operator to register in EigenDA",
+		EnvVar:   common.PrefixEnvVar(flags.EnvVarPrefix, "ADDRESS"),
+	}
+
 	// The socket and the quorums to register.
 	SocketFlag = cli.StringFlag{
 		Name:     "socket",
@@ -112,6 +120,7 @@ type Config struct {
 	BlsKeyFile                    string
 	EcdsaKeyPassword              string
 	BlsKeyPassword                string
+	Address                       string
 	Socket                        string
 	QuorumIDList                  []core.QuorumID
 	ChainRpcUrl                   string
@@ -144,6 +153,7 @@ func NewConfig(ctx *cli.Context) (*Config, error) {
 		BlsKeyPassword:                ctx.GlobalString(BlsKeyPasswordFlag.Name),
 		EcdsaKeyFile:                  ctx.GlobalString(EcdsaKeyFileFlag.Name),
 		BlsKeyFile:                    ctx.GlobalString(BlsKeyFileFlag.Name),
+		Address:                       ctx.GlobalString(AddressFlag.Name),
 		Socket:                        ctx.GlobalString(SocketFlag.Name),
 		QuorumIDList:                  ids,
 		ChainRpcUrl:                   ctx.GlobalString(ChainRpcUrlFlag.Name),