[v2] Add quorum results to attestation (#1018)

ian-shim · hopeyen · commit 3063aae013fc · 2024-12-18T23:56:25.000-08:00
diff --git a/api/docs/disperser_v2.html b/api/docs/disperser_v2.html
@@ -288,7 +288,8 @@ <h3 id="disperser.v2.Attestation">Attestation</h3>
                   <td>quorum_apks</td>
                   <td><a href="#bytes">bytes</a></td>
                   <td>repeated</td>
-                  <td><p>Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum </p></td>
+                  <td><p>Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum
+The order of the quorum_apks should match the order of the quorum_numbers </p></td>
                 </tr>
               
                 <tr>
@@ -305,6 +306,14 @@ <h3 id="disperser.v2.Attestation">Attestation</h3>
                   <td><p>Relevant quorum numbers for the attestation </p></td>
                 </tr>
               
+                <tr>
+                  <td>quorum_signed_percentages</td>
+                  <td><a href="#bytes">bytes</a></td>
+                  <td></td>
+                  <td><p>The attestation rate for each quorum.
+The order of the quorum_signed_percentages should match the order of the quorum_numbers </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
diff --git a/api/docs/disperser_v2.md b/api/docs/disperser_v2.md
@@ -44,9 +44,10 @@
 | ----- | ---- | ----- | ----------- |
 | non_signer_pubkeys | [bytes](#bytes) | repeated | Serialized bytes of non signer public keys (G1 points) |
 | apk_g2 | [bytes](#bytes) |  | Serialized bytes of G2 point that represents aggregate public key of all signers |
-| quorum_apks | [bytes](#bytes) | repeated | Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum |
+| quorum_apks | [bytes](#bytes) | repeated | Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum The order of the quorum_apks should match the order of the quorum_numbers |
 | sigma | [bytes](#bytes) |  | Serialized bytes of aggregate signature |
 | quorum_numbers | [uint32](#uint32) | repeated | Relevant quorum numbers for the attestation |
+| quorum_signed_percentages | [bytes](#bytes) |  | The attestation rate for each quorum. The order of the quorum_signed_percentages should match the order of the quorum_numbers |
 
 
 
diff --git a/api/docs/eigenda-protos.html b/api/docs/eigenda-protos.html
@@ -1959,7 +1959,8 @@ <h3 id="disperser.v2.Attestation">Attestation</h3>
                   <td>quorum_apks</td>
                   <td><a href="#bytes">bytes</a></td>
                   <td>repeated</td>
-                  <td><p>Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum </p></td>
+                  <td><p>Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum
+The order of the quorum_apks should match the order of the quorum_numbers </p></td>
                 </tr>
               
                 <tr>
@@ -1976,6 +1977,14 @@ <h3 id="disperser.v2.Attestation">Attestation</h3>
                   <td><p>Relevant quorum numbers for the attestation </p></td>
                 </tr>
               
+                <tr>
+                  <td>quorum_signed_percentages</td>
+                  <td><a href="#bytes">bytes</a></td>
+                  <td></td>
+                  <td><p>The attestation rate for each quorum.
+The order of the quorum_signed_percentages should match the order of the quorum_numbers </p></td>
+                </tr>
+              
             </tbody>
           </table>
 
diff --git a/api/docs/eigenda-protos.md b/api/docs/eigenda-protos.md
@@ -746,9 +746,10 @@ If DisperseBlob returns the following error codes: INVALID_ARGUMENT (400): reque
 | ----- | ---- | ----- | ----------- |
 | non_signer_pubkeys | [bytes](#bytes) | repeated | Serialized bytes of non signer public keys (G1 points) |
 | apk_g2 | [bytes](#bytes) |  | Serialized bytes of G2 point that represents aggregate public key of all signers |
-| quorum_apks | [bytes](#bytes) | repeated | Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum |
+| quorum_apks | [bytes](#bytes) | repeated | Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum The order of the quorum_apks should match the order of the quorum_numbers |
 | sigma | [bytes](#bytes) |  | Serialized bytes of aggregate signature |
 | quorum_numbers | [uint32](#uint32) | repeated | Relevant quorum numbers for the attestation |
+| quorum_signed_percentages | [bytes](#bytes) |  | The attestation rate for each quorum. The order of the quorum_signed_percentages should match the order of the quorum_numbers |
 
 
 
diff --git a/api/grpc/disperser/v2/disperser_v2.pb.go b/api/grpc/disperser/v2/disperser_v2.pb.go
diff --git a/api/proto/disperser/v2/disperser_v2.proto b/api/proto/disperser/v2/disperser_v2.proto
@@ -138,11 +138,15 @@ message Attestation {
   // Serialized bytes of G2 point that represents aggregate public key of all signers
   bytes apk_g2 = 2;
   // Serialized bytes of aggregate public keys (G1 points) from all nodes for each quorum
+  // The order of the quorum_apks should match the order of the quorum_numbers
   repeated bytes quorum_apks = 3;
   // Serialized bytes of aggregate signature
   bytes sigma = 4;
   // Relevant quorum numbers for the attestation
   repeated uint32 quorum_numbers = 5;
+  // The attestation rate for each quorum.
+  // The order of the quorum_signed_percentages should match the order of the quorum_numbers
+  bytes quorum_signed_percentages = 6;
 }
 
 message PaymentGlobalParams {
diff --git a/core/v2/types.go b/core/v2/types.go
@@ -312,6 +312,8 @@ type Attestation struct {
 	Sigma *core.Signature
 	// QuorumNumbers contains the quorums relevant for the attestation
 	QuorumNumbers []core.QuorumID
+	// QuorumResults contains the results of the quorum verification
+	QuorumResults map[core.QuorumID]uint8
 }
 
 func (a *Attestation) ToProtobuf() (*disperserpb.Attestation, error) {
@@ -323,6 +325,7 @@ func (a *Attestation) ToProtobuf() (*disperserpb.Attestation, error) {
 
 	quorumAPKs := make([][]byte, len(a.QuorumAPKs))
 	quorumNumbers := make([]uint32, len(a.QuorumNumbers))
+	quorumResults := make([]uint8, len(a.QuorumResults))
 	for i, q := range a.QuorumNumbers {
 		quorumNumbers[i] = uint32(q)
 
@@ -332,17 +335,19 @@ func (a *Attestation) ToProtobuf() (*disperserpb.Attestation, error) {
 		}
 		apkBytes := apk.Bytes()
 		quorumAPKs[i] = apkBytes[:]
+		quorumResults[i] = a.QuorumResults[q]
 	}
 
 	apkG2Bytes := a.APKG2.Bytes()
 	sigmaBytes := a.Sigma.Bytes()
 
 	return &disperserpb.Attestation{
-		NonSignerPubkeys: nonSignerPubKeys,
-		ApkG2:            apkG2Bytes[:],
-		QuorumApks:       quorumAPKs,
-		Sigma:            sigmaBytes[:],
-		QuorumNumbers:    quorumNumbers,
+		NonSignerPubkeys:        nonSignerPubKeys,
+		ApkG2:                   apkG2Bytes[:],
+		QuorumApks:              quorumAPKs,
+		Sigma:                   sigmaBytes[:],
+		QuorumNumbers:           quorumNumbers,
+		QuorumSignedPercentages: quorumResults,
 	}, nil
 }
 
diff --git a/disperser/common/v2/blobstore/dynamo_metadata_store_test.go b/disperser/common/v2/blobstore/dynamo_metadata_store_test.go
@@ -460,6 +460,10 @@ func TestBlobMetadataStoreBatchAttestation(t *testing.T) {
 			G1Point: core.NewG1Point(big.NewInt(9), big.NewInt(10)),
 		},
 		QuorumNumbers: []core.QuorumID{0, 1},
+		QuorumResults: map[uint8]uint8{
+			0: 100,
+			1: 80,
+		},
 	}
 
 	err = blobMetadataStore.PutAttestation(ctx, attestation)
diff --git a/disperser/controller/dispatcher.go b/disperser/controller/dispatcher.go
@@ -274,6 +274,10 @@ func (d *Dispatcher) HandleSignatures(ctx context.Context, batchData *batchData,
 		return fmt.Errorf("failed to aggregate signatures for batch %s: %w", batchHeaderHash, err)
 	}
 
+	quorumResults := make(map[core.QuorumID]uint8)
+	for quorumID, result := range quorumAttestation.QuorumResults {
+		quorumResults[quorumID] = result.PercentSigned
+	}
 	err = d.blobMetadataStore.PutAttestation(ctx, &corev2.Attestation{
 		BatchHeader:      batchData.Batch.BatchHeader,
 		AttestedAt:       uint64(time.Now().UnixNano()),
@@ -282,6 +286,7 @@ func (d *Dispatcher) HandleSignatures(ctx context.Context, batchData *batchData,
 		QuorumAPKs:       aggSig.QuorumAggPubKeys,
 		Sigma:            aggSig.AggSignature,
 		QuorumNumbers:    nonZeroQuorums,
+		QuorumResults:    quorumResults,
 	})
 	putAttestationFinished := time.Now()
 	d.metrics.reportPutAttestationLatency(putAttestationFinished.Sub(aggregateSignaturesFinished))
diff --git a/disperser/controller/dispatcher_test.go b/disperser/controller/dispatcher_test.go
@@ -112,6 +112,7 @@ func TestDispatcherHandleBatch(t *testing.T) {
 	require.Len(t, att.QuorumAPKs, 2)
 	require.NotNil(t, att.Sigma)
 	require.ElementsMatch(t, att.QuorumNumbers, []core.QuorumID{0, 1})
+	require.InDeltaMapValues(t, map[core.QuorumID]uint8{0: 100, 1: 100}, att.QuorumResults, 0)
 
 	deleteBlobs(t, components.BlobMetadataStore, objs.blobKeys, [][32]byte{bhh})
 }
diff --git a/inabox/tests/integration_v2_test.go b/inabox/tests/integration_v2_test.go
@@ -93,6 +93,11 @@ var _ = Describe("Inabox v2 Integration", func() {
 				Expect(batchHeader1.GetReferenceBlockNumber()).To(BeNumerically(">", 0))
 				attestation := reply1.GetSignedBatch().GetAttestation()
 				Expect(attestation).To(Not(BeNil()))
+				Expect(attestation.QuorumNumbers).To(Equal([]uint32{0, 1}))
+				Expect(len(attestation.NonSignerPubkeys)).To(Equal(0))
+				Expect(attestation.ApkG2).To(Not(BeNil()))
+				Expect(len(attestation.QuorumApks)).To(Equal(2))
+				Expect(attestation.QuorumSignedPercentages).To(Equal([]byte{100, 100}))
 				blobVerification := reply1.GetBlobVerificationInfo()
 				Expect(blobVerification).To(Not(BeNil()))
 				Expect(blobVerification.GetBlobCertificate()).To(Not(BeNil()))
@@ -116,6 +121,11 @@ var _ = Describe("Inabox v2 Integration", func() {
 				Expect(batchHeader2.GetReferenceBlockNumber()).To(BeNumerically(">", 0))
 				attestation = reply2.GetSignedBatch().GetAttestation()
 				Expect(attestation).To(Not(BeNil()))
+				Expect(attestation.QuorumNumbers).To(Equal([]uint32{0, 1}))
+				Expect(len(attestation.NonSignerPubkeys)).To(Equal(0))
+				Expect(attestation.ApkG2).To(Not(BeNil()))
+				Expect(len(attestation.QuorumApks)).To(Equal(2))
+				Expect(attestation.QuorumSignedPercentages).To(Equal([]byte{100, 100}))
 				blobVerification = reply2.GetBlobVerificationInfo()
 				Expect(blobVerification).To(Not(BeNil()))
 				Expect(blobVerification.GetBlobCertificate()).To(Not(BeNil()))

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ func TestDispatcherHandleBatch(t *testing.T) {`
`112`	`112`	`require.Len(t, att.QuorumAPKs, 2)`
`113`	`113`	`require.NotNil(t, att.Sigma)`
`114`	`114`	`require.ElementsMatch(t, att.QuorumNumbers, []core.QuorumID{0, 1})`
	`115`	`+ require.InDeltaMapValues(t, map[core.QuorumID]uint8{0: 100, 1: 100}, att.QuorumResults, 0)`
`115`	`116`
`116`	`117`	`deleteBlobs(t, components.BlobMetadataStore, objs.blobKeys, [][32]byte{bhh})`
`117`	`118`	`}`