set EnclaveDebug field of QueryAvailableEnclaveKeysRequest

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>
datachainlab · Feb 16, 2025 · 330760b · 330760b
1 parent cc4ce32
commit 330760b
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 64 deletions.
diff --git a/lcp b/lcp
diff --git a/relay/enclave/query.pb.go b/relay/enclave/query.pb.go
diff --git a/relay/lcp.go b/relay/lcp.go
@@ -233,11 +233,17 @@ func (pr *Prover) loadEKIAndCheckUpdateNeeded(ctx context.Context, counterparty
 
 // selectNewEnclaveKey selects a new enclave key from the LCP service
 func (pr *Prover) selectNewEnclaveKey(ctx context.Context) (*enclave.EnclaveKeyInfo, error) {
-	res, err := pr.lcpServiceClient.AvailableEnclaveKeys(ctx, &enclave.QueryAvailableEnclaveKeysRequest{Mrenclave: pr.config.GetMrenclave(), RaType: uint32(pr.getRAType())})
+	req := enclave.QueryAvailableEnclaveKeysRequest{
+		Mrenclave:    pr.config.GetMrenclave(),
+		EnclaveDebug: pr.config.IsDebugEnclave,
+		RaType:       uint32(pr.getRAType()),
+	}
+	pr.getLogger().Debug("query available enclave keys", "mrenclave", hex.EncodeToString(req.Mrenclave), "debug", req.EnclaveDebug, "ra_type", req.RaType)
+	res, err := pr.lcpServiceClient.AvailableEnclaveKeys(ctx, &req)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to call AvailableEnclaveKeys: mr_enclave=%v debug=%v ra_type=%v %w", hex.EncodeToString(req.Mrenclave), req.EnclaveDebug, req.RaType, err)
 	} else if len(res.Keys) == 0 {
-		return nil, fmt.Errorf("no available enclave keys")
+		return nil, fmt.Errorf("no available enclave keys: mrenclave=%v debug=%v ra_type=%v", hex.EncodeToString(req.Mrenclave), req.EnclaveDebug, req.RaType)
 	}
 
 	for _, eki := range res.Keys {
+1 −0		app/src/commands/enclave.rs
+1 −1		modules/attestation-report/src/lib.rs
+17 −10		modules/attestation-report/src/report.rs
+72 −25		modules/keymanager/src/lib.rs
+1 −0		modules/service/src/enclave.rs
+2 −1		proto/definitions/lcp/service/enclave/v1/query.proto
+ −		proto/src/descriptor.bin
+3 −1		proto/src/prost/lcp.service.enclave.v1.rs