@veramo/credential-ld 5.1.5-next.12 → 5.1.5-next.13

package/src/suites/Ed25519Signature2020.ts

@@ -1,8 +1,22 @@
 import { RequiredAgentMethods, VeramoLdSignature } from '../ld-suites.js'
-import { CredentialPayload, DIDDocument, IAgentContext, IKey, TKeyType } from '@veramo/core-types'
+import {
+  CredentialPayload,
+  DIDDocComponent,
+  DIDDocument,
+  IAgentContext,
+  IKey,
+  IResolver,
+  TKeyType,
+} from '@veramo/core-types'
 import * as u8a from 'uint8arrays'
 import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020'
 import { Ed25519VerificationKey2020 } from '@digitalcredentials/ed25519-verification-key-2020'
+import { asArray, base64ToBytes, bytesToMultibase, extractPublicKeyHex, hexToBytes } from '@veramo/utils'
+import { VerificationMethod } from 'did-resolver'
+
+import Debug from 'debug'
+
+const debug = Debug('veramo:credential-ld:Ed25519Signature2020')
 
 /**
  * Veramo wrapper for the Ed25519Signature2020 suite by digitalcredentials
@@ -10,9 +24,6 @@ import { Ed25519VerificationKey2020 } from '@digitalcredentials/ed25519-verifica
  * @alpha This API is experimental and is very likely to change or disappear in future releases without notice.
  */
 export class VeramoEd25519Signature2020 extends VeramoLdSignature {
-  private readonly MULTIBASE_BASE58BTC_PREFIX = 'z'
-  private readonly MULTICODEC_PREFIX = [0xed, 0x01]
-
   getSupportedVerificationType(): string {
     return 'Ed25519VerificationKey2020'
   }
@@ -40,15 +51,16 @@ export class VeramoEd25519Signature2020 extends VeramoLdSignature {
           keyRef: key.kid,
           data: messageString,
           encoding: 'base64',
+          algorithm: 'EdDSA',
         })
-        return u8a.fromString(signature)
+        return base64ToBytes(signature)
       },
     }
 
     const verificationKey = new Ed25519VerificationKey2020({
       id,
       controller,
-      publicKeyMultibase: this.preSigningKeyModification(u8a.fromString(key.publicKeyHex, 'hex')),
+      publicKeyMultibase: bytesToMultibase(hexToBytes(key.publicKeyHex), 'Ed25519'),
       // signer: () => signer,
       // type: this.getSupportedVerificationType(),
     })
@@ -69,12 +81,61 @@ export class VeramoEd25519Signature2020 extends VeramoLdSignature {
     // nothing to do here
   }
 
