feat: add base support for eddsa2022

component/wallet-cli/pkg/oidc4vci/proof.go

@@ -16,7 +16,9 @@ import (
 	"github.com/trustbloc/kms-go/spi/kms"
 	"github.com/trustbloc/vc-go/cwt"
 	"github.com/trustbloc/vc-go/dataintegrity"
+	"github.com/trustbloc/vc-go/dataintegrity/suite"
 	"github.com/trustbloc/vc-go/dataintegrity/suite/ecdsa2019"
+	"github.com/trustbloc/vc-go/dataintegrity/suite/eddsa2022"
 	"github.com/trustbloc/vc-go/jwt"
 	"github.com/trustbloc/vc-go/proof"
 	"github.com/trustbloc/vc-go/proof/creator"
@@ -231,10 +233,24 @@ func (b *LDPProofBuilder) Build(
 		return nil, fmt.Errorf("new presentation: %w", err)
 	}
 
-	signerSuite := ecdsa2019.NewSignerInitializer(&ecdsa2019.SignerInitializerOptions{
-		SignerGetter:     ecdsa2019.WithStaticSigner(req.Signer),
-		LDDocumentLoader: ld.NewDefaultDocumentLoader(http.DefaultClient),
-	})
+	var signerSuite suite.SignerInitializer
+	var cryptoSuite string
+
+	if req.WalletKeyType == kms.ED25519Type {
+		signerSuite = eddsa2022.NewSignerInitializer(&eddsa2022.SignerInitializerOptions{
+			SignerGetter:     eddsa2022.WithStaticSigner(req.Signer),
+			LDDocumentLoader: ld.NewDefaultDocumentLoader(http.DefaultClient),
+		})
+
+		cryptoSuite = eddsa2022.SuiteType
+	} else {
+		signerSuite = ecdsa2019.NewSignerInitializer(&ecdsa2019.SignerInitializerOptions{
+			SignerGetter:     ecdsa2019.WithStaticSigner(req.Signer),
+			LDDocumentLoader: ld.NewDefaultDocumentLoader(http.DefaultClient),
+		})
+
+		cryptoSuite = ecdsa2019.SuiteType
+	}
 
 	signer, err := dataintegrity.NewSigner(&dataintegrity.Options{
 		DIDResolver: req.VDR,
@@ -246,7 +262,7 @@ func (b *LDPProofBuilder) Build(
 	pres.Holder = req.WalletDID
 	if err = pres.AddDataIntegrityProof(&verifiable.DataIntegrityProofContext{
 		SigningKeyID: fmt.Sprintf("%s#%s", req.WalletDID, req.WalletKeyID),
-		CryptoSuite:  ecdsa2019.SuiteType,
+		CryptoSuite:  cryptoSuite,
 		Created:      lo.ToPtr(time.Now().UTC()),
 		Domain:       req.CredentialIssuer,
 		Challenge:    req.Claims.Nonce,

pkg/doc/vc/crypto/crypto_test.go

@@ -717,7 +717,11 @@ func TestSignCredential(t *testing.T) {
 			"info":       "Info",
 		})
 
-		signedVC, err := c.SignCredential(getTestLDPDataIntegritySigner(), unsignedVC)
+		signedVC, err := c.SignCredential(getTestLDPDataIntegritySigner(
+			ecdsa2019.SuiteType,
+			vcsverifiable.Ed25519Signature2018,
+			kms.ED25519,
+		), unsignedVC)
 		require.NoError(t, err)
 		require.Equal(t, 1, len(signedVC.Proofs()))
 		require.False(t, signedVC.IsJWT())
@@ -862,12 +866,19 @@ func TestSignCredential(t *testing.T) {
 }
 
 func getTestLDPSigner() *vc.Signer {
+	return getTestLDPSignerInternal("Ed25519Signature2018", kms.ED25519Type)
+}
+
+func getTestLDPSignerInternal(
+	signatureType vcsverifiable.SignatureType,
+	keyType kms.KeyType,
+) *vc.Signer {
 	return &vc.Signer{
 		DID:           "did:trustbloc:abc",
-		SignatureType: "Ed25519Signature2018",
+		SignatureType: signatureType,
 		Creator:       "did:trustbloc:abc#key1",
 		KMSKeyID:      "key1",
-		KeyType:       kms.ED25519,
+		KeyType:       keyType,
 		KMS: &vcskms.MockKMS{
 			FixedSigner: &mockwrapper.MockFixedKeyCrypto{},
 		},
@@ -878,19 +889,25 @@ func getTestLDPSigner() *vc.Signer {
 	}
 }
 
-func getTestLDPDataIntegritySigner() *vc.Signer {
-	s := getTestLDPSigner()
+//nolint:unparam
+func getTestLDPDataIntegritySigner(
+	suite string,
+	signatureType vcsverifiable.SignatureType,
+	keyType kms.KeyType,
+) *vc.Signer {
+	s := getTestLDPSignerInternal(signatureType, keyType)
 	s.DataIntegrityProof = vc.DataIntegrityProofConfig{
 		Enable:    true,
-		SuiteType: ecdsa2019.SuiteType,
+		SuiteType: suite,
 	}
 
 	return s
 }
 
 func getJWTSigner(
 	customSigner api.KMSCryptoMultiSigner,
-	kid string) *vc.Signer {
+	kid string,
+) *vc.Signer {
 	return &vc.Signer{
 		DID:           didID,
 		SignatureType: "Ed25519Signature2018",

pkg/doc/vc/crypto/dataIntegrity.go

@@ -13,6 +13,7 @@ import (
 	"github.com/trustbloc/vc-go/dataintegrity"
 	dataintegritysuite "github.com/trustbloc/vc-go/dataintegrity/suite"
 	"github.com/trustbloc/vc-go/dataintegrity/suite/ecdsa2019"
+	"github.com/trustbloc/vc-go/dataintegrity/suite/eddsa2022"
 	"github.com/trustbloc/vc-go/verifiable"
 
 	"github.com/trustbloc/vcs/pkg/doc/vc"
@@ -82,11 +83,16 @@ func (c *Crypto) signCredentialLDPDataIntegrity(signerData *vc.Signer,
 func (c *Crypto) getDataIntegritySignerInitializer(
 	dataIntegritySuiteType string, signer vc.SignerAlgorithm) (dataintegritysuite.SignerInitializer, error) {
 	switch dataIntegritySuiteType { //nolint: exhaustive
-	case ecdsa2019.SuiteType:
+	case ecdsa2019.SuiteType, ecdsa2019.SuiteTypeNew:
 		return ecdsa2019.NewSignerInitializer(&ecdsa2019.SignerInitializerOptions{
 			SignerGetter:     ecdsa2019.WithStaticSigner(signer),
 			LDDocumentLoader: c.documentLoader,
 		}), nil
+	case eddsa2022.SuiteType:
+		return eddsa2022.NewSignerInitializer(&eddsa2022.SignerInitializerOptions{
+			SignerGetter:     eddsa2022.WithStaticSigner(signer),
+			LDDocumentLoader: c.documentLoader,
+		}), nil
 	default:
 		return nil, fmt.Errorf("data integrity suite \"%s\" unsupported", dataIntegritySuiteType)
 	}

pkg/doc/vc/crypto/dataIntegrity_test.go

@@ -19,8 +19,12 @@ import (
 	vdrmock "github.com/trustbloc/did-go/vdr/mock"
 	mockwrapper "github.com/trustbloc/kms-go/mock/wrapper"
 	kmsapi "github.com/trustbloc/kms-go/spi/kms"
+	"github.com/trustbloc/vc-go/dataintegrity/suite/ecdsa2019"
+	"github.com/trustbloc/vc-go/dataintegrity/suite/eddsa2022"
 	"github.com/trustbloc/vc-go/verifiable"
+
 	"github.com/trustbloc/vcs/internal/mock/vcskms"
+	vcsverifiable "github.com/trustbloc/vcs/pkg/doc/verifiable"
 
 	"github.com/trustbloc/vcs/pkg/internal/testutil"
 )
@@ -49,7 +53,11 @@ func TestCrypto_SignCredentialLDPDataIntegrity(t *testing.T) { //nolint:gocognit
 		testutil.DocumentLoader(t),
 	)
 
-	testSigner := getTestLDPDataIntegritySigner()
+	testSigner := getTestLDPDataIntegritySigner(
+		ecdsa2019.SuiteType,
+		vcsverifiable.Ed25519Signature2018,
+		kmsapi.ED25519,
+	)
 
 	unsignedVc, err := verifiable.CreateCredential(verifiable.CredentialContents{
 		ID:      "http://example.edu/credentials/1872",
@@ -93,6 +101,46 @@ func TestCrypto_SignCredentialLDPDataIntegrity(t *testing.T) { //nolint:gocognit
 		require.NotEmpty(t, signedVC.Proofs()[0]["proofValue"])
 	})
 
+	t.Run("Success ecdsa-rdfc-2019", func(t *testing.T) {
+		legacySigner := getTestLDPDataIntegritySigner(
+			ecdsa2019.SuiteTypeNew,
+			vcsverifiable.Ed25519Signature2020,
+			kmsapi.ED25519,
+		)
+
+		signedVC, err := c.signCredentialLDPDataIntegrity(legacySigner, unsignedVc)
+		require.NoError(t, err)
+		require.Equal(t, 1, len(signedVC.Proofs()))
+
+		require.Equal(t, "DataIntegrityProof", signedVC.Proofs()[0]["type"])
+		require.Equal(t, "ecdsa-rdfc-2019", signedVC.Proofs()[0]["cryptosuite"])
+		require.Equal(t, "#key1", signedVC.Proofs()[0]["verificationMethod"])
+		require.Equal(t, "assertionMethod", signedVC.Proofs()[0]["proofPurpose"])
+		require.Empty(t, signedVC.Proofs()[0]["challenge"])
+		require.Empty(t, signedVC.Proofs()[0]["domain"])
+		require.NotEmpty(t, signedVC.Proofs()[0]["proofValue"])
+	})
+
+	t.Run("Success eddsa-rdfc-2022", func(t *testing.T) {
+		eddsa2022Signer := getTestLDPDataIntegritySigner(
+			eddsa2022.SuiteType,
+			vcsverifiable.Ed25519Signature2020,
+			kmsapi.ED25519,
+		)
+
+		signedVC, err := c.signCredentialLDPDataIntegrity(eddsa2022Signer, unsignedVc)
+		require.NoError(t, err)
+		require.Equal(t, 1, len(signedVC.Proofs()))
+
+		require.Equal(t, "DataIntegrityProof", signedVC.Proofs()[0]["type"])
+		require.Equal(t, "eddsa-rdfc-2022", signedVC.Proofs()[0]["cryptosuite"])
+		require.Equal(t, "#key1", signedVC.Proofs()[0]["verificationMethod"])
+		require.Equal(t, "assertionMethod", signedVC.Proofs()[0]["proofPurpose"])
+		require.Empty(t, signedVC.Proofs()[0]["challenge"])
+		require.Empty(t, signedVC.Proofs()[0]["domain"])
+		require.NotEmpty(t, signedVC.Proofs()[0]["proofValue"])
+	})
+
 	t.Run("Success with options", func(t *testing.T) {
 		testCrypto := New(
 			&vdrmock.VDRegistry{
@@ -127,7 +175,12 @@ func TestCrypto_SignCredentialLDPDataIntegrity(t *testing.T) { //nolint:gocognit
 			verifiable.CredentialContents{ID: "http://example.edu/credentials/1872"}, nil)
 		require.NoError(t, err)
 
-		ariesSigner := getTestLDPDataIntegritySigner()
+		ariesSigner := getTestLDPDataIntegritySigner(
+			ecdsa2019.SuiteType,
+			vcsverifiable.Ed25519Signature2018,
+			kmsapi.ED25519,
+		)
+
 		ariesSigner.DataIntegrityProof.SuiteType = "undefined"
 
 		signedVC, err := c.signCredentialLDPDataIntegrity(ariesSigner, testCredentials)
@@ -136,7 +189,11 @@ func TestCrypto_SignCredentialLDPDataIntegrity(t *testing.T) { //nolint:gocognit
 	})
 
 	t.Run("Error get signer", func(t *testing.T) {
-		ariesSigner := getTestLDPDataIntegritySigner()
+		ariesSigner := getTestLDPDataIntegritySigner(
+			ecdsa2019.SuiteType,
+			vcsverifiable.Ed25519Signature2018,
+			kmsapi.ED25519,
+		)
 
 		ariesSigner.KMS = &vcskms.MockKMS{
 			Signer: &mockwrapper.MockKMSCrypto{FixedKeyCryptoErr: errors.New("some error")},

pkg/restapi/v1/oidc4ci/controller.go

@@ -36,7 +36,9 @@
 	"github.com/trustbloc/logutil-go/pkg/log"
 	"github.com/trustbloc/vc-go/cwt"
 	"github.com/trustbloc/vc-go/dataintegrity"
+	"github.com/trustbloc/vc-go/dataintegrity/suite"
 	"github.com/trustbloc/vc-go/dataintegrity/suite/ecdsa2019"
+	"github.com/trustbloc/vc-go/dataintegrity/suite/eddsa2022"
 	"github.com/trustbloc/vc-go/jwt"
 	"github.com/trustbloc/vc-go/proof"
 	"github.com/trustbloc/vc-go/proof/checker"
@@ -732,7 +734,7 @@
 			return "", "", resterr.NewOIDCError(invalidRequestOIDCErr, errors.New("invalid ldp_vp"))
 		}
 
-		ver, err := c.getDataIntegrityVerifier()
+		ver, err := c.getDataIntegrityVerifier(*credentialReq.Proof.LdpVp)
 		if err != nil {
 			return "", "", resterr.NewOIDCError(invalidRequestOIDCErr, fmt.Errorf("get data integrity verifier: %w", err))
 		}
@@ -795,10 +797,26 @@
 	return did, proofClaims.Audience, nil
 }
 
-func (c *Controller) getDataIntegrityVerifier() (*dataintegrity.Verifier, error) {
-	verifySuite := ecdsa2019.NewVerifierInitializer(&ecdsa2019.VerifierInitializerOptions{
-		LDDocumentLoader: c.documentLoader,
-	})
+func (c *Controller) getDataIntegrityVerifier(proofData map[string]interface{}) (*dataintegrity.Verifier, error) {
+	var cryptosuite string
+
+	if rawProof, ok := proofData["proof"]; ok {
+		if mapped, mapOk := rawProof.(map[string]interface{}); mapOk {
+			cryptosuite = fmt.Sprint(mapped["cryptosuite"])
+		}
+	}
+
+	var verifySuite suite.VerifierInitializer
+	switch cryptosuite {
+	case eddsa2022.SuiteType:
+		verifySuite = eddsa2022.NewVerifierInitializer(&eddsa2022.VerifierInitializerOptions{
+			LDDocumentLoader: c.documentLoader,
+		})
+	default:
+		verifySuite = ecdsa2019.NewVerifierInitializer(&ecdsa2019.VerifierInitializerOptions{
+			LDDocumentLoader: c.documentLoader,
+		})
+	}
 
 	verifier, err := dataintegrity.NewVerifier(&dataintegrity.Options{
 		DIDResolver: c.vdr,

pkg/service/oidc4vp/oidc4vp_wallet_notification_test.go

@@ -111,7 +111,9 @@ func TestService_HandleWalletNotification_SupportedAuthResponseErrorTypes(t *tes
 
 			eventService.EXPECT().
 				Publish(gomock.Any(), spi.VerifierEventTopic, gomock.Any()).
-				DoAndReturn(func(_ context.Context, _ string, evt *spi.Event) error {
+				DoAndReturn(func(_ context.Context, _ string, evtArr ...*spi.Event) error {
+					evt := evtArr[0]
+
 					assert.NotEmpty(t, evt.ID)
 					assert.Equal(t, "source://vcs/verifier", evt.Source)
 					assert.Equal(t, string(transactionID), evt.TransactionID)
@@ -179,7 +181,9 @@ func TestService_HandleWalletNotification_EdgeCases(t *testing.T) {
 
 					eventService.EXPECT().
 						Publish(gomock.Any(), spi.VerifierEventTopic, gomock.Any()).
-						DoAndReturn(func(_ context.Context, _ string, evt *spi.Event) error {
+						DoAndReturn(func(_ context.Context, _ string, evtArr ...*spi.Event) error {
+							evt := evtArr[0]
+
 							assert.NotEmpty(t, evt.ID)
 							assert.Equal(t, "source://vcs/verifier", evt.Source)
 							assert.Equal(t, string(transactionID), evt.TransactionID)

pkg/service/verifycredential/verifycredential_service.go

@@ -18,7 +18,9 @@
 	vdrapi "github.com/trustbloc/did-go/vdr/api"
 	"github.com/trustbloc/logutil-go/pkg/log"
 	"github.com/trustbloc/vc-go/dataintegrity"
+	"github.com/trustbloc/vc-go/dataintegrity/suite"
 	"github.com/trustbloc/vc-go/dataintegrity/suite/ecdsa2019"
+	"github.com/trustbloc/vc-go/dataintegrity/suite/eddsa2022"
 	"github.com/trustbloc/vc-go/proof/defaults"
 	"github.com/trustbloc/vc-go/verifiable"
 	"github.com/trustbloc/vc-go/vermethod"
@@ -120,7 +122,7 @@
 }
 
 func (s *Service) verifyVC(vc *verifiable.Credential, strictValidation bool) error {
-	diVerifier, err := s.getDataIntegrityVerifier()
+	diVerifier, err := s.getDataIntegrityVerifier(vc.Proofs())
 	if err != nil {
 		return fmt.Errorf("get data integrity verifier: %w", err)
 	}
@@ -274,10 +276,24 @@
 	return nil
 }
 
-func (s *Service) getDataIntegrityVerifier() (*dataintegrity.Verifier, error) {
-	verifySuite := ecdsa2019.NewVerifierInitializer(&ecdsa2019.VerifierInitializerOptions{
-		LDDocumentLoader: s.documentLoader,
-	})
+func (s *Service) getDataIntegrityVerifier(proofs []verifiable.Proof) (*dataintegrity.Verifier, error) {
+	var cryptoSuite string
+	if len(proofs) > 0 {
+		cryptoSuite = fmt.Sprint(proofs[0]["cryptosuite"])
+	}
+
+	var verifySuite suite.VerifierInitializer
+
+	switch cryptoSuite {
+	case eddsa2022.SuiteType:
+		verifySuite = eddsa2022.NewVerifierInitializer(&eddsa2022.VerifierInitializerOptions{
+			LDDocumentLoader: s.documentLoader,
+		})
+	default:
+		verifySuite = ecdsa2019.NewVerifierInitializer(&ecdsa2019.VerifierInitializerOptions{
+			LDDocumentLoader: s.documentLoader,
+		})
+	}
 
 	verifier, err := dataintegrity.NewVerifier(&dataintegrity.Options{
 		DIDResolver: s.vdr,