upgrade lcp version

Signed-off-by: Jun Kimura <[email protected]>
datachainlab · Jun 16, 2024 · 6e5dfcc · 6e5dfcc
1 parent c7e5755
commit 6e5dfcc
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 63 deletions.
diff --git a/lcp b/lcp
diff --git a/light-clients/lcp/types/lcp.pb.go b/light-clients/lcp/types/lcp.pb.go
diff --git a/light-clients/lcp/types/update.go b/light-clients/lcp/types/update.go
@@ -121,7 +121,7 @@ func (cs ClientState) verifyRegisterEnclaveKey(ctx sdk.Context, store storetypes
 	}
 	var operator common.Address
 	if len(message.OperatorSignature) > 0 {
-		commitment, err := ComputeEIP712RegisterEnclaveKeyHash(ctx.ChainID(), []byte(exported.StoreKey), message.Report)
+		commitment, err := ComputeEIP712RegisterEnclaveKeyHash(ctx.ChainID(), []byte(exported.StoreKey), string(message.Report))
 		if err != nil {
 			return errorsmod.Wrapf(clienttypes.ErrInvalidHeader, "failed to compute commitment: %v", err)
 		}
@@ -246,7 +246,7 @@ func (cs ClientState) registerEnclaveKey(ctx sdk.Context, clientStore storetypes
 	}
 	var operator common.Address
 	if len(message.OperatorSignature) > 0 {
-		commitment, err := ComputeEIP712RegisterEnclaveKeyHash(ctx.ChainID(), []byte(exported.StoreKey), message.Report)
+		commitment, err := ComputeEIP712RegisterEnclaveKeyHash(ctx.ChainID(), []byte(exported.StoreKey), string(message.Report))
 		if err != nil {
 			panic(errorsmod.Wrapf(clienttypes.ErrInvalidHeader, "failed to compute commitment: %v", err))
 		}

diff --git a/relay/lcp.go b/relay/lcp.go
@@ -218,10 +218,10 @@ func (pr *Prover) selectNewEnclaveKey(ctx context.Context) (*enclave.EnclaveKeyI
 	}
 
 	for _, eki := range res.Keys {
-		if err := ias.VerifyReport(eki.Report, eki.Signature, eki.SigningCert, time.Now()); err != nil {
+		if err := ias.VerifyReport([]byte(eki.Report), eki.Signature, eki.SigningCert, time.Now()); err != nil {
 			return nil, err
 		}
-		avr, err := ias.ParseAndValidateAVR(eki.Report)
+		avr, err := ias.ParseAndValidateAVR([]byte(eki.Report))
 		if err != nil {
 			return nil, err
 		}
@@ -320,14 +320,14 @@ func (pr *Prover) updateELC(elcClientID string, includeState bool) ([]*elc.MsgUp
 
 func (pr *Prover) registerEnclaveKey(verifier core.Chain, eki *enclave.EnclaveKeyInfo) (core.MsgID, error) {
 	clientLogger := pr.getClientLogger(pr.originChain.Path().ClientID)
-	if err := ias.VerifyReport(eki.Report, eki.Signature, eki.SigningCert, time.Now()); err != nil {
+	if err := ias.VerifyReport([]byte(eki.Report), eki.Signature, eki.SigningCert, time.Now()); err != nil {
 		return nil, err
 	}
-	if _, err := ias.ParseAndValidateAVR(eki.Report); err != nil {
+	if _, err := ias.ParseAndValidateAVR([]byte(eki.Report)); err != nil {
 		return nil, err
 	}
 	message := &lcptypes.RegisterEnclaveKeyMessage{
-		Report:            eki.Report,
+		Report:            []byte(eki.Report),
 		Signature:         eki.Signature,
 		SigningCert:       eki.SigningCert,
 		OperatorSignature: nil,

diff --git a/sgx/ias/sgx.go b/sgx/ias/sgx.go
@@ -27,7 +27,7 @@ func (avr AttestationVerificationReport) GetTimestamp() time.Time {
 	return tm.Truncate(time.Second)
 }
 
-func VerifyReport(report string, signature []byte, signingCertDer []byte, currentTime time.Time) error {
+func VerifyReport(report []byte, signature []byte, signingCertDer []byte, currentTime time.Time) error {
 	rootCert := GetRARootCert()
 	signingCert, err := x509.ParseCertificate(signingCertDer)
 	if err != nil {
@@ -50,15 +50,15 @@ func VerifyReport(report string, signature []byte, signingCertDer []byte, curren
 		return fmt.Errorf("unexpected root cert: %v", chains[0][1])
 	}
 
-	if err = signingCert.CheckSignature(x509.SHA256WithRSA, []byte(report), signature); err != nil {
+	if err = signingCert.CheckSignature(x509.SHA256WithRSA, report, signature); err != nil {
 		return fmt.Errorf("failed to verify AVR signature: %w", err)
 	}
 
 	return nil
 }
 
-func ParseAndValidateAVR(report string) (*AttestationVerificationReport, error) {
-	avr, err := ias.UnsafeDecodeAVR([]byte(report))
+func ParseAndValidateAVR(report []byte) (*AttestationVerificationReport, error) {
+	avr, err := ias.UnsafeDecodeAVR(report)
 	if err != nil {
 		return nil, err
 	}
+1 −1		modules/attestation-report/src/report.rs
+1 −1		modules/attestation-report/src/verification.rs
+11 −1		modules/lcp-client/src/errors.rs
+2 −2		modules/lcp-client/src/message.rs
+1 −1		proto/definitions/ibc/lightclients/lcp/v1/lcp.proto
+ −		proto/src/descriptor.bin
+2 −2		proto/src/prost/ibc.lightclients.lcp.v1.rs