Integrate product-core branch feat/iota-v1-2-3-and-resources-for-wasm

Cargo.toml

@@ -29,9 +29,9 @@ exclude = ["bindings/wasm/identity_wasm", "bindings/grpc"]
 
 [workspace.dependencies]
 bls12_381_plus = { version = "0.8.17" }
-iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction" }
-iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction_ts" }
-product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "product_common" }
+iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/iota-v1-2-3-and-resources-for-wasm", package = "iota_interaction" }
+iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/iota-v1-2-3-and-resources-for-wasm", package = "iota_interaction_ts" }
+product_common = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/iota-v1-2-3-and-resources-for-wasm", package = "product_common" }
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
 serde_json = { version = "1.0", default-features = false }
 strum = { version = "0.25", default-features = false, features = ["std", "derive"] }

bindings/grpc/Cargo.toml

@@ -24,7 +24,7 @@ identity_iota = { path = "../../identity_iota", features = ["resolver", "sd-jwt"
 identity_jose = { path = "../../identity_jose" }
 identity_storage = { path = "../../identity_storage", features = ["memstore"] }
 identity_stronghold = { path = "../../identity_stronghold", features = ["send-sync-storage"] }
-iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v0.12.0-rc" }
+iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v1.2.3" }
 iota-sdk-legacy = { package = "iota-sdk", version = "1.1.2", features = ["stronghold"] }
 prost = "0.13"
 rand = "0.8.5"

bindings/wasm/identity_wasm/Cargo.toml

@@ -25,12 +25,12 @@ identity_ecdsa_verifier = { path = "../../../identity_ecdsa_verifier", default-f
 identity_eddsa_verifier = { path = "../../../identity_eddsa_verifier", default-features = false, features = ["ed25519"] }
 # Remove iota-sdk dependency while working on issue #1445
 iota-sdk = { version = "1.1.5", default-features = false, features = ["serde", "std"] }
-iota_interaction = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction", default-features = false }
-iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "iota_interaction_ts" }
+iota_interaction = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/iota-v1-2-3-and-resources-for-wasm", package = "iota_interaction", default-features = false }
+iota_interaction_ts = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/iota-v1-2-3-and-resources-for-wasm", package = "iota_interaction_ts", features = ["into-wasm-error"] }
 js-sys = { version = "0.3.61" }
 json-proof-token = "0.3.4"
 proc_typescript = { version = "0.1.0", path = "./proc_typescript" }
-product_common = { git = "https://github.com/iotaledger/product-core.git", tag = "v0.2.1", package = "product_common", features = ["core-client", "transaction", "bindings"] }
+product_common = { git = "https://github.com/iotaledger/product-core.git", branch = "feat/iota-v1-2-3-and-resources-for-wasm", package = "product_common", features = ["core-client", "transaction", "bindings"] }
 secret-storage = { git = "https://github.com/iotaledger/secret-storage.git", default-features = false, tag = "v0.3.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde-wasm-bindgen = "0.6.5"

bindings/wasm/identity_wasm/package.json

@@ -74,7 +74,7 @@
     "wasm-opt": "^1.4.0"
   },
   "dependencies": {
-    "@iota/iota-interaction-ts": "^0.5.1",
+    "@iota/iota-interaction-ts": "^0.6.1",
     "@noble/ed25519": "^1.7.3",
     "@noble/hashes": "^1.4.0",
     "@types/node-fetch": "^2.6.2",

bindings/wasm/identity_wasm/src/common/imported_document_lock.rs

@@ -7,11 +7,12 @@ use identity_iota::document::CoreDocument;
 use identity_iota::prelude::IotaDocument;
 use js_sys::Array;
 
+use product_common::bindings::wasm_error::Result;
+
 use crate::did::ArrayIToCoreDocument;
 use crate::did::CoreDocumentLock;
 use crate::did::IToCoreDocument;
 use crate::did::WasmCoreDocument;
-use crate::error::Result;
 use crate::iota::IotaDocumentLock;
 use crate::iota::WasmIotaDocument;
 

bindings/wasm/identity_wasm/src/common/timestamp.rs

@@ -5,8 +5,9 @@ use identity_iota::core::Duration;
 use identity_iota::core::Timestamp;
 use wasm_bindgen::prelude::*;
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_json;
 
 #[wasm_bindgen]
 extern "C" {

bindings/wasm/identity_wasm/src/common/types.rs

@@ -5,7 +5,7 @@ use identity_iota::core::Object;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
 
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::WasmResult;
 
 #[wasm_bindgen]
 extern "C" {

bindings/wasm/identity_wasm/src/common/utils.rs

@@ -4,8 +4,8 @@
 use wasm_bindgen::JsCast;
 use wasm_bindgen::JsValue;
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 
 /// Special-case for deserializing [`js_sys::Map`], which otherwise serializes to JSON as an empty
 /// object `{}`. This uses a [`js_sys::Object`] as an intermediate representation to convert

bindings/wasm/identity_wasm/src/credential/credential.rs

@@ -26,8 +26,10 @@ use crate::credential::ArraySubject;
 use crate::credential::ICredential;
 use crate::credential::UrlOrIssuer;
 use crate::credential::WasmProof;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 
 /// Represents a set of claims describing an entity.
 #[wasm_bindgen(js_name = Credential, inspectable)]

bindings/wasm/identity_wasm/src/credential/credential_builder.rs

@@ -19,7 +19,7 @@ use wasm_bindgen::prelude::*;
 
 use proc_typescript::typescript;
 
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::WasmResult;
 
 impl TryFrom<ICredential> for CredentialBuilder {
   type Error = JsValue;

bindings/wasm/identity_wasm/src/credential/domain_linkage_configuration.rs

@@ -4,8 +4,10 @@
 use crate::credential::ArrayCoreDID;
 use crate::credential::WasmJwt;
 use crate::did::WasmCoreDID;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 
 use identity_iota::credential::DomainLinkageConfiguration;
 use identity_iota::credential::Jwt;

bindings/wasm/identity_wasm/src/credential/domain_linkage_credential_builder.rs

@@ -1,7 +1,7 @@
 // Copyright 2020-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::WasmResult;
 use identity_iota::core::Timestamp;
 use identity_iota::core::Url;
 use identity_iota::credential::DomainLinkageCredentialBuilder;

bindings/wasm/identity_wasm/src/credential/domain_linkage_validator.rs

@@ -5,8 +5,8 @@ use crate::common::ImportedDocumentLock;
 use crate::credential::WasmDomainLinkageConfiguration;
 use crate::credential::WasmJwtCredentialValidationOptions;
 use crate::did::IToCoreDocument;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use crate::verification::IJwsVerifier;
 use crate::verification::WasmJwsVerifier;
 use identity_iota::core::Url;

bindings/wasm/identity_wasm/src/credential/jpt.rs

@@ -3,6 +3,7 @@
 
 use identity_iota::credential::Jpt;
 use wasm_bindgen::prelude::*;
+use product_common::impl_wasm_clone;
 
 /// A JSON Proof Token (JPT).
 #[wasm_bindgen(js_name = Jpt)]

bindings/wasm/identity_wasm/src/credential/jpt_credential_validator/decoded_jpt_credential.rs

@@ -4,10 +4,11 @@
 use identity_iota::core::Object;
 use identity_iota::credential::DecodedJptCredential;
 use wasm_bindgen::prelude::*;
+use product_common::impl_wasm_clone;
+use product_common::bindings::wasm_error::Result;
 
 use crate::common::MapStringAny;
 use crate::credential::WasmCredential;
-use crate::error::Result;
 use crate::jpt::WasmJwpIssued;
 
 #[wasm_bindgen(js_name = DecodedJptCredential)]

bindings/wasm/identity_wasm/src/credential/jpt_credential_validator/jpt_credential_validation_options.rs

@@ -4,8 +4,10 @@
 use identity_iota::credential::JptCredentialValidationOptions;
 use wasm_bindgen::prelude::*;
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 
 /// Options to declare validation criteria for {@link Jpt}.
 #[derive(Debug, Default, Clone)]

bindings/wasm/identity_wasm/src/credential/jpt_credential_validator/jpt_credential_validator.rs

@@ -7,8 +7,8 @@ use crate::credential::WasmFailFast;
 use crate::credential::WasmJpt;
 use crate::credential::WasmJptCredentialValidationOptions;
 use crate::did::IToCoreDocument;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use identity_iota::credential::JptCredentialValidator;
 use wasm_bindgen::prelude::*;
 

bindings/wasm/identity_wasm/src/credential/jpt_credential_validator/jpt_credential_validator_utils.rs

@@ -8,8 +8,8 @@ use crate::credential::WasmCredential;
 use crate::credential::WasmJpt;
 use crate::did::IToCoreDocument;
 use crate::did::WasmCoreDID;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use identity_iota::core::Object;
 use identity_iota::credential::JptCredentialValidatorUtils;
 use identity_iota::did::CoreDID;

bindings/wasm/identity_wasm/src/credential/jpt_credential_validator/jwp_credential_options.rs

@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use identity_iota::credential::JwpCredentialOptions;
 use serde::Deserialize;
 use serde::Serialize;

bindings/wasm/identity_wasm/src/credential/jpt_credential_validator/jwp_verification_options.rs

@@ -1,8 +1,10 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 use identity_iota::document::verifiable::JwpVerificationOptions;
 use wasm_bindgen::prelude::*;
 

bindings/wasm/identity_wasm/src/credential/jpt_presentiation_validation/decoded_jpt_presentation.rs

@@ -7,7 +7,8 @@ use wasm_bindgen::prelude::*;
 
 use crate::common::MapStringAny;
 use crate::credential::WasmCredential;
-use crate::error::Result;
+use product_common::bindings::wasm_error::Result;
+use product_common::impl_wasm_clone;
 
 #[wasm_bindgen(js_name = DecodedJptPresentation)]
 pub struct WasmDecodedJptPresentation(pub(crate) DecodedJptPresentation<Object>);

bindings/wasm/identity_wasm/src/credential/jpt_presentiation_validation/jpt_presentation_validation_options.rs

@@ -4,8 +4,10 @@
 use identity_iota::credential::JptPresentationValidationOptions;
 use wasm_bindgen::prelude::*;
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 
 /// Options to declare validation criteria for a {@link Jpt} presentation.
 #[derive(Debug, Default, Clone)]

bindings/wasm/identity_wasm/src/credential/jpt_presentiation_validation/jpt_presentation_validator.rs

@@ -7,8 +7,8 @@ use crate::credential::WasmFailFast;
 use crate::credential::WasmJpt;
 use crate::credential::WasmJptPresentationValidationOptions;
 use crate::did::IToCoreDocument;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use identity_iota::credential::JptPresentationValidator;
 use wasm_bindgen::prelude::*;
 

bindings/wasm/identity_wasm/src/credential/jpt_presentiation_validation/jpt_presentation_validator_utils.rs

@@ -6,8 +6,8 @@ use crate::credential::options::WasmStatusCheck;
 use crate::credential::WasmCredential;
 use crate::credential::WasmJpt;
 use crate::did::WasmCoreDID;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use identity_iota::credential::JptPresentationValidatorUtils;
 use wasm_bindgen::prelude::*;
 

bindings/wasm/identity_wasm/src/credential/jwt.rs

@@ -3,6 +3,8 @@
 
 use identity_iota::credential::Jwt;
 use wasm_bindgen::prelude::*;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 
 /// A wrapper around a JSON Web Token (JWK).
 #[wasm_bindgen(js_name = Jwt)]

bindings/wasm/identity_wasm/src/credential/jwt_credential_validation/jwt_credential_validator.rs

@@ -23,8 +23,8 @@ use crate::did::ArrayIToCoreDocument;
 use crate::did::IToCoreDocument;
 use crate::did::WasmCoreDID;
 use crate::did::WasmJwsVerificationOptions;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use crate::verification::IJwsVerifier;
 use crate::verification::WasmJwsVerifier;
 

bindings/wasm/identity_wasm/src/credential/jwt_credential_validation/kb_validation_options.rs

@@ -1,8 +1,10 @@
 // Copyright 2020-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 use identity_iota::credential::KeyBindingJWTValidationOptions;
 use wasm_bindgen::prelude::*;
 

bindings/wasm/identity_wasm/src/credential/jwt_credential_validation/options.rs

@@ -1,8 +1,10 @@
 // Copyright 2020-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 use wasm_bindgen::prelude::*;
 
 use identity_iota::credential::JwtCredentialValidationOptions;

bindings/wasm/identity_wasm/src/credential/jwt_credential_validation/sd_jwt_validator.rs

@@ -10,8 +10,8 @@ use crate::credential::WasmFailFast;
 use crate::did::ArrayIToCoreDocument;
 use crate::did::IToCoreDocument;
 use crate::did::WasmJwsVerificationOptions;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use crate::sd_jwt::WasmKeyBindingJwtClaims;
 use crate::sd_jwt::WasmSdJwt;
 use crate::verification::IJwsVerifier;

bindings/wasm/identity_wasm/src/credential/jwt_credential_validation/unknown_credential.rs

@@ -5,6 +5,8 @@ use identity_iota::core::Object;
 use identity_iota::credential::Credential;
 use identity_iota::credential::Jwt;
 use wasm_bindgen::prelude::*;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 
 use crate::common::RecordStringAny;
 use crate::credential::WasmCredential;

bindings/wasm/identity_wasm/src/credential/jwt_presentation_validation/jwt_presentation_validator.rs

@@ -8,8 +8,8 @@ use crate::credential::WasmJwt;
 use crate::credential::WasmPresentation;
 use crate::did::IToCoreDocument;
 use crate::did::WasmCoreDID;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
 use crate::verification::IJwsVerifier;
 use crate::verification::WasmJwsVerifier;
 use identity_iota::credential::JwtPresentationValidator;

bindings/wasm/identity_wasm/src/credential/jwt_presentation_validation/options.rs

@@ -1,8 +1,10 @@
 // Copyright 2020-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
+use product_common::impl_wasm_json;
 use identity_iota::credential::JwtPresentationValidationOptions;
 use wasm_bindgen::prelude::*;
 

bindings/wasm/identity_wasm/src/credential/linked_domain_service.rs

@@ -3,8 +3,9 @@
 
 use crate::common::ArrayString;
 use crate::did::WasmService;
-use crate::error::Result;
-use crate::error::WasmResult;
+use product_common::bindings::wasm_error::Result;
+use product_common::bindings::wasm_error::WasmResult;
+use product_common::impl_wasm_clone;
 use identity_iota::core::Object;
 use identity_iota::core::OrderedSet;
 use identity_iota::core::Url;