From 941e9298ab7071f975343aa1c21aa775a89bf2d5 Mon Sep 17 00:00:00 2001 From: Dmitri Zagidulin Date: Thu, 8 Feb 2024 13:11:15 -0500 Subject: [PATCH] WIP --- app/lib/decode.ts | 3 ++- app/lib/did.ts | 3 ++- app/lib/didAuthRequest.ts | 1 + app/lib/exchanges.ts | 1 + app/lib/present.ts | 1 + app/lib/validate.ts | 1 + .../ExchangeCredentials/ExchangeCredentials.tsx | 3 ++- app/types/digitalcredentials.d.ts | 2 +- ios/Podfile.lock | 2 +- package.json | 17 +++++++++-------- 10 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/lib/decode.ts b/app/lib/decode.ts index 12042d45..7d3ea8b1 100644 --- a/app/lib/decode.ts +++ b/app/lib/decode.ts @@ -1,3 +1,4 @@ +// import '@digitalcredentials/data-integrity-rn'; import { fromQrCode, toQrCode } from '@digitalcredentials/vpqr'; import qs from 'query-string'; @@ -109,7 +110,7 @@ async function credentialsFromJson(text: string): Promise { /** * A method for decoding credentials from a variety text formats. - * + * * @param text - A string containing a VPQR, URL, or JSON object. * @returns {Promise} - An array of credentials. */ diff --git a/app/lib/did.ts b/app/lib/did.ts index b82a5b79..665f70ab 100644 --- a/app/lib/did.ts +++ b/app/lib/did.ts @@ -1,3 +1,4 @@ +// import '@digitalcredentials/data-integrity-rn'; import * as DidMethodKey from '@digitalcredentials/did-method-key'; import { generateSecureRandom } from 'react-native-securerandom'; import { AddDidRecordParams } from '../model'; @@ -18,4 +19,4 @@ export async function mintDid(): Promise { ]: DidKey[] = expandedMap.map(([, pair]): DidKey => pair); return { didDocument, verificationKey, keyAgreementKey }; -} \ No newline at end of file +} diff --git a/app/lib/didAuthRequest.ts b/app/lib/didAuthRequest.ts index 9d23f8cc..a3e129e0 100644 --- a/app/lib/didAuthRequest.ts +++ b/app/lib/didAuthRequest.ts @@ -1,3 +1,4 @@ +// import '@digitalcredentials/data-integrity-rn'; import { ProfileRecordRaw } from '../model'; import { makeSelectDidFromProfile, selectWithFactory } from '../store/selectorFactories'; import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020'; diff --git a/app/lib/exchanges.ts b/app/lib/exchanges.ts index 440f0269..0d8f2b49 100644 --- a/app/lib/exchanges.ts +++ b/app/lib/exchanges.ts @@ -1,4 +1,5 @@ import uuid from 'react-native-uuid'; +// import '@digitalcredentials/data-integrity-rn'; import vc from '@digitalcredentials/vc'; import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020'; import { securityLoader } from '@digitalcredentials/security-document-loader'; diff --git a/app/lib/present.ts b/app/lib/present.ts index f4d7f1cb..7e90509e 100644 --- a/app/lib/present.ts +++ b/app/lib/present.ts @@ -1,4 +1,5 @@ import uuid from 'react-native-uuid'; +// import '@digitalcredentials/data-integrity-rn'; import vc from '@digitalcredentials/vc'; import { Ed25519VerificationKey2020 } from '@digitalcredentials/ed25519-verification-key-2020'; import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020'; diff --git a/app/lib/validate.ts b/app/lib/validate.ts index 4b92d82f..be3b4f86 100644 --- a/app/lib/validate.ts +++ b/app/lib/validate.ts @@ -1,3 +1,4 @@ +// import '@digitalcredentials/data-integrity-rn'; import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020'; import { purposes } from '@digitalcredentials/jsonld-signatures'; import { checkStatus } from '@digitalcredentials/vc-status-list'; diff --git a/app/screens/ExchangeCredentials/ExchangeCredentials.tsx b/app/screens/ExchangeCredentials/ExchangeCredentials.tsx index 1f616358..2c7f9f94 100644 --- a/app/screens/ExchangeCredentials/ExchangeCredentials.tsx +++ b/app/screens/ExchangeCredentials/ExchangeCredentials.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { Text } from 'react-native-elements'; +// import '@digitalcredentials/data-integrity-rn'; import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020'; import { Ed25519VerificationKey2020 } from '@digitalcredentials/ed25519-verification-key-2020'; import { ConfirmModal } from '../../components'; @@ -60,7 +61,7 @@ export default function ExchangeCredentials({ route }: ExchangeCredentialsProps) const credential = credentialField[0]; await dispatch(stageCredentials([credential])); await delay(500); - navigationRef.navigate('AcceptCredentialsNavigation', { + navigationRef.navigate('AcceptCredentialsNavigation', { screen: 'ApproveCredentialsScreen', params: { rawProfileRecord diff --git a/app/types/digitalcredentials.d.ts b/app/types/digitalcredentials.d.ts index a5adda20..0496c1ac 100644 --- a/app/types/digitalcredentials.d.ts +++ b/app/types/digitalcredentials.d.ts @@ -3,7 +3,7 @@ declare module '@digitalcredentials/did-method-key'; declare module '@digitalcredentials/vc'; declare module '@digitalcredentials/vc-status-list'; declare module '@digitalcredentials/vpqr'; -declare module '@digitalcredentials/http-client'; +declare module '@digitalbazaar/http-client'; declare module '@digitalcredentials/jsonld-signatures'; declare module '@digitalcredentials/ed25519-signature-2020' { export class Ed25519Signature2020 { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 78011aab..9f399c09 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -722,4 +722,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: fdd666d8cc882e6bdde657edd92cb85cf1799cb1 -COCOAPODS: 1.14.3 +COCOAPODS: 1.12.1 diff --git a/package.json b/package.json index ac030323..36b3ab8b 100644 --- a/package.json +++ b/package.json @@ -16,19 +16,18 @@ "@digitalcredentials/crypto-ld": "^7.0.3", "@digitalcredentials/did-io": "^1.0.2", "@digitalcredentials/did-method-key": "^2.0.3", - "@digitalcredentials/ed25519-signature-2020": "^3.0.1", + "@digitalcredentials/ed25519-signature-2020": "^4.0.0", "@digitalcredentials/ed25519-verification-key-2020": "^4.0.0", "@digitalcredentials/issuer-registry-client": "^2.0.0", - "@digitalcredentials/minimal-cipher": "^5.1.2", - "@digitalcredentials/security-document-loader": "^3.1.0", - "@digitalcredentials/vc": "^6.0.0", - "@digitalcredentials/vc-status-list": "^7.2.0", + "@digitalcredentials/security-document-loader": "^4.0.0", + "@digitalcredentials/vc": "^7.0.0", + "@digitalcredentials/vc-status-list": "^8.0.0", "@digitalcredentials/vpqr": "^2.2.1", "@expo-google-fonts/roboto": "^0.2.0", "@expo-google-fonts/roboto-mono": "^0.2.2", "@expo-google-fonts/rubik": "^0.2.0", "@expo/vector-icons": "^12.0.0", - "@interop/did-web-resolver": "^2.2.1", + "@interop/did-web-resolver": "^4.0.0", "@react-native-async-storage/async-storage": "^1.17.7", "@react-native-clipboard/clipboard": "^1.10.0", "@react-native-community/masked-view": "0.1.10", @@ -38,6 +37,7 @@ "@react-navigation/stack": "^6.0.1", "@reduxjs/toolkit": "^1.6.1", "@types/text-encoding": "^0.0.36", + "asmcrypto.js": "^2.3.2", "big-integer": "^1.6.49", "bson": "4.4.1", "crypto-js": "^4.1.1", @@ -54,6 +54,7 @@ "json-canonicalize": "^1.0.4", "jsonpath-plus": "^7.2.0", "moment": "^2.29.1", + "msrcrypto": "^1.5.8", "patch-package": "^6.4.7", "process": "^0.11.10", "query-string": "^7.1.0", @@ -112,15 +113,15 @@ "@babel/core": "^7.9.0", "@digitalcredentials/lru-memoize": "^2.1.4", "@types/crypto-js": "^4.1.1", - "@types/react": "~17.0.2", - "jest": "^29.6.3", "@types/jest": "^29.5.5", + "@types/react": "~17.0.2", "@types/react-native": "~0.67.8", "@typescript-eslint/eslint-plugin": "^6.16.0", "@typescript-eslint/parser": "^6.16.0", "eslint": "^7.32.0", "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-native": "^3.11.0", + "jest": "^29.6.3", "rn-animated-ellipsis": "^2.1.3", "typescript": "^5.3.2" },