Merge branch 'dev' into build/upgrade-tauri

.github/workflows/format-lint-test.yaml

@@ -53,7 +53,7 @@ jobs:
         working-directory: ./unime/src-tauri
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libsoup-3.0 javascriptcoregtk-4.1 webkit2gtk-4.1
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
       - name: Format
         working-directory: ./unime/src-tauri
@@ -101,7 +101,7 @@ jobs:
         working-directory: ./identity-wallet
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libsoup-3.0 javascriptcoregtk-4.1 webkit2gtk-4.1
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
       - name: Format
         working-directory: ./identity-wallet

Cargo.toml

@@ -26,10 +26,10 @@ tauri-build = "2.0.3"
 # tauri-utils = { version = "2.0.0-rc.0", features = [ "resources" ] }
 # tauri-winres = "=0.1"
 
-did_manager = { git = "https://github.com/impierce/did-manager.git", rev = "2b88f55" }
+did_manager = { git = "https://git@github.com/impierce/did-manager.git", tag = "v1.0.0-beta.3" }
 jsonwebtoken = "9.3"
 log = "^0.4"
-oid4vc = { git = "https://[email protected]/impierce/openid4vc.git", rev = "d095db0" }
+oid4vc = { git = "https://[email protected]/impierce/openid4vc.git", rev = "7be5b72" }
 rand = "0.8"
 serde_json = "1.0"
 serial_test = "2.0"
@@ -46,4 +46,4 @@ keywords = ["identity", "did", "ssi", "wallet", "siopv2"]
 license = "Apache-2.0"
 repository = "https://github.com/impierce/identity-wallet"
 edition = "2021"
-rust-version = "1.75.0"
+rust-version = "1.76.0"

identity-wallet/Cargo.toml

@@ -2,7 +2,7 @@
 name = "identity-wallet"
 version = "0.6.12"
 edition = "2021"
-rust-version = "1.75.0"
+rust-version.workspace = true
 
 [dependencies]
 tauri.workspace = true
@@ -23,8 +23,10 @@ identity_credential = { version = "1.3", default-features = false, features = [
     "presentation",
     "validator",
 ] }
+identity_core = { version = "1.3" }
 identity_eddsa_verifier = { version = "1.3" }
 identity_iota = { version = "1.3" }
+identity_jose = { version = "1.3" }
 iota_stronghold = { version = "2.1" }
 itertools = "0.10.5"
 jsonwebtoken.workspace = true
@@ -37,6 +39,7 @@ reqwest = { version = "0.11", default-features = false, features = [
     "rustls-tls",
 ] }
 serde = { version = "1.0", features = ["derive"] }
+serde_with = "3.8"
 serde_json.workspace = true
 sha256 = "1.4"
 stronghold_engine = { version = "2.0.1" }
@@ -51,7 +54,6 @@ url = "2.5"
 uuid = { version = "1.4", features = ["v4", "fast-rng", "serde"] }
 
 [dev-dependencies]
-ring = "0.17"
 serial_test.workspace = true
 tempfile.workspace = true
 wiremock.workspace = true

identity-wallet/bindings/AppState.ts

@@ -6,5 +6,6 @@ import type { DisplayCredential } from "./credentials/DisplayCredential";
 import type { HistoryEvent } from "./history/HistoryEvent";
 import type { ProfileSettings } from "./profile_settings/ProfileSettings";
 import type { SearchResults } from "./search/SearchResults";
+import type { TrustLists } from "./trust_list/TrustLists";
 
-export interface AppState { dids: Record<string, string>, connections: Connections, credentials: Array<DisplayCredential>, search_results: SearchResults, profile_settings: ProfileSettings, current_user_prompt: CurrentUserPrompt | null, user_journey: any | null, debug_messages: Array<string>, history: Array<HistoryEvent>, dev_mode: DevMode, }
+export interface AppState { dids: Record<string, string>, connections: Connections, credentials: Array<DisplayCredential>, trust_lists: TrustLists, search_results: SearchResults, profile_settings: ProfileSettings, current_user_prompt: CurrentUserPrompt | null, user_journey: any | null, debug_messages: Array<string>, history: Array<HistoryEvent>, dev_mode: DevMode, }

