Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
allow-parallel-runners: true
go: '1.18'
go: '1.24'
timeout: 5m

linters:
Expand All @@ -10,7 +10,6 @@ linters:
- bodyclose
- containedctx
- contextcheck
- exportloopref
- errcheck
- forbidigo
- forcetypeassert
Expand All @@ -20,7 +19,7 @@ linters:
# - gocritic
- gosimple
- gofumpt
- gomnd
- mnd
- govet
- ineffassign
- misspell
Expand Down Expand Up @@ -54,8 +53,6 @@ linters-settings:
- blank
- dot

gofumpt:
lang-version: "1.18"
gocognit:
min-complexity: 40
gocyclo:
Expand Down
31 changes: 4 additions & 27 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,15 @@ func main() {
chiMiddleware.NoCache,
)

keysLoader := &loaders.FSKeyLoader{Dir: cfg.KeyDIR}
keysLoader := loaders.NewEmbeddedKeyLoader(
loaders.WithKeyLoader(loader.NewLocalKeyLoader(cfg.KeyDIR)),
)
w3cLoader := loader.NewW3CDocumentLoader(nil, cfg.IPFSURL)
resolvers, senderDIDs, err := parseResolverSettings(ctx, cfg.ResolverSettings)
if err != nil {
log.WithField("error", err).Error("cannot parse resolver settings")
return
}

verifier, err := auth.NewVerifier(keysLoader, resolvers, auth.WithDocumentLoader(w3cLoader))
if err != nil {
log.WithFields(log.Fields{"err": err}).Error("failed to create verifier")
Expand Down Expand Up @@ -78,7 +79,7 @@ func main() {
}

// parseResolverSettings parses the resolver settings from the config file
func parseResolverSettings(ctx context.Context, rs config.ResolverSettings) (map[string]pubsignals.StateResolver, map[string]string, error) {
func parseResolverSettings(_ context.Context, rs config.ResolverSettings) (map[string]pubsignals.StateResolver, map[string]string, error) {
var (
resolvers = make(map[string]pubsignals.StateResolver)
verifiersDIDs = make(map[string]string)
Expand All @@ -89,33 +90,9 @@ func parseResolverSettings(ctx context.Context, rs config.ResolverSettings) (map
prefix := fmt.Sprintf("%s:%s", chainName, networkName)
resolver := state.NewETHResolver(networkSettings.NetworkURL, networkSettings.ContractAddress)
resolvers[prefix] = resolver

//if err := registerCustomDIDMethod(ctx, chainName, networkName, networkSettings); err != nil {
// log.Error(ctx, "cannot register custom DID method", "err", err)
// return nil, nil, err
//}

verifiersDIDs[networkSettings.ChainID] = networkSettings.DID
}
}

return resolvers, verifiersDIDs, nil
}

//func registerCustomDIDMethod(ctx context.Context, blockchain string, network string, resolverAttrs config.ResolverSettingsAttrs) error {
// chainID, err := strconv.Atoi(resolverAttrs.ChainID)
// if err != nil {
// return fmt.Errorf("cannot convert chainID to int: %w", err)
// }
// params := core.DIDMethodNetworkParams{
// Method: core.DIDMethod(resolverAttrs.Method),
// Blockchain: core.Blockchain(blockchain),
// Network: core.NetworkID(network),
// NetworkFlag: resolverAttrs.NetworkFlag,
// }
// if err := core.RegisterDIDMethodNetwork(params, core.WithChainID(chainID)); err != nil {
// log.Error(ctx, "cannot register custom DID method", "err", err, "customDID", chainID)
// return err
// }
// return nil
//}
Loading
Loading