feat: credo 0.5.0 support (#87)

Signed-off-by: Timo Glastra <[email protected]> Co-authored-by: Jan <[email protected]>
animo · Mar 19, 2024 · e1097f9 · e1097f9
1 parent 8361d94
commit e1097f9
Show file tree

Hide file tree

Showing 73 changed files with 6,945 additions and 9,715 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -8,11 +8,6 @@ on:
     branches:
       - main
 
-# Cancel multiple runs for the same PR or branch
-concurrency:
-  group: aries-framework-${{ github.ref }}-${{ github.repository }}-${{ github.event_name }}
-  cancel-in-progress: true
-
 jobs:
   validate:
     runs-on: ubuntu-22.04
@@ -41,6 +36,3 @@ jobs:
 
       - name: Check Types
         run: yarn check-types
-
-      - name: Unit Tests
-        run: yarn test:unit
diff --git a/.yarn/patches/@sphereon-did-auth-siop-npm-0.3.2-unstable.0-6a34120d09.patch b/.yarn/patches/@sphereon-did-auth-siop-npm-0.3.2-unstable.0-6a34120d09.patch
diff --git a/apps/expo/app.config.js b/apps/expo/app.config.js
@@ -65,6 +65,7 @@ const config = {
   updates: {
     fallbackToCacheTimeout: 0,
   },
+  plugins: ['expo-font', 'expo-secure-store'],
   assetBundlePatterns: ['**/*'],
   ios: {
     supportsTablet: false,

diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx
@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/order
 import type { AppAgent } from '@internal/agent'
 
 import {
@@ -15,7 +16,8 @@ import { Provider } from 'app/provider'
 import { NoInternetToastProvider } from 'app/provider/NoInternetToastProvider'
 import { isAndroid } from 'app/utils/platform'
 import { useFonts } from 'expo-font'
-import { SplashScreen, Stack } from 'expo-router'
+import { Stack } from 'expo-router'
+import * as SplashScreen from 'expo-splash-screen'
 import { useEffect, useState } from 'react'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 

diff --git a/apps/expo/app/index.tsx b/apps/expo/app/index.tsx
@@ -11,6 +11,7 @@ export default function Screen() {
       <Stack.Screen
         options={{
           headerShown: true,
+          title: 'Home',
           header: () => {
             return <XStack h={top} bg="$grey-200" />
           },

diff --git a/apps/expo/babel.config.js b/apps/expo/babel.config.js
@@ -1,11 +1,10 @@
 /* eslint-disable */
 
 module.exports = function (api) {
-  api.cache(true)
+  api.cache(false)
   return {
     presets: [['babel-preset-expo', { jsxRuntime: 'automatic' }]],
     plugins: [
-      require.resolve('expo-router/babel'),
       [
         require.resolve('babel-plugin-module-resolver'),
         {
@@ -16,28 +15,18 @@ module.exports = function (api) {
             '@internal/ui': '../../packages/ui',
             '@internal/agent': '../../packages/agent',
             '@internal/utils': '../../packages/utils',
-            '@internal/openid4vc-client': '../../packages/openid4vc-client',
           },
           extensions: ['.js', '.jsx', '.tsx', '.ios.js', '.android.js'],
         },
       ],
       // if you want reanimated support
       // 'react-native-reanimated/plugin',
-      ...(process.env.EAS_BUILD_PLATFORM === 'android'
-        ? []
-        : [
-            [
-              '@tamagui/babel-plugin',
-              {
-                components: ['@internal/ui', 'tamagui'],
-                config: './tamagui.config.ts',
-              },
-            ],
-          ]),
       [
-        'transform-inline-environment-variables',
+        '@tamagui/babel-plugin',
         {
-          include: 'TAMAGUI_TARGET',
+          components: ['@internal/ui', 'tamagui'],
+          config: './tamagui.config.ts',
+          disableExtraction: process.env.NODE_ENV === 'development',
         },
       ],
     ],

diff --git a/apps/expo/eas.json b/apps/expo/eas.json
@@ -11,14 +11,12 @@
         "image": "latest"
       },
       "env": {
-        "TAMAGUI_TARGET": "native",
         "APP_VARIANT": "development"
       }
     },
     "preview": {
       "distribution": "internal",
       "env": {
-        "TAMAGUI_TARGET": "native",
         "APP_VARIANT": "preview"
       }
     },
@@ -27,9 +25,6 @@
       "distribution": "store",
       "android": {
         "buildType": "app-bundle"
-      },
-      "env": {
-        "TAMAGUI_TARGET": "native"
       }
     }
   },

diff --git a/apps/expo/index.js b/apps/expo/index.js
diff --git a/apps/expo/metro.config.js b/apps/expo/metro.config.js
@@ -7,7 +7,7 @@ const { getDefaultConfig } = require('@expo/metro-config')
 const path = require('path')
 
 const projectRoot = __dirname
-const workspaceRoot = path.resolve(__dirname, '../..')
+const workspaceRoot = path.resolve(projectRoot, '../..')
 
 const config = getDefaultConfig(projectRoot)
 
@@ -16,9 +16,6 @@ config.resolver.nodeModulesPaths = [
   path.resolve(projectRoot, 'node_modules'),
   path.resolve(workspaceRoot, 'node_modules'),
 ]
-config.resolver.sourceExts = ['js', 'json', 'ts', 'tsx', 'cjs']
-
-config.transformer = { ...config.transformer, unstable_allowRequireContext: true }
-config.transformer.minifierPath = require.resolve('metro-minify-terser')
+config.resolver.sourceExts = ['js', 'json', 'ts', 'tsx', 'cjs', 'mjs']
 
 module.exports = config
diff --git a/apps/expo/package.json b/apps/expo/package.json
@@ -1,60 +1,57 @@
 {
   "name": "expo-app",
-  "version": "1.1.6",
-  "main": "index.js",
+  "version": "1.2.0",
+  "main": "expo-router/entry",
   "private": true,
   "scripts": {
-    "start": "TAMAGUI_TARGET=native APP_VARIANT=development expo start -c --dev-client",
-    "android": "TAMAGUI_TARGET=native APP_VARIANT=development yarn expo run:android",
-    "ios": "TAMAGUI_TARGET=native APP_VARIANT=development yarn expo run:ios",
-    "prebuild": "TAMAGUI_TARGET=native APP_VARIANT=development expo prebuild --no-install"
+    "start": "APP_VARIANT=development expo start -c --dev-client",
+    "android": "APP_VARIANT=development yarn expo run:android",
+    "ios": "APP_VARIANT=development yarn expo run:ios",
+    "prebuild": "APP_VARIANT=development expo prebuild --no-install"
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
-    "@hyperledger/anoncreds-react-native": "^0.1.0",
-    "@hyperledger/aries-askar-react-native": "0.1.0",
-    "@hyperledger/indy-vdr-react-native": "^0.1.0",
+    "@hyperledger/anoncreds-react-native": "^0.2.1",
+    "@hyperledger/aries-askar-react-native": "^0.2.0",
+    "@hyperledger/indy-vdr-react-native": "^0.2.0",
     "@internal/agent": "*",
     "@internal/ui": "*",
     "@react-native-community/blur": "^4.3.2",
-    "@react-native-community/netinfo": "^9.3.10",
-    "@react-native-masked-view/masked-view": "^0.2.9",
+    "@react-native-community/netinfo": "11.1.0",
+    "@react-native-masked-view/masked-view": "0.3.0",
     "@react-navigation/native": "^6.1.6",
     "app": "*",
     "babel-plugin-module-resolver": "^4.1.0",
     "burnt": "^0.12.1",
-    "expo": "^49.0.0",
-    "expo-barcode-scanner": "~12.5.3",
-    "expo-constants": "~14.4.2",
-    "expo-dev-client": "~2.4.11",
-    "expo-font": "~11.4.0",
-    "expo-haptics": "~12.4.0",
-    "expo-image": "~1.3.3",
-    "expo-linear-gradient": "~12.3.0",
-    "expo-linking": "~5.0.2",
-    "expo-navigation-bar": "~2.3.0",
-    "expo-router": "^2.0.0",
-    "expo-secure-store": "~12.3.1",
-    "expo-splash-screen": "~0.20.5",
-    "expo-status-bar": "~1.6.0",
-    "expo-system-ui": "~2.4.0",
-    "expo-updates": "~0.18.13",
+    "expo": "^50.0.0",
+    "expo-barcode-scanner": "~12.9.3",
+    "expo-constants": "~15.4.5",
+    "expo-dev-client": "~3.3.10",
+    "expo-font": "~11.10.3",
+    "expo-haptics": "~12.8.1",
+    "expo-image": "~1.10.6",
+    "expo-linear-gradient": "~12.7.2",
+    "expo-linking": "~6.2.2",
+    "expo-navigation-bar": "~2.8.1",
+    "expo-router": "~3.4.8",
+    "expo-secure-store": "~12.8.1",
+    "expo-splash-screen": "~0.26.4",
+    "expo-status-bar": "~1.11.1",
+    "expo-system-ui": "~2.9.3",
+    "expo-updates": "~0.24.12",
     "react": "18.2.0",
     "react-dom": "^18.2.0",
-    "react-native": "0.72.5",
+    "react-native": "0.73.5",
     "react-native-fs": "^2.20.0",
-    "react-native-gesture-handler": "~2.12.0",
-    "react-native-get-random-values": "~1.9.0",
-    "react-native-safe-area-context": "4.6.3",
-    "react-native-screens": "~3.22.0",
-    "react-native-svg": "13.9.0"
+    "react-native-gesture-handler": "~2.14.0",
+    "react-native-get-random-values": "~1.8.0",
+    "react-native-safe-area-context": "4.8.2",
+    "react-native-screens": "~3.29.0",
+    "react-native-svg": "14.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.9",
-    "@expo/metro-config": "~0.10.0",
-    "@tamagui/babel-plugin": "latest",
-    "babel-plugin-transform-inline-environment-variables": "^0.4.4",
-    "metro-minify-terser": "^0.74.1",
+    "@tamagui/babel-plugin": "1.91.4",
     "typescript": "^4.7.4"
   }
 }
diff --git a/apps/expo/utils/walletKeyStore.ts b/apps/expo/utils/walletKeyStore.ts
@@ -1,21 +1,32 @@
-import { uuid } from '@aries-framework/core/build/utils/uuid'
+import { ariesAskar } from '@hyperledger/aries-askar-react-native'
 import * as SecureStore from 'expo-secure-store'
 
-const STORE_KEY = 'wallet-key' as const
+const STORE_KEY_LEGACY = 'wallet-key' as const
+const STORE_KEY_RAW = 'paradym-wallet-key-raw' as const
 
-const generateNewWalletKey = (): string => {
-  return uuid()
+const generateNewWalletKey = (): { walletKey: string; keyDerivation: 'raw' } => {
+  return { walletKey: ariesAskar.storeGenerateRawKey({}), keyDerivation: 'raw' }
 }
 
-export const getSecureWalletKey = async (): Promise<string> => {
+export const getSecureWalletKey = async (): Promise<{
+  walletKey: string
+  keyDerivation: 'raw' | 'derive'
+}> => {
   const secureStoreAvailable = await SecureStore.isAvailableAsync()
   if (!secureStoreAvailable) throw new Error('SecureStore is not available on this device.')
 
-  const walletKey = await SecureStore.getItemAsync(STORE_KEY)
-  if (walletKey) return walletKey
+  // New method: raw wallet key
+  let walletKey = await SecureStore.getItemAsync(STORE_KEY_RAW)
+  if (walletKey) return { walletKey, keyDerivation: 'raw' }
 
+  // TODO: rotate the old wallet key to a new raw key
+  // Old method: derived wallet key
+  walletKey = await SecureStore.getItemAsync(STORE_KEY_LEGACY)
+  if (walletKey) return { walletKey, keyDerivation: 'derive' }
+
+  // No wallet key found, generate new method: raw wallet key
   const newWalletKey = generateNewWalletKey()
-  await SecureStore.setItemAsync(STORE_KEY, newWalletKey)
+  await SecureStore.setItemAsync(STORE_KEY_RAW, newWalletKey.keyDerivation)
 
   return newWalletKey
 }
diff --git a/noop/index.js b/noop/index.js
diff --git a/package.json b/package.json
@@ -31,16 +31,14 @@
   "resolutions": {
     "@unimodules/react-native-adapter": "./noop",
     "@unimodules/core": "./noop",
-    "ref-napi": "npm:@2060.io/[email protected]",
     "@cosmjs/amino": "npm:@cosmjs-rn/amino@^0.27.1",
     "@cosmjs/encoding": "npm:@cosmjs-rn/encoding@^0.27.1",
     "@cosmjs/math": "npm:@cosmjs-rn/math@^0.27.1",
     "@cosmjs/stargate": "npm:@cosmjs-rn/stargate@^0.27.1",
     "@cosmjs/tendermint-rpc": "npm:@cosmjs-rn/tendermint-rpc@^0.27.1",
     "@cosmjs/utils": "npm:@cosmjs-rn/utils@^0.27.1",
     "@cosmjs/proto-signing": "npm:@cosmjs-rn/proto-signing@^0.27.1",
-    "@cosmjs/crypto": "npm:@cosmjs-rn/crypto@^0.27.1",
-    "@sphereon/[email protected]": "patch:@sphereon/did-auth-siop@npm%3A0.3.2-unstable.0#./.yarn/patches/@sphereon-did-auth-siop-npm-0.3.2-unstable.0-6a34120d09.patch"
+    "@cosmjs/crypto": "npm:@cosmjs-rn/crypto@^0.27.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
@@ -54,7 +52,6 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
-    "expo-linking": "~5.0.2",
     "node-gyp": "^9.3.1",
     "prettier": "^2.7.1",
     "turbo": "^1.8.3",

diff --git a/packages/agent/package.json b/packages/agent/package.json
@@ -4,28 +4,23 @@
   "private": true,
   "main": "src/index.ts",
   "dependencies": {
-    "@aries-framework/anoncreds": "0.4.2",
-    "@aries-framework/anoncreds-rs": "0.4.2",
-    "@aries-framework/askar": "0.4.2",
-    "@aries-framework/cheqd": "0.4.2",
-    "@aries-framework/core": "0.4.2",
-    "@aries-framework/indy-vdr": "0.4.2",
-    "@aries-framework/react-hooks": "0.4.2",
-    "@aries-framework/react-native": "0.4.2",
-    "@internal/openid4vc-client": "*",
+    "@credo-ts/anoncreds": "0.5.1-alpha.0",
+    "@credo-ts/askar": "0.5.1-alpha.0",
+    "@credo-ts/cheqd": "0.5.1-alpha.0",
+    "@credo-ts/core": "0.5.1-alpha.0",
+    "@credo-ts/indy-vdr": "0.5.1-alpha.0",
+    "@credo-ts/openid4vc": "0.5.1-alpha.0",
+    "@credo-ts/question-answer": "0.5.1-alpha.0",
+    "@credo-ts/react-hooks": "^0.6.1",
+    "@credo-ts/react-native": "0.5.1-alpha.0",
     "@internal/utils": "*",
     "@tanstack/react-query": "^4.33.0",
     "query-string": "^8.1.0",
     "rxjs": "^7.8.1"
   },
   "peerDependencies": {
-    "@hyperledger/anoncreds-react-native": "^0.1.0",
-    "@hyperledger/aries-askar-react-native": "0.1.0",
-    "@hyperledger/indy-vdr-react-native": "^0.1.0"
-  },
-  "devDependencies": {
-    "@hyperledger/anoncreds-react-native": "^0.1.0",
-    "@hyperledger/aries-askar-react-native": "0.1.0",
-    "@hyperledger/indy-vdr-react-native": "^0.1.0"
+    "@hyperledger/anoncreds-react-native": "*",
+    "@hyperledger/aries-askar-react-native": "*",
+    "@hyperledger/indy-vdr-react-native": "*"
   }
 }