From a84590378ca07bdda50ad25c822cb1e8befc9dd0 Mon Sep 17 00:00:00 2001 From: Jonathan Alvarez Date: Fri, 25 Oct 2024 23:01:30 +0000 Subject: [PATCH 1/7] client-api: add omniaccount type definitions --- .../prepare-build/interfaces/definitions.ts | 1 + .../interfaces/omniaccount/definitions.ts | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniaccount/definitions.ts diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts index 1d1999fd76..5498e37c4b 100644 --- a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts +++ b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts @@ -1,4 +1,5 @@ export { default as identity } from "./identity/definitions"; export { default as vc } from "./vc/definitions"; +export { default as omniaccount } from "./omniaccount/definitions"; export { default as trusted_operations } from "./trusted_operations/definitions"; export { default as sidechain } from "./sidechain/definitions"; diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniaccount/definitions.ts b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniaccount/definitions.ts new file mode 100644 index 0000000000..fd319c4e65 --- /dev/null +++ b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniaccount/definitions.ts @@ -0,0 +1,24 @@ +export default { + types: { + Intent: { + _enum: { + TransferEthereum: "IntentTransferEthereum", + CallEthereum: "IntentCallEthereum", + SystemRemark: "Bytes", + TransferNative: "IntentTransferNative", + }, + }, + IntentTransferEthereum: { + to: "H160", + value: "[u8;32]", + }, + IntentCallEthereum: { + address: "H160", + input: "Bytes", + }, + IntentTransferNative: { + to: "AccountId32", + value: "u128", + }, + }, +}; From 318d2a38d762902cc13b457cdd3a88051aab9f56 Mon Sep 17 00:00:00 2001 From: Jonathan Alvarez Date: Fri, 25 Oct 2024 23:02:19 +0000 Subject: [PATCH 2/7] client-api: add request_intent method in trusted_call Signed-off-by: Jonathan Alvarez --- .../prepare-build/interfaces/trusted_operations/definitions.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts index f3cd426fe9..09f6c64be4 100644 --- a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts +++ b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts @@ -65,6 +65,7 @@ export default { __Unused_24: "Null", clean_id_graphs: "(LitentryIdentity)", + request_intent: "(LitentryIdentity, Intent)", }, }, TrustedOperationStatus: { From 85c87fa82b5c2eea8aa0b2ab3a3b12044dcfdd37 Mon Sep 17 00:00:00 2001 From: Jonathan Alvarez Date: Fri, 25 Oct 2024 23:02:27 +0000 Subject: [PATCH 3/7] omniaccount: add getter Signed-off-by: Jonathan Alvarez --- tee-worker/identity/app-libs/stf/src/getter.rs | 3 +++ .../prepare-build/interfaces/sidechain/definitions.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/tee-worker/identity/app-libs/stf/src/getter.rs b/tee-worker/identity/app-libs/stf/src/getter.rs index d8a4640393..d5397681e4 100644 --- a/tee-worker/identity/app-libs/stf/src/getter.rs +++ b/tee-worker/identity/app-libs/stf/src/getter.rs @@ -103,6 +103,8 @@ pub enum PublicGetter { nonce(Identity), #[codec(index = 2)] id_graph_hash(Identity), + #[codec(index = 3)] + omniaccount(Identity), } #[derive(Encode, Decode, Clone, Debug, PartialEq, Eq)] @@ -289,6 +291,7 @@ impl ExecuteGetter for PublicGetter { }, PublicGetter::id_graph_hash(identity) => IdentityManagement::id_graph_hash(&identity).map(|h| h.encode()), + PublicGetter::omniaccount(identity) => identity.to_native_account().map(|h| h.encode()), } } diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts index 7b1baaa937..f110c56326 100644 --- a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts +++ b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts @@ -38,6 +38,7 @@ export default { some_value: "u32", nonce: "(LitentryIdentity)", id_graph_hash: "(LitentryIdentity)", + omniaccount: "(LitentryIdentity)", }, }, From 22a72c6b5cf5f9881bb105c5c398a27d5aec2564 Mon Sep 17 00:00:00 2001 From: Jonathan Alvarez Date: Fri, 25 Oct 2024 23:51:57 +0000 Subject: [PATCH 4/7] client-api: preview versions --- tee-worker/identity/client-api/parachain-api/CHANGELOG.md | 6 ++++++ tee-worker/identity/client-api/parachain-api/package.json | 2 +- tee-worker/identity/client-api/sidechain-api/CHANGELOG.md | 4 ++++ tee-worker/identity/client-api/sidechain-api/package.json | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tee-worker/identity/client-api/parachain-api/CHANGELOG.md b/tee-worker/identity/client-api/parachain-api/CHANGELOG.md index e6855d9350..1a1f50e2b5 100644 --- a/tee-worker/identity/client-api/parachain-api/CHANGELOG.md +++ b/tee-worker/identity/client-api/parachain-api/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## Added + +- Type definitions for the new OmniAccount Pallet. +- Expose getter to get the derived `omniaccount` address from a given identity +- Expose the OmniAccount `request_intent`'s trusted call. + ## [0.9.20-4.1] - 2024-09-30 - Update for version [parachain-release v0.9.20-04](https://github.com/litentry/litentry-parachain/releases/tag/v0.9.20-04) diff --git a/tee-worker/identity/client-api/parachain-api/package.json b/tee-worker/identity/client-api/parachain-api/package.json index 820398f9fa..f8af103406 100644 --- a/tee-worker/identity/client-api/parachain-api/package.json +++ b/tee-worker/identity/client-api/parachain-api/package.json @@ -5,7 +5,7 @@ "main": "dist/src/index.js", "module": "dist/src/index.js", "sideEffects": false, - "version": "0.9.20-04.1", + "version": "0.9.20-next.0", "scripts": { "clean": "rm -rf dist build node_modules", "update-metadata": "curl -s -H \"Content-Type: application/json\" -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9944 > prepare-build/litentry-parachain-metadata.json", diff --git a/tee-worker/identity/client-api/sidechain-api/CHANGELOG.md b/tee-worker/identity/client-api/sidechain-api/CHANGELOG.md index c042f1382a..07b6b90be5 100644 --- a/tee-worker/identity/client-api/sidechain-api/CHANGELOG.md +++ b/tee-worker/identity/client-api/sidechain-api/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## Added + +- Type definitions for the new OmniAccount Pallet. + ## [0.9.20-4] - 2024-09-30 - Update for version [parachain-release v0.9.20-04](https://github.com/litentry/litentry-parachain/releases/tag/v0.9.20-04) diff --git a/tee-worker/identity/client-api/sidechain-api/package.json b/tee-worker/identity/client-api/sidechain-api/package.json index 02c6541a47..41b4ce7546 100644 --- a/tee-worker/identity/client-api/sidechain-api/package.json +++ b/tee-worker/identity/client-api/sidechain-api/package.json @@ -5,7 +5,7 @@ "main": "dist/src/index.js", "module": "dist/src/index.js", "sideEffects": false, - "version": "0.9.20-04", + "version": "0.9.20-next.0", "scripts": { "clean": "rm -rf dist build node_modules", "update-metadata": "../../bin/litentry-cli print-sgx-metadata-raw > prepare-build/litentry-sidechain-metadata.json", From ca1d5217bddd2a186af2cff2b12c864d17d6f146 Mon Sep 17 00:00:00 2001 From: Jonathan Alvarez Date: Sun, 27 Oct 2024 00:59:59 -0500 Subject: [PATCH 5/7] Revert "omniaccount: add getter" This reverts commit 85c87fa82b5c2eea8aa0b2ab3a3b12044dcfdd37. --- tee-worker/identity/app-libs/stf/src/getter.rs | 3 --- .../prepare-build/interfaces/sidechain/definitions.ts | 1 - 2 files changed, 4 deletions(-) diff --git a/tee-worker/identity/app-libs/stf/src/getter.rs b/tee-worker/identity/app-libs/stf/src/getter.rs index d5397681e4..d8a4640393 100644 --- a/tee-worker/identity/app-libs/stf/src/getter.rs +++ b/tee-worker/identity/app-libs/stf/src/getter.rs @@ -103,8 +103,6 @@ pub enum PublicGetter { nonce(Identity), #[codec(index = 2)] id_graph_hash(Identity), - #[codec(index = 3)] - omniaccount(Identity), } #[derive(Encode, Decode, Clone, Debug, PartialEq, Eq)] @@ -291,7 +289,6 @@ impl ExecuteGetter for PublicGetter { }, PublicGetter::id_graph_hash(identity) => IdentityManagement::id_graph_hash(&identity).map(|h| h.encode()), - PublicGetter::omniaccount(identity) => identity.to_native_account().map(|h| h.encode()), } } diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts index f110c56326..7b1baaa937 100644 --- a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts +++ b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts @@ -38,7 +38,6 @@ export default { some_value: "u32", nonce: "(LitentryIdentity)", id_graph_hash: "(LitentryIdentity)", - omniaccount: "(LitentryIdentity)", }, }, From fafceed07769a1a4a12201f1c509a6be211665ab Mon Sep 17 00:00:00 2001 From: Jonathan Alvarez Date: Sun, 27 Oct 2024 06:18:35 +0000 Subject: [PATCH 6/7] rename definitions to omniAccount align with our preferred name of OmniAccount --- .../parachain-api/prepare-build/interfaces/definitions.ts | 2 +- .../interfaces/{omniaccount => omniAccount}/definitions.ts | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/{omniaccount => omniAccount}/definitions.ts (100%) diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts index 5498e37c4b..bb7bb66c2f 100644 --- a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts +++ b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts @@ -1,5 +1,5 @@ export { default as identity } from "./identity/definitions"; export { default as vc } from "./vc/definitions"; -export { default as omniaccount } from "./omniaccount/definitions"; +export { default as omniAccount } from "./omniAccount/definitions"; export { default as trusted_operations } from "./trusted_operations/definitions"; export { default as sidechain } from "./sidechain/definitions"; diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniaccount/definitions.ts b/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts similarity index 100% rename from tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniaccount/definitions.ts rename to tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts From 6b27e2d6467d0287d9a663dffb2fbf5b1c2c83b8 Mon Sep 17 00:00:00 2001 From: Jonathan Alvarez Date: Sun, 27 Oct 2024 06:19:34 +0000 Subject: [PATCH 7/7] parachain-api: bump preview version Signed-off-by: Jonathan Alvarez --- tee-worker/identity/client-api/parachain-api/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tee-worker/identity/client-api/parachain-api/package.json b/tee-worker/identity/client-api/parachain-api/package.json index f8af103406..e87be8e989 100644 --- a/tee-worker/identity/client-api/parachain-api/package.json +++ b/tee-worker/identity/client-api/parachain-api/package.json @@ -5,7 +5,7 @@ "main": "dist/src/index.js", "module": "dist/src/index.js", "sideEffects": false, - "version": "0.9.20-next.0", + "version": "0.9.20-next.1", "scripts": { "clean": "rm -rf dist build node_modules", "update-metadata": "curl -s -H \"Content-Type: application/json\" -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9944 > prepare-build/litentry-parachain-metadata.json",