identity-wallet/bindings/actions/Action.ts

@@ -1,20 +1,27 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AddRecentSearch } from "./AddRecentSearch";
+import type { AddTrustList } from "./AddTrustList";
+import type { AddTrustListEntry } from "./AddTrustListEntry";
 import type { CancelUserFlow } from "./CancelUserFlow";
 import type { CreateNew } from "./CreateNew";
 import type { CredentialOffersSelected } from "./CredentialOffersSelected";
 import type { CredentialsSelected } from "./CredentialsSelected";
 import type { DeleteCredential } from "./DeleteCredential";
 import type { DeleteRecentSearch } from "./DeleteRecentSearch";
+import type { DeleteTrustList } from "./DeleteTrustList";
+import type { DeleteTrustListEntry } from "./DeleteTrustListEntry";
 import type { DevProfile } from "./DevProfile";
+import type { EditTrustList } from "./EditTrustList";
+import type { EditTrustListEntry } from "./EditTrustListEntry";
 import type { QrCodeScanned } from "./QrCodeScanned";
 import type { SearchQuery } from "./SearchQuery";
 import type { SetLocale } from "./SetLocale";
 import type { SetPreferredDidMethod } from "./SetPreferredDidMethod";
 import type { SetPreferredKeyType } from "./SetPreferredKeyType";
+import type { ToggleTrustListEntry } from "./ToggleTrustListEntry";
 import type { UnlockStorage } from "./UnlockStorage";
 import type { UpdateCredentialMetadata } from "./UpdateCredentialMetadata";
 import type { UpdateProfileSettings } from "./UpdateProfileSettings";
 import type { UpdateSortingPreference } from "./UpdateSortingPreference";
 
-export type Action = { "type": "[App] Get state" } | { "type": "[Storage] Unlock", payload: UnlockStorage, } | { "type": "[App] Reset" } | { "type": "[DID] Create new", payload: CreateNew, } | { "type": "[Settings] Set locale", payload: SetLocale, } | { "type": "[Settings] Update profile", payload: UpdateProfileSettings, } | { "type": "[QR Code] Scanned", payload: QrCodeScanned, } | { "type": "[Authenticate] Connection accepted" } | { "type": "[User Flow] Cancel", payload?: CancelUserFlow, } | { "type": "[DEV] Load DEV profile", payload: DevProfile, } | { "type": "[DEV] Toggle DEV mode" } | { "type": "[Authenticate] Credentials selected", payload: CredentialsSelected, } | { "type": "[Credential Offer] Selected", payload: CredentialOffersSelected, } | { "type": "[Credential Metadata] Update", payload: UpdateCredentialMetadata, } | { "type": "[Credential] Delete", payload: DeleteCredential, } | { "type": "[User Journey] Cancel" } | { "type": "[Settings] Update sorting preference", payload: UpdateSortingPreference, } | { "type": "[Search] Query", payload: SearchQuery, } | { "type": "[Search] Add recent", payload: AddRecentSearch, } | { "type": "[Search] Delete recent", payload: DeleteRecentSearch, } | { "type": "[DID] Set preferred method", payload: SetPreferredDidMethod, } | { "type": "[Keys] Set preferred key type", payload: SetPreferredKeyType, };
+export type Action = { "type": "[App] Get state" } | { "type": "[Storage] Unlock", payload: UnlockStorage, } | { "type": "[App] Reset" } | { "type": "[DID] Create new", payload: CreateNew, } | { "type": "[Settings] Set locale", payload: SetLocale, } | { "type": "[Settings] Update profile", payload: UpdateProfileSettings, } | { "type": "[QR Code] Scanned", payload: QrCodeScanned, } | { "type": "[Authenticate] Connection accepted" } | { "type": "[User Flow] Cancel", payload?: CancelUserFlow, } | { "type": "[DEV] Load DEV profile", payload: DevProfile, } | { "type": "[DEV] Toggle DEV mode" } | { "type": "[Authenticate] Credentials selected", payload: CredentialsSelected, } | { "type": "[Credential Offer] Selected", payload: CredentialOffersSelected, } | { "type": "[Credential Metadata] Update", payload: UpdateCredentialMetadata, } | { "type": "[Credential] Delete", payload: DeleteCredential, } | { "type": "[User Journey] Cancel" } | { "type": "[Settings] Update sorting preference", payload: UpdateSortingPreference, } | { "type": "[Search] Query", payload: SearchQuery, } | { "type": "[Search] Add recent", payload: AddRecentSearch, } | { "type": "[Search] Delete recent", payload: DeleteRecentSearch, } | { "type": "[DID] Set preferred method", payload: SetPreferredDidMethod, } | { "type": "[Keys] Set preferred key type", payload: SetPreferredKeyType, } | { "type": "[Trust List] Add entry", payload: AddTrustListEntry, } | { "type": "[Trust List] Edit entry", payload: EditTrustListEntry, } | { "type": "[Trust List] Delete entry", payload: DeleteTrustListEntry, } | { "type": "[Trust List] Toggle entry", payload: ToggleTrustListEntry, } | { "type": "[Trust Lists] Add", payload: AddTrustList, } | { "type": "[Trust Lists] Edit", payload: EditTrustList, } | { "type": "[Trust Lists] Delete", payload: DeleteTrustList, };

