Skip to content

Pass MerklizeOption[s] to MerklizeJSONLD #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2023
Merged

Pass MerklizeOption[s] to MerklizeJSONLD #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df42073
Pass MerklizeOption[s] to MerklizeJSONLD
olomix Jun 16, 2023
3350fec
Add merklizer options to ParseClaim method
olomix Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions json/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func (s Parser) ParseClaim(ctx context.Context, credential verifiable.W3CCredent
SubjectPosition: verifiable.CredentialSubjectPositionIndex,
MerklizedRootPosition: verifiable.CredentialMerklizedRootPositionNone,
Updatable: false,
MerklizerOpts: nil,
}
}

Expand Down Expand Up @@ -92,7 +93,7 @@ func (s Parser) ParseClaim(ctx context.Context, credential verifiable.W3CCredent

switch opts.MerklizedRootPosition {
case verifiable.CredentialMerklizedRootPositionIndex:
mkRoot, err := credential.Merklize(ctx)
mkRoot, err := credential.Merklize(ctx, opts.MerklizerOpts...)
if err != nil {
return nil, err
}
Expand All @@ -101,7 +102,7 @@ func (s Parser) ParseClaim(ctx context.Context, credential verifiable.W3CCredent
return nil, err
}
case verifiable.CredentialMerklizedRootPositionValue:
mkRoot, err := credential.Merklize(ctx)
mkRoot, err := credential.Merklize(ctx, opts.MerklizerOpts...)
if err != nil {
return nil, err
}
Expand Down
2 changes: 2 additions & 0 deletions processor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"

core "github.com/iden3/go-iden3-core"
"github.com/iden3/go-schema-processor/merklize"
"github.com/iden3/go-schema-processor/verifiable"
"github.com/pkg/errors"
)
Expand Down Expand Up @@ -45,6 +46,7 @@ type CoreClaimOptions struct {
SubjectPosition string `json:"subjectPosition"`
MerklizedRootPosition string `json:"merklizedRootPosition"`
Updatable bool `json:"updatable"`
MerklizerOpts []merklize.MerklizeOption
}

var (
Expand Down
6 changes: 4 additions & 2 deletions verifiable/credential.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ type W3CCredential struct {
}

// Merklize merklizes verifiable credential
func (vc *W3CCredential) Merklize(ctx context.Context) (*merklize.Merklizer, error) {
func (vc *W3CCredential) Merklize(ctx context.Context,
opts ...merklize.MerklizeOption) (*merklize.Merklizer, error) {

credentialBytes, err := json.Marshal(vc)
if err != nil {
Expand All @@ -46,7 +47,8 @@ func (vc *W3CCredential) Merklize(ctx context.Context) (*merklize.Merklizer, err
return nil, err
}

mk, err := merklize.MerklizeJSONLD(ctx, bytes.NewReader(credentialWithoutProofBytes))
mk, err := merklize.MerklizeJSONLD(ctx,
bytes.NewReader(credentialWithoutProofBytes), opts...)
if err != nil {
return nil, err
}
Expand Down