-  preDidResolutionModification(didUrl: string, didDoc: DIDDocument): void {
-    // nothing to do here
+  async preDidResolutionModification(
+    didUrl: string,
+    doc: DIDDocument | Exclude<string, DIDDocComponent>,
+    context: IAgentContext<IResolver>,
+  ): Promise<DIDDocument | Exclude<string, DIDDocComponent>> {
+    let document = doc
+    // The verification method (key) must contain "https://w3id.org/security/suites/ed25519-2020/v1" context.
+    if ((document as DIDDocument).verificationMethod) {
+      document.verificationMethod = asArray(document.verificationMethod)?.map(
+        this.transformVerificationMethod,
+      )
+    }
+
+    // this signature suite requires the document loader to dereference the DID URL
+    if (didUrl.includes('#') && didUrl !== document.id) {
+      const contexts = (document as DIDDocument)['@context']
+      try {
+        let newDoc: any = (await context.agent.getDIDComponentById({
+          didDocument: document,
+          didUrl: didUrl,
+        })) as Exclude<string, DIDDocComponent>
+
+        // other signature suites require the full DID document, so as a workaround
+        // we'll only return the 2020 verification method, even if the 2018 would also be compatible
+        if (
+          [
+            'Ed25519VerificationKey2020',
+            // 'Ed25519VerificationKey2018',
+            // 'JsonWebKey2020'
+          ].includes(newDoc.type)
+        ) {
+          newDoc['@context'] = [...new Set([...asArray(contexts), ...asArray(document['@context'])])]
+          document = newDoc
+        }
+      } catch (e: any) {
+        debug(`document loader could not locate DID component by fragment: ${didUrl}`)
+      }
+    }
+
+    if ((document as VerificationMethod).type === 'Ed25519VerificationKey2020') {
+      document = this.transformVerificationMethod(document as VerificationMethod)
+    }
+
+    return document
   }
 
-  preSigningKeyModification(key: Uint8Array): string {
-    const modifiedKey = u8a.concat([this.MULTICODEC_PREFIX, key])
-    return `${this.MULTIBASE_BASE58BTC_PREFIX}${u8a.toString(modifiedKey, 'base58btc')}`
+  private transformVerificationMethod(vm: VerificationMethod): VerificationMethod {
+    if (vm.type === 'Ed25519VerificationKey2020') {
+      ;(vm as any)['@context'] = 'https://w3id.org/security/suites/ed25519-2020/v1'
+      // publicKeyMultibase is required by this suite
+      if (!vm.publicKeyMultibase) {
+        const publicKeyHex = extractPublicKeyHex(vm)
+        vm.publicKeyMultibase = bytesToMultibase(hexToBytes(publicKeyHex), 'Ed25519')
+      }
+    }
+    return vm
   }
 }

package/src/suites/JsonWebSignature2020.ts

@@ -83,8 +83,9 @@ export class VeramoJsonWebSignature2020 extends VeramoLdSignature {
         // nop
     }
 
-    preDidResolutionModification(didUrl: string, didDoc: DIDDocument): void {
+    async preDidResolutionModification(didUrl: string, didDoc: DIDDocument): Promise<DIDDocument> {
         // do nothing
+        return didDoc
     }
 
 }

package/build/contexts/did_v0.11.json

@@ -1,61 +0,0 @@
-{
-    "@context": {
-        "@version": 1.1,
-        "id": "@id",
-        "type": "@type",
-        "dc": "http://purl.org/dc/terms/",
-        "schema": "http://schema.org/",
-        "sec": "https://w3id.org/security#",
-        "didv": "https://w3id.org/did#",
-        "xsd": "http://www.w3.org/2001/XMLSchema#",
-        "EcdsaSecp256k1Signature2019": "sec:EcdsaSecp256k1Signature2019",
-        "EcdsaSecp256k1VerificationKey2019": "sec:EcdsaSecp256k1VerificationKey2019",
-        "Ed25519Signature2018": "sec:Ed25519Signature2018",
-        "Ed25519VerificationKey2018": "sec:Ed25519VerificationKey2018",
-        "Ed25519Signature2020": "sec:Ed25519Signature2020",
-        "Ed25519VerificationKey2020": "sec:Ed25519VerificationKey2020",
-        "JsonWebSignature2020": "sec:JsonWebSignature2020",
-        "JsonWebKey2020": "sec:JsonWebKey2020",
-        "RsaSignature2018": "sec:RsaSignature2018",
-        "RsaVerificationKey2018": "sec:RsaVerificationKey2018",
-        "SchnorrSecp256k1Signature2019": "sec:SchnorrSecp256k1Signature2019",
-        "SchnorrSecp256k1VerificationKey2019": "sec:SchnorrSecp256k1VerificationKey2019",
-        "ServiceEndpointProxyService": "didv:ServiceEndpointProxyService",
-        "allowedAction": "sec:allowedAction",
-        "assertionMethod": { "@id": "sec:assertionMethod", "@type": "@id", "@container": "@set" },
-        "authentication": { "@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set" },
-        "capability": { "@id": "sec:capability", "@type": "@id" },
-        "capabilityAction": "sec:capabilityAction",
-        "capabilityChain": { "@id": "sec:capabilityChain", "@type": "@id", "@container": "@list" },
-        "capabilityDelegation": { "@id": "sec:capabilityDelegationMethod", "@type": "@id", "@container": "@set" },
-        "capabilityInvocation": { "@id": "sec:capabilityInvocationMethod", "@type": "@id", "@container": "@set" },
-        "capabilityStatusList": { "@id": "sec:capabilityStatusList", "@type": "@id" },
-        "canonicalizationAlgorithm": "sec:canonicalizationAlgorithm",
-        "caveat": { "@id": "sec:caveat", "@type": "@id", "@container": "@set" },
-        "challenge": "sec:challenge",
-        "controller": { "@id": "sec:controller", "@type": "@id" },
-        "created": { "@id": "dc:created", "@type": "xsd:dateTime" },
-        "creator": { "@id": "dc:creator", "@type": "@id" },
-        "delegator": { "@id": "sec:delegator", "@type": "@id" },
-        "domain": "sec:domain",
-        "expirationDate": { "@id": "sec:expiration", "@type": "xsd:dateTime" },
-        "invocationTarget": { "@id": "sec:invocationTarget", "@type": "@id" },
-        "invoker": { "@id": "sec:invoker", "@type": "@id" },
-        "jws": "sec:jws",
-        "keyAgreement": { "@id": "sec:keyAgreementMethod", "@type": "@id", "@container": "@set" },
-        "nonce": "sec:nonce",
-        "owner": { "@id": "sec:owner", "@type": "@id" },
-        "proof": { "@id": "sec:proof", "@type": "@id", "@container": "@graph" },
-        "proofPurpose": { "@id": "sec:proofPurpose", "@type": "@vocab" },
-        "proofValue": "sec:proofValue",
-        "publicKey": { "@id": "sec:publicKey", "@type": "@id", "@container": "@set" },
-        "publicKeyBase58": "sec:publicKeyBase58",
-        "publicKeyMultibase": "sec:publicKeyMultibase",
-        "publicKeyJwk": "sec:publicKeyJwk",
-        "publicKeyPem": "sec:publicKeyPem",
-        "revoked": { "@id": "sec:revoked", "@type": "xsd:dateTime" },
-        "service": { "@id": "didv:service", "@type": "@id", "@container": "@set" },
-        "serviceEndpoint": { "@id": "didv:serviceEndpoint", "@type": "@id" },
-        "verificationMethod": { "@id": "sec:verificationMethod", "@type": "@id" }
-    }
-}

package/build/contexts/ed25519-signature-2020-v1.json

@@ -1,77 +0,0 @@
-{
-    "@context": {
-        "id": "@id",
-        "type": "@type",
-        "@protected": true,
-        "proof": {
-            "@id": "https://w3id.org/security#proof",
-            "@type": "@id",
-            "@container": "@graph"
-        },
-        "Ed25519VerificationKey2020": {
-            "@id": "https://w3id.org/security#Ed25519VerificationKey2020"
-        },
-        "Ed25519Signature2020": {
-            "@id": "https://w3id.org/security#Ed25519Signature2020",
-            "@context": {
-                "@protected": true,
-                "id": "@id",
-                "type": "@type",
-                "challenge": "https://w3id.org/security#challenge",
-                "created": {
-                    "@id": "http://purl.org/dc/terms/created",
-                    "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
-                },
-                "domain": "https://w3id.org/security#domain",
-                "expires": {
-                    "@id": "https://w3id.org/security#expiration",
-                    "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
-                },
-                "nonce": "https://w3id.org/security#nonce",
-                "proofPurpose": {
-                    "@id": "https://w3id.org/security#proofPurpose",
-                    "@type": "@vocab",
-                    "@context": {
-                        "@version": 1.1,
-                        "@protected": true,
-                        "id": "@id",
-                        "type": "@type",
-                        "assertionMethod": {
-                            "@id": "https://w3id.org/security#assertionMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        },
-                        "authentication": {
-                            "@id": "https://w3id.org/security#authenticationMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        },
-                        "capabilityInvocation": {
-                            "@id": "https://w3id.org/security#capabilityInvocationMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        },
-                        "capabilityDelegation": {
-                            "@id": "https://w3id.org/security#capabilityDelegationMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        },
-                        "keyAgreement": {
-                            "@id": "https://w3id.org/security#keyAgreementMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        }
-                    }
-                },
-                "proofValue": {
-                    "@id": "https://w3id.org/security#proofValue",
-                    "@type": "https://w3id.org/security#multibase"
-                },
-                "verificationMethod": {
-                    "@id": "https://w3id.org/security#verificationMethod",
-                    "@type": "@id"
-                }
-            }
-        }
-    }
-}

package/build/contexts/kyc-v1.json

@@ -1,8 +0,0 @@
-{
-    "@context": {
-        "@version": 1.1,
-        "@protected": true,
-        "VerifiableKyc": "https://veramo.io/contexts/kyc#VerifiableKyc",
-        "name": "https://schema.org/name"
-    }
-}

package/build/contexts/socialmedia-v1.json

@@ -1,7 +0,0 @@
-{
-    "@context": {
-        "@version": 1.1,
-        "@protected": true,
-        "VerifableSocialMediaPosting": "https://veramo.io/contexts/socialmedia#VerifableSocialMediaPosting"
-    }
-}

package/build/contexts/transmute_v1.json

@@ -1,20 +0,0 @@
-{
-    "@context": [
-        {
-            "@version": 1.1
-        },
-        "https://www.w3.org/ns/did/v1",
-        {
-            "JsonWebKey2020": "https://w3id.org/security#JsonWebKey2020",
-            "Ed25519VerificationKey2018": "https://w3id.org/security#Ed25519VerificationKey2018",
-            "X25519KeyAgreementKey2019": "https://w3id.org/security#X25519KeyAgreementKey2019",
-            "publicKeyJwk": {
-                "@id": "https://w3id.org/security#publicKeyJwk",
-                "@type": "@json"
-            },
-            "publicKeyBase58": {
-                "@id": "https://w3id.org/security#publicKeyBase58"
-            }
-        }
-    ]
-}

package/src/contexts/did_v0.11.json

@@ -1,64 +0,0 @@
-{
-  "@context": {
-    "@version": 1.1,
-    "id": "@id",
-    "type": "@type",
-
-    "dc": "http://purl.org/dc/terms/",
-    "schema": "http://schema.org/",
-    "sec": "https://w3id.org/security#",
-    "didv": "https://w3id.org/did#",
-    "xsd": "http://www.w3.org/2001/XMLSchema#",
-
-    "EcdsaSecp256k1Signature2019": "sec:EcdsaSecp256k1Signature2019",
-    "EcdsaSecp256k1VerificationKey2019": "sec:EcdsaSecp256k1VerificationKey2019",
-    "Ed25519Signature2018": "sec:Ed25519Signature2018",
-    "Ed25519VerificationKey2018": "sec:Ed25519VerificationKey2018",
-    "Ed25519Signature2020": "sec:Ed25519Signature2020",
-    "Ed25519VerificationKey2020": "sec:Ed25519VerificationKey2020",
-    "JsonWebSignature2020": "sec:JsonWebSignature2020",
-    "JsonWebKey2020": "sec:JsonWebKey2020",
-    "RsaSignature2018": "sec:RsaSignature2018",
-    "RsaVerificationKey2018": "sec:RsaVerificationKey2018",
-    "SchnorrSecp256k1Signature2019": "sec:SchnorrSecp256k1Signature2019",
-    "SchnorrSecp256k1VerificationKey2019": "sec:SchnorrSecp256k1VerificationKey2019",
-    "ServiceEndpointProxyService": "didv:ServiceEndpointProxyService",
-
-    "allowedAction": "sec:allowedAction",
-    "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
-    "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"},
-    "capability": {"@id": "sec:capability", "@type": "@id"},
-    "capabilityAction": "sec:capabilityAction",
-    "capabilityChain": {"@id": "sec:capabilityChain", "@type": "@id", "@container": "@list"},
-    "capabilityDelegation": {"@id": "sec:capabilityDelegationMethod", "@type": "@id", "@container": "@set"},
-    "capabilityInvocation": {"@id": "sec:capabilityInvocationMethod", "@type": "@id", "@container": "@set"},
-    "capabilityStatusList": {"@id": "sec:capabilityStatusList", "@type": "@id"},
-    "canonicalizationAlgorithm": "sec:canonicalizationAlgorithm",
-    "caveat": {"@id": "sec:caveat", "@type": "@id", "@container": "@set"},
-    "challenge": "sec:challenge",
-    "controller": {"@id": "sec:controller", "@type": "@id"},
-    "created": {"@id": "dc:created", "@type": "xsd:dateTime"},
-    "creator": {"@id": "dc:creator", "@type": "@id"},
-    "delegator": {"@id": "sec:delegator", "@type": "@id"},
-    "domain": "sec:domain",
-    "expirationDate": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
-    "invocationTarget": {"@id": "sec:invocationTarget", "@type": "@id"},
-    "invoker": {"@id": "sec:invoker", "@type": "@id"},
-    "jws": "sec:jws",
-    "keyAgreement": {"@id": "sec:keyAgreementMethod", "@type": "@id", "@container": "@set"},
-    "nonce": "sec:nonce",
-    "owner": {"@id": "sec:owner", "@type": "@id"},
-    "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
-    "proofPurpose": {"@id": "sec:proofPurpose", "@type": "@vocab"},
-    "proofValue": "sec:proofValue",
-    "publicKey": {"@id": "sec:publicKey", "@type": "@id", "@container": "@set"},
-    "publicKeyBase58": "sec:publicKeyBase58",
-    "publicKeyMultibase": "sec:publicKeyMultibase",
-    "publicKeyJwk": "sec:publicKeyJwk",
-    "publicKeyPem": "sec:publicKeyPem",
-    "revoked": {"@id": "sec:revoked", "@type": "xsd:dateTime"},
-    "service": {"@id": "didv:service", "@type": "@id", "@container": "@set"},
-    "serviceEndpoint": {"@id": "didv:serviceEndpoint", "@type": "@id"},
-    "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
-  }
-}

package/src/contexts/ed25519-signature-2020-v1.json

@@ -1,77 +0,0 @@
-{
-    "@context": {
-      "id": "@id",
-      "type": "@type",
-      "@protected": true,
-      "proof": {
-        "@id": "https://w3id.org/security#proof",
-        "@type": "@id",
-        "@container": "@graph"
-      },
-      "Ed25519VerificationKey2020": {
-        "@id": "https://w3id.org/security#Ed25519VerificationKey2020"
-      },
-      "Ed25519Signature2020": {
-        "@id": "https://w3id.org/security#Ed25519Signature2020",
-        "@context": {
-          "@protected": true,
-          "id": "@id",
-          "type": "@type",
-          "challenge": "https://w3id.org/security#challenge",
-          "created": {
-            "@id": "http://purl.org/dc/terms/created",
-            "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
-          },
-          "domain": "https://w3id.org/security#domain",
-          "expires": {
-            "@id": "https://w3id.org/security#expiration",
-            "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
-          },
-          "nonce": "https://w3id.org/security#nonce",
-          "proofPurpose": {
-            "@id": "https://w3id.org/security#proofPurpose",
-            "@type": "@vocab",
-            "@context": {
-              "@version": 1.1,
-              "@protected": true,
-              "id": "@id",
-              "type": "@type",
-              "assertionMethod": {
-                "@id": "https://w3id.org/security#assertionMethod",
-                "@type": "@id",
-                "@container": "@set"
-              },
-              "authentication": {
-                "@id": "https://w3id.org/security#authenticationMethod",
-                "@type": "@id",
-                "@container": "@set"
-              },
-              "capabilityInvocation": {
-                "@id": "https://w3id.org/security#capabilityInvocationMethod",
-                "@type": "@id",
-                "@container": "@set"
-              },
-              "capabilityDelegation": {
-                "@id": "https://w3id.org/security#capabilityDelegationMethod",
-                "@type": "@id",
-                "@container": "@set"
-              },
-              "keyAgreement": {
-                "@id": "https://w3id.org/security#keyAgreementMethod",
-                "@type": "@id",
-                "@container": "@set"
-              }
-            }
-          },
-          "proofValue": {
-            "@id": "https://w3id.org/security#proofValue",
-            "@type": "https://w3id.org/security#multibase"
-          },
-          "verificationMethod": {
-            "@id": "https://w3id.org/security#verificationMethod",
-            "@type": "@id"
-          }
-        }
-      }
-    }
-  }

package/src/contexts/json-web-signature-2020-v1.json

@@ -1,71 +0,0 @@
-{
-    "@context": {
-        "@version": 1.1,
-        "id": "@id",
-        "type": "@type",
-        "@protected": true,
-        "JsonWebKey2020": {
-            "@id": "https://w3id.org/security#JsonWebKey2020"
-        },
-        "JsonWebSignature2020": {
-            "@id": "https://w3id.org/security#JsonWebSignature2020",
-            "@context": {
-                "@version": 1.1,
-                "id": "@id",
-                "type": "@type",
-                "@protected": true,
-                "challenge": "https://w3id.org/security#challenge",
-                "created": {
-                    "@id": "http://purl.org/dc/terms/created",
-                    "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
-                },
-                "domain": "https://w3id.org/security#domain",
-                "expires": {
-                    "@id": "https://w3id.org/security#expiration",
-                    "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
-                },
-                "jws": "https://w3id.org/security#jws",
-                "nonce": "https://w3id.org/security#nonce",
-                "proofPurpose": {
-                    "@id": "https://w3id.org/security#proofPurpose",
-                    "@type": "@vocab",
-                    "@context": {
-                        "@version": 1.1,
-                        "@protected": true,
-                        "id": "@id",
-                        "type": "@type",
-                        "assertionMethod": {
-                            "@id": "https://w3id.org/security#assertionMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        },
-                        "authentication": {
-                            "@id": "https://w3id.org/security#authenticationMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        },
-                        "capabilityInvocation": {
-                            "@id": "https://w3id.org/security#capabilityInvocationMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        },
-                        "capabilityDelegation": {
-                            "@id": "https://w3id.org/security#capabilityDelegationMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        },
-                        "keyAgreement": {
-                            "@id": "https://w3id.org/security#keyAgreementMethod",
-                            "@type": "@id",
-                            "@container": "@set"
-                        }
-                    }
-                },
-                "verificationMethod": {
-                    "@id": "https://w3id.org/security#verificationMethod",
-                    "@type": "@id"
-                }
-            }
-        }
-    }
-}

package/src/contexts/kyc-v1.json

@@ -1,8 +0,0 @@
-{
-  "@context": {
-      "@version": 1.1,
-      "@protected": true,
-      "VerifiableKyc": "https://veramo.io/contexts/kyc#VerifiableKyc",
-      "name": "https://schema.org/name"
-  }
-}

package/src/contexts/socialmedia-v1.json

@@ -1,7 +0,0 @@
-{
-  "@context": {
-      "@version": 1.1,
-      "@protected": true,
-      "VerifableSocialMediaPosting": "https://veramo.io/contexts/socialmedia#VerifableSocialMediaPosting"
-  }
-}

package/src/contexts/transmute_v1.json

@@ -1,21 +0,0 @@
-{
-  "@context": [
-    {
-      "@version": 1.1
-    },
-    "https://www.w3.org/ns/did/v1",
-    {
-      "JsonWebKey2020": "https://w3id.org/security#JsonWebKey2020",
-      "Ed25519VerificationKey2018": "https://w3id.org/security#Ed25519VerificationKey2018",
-      "X25519KeyAgreementKey2019": "https://w3id.org/security#X25519KeyAgreementKey2019",
-
-      "publicKeyJwk": {
-        "@id": "https://w3id.org/security#publicKeyJwk",
-        "@type": "@json"
-      },
-      "publicKeyBase58": {
-        "@id": "https://w3id.org/security#publicKeyBase58"
-      }
-    }
-  ]
-}