A little bit of renaming + usability improvements

Author: soerenbf

packages/sdk/CHANGELOG.md

@@ -12,16 +12,17 @@
   - renamed `VerifiableCredentialQualifier` to `Web3IdCredentialQualifier`
   - renamed `VerifiableCredentialStatement` to `Web3IdCredentialStatement`
   - renamed `IdentityQualifier` to `AccountCredentialQualifier`
-  - renamed `RequestStatement` to `CredentialRequestStatement`, which is now a union of
-  `AccountCredentialStatement | Web3IdCredentialStatement | IdentityCredentialStatement` instead of the corresponding
-  old dynamic version.
+  - renamed `RequestStatement` to `SpecifiedCredentialStatement`, which is now a union of
+  `SpecifiedAccountCredentialStatement | SpecifiedWeb3IdCredentialStatement | SpecifiedIdentityCredentialStatement`
+  instead of the corresponding old dynamic version.
 
 ### Added
 
 - `Web3StatementBuilder.forIdentityCredentials`, used for statements for identity credentials without tying it to an account
 - types `IdentityCredentialQualifier`, `IdentityCommitmentInput`, and `CredentialsInputsIdentity` which have been added
   to the respective union types that reflect the possible variants.
 - helper functions `createIdentityCommitmentInput` and `createIdentityCommitmentInputWithHdWallet`
+- helper function `createIdentityDID`
 
 - types `VerifiablePresentationV1` and `VerifiablePresentationRequestV1` to be used with the new zero-knowledge proof
   protocol
@@ -32,6 +33,8 @@
   - `VerifiablePresentationV1.createFromAnchor` which is a GRPC helper function for creating a verifiable presentation
   from a minimal set of values. This also creates the `VerifiablePresentation.Context` from the corresponding
   `VerifiablePresentationRequestV1.Context`.
+  - `VerifiablePresentationV1.verify`, and the corresponding GRPC helper `VerifiablePresentationV1.verifyWithNode` for
+  verification of the proof.
   - **Please note**: some functionality related to this is currently either stubbed or routed into the old verifiable
   presentation computation functions for now.
 

packages/sdk/src/commonProofTypes.ts

