Feature/Verify Token V2

auth.go

@@ -15,6 +15,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/google/uuid"
 	"github.com/iden3/contracts-abi/state/go/abi"
+	"github.com/iden3/driver-did-iden3/pkg/services/blockchain/eth"
 	"github.com/iden3/go-circuits/v2"
 	"github.com/iden3/go-iden3-auth/v2/loaders"
 	"github.com/iden3/go-iden3-auth/v2/proofs"
@@ -100,6 +101,7 @@ type Verifier struct {
 	verificationKeyLoader loaders.VerificationKeyLoader
 	documentLoader        ld.DocumentLoader
 	stateResolver         map[string]pubsignals.StateResolver
+	ethResolvers          map[int]eth.Resolver
 	packageManager        iden3comm.PackageManager
 }
 
@@ -139,17 +141,46 @@ func WithDIDResolver(resolver packers.DIDResolverHandlerFunc) VerifierOption {
 	}
 }
 
+// WithEthereumResolvers set the ethereum resolvers to use. It will overwrite the
+// default ones.
+func WithEthereumResolvers(resolvers map[int]eth.Resolver) VerifierOption {
+	return func(opts *verifierOpts) {
+		opts.ethResolvers = resolvers
+	}
+}
+
 type verifierOpts struct {
-	docLoader   ld.DocumentLoader
-	ipfsCli     schemaloaders.IPFSClient
-	ipfsGW      string
-	didResolver packers.DIDResolverHandlerFunc
+	docLoader    ld.DocumentLoader
+	ipfsCli      schemaloaders.IPFSClient
+	ipfsGW       string
+	didResolver  packers.DIDResolverHandlerFunc
+	ethResolvers map[int]eth.Resolver
 }
 
-func newOpts() verifierOpts {
-	return verifierOpts{
-		didResolver: UniversalDIDResolver,
+func defaultEthResolver() (map[int]eth.Resolver, error) {
+	const (
+		chainID      = 21000
+		rpc          = "https://rpc-mainnet.privado.id"
+		contractAddr = "0x58485809CfAc875B7E6F54E3fCb5f24614f202e9"
+	)
+	r, err := eth.NewResolver(rpc, contractAddr)
+	if err != nil {
+		return nil, err
 	}
+	return map[int]eth.Resolver{
+		chainID: *r,
+	}, nil
+}
+
+func newOpts() (verifierOpts, error) {
+	ethRes, err := defaultEthResolver()
+	if err != nil {
+		return verifierOpts{}, err
+	}
+	return verifierOpts{
+		didResolver:  UniversalDIDResolver,
+		ethResolvers: ethRes,
+	}, nil
 }
 
 // NewVerifier returns setup instance of auth library
@@ -158,7 +189,10 @@ func NewVerifier(
 	resolver map[string]pubsignals.StateResolver,
 	opts ...VerifierOption,
 ) (*Verifier, error) {
-	vOpts := newOpts()
+	vOpts, err := newOpts()
+	if err != nil {
+		return nil, err
+	}
 	for _, optFn := range opts {
 		optFn(&vOpts)
 	}
@@ -172,7 +206,7 @@ func NewVerifier(
 		packageManager:        *iden3comm.NewPackageManager(),
 	}
 
-	err := v.SetupAuthV2ZKPPacker()
+	err = v.SetupAuthV2ZKPPacker()
 	if err != nil {
 		return nil, err
 	}
@@ -302,7 +336,6 @@ func CreateContractInvokeRequestWithMessage(
 		From:     sender,
 		Body: protocol.ContractInvokeRequestMessageBody{
 			Reason:          reason,
-			Message:         message,
 			TransactionData: transactionData,
 			Scope:           zkRequests,
 		},
@@ -516,7 +549,44 @@ func verifyGroupIDMathch(linkID *big.Int, groupID int, requestID uint32, groupID
 	return nil
 }
 
+// VerifyToken performs verification of jws/jwz token using the registered packers in package manager
+func (v *Verifier) VerifyToken(
+	token string,
+	opts ...pubsignals.VerifyOpt,
+) (*protocol.AuthorizationResponseMessage, error) {
+
+	var unpackOpts []iden3comm.PackerParams
+	cfg := pubsignals.VerifyConfig{}
+	for _, o := range opts {
+		o(&cfg)
+	}
+	if cfg.AcceptedProofGenerationDelay > 0 {
+		authV2Set, err := v.verificationKeyLoader.Load(circuits.AuthV2CircuitID)
+		if err != nil {
+			return nil, fmt.Errorf("failed upload circuits files: %w", err)
+		}
+		unpackOpts = append(unpackOpts, packers.NewZKPPUnpackerParams(authV2Set, v.ethResolvers, cfg.AcceptedProofGenerationDelay))
+	}
+
+	msg, _, err := v.packageManager.Unpack([]byte(token), unpackOpts...)
+	if err != nil {
+		return nil, err
+	}
+	msgBytes, err := json.Marshal(msg)
+	if err != nil {
+		return nil, err
+	}
+
+	var authMsgResponse protocol.AuthorizationResponseMessage
+	err = json.Unmarshal(msgBytes, &authMsgResponse)
+	if err != nil {
+		return nil, err
+	}
+	return &authMsgResponse, err
+}
+
 // VerifyJWZ performs verification of jwz token
+// Deprecated: Use VerifyToken instead
 func (v *Verifier) VerifyJWZ(
 	ctx context.Context,
 	token string,