Merge pull request #19 from Layr-Labs/seri.choi/m1-1

feat: add leaf salting to operator table merkle tree generation

Author: serichoi65

pkg/distribution/distribution.go

@@ -5,9 +5,14 @@ package distribution
 
 import (
 	"fmt"
+
 	"github.com/ethereum/go-ethereum/common"
 )
 
+// OPERATOR_TABLE_LEAF_SALT is the salt used for encoding operator table leaves
+// This matches the salt used in the EigenLayer contracts to prevent second preimage attacks
+const OPERATOR_TABLE_LEAF_SALT = 0x8e
+
 // OperatorSet represents a unique operator set in the EigenLayer ecosystem.
 // It consists of an ID and the address of the associated AVS (Actively Validated Service).
 type OperatorSet struct {
@@ -137,3 +142,20 @@ func (d *Distribution) GetOperatorSets() []OperatorSet {
 	}
 	return sets
 }
+
+// EncodeOperatorTableLeaf encodes an operator table leaf for merkleization.
+// This function creates a consistent leaf encoding format that matches the EigenLayer
+// contracts' LeafCalculatorMixin implementation to prevent second preimage attacks.
+//
+// The format follows: OPERATOR_TABLE_LEAF_SALT || operatorTableBytes
+// The Merkle tree library will then hash this salted data with keccak256.
+//
+// Parameters:
+//   - operatorTableBytes: The operator table data bytes
+//
+// Returns:
+//   - []byte: The salted leaf data (salt + operatorTableBytes)
+func EncodeOperatorTableLeaf(operatorTableBytes []byte) []byte {
+	saltByte := []byte{OPERATOR_TABLE_LEAF_SALT}
+	return append(saltByte, operatorTableBytes...)
+}

pkg/operatorTableCalculator/operatorTableCalculator.go

@@ -114,7 +114,15 @@ func (c *StakeTableCalculator) CalculateStakeTableRoot(
 			zap.String("opsetAvs", opset.Avs.String()),
 			zap.String("bytes", hexutil.Encode(tableBytes)),
 		)
-		opsetTableRoots[i] = tableBytes
+
+		encodedLeaf := distribution.EncodeOperatorTableLeaf(tableBytes)
+		opsetTableRoots[i] = encodedLeaf
+
+		c.logger.Sugar().Infow("Encoded operator table leaf for opset",
+			zap.Uint32("opsetId", opset.Id),
+			zap.String("opsetAvs", opset.Avs.String()),
+			zap.String("encodedLeaf", hexutil.Encode(encodedLeaf)),
+		)
 
 		err = dist.SetTableData(opset, tableBytes)
 		if err != nil {