identity-wallet/bindings/actions/AddTrustList.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface AddTrustList { display_name: string, }

identity-wallet/bindings/actions/AddTrustListEntry.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface AddTrustListEntry { trust_list_id: string, domain: string, }

identity-wallet/bindings/actions/DeleteTrustList.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface DeleteTrustList { trust_list_id: string, }

identity-wallet/bindings/actions/DeleteTrustListEntry.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface DeleteTrustListEntry { trust_list_id: string, domain: string, }

identity-wallet/bindings/actions/EditTrustList.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface EditTrustList { trust_list_id: string, new_display_name: string, }

identity-wallet/bindings/actions/EditTrustListEntry.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface EditTrustListEntry { trust_list_id: string, old_domain: string, new_domain: string, }

identity-wallet/bindings/actions/ToggleTrustListEntry.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface ToggleTrustListEntry { trust_list_id: string, domain: string, }

identity-wallet/bindings/trust_list/TrustList.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface TrustList { id: string, display_name: string, custom: boolean, entries: Record<string, boolean>, }

identity-wallet/bindings/trust_list/TrustLists.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { TrustList } from "./TrustList";
+
+export type TrustLists = Array<TrustList>;

identity-wallet/bindings/user_prompt/CurrentUserPrompt.ts

@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { LinkedVerifiableCredentialData } from "./LinkedVerifiableCredentialData";
 import type { ValidationResult } from "./ValidationResult";
 
-export type CurrentUserPrompt = { "type": "redirect", target: string, } | { "type": "password-required" } | { "type": "accept-connection", client_name: string, logo_uri?: string, redirect_uri: string, previously_connected: boolean, domain_validation: ValidationResult, } | { "type": "credential-offer", issuer_name: string, logo_uri?: string, credential_configurations: Record<string, any>, } | { "type": "share-credentials", client_name: string, logo_uri?: string, options: Array<string>, };
+export type CurrentUserPrompt = { "type": "redirect", target: string, } | { "type": "password-required" } | { "type": "accept-connection", client_name: string, logo_uri?: string, redirect_uri: string, previously_connected: boolean, domain_validation: ValidationResult, linked_verifiable_presentations: Array<LinkedVerifiableCredentialData>, } | { "type": "credential-offer", issuer_name: string, logo_uri?: string, credential_configurations: Record<string, any>, } | { "type": "share-credentials", client_name: string, logo_uri?: string, options: Array<string>, };

identity-wallet/bindings/user_prompt/LinkedVerifiableCredentialData.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface LinkedVerifiableCredentialData { name: string | null, logo_uri: string | null, issuance_date: string, }

identity-wallet/bindings/user_prompt/ValidationResult.ts

@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ValidationStatus } from "./ValidationStatus";
 
-export interface ValidationResult { status: ValidationStatus, message: string | null, }
+export interface ValidationResult { status: ValidationStatus, name?: string, logo_uri?: string, issuance_date?: string, message?: string, }