@@ -1,4 +1,4 @@
-export interface StatementBuilder<ValueType, AttributeType> {
+export interface StatementBuilder<AttributeType, ValueType> {
     addRange(attribute: AttributeType, lower: ValueType, upper: ValueType): this;
 
     addMembership(attribute: AttributeType, set: ValueType[]): this;

packages/sdk/src/wasm/VerifiablePresentationV1/proof.ts

@@ -22,13 +22,13 @@ import { bail } from '../../util.js';
 import {
     AtomicStatementV2,
     CommitmentInput,
-    CredentialRequestStatement,
     CredentialsInputs,
     DIDString,
     IdentityCommitmentInput,
-    IdentityCredentialRequestStatement,
-    isAccountCredentialRequestStatement,
-    isIdentityCredentialRequestStatement,
+    SpecifiedCredentialStatement,
+    SpecifiedIdentityCredentialStatement,
+    isSpecifiedAccountCredentialStatement,
+    isSpecifiedIdentityCredentialStatement,
 } from '../../web3-id/index.js';
 import { Web3IdProofRequest, getVerifiablePresentation } from '../web3Id.js';
 import { GivenContextJSON, givenContextFromJSON, givenContextToJSON } from './internal.js';
@@ -72,7 +72,7 @@ export type IdentityBasedCredential = {
 };
 
 function createIdentityCredentialStub(
-    { id, statement }: IdentityCredentialRequestStatement,
+    { id, statement }: SpecifiedIdentityCredentialStatement,
     ipIndex: number
 ): IdentityBasedCredential {
     const network = id.split(':')[1] as Network;
@@ -170,11 +170,11 @@ export function fromJSON(value: JSON): VerifiablePresentationV1 {
 export async function createFromAnchor(
     grpc: ConcordiumGRPCClient,
     presentationRequest: Request.Type,
-    requestStatements: CredentialRequestStatement[],
+    statements: SpecifiedCredentialStatement[],
     inputs: CommitmentInput[],
-    additionalContext: GivenContext[],
-    globalContext: CryptographicParameters
+    additionalContext: GivenContext[]
 ): Promise<VerifiablePresentationV1> {
+    const globalContext = await grpc.getCryptographicParameters();
     const transaction = await grpc.getBlockItemStatus(presentationRequest.transactionRef);
     if (transaction.status !== TransactionStatusEnum.Finalized) {
         throw new Error('anchor reference not finalized');
@@ -201,24 +201,24 @@ export async function createFromAnchor(
 
     const blockContext: GivenContext = { label: 'BlockHash', context: blockHash };
     const proofContext = createContext(presentationRequest.requestContext, [...additionalContext, blockContext]);
-    return create(requestStatements, inputs, proofContext, globalContext);
+    return create(statements, inputs, proofContext, globalContext);
 }
 
 // TODO: this entire function should call a function in @concordium/rust-bindings to create the verifiable
 // presentation from the function arguments. For now, we hack something together from the old protocol which
 // means filtering and mapping the input/output.
 export function create(
-    requestStatements: CredentialRequestStatement[],
+    requestStatements: SpecifiedCredentialStatement[],
     inputs: CommitmentInput[],
     proofContext: Context,
     globalContext: CryptographicParameters
 ): VerifiablePresentationV1 {
     // first we filter out the id statements, as they're not compatible with the current implementation
     // in concordium-base
-    const idStatements: [number, IdentityCredentialRequestStatement][] = [];
-    const compatibleStatements: Exclude<CredentialRequestStatement, IdentityCredentialRequestStatement>[] = [];
+    const idStatements: [number, SpecifiedIdentityCredentialStatement][] = [];
+    const compatibleStatements: Exclude<SpecifiedCredentialStatement, SpecifiedIdentityCredentialStatement>[] = [];
     requestStatements.forEach((s, i) => {
-        if (isIdentityCredentialRequestStatement(s)) idStatements.push([i, s]);
+        if (isSpecifiedIdentityCredentialStatement(s)) idStatements.push([i, s]);
         else compatibleStatements.push(s);
     });
 
@@ -240,7 +240,7 @@ export function create(
     const compatibleCredentials: Credential[] = verifiableCredential.map<Credential>((c, i) => {
         const { proof, ...credentialSubject } = c.credentialSubject;
         const { created, type: _type, ...proofValues } = proof;
-        const type = isAccountCredentialRequestStatement(compatibleStatements[i])
+        const type = isSpecifiedAccountCredentialStatement(compatibleStatements[i])
             ? 'ConcordiumAccountBasedCredential'
             : 'ConcordiumWeb3BasedCredential';
         return {
@@ -281,3 +281,12 @@ export function verify(
 ): true | Error {
     return true;
 }
+
+export async function verifyWithNode(
+    presentation: VerifiablePresentationV1,
+    request: Request.Type,
+    grpc: ConcordiumGRPCClient,
+    network: Network
+): Promise<true | Error> {
+    return true;
+}

packages/sdk/src/wasm/web3Id.ts

@@ -6,9 +6,9 @@ import { VerifiablePresentation } from '../types/VerifiablePresentation.js';
 import { VerifyWeb3IdCredentialSignatureInput } from '../web3-id/helpers.js';
 import {
     CommitmentInput,
-    CredentialRequestStatement,
     CredentialsInputs,
-    isIdentityCredentialRequestStatement,
+    SpecifiedCredentialStatement,
+    isSpecifiedIdentityCredentialStatement,
 } from '../web3-id/types.js';
 
 /**
@@ -21,7 +21,7 @@ export function verifyWeb3IdCredentialSignature(input: VerifyWeb3IdCredentialSig
 
 export type Web3IdProofRequest = {
     challenge: string;
-    credentialStatements: CredentialRequestStatement[];
+    credentialStatements: SpecifiedCredentialStatement[];
 };
 
 export type Web3IdProofInput = {
@@ -35,7 +35,7 @@ export type Web3IdProofInput = {
  */
 export function getVerifiablePresentation(input: Web3IdProofInput): VerifiablePresentation {
     // validate that we don't pass any unsupported credentials in
-    if (input.request.credentialStatements.some((statement) => isIdentityCredentialRequestStatement(statement)))
+    if (input.request.credentialStatements.some((statement) => isSpecifiedIdentityCredentialStatement(statement)))
         throw new Error('Identity proofs are not supported for this verifiable presentation protocol');
 
     try {