Update GetSignatureFormat to use ethrpc for chainID and accept wallet parameter

Co-Authored-By: Chris Li <chris.li.2046@gmail.com>

Author: devin-ai-integration[bot]

aggregator/auth.go

@@ -187,13 +187,19 @@ func (r *RpcServer) verifyOperator(ctx context.Context, operatorAddr string) (bo
 }
 
 func (r *RpcServer) GetSignatureFormat(ctx context.Context, req *avsproto.GetSignatureFormatReq) (*avsproto.GetSignatureFormatResp, error) {
-	chainId := int64(1) // Example Ethereum mainnet
+	chainId, err := r.ethrpc.ChainID(ctx)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "Failed to get chainID: %v", err)
+	}
+	
 	issuedAt := time.Now().UTC().Format("2006-01-02T15:04:05.000Z")
+	
 	expiredAt := time.Now().Add(time.Hour * 24).UTC().Format("2006-01-02T15:04:05.000Z")
-	walletAddress := "0x0000000000000000000000000000000000000000" // Example address
-
-	formattedMessage := fmt.Sprintf(authTemplate, chainId, issuedAt, expiredAt, walletAddress)
-
+	
+	walletAddress := req.Wallet
+	
+	formattedMessage := fmt.Sprintf(authTemplate, chainId.Int64(), issuedAt, expiredAt, walletAddress)
+	
 	return &avsproto.GetSignatureFormatResp{
 		Format: formattedMessage,
 	}, nil

aggregator/auth_test.go

@@ -3,6 +3,8 @@ package aggregator
 import (
 	"context"
 	"fmt"
+	"math/big"
+	"strings"
 	"testing"
 	"time"
 
@@ -18,6 +20,14 @@ import (
 	sdklogging "github.com/Layr-Labs/eigensdk-go/logging"
 )
 
+type MockEthClient struct {
+	chainID *big.Int
+}
+
+func (m *MockEthClient) ChainID(ctx context.Context) (*big.Int, error) {
+	return m.chainID, nil
+}
+
 func TestGetKeyWithSignature(t *testing.T) {
 	logger, _ := sdklogging.NewZapLogger("development")
 
@@ -80,22 +90,34 @@ func TestGetKeyWithSignature(t *testing.T) {
 func TestGetSignatureFormat(t *testing.T) {
 	logger, _ := sdklogging.NewZapLogger("development")
 
+	mockEthClient := &MockEthClient{
+		chainID: big.NewInt(1), // Ethereum mainnet
+	}
+
 	r := RpcServer{
 		config: &config.Config{
 			JwtSecret: []byte("test123"),
 			Logger:    logger,
 		},
+		ethrpc: mockEthClient,
 	}
 
-	req := &avsproto.GetSignatureFormatReq{}
+	walletAddress := "0x1234567890123456789012345678901234567890"
+	req := &avsproto.GetSignatureFormatReq{
+		Wallet: walletAddress,
+	}
 
 	resp, err := r.GetSignatureFormat(context.Background(), req)
 
 	if err != nil {
 		t.Errorf("expected GetSignatureFormat to succeed but got error: %s", err)
 	}
 
-	if resp.Format != authTemplate {
-		t.Errorf("expected format to be %s but got %s", authTemplate, resp.Format)
+	if !strings.Contains(resp.Format, walletAddress) {
+		t.Errorf("expected format to contain wallet address %s but got %s", walletAddress, resp.Format)
+	}
+
+	if !strings.Contains(resp.Format, "Chain ID: 1") {
+		t.Errorf("expected format to contain Chain ID: 1 but got %s", resp.Format)
 	}
 }

protobuf/avs.proto

@@ -659,11 +659,12 @@ message DeleteSecretReq {
 }
 
 message GetSignatureFormatReq {
-  // Empty request
+  // The wallet address to include in the signature format
+  string wallet = 1;
 }
 
 message GetSignatureFormatResp {
-  // The template format for signature messages
+  // The formatted signature message with server-side values filled in
   string format = 1;
 }