client-sdk: decode the result of native trusted operations

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.5",
+    "version": "0.9.20-next.7",
     "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",

tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts

@@ -142,27 +142,29 @@ export default {
             },
         },
         NativeTaskError: {
-            UnexpectedCall: "String",
-            ShieldingKeyRetrievalFailed: "String", // Stringified itp_sgx_crypto::Error
-            RequestPayloadDecodingFailed: "Null",
-            ParentchainDataRetrievalFailed: "String", // Stringified itp_stf_state_handler::Error
-            InvalidSignerAccount: "Null",
-            UnauthorizedSigner: "Null",
-            InvalidMemberIdentity: "Null",
-            MissingAesKey: "Null",
-            MrEnclaveRetrievalFailed: "Null",
-            EnclaveSignerRetrievalFailed: "Null",
-            AuthenticationVerificationFailed: "Null",
-            ValidationDataVerificationFailed: "Null",
-            ConnectionHashNotFound: "String",
-            MetadataRetrievalFailed: "String", // Stringified itp_node_api_metadata_provider::Error
-            InvalidMetadata: "String", // Stringified itp_node_api_metadata::Error
-            TrustedCallSendingFailed: "String", // Stringified mpsc::SendError<(H256, TrustedCall)>
-            CallSendingFailed: "String",
-            ExtrinsicConstructionFailed: "String", // Stringified itp_extrinsics_factory::Error
-            ExtrinsicSendingFailed: "String", // Stringified sgx_status_t
-            InvalidRequest: "Null",
-            NativeRequestSendFailed: "Null",
+            _enum: {
+                UnexpectedCall: "Text",
+                ShieldingKeyRetrievalFailed: "Text", // Stringified itp_sgx_crypto::Error
+                RequestPayloadDecodingFailed: "Null",
+                ParentchainDataRetrievalFailed: "Text", // Stringified itp_stf_state_handler::Error
+                InvalidSignerAccount: "Null",
+                UnauthorizedSigner: "Null",
+                InvalidMemberIdentity: "Null",
+                MissingAesKey: "Null",
+                MrEnclaveRetrievalFailed: "Null",
+                EnclaveSignerRetrievalFailed: "Null",
+                AuthenticationVerificationFailed: "Null",
+                ValidationDataVerificationFailed: "Null",
+                ConnectionHashNotFound: "Text",
+                MetadataRetrievalFailed: "Text", // Stringified itp_node_api_metadata_provider::Error
+                InvalidMetadata: "Text", // Stringified itp_node_api_metadata::Error
+                TrustedCallSendingFailed: "Text", // Stringified mpsc::SendError<(H256, TrustedCall)>
+                CallSendingFailed: "Text",
+                ExtrinsicConstructionFailed: "Text", // Stringified itp_extrinsics_factory::Error
+                ExtrinsicSendingFailed: "Text", // Stringified sgx_status_t
+                InvalidRequest: "Null",
+                NativeRequestSendFailed: "Null",
+            },
         },
     },
 };

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-next.5",
+    "version": "0.9.20-next.7",
     "scripts": {
         "clean": "rm -rf dist build node_modules",
         "update-metadata": "../../bin/litentry-cli print-sgx-metadata-raw > prepare-build/litentry-sidechain-metadata.json",

tee-worker/identity/client-sdk/packages/client-sdk/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@litentry/client-sdk",
   "description": "This package provides helpers for dApps to interact with the Litentry Protocol.",
-  "version": "1.0.0-next.0",
+  "version": "1.0.0-next.1",
   "license": "GPL-3.0-or-later",
   "dependencies": {},
   "devDependencies": {
     "@polkadot/rpc-provider": "^10.9.1"
   },
   "peerDependencies": {
-    "@litentry/parachain-api": "0.9.20-next.5",
-    "@litentry/sidechain-api": "0.9.20-next.5",
+    "@litentry/parachain-api": "0.9.20-next.7",
+    "@litentry/sidechain-api": "0.9.20-next.7",
     "@litentry/chaindata": "*",
     "@polkadot/api": "^10.9.1",
     "@polkadot/types": "^10.9.1",

tee-worker/identity/client-sdk/packages/client-sdk/src/lib/requests/call-ethereum.request.ts

@@ -1,13 +1,14 @@
 import { assert, hexToU8a } from '@polkadot/util';
-import { randomAsHex } from '@polkadot/util-crypto';
 
 import type { ApiPromise } from '@polkadot/api';
 import type {
   LitentryIdentity,
+  TrustedCallResult,
   WorkerRpcReturnValue,
 } from '@litentry/parachain-api';
 
 import { enclave } from '../enclave';
+import { codecToString } from '../util/codec-to-string';
 import { createPayloadToSign } from '../util/create-payload-to-sign';
 import { createTrustedCallType } from '../type-creators/trusted-call';
 import { createRequestType } from '../type-creators/request';
@@ -33,10 +34,10 @@ export async function callEthereum(
   }
 ): Promise<{
   payloadToSign: string;
-  txHash: string;
   send: (args: { signedPayload: string }) => Promise<{
-    response: Array<WorkerRpcReturnValue>;
-    txHash: string;
+    response: WorkerRpcReturnValue;
+    blockHash: string;
+    extrinsicHash: string;
   }>;
 }> {
   const { who, omniAccount } = data;
@@ -45,7 +46,6 @@ export async function callEthereum(
 
   const shard = await enclave.getShard(api);
   const shardU8 = hexToU8a(shard);
-  const txHash = randomAsHex();
 
   const { call } = await createTrustedCallType(api.registry, {
     method: 'request_intent',
@@ -72,8 +72,9 @@ export async function callEthereum(
   const send = async (args: {
     signedPayload: string;
   }): Promise<{
-    response: Array<WorkerRpcReturnValue>;
-    txHash: string;
+    response: WorkerRpcReturnValue;
+    blockHash: string;
+    extrinsicHash: string;
   }> => {
     // prepare and encrypt request
 
@@ -92,16 +93,27 @@ export async function callEthereum(
       params: [request.toHex()],
     };
 
-    const enclaveResult = await enclave.send(api, rpcRequest);
+    const [response] = await enclave.send(api, rpcRequest); // we expect 1 response only
+
+    const result: TrustedCallResult = api.createType(
+      'TrustedCallResult',
+      response.value
+    );
+
+    if (result.isErr) {
+      throw new Error(codecToString(result.asErr));
+    }
+
+    const { extrinsic_hash, block_hash } = result.asOk;
 
     return {
-      txHash,
-      response: enclaveResult,
+      response,
+      extrinsicHash: extrinsic_hash.toString(),
+      blockHash: block_hash.toString(),
     };
   };
 
   return {
-    txHash,
     payloadToSign,
     send,
   };

tee-worker/identity/client-sdk/packages/client-sdk/src/lib/requests/create-account-store.request.ts

@@ -1,13 +1,14 @@
 import { hexToU8a } from '@polkadot/util';
-import { randomAsHex } from '@polkadot/util-crypto';
 
 import type { ApiPromise } from '@polkadot/api';
 import type {
   LitentryIdentity,
+  TrustedCallResult,
   WorkerRpcReturnValue,
 } from '@litentry/parachain-api';
 
 import { enclave } from '../enclave';
+import { codecToString } from '../util/codec-to-string';
 import { createPayloadToSign } from '../util/create-payload-to-sign';
 import { createTrustedCallType } from '../type-creators/trusted-call';
 import { createRequestType } from '../type-creators/request';
@@ -28,17 +29,16 @@ export async function createAccountStore(
   }
 ): Promise<{
   payloadToSign: string;
-  txHash: string;
   send: (args: { signedPayload: string }) => Promise<{
-    response: Array<WorkerRpcReturnValue>;
-    txHash: string;
+    response: WorkerRpcReturnValue;
+    blockHash: string;
+    extrinsicHash: string;
   }>;
 }> {
   const { who, omniAccount } = data;
 
   const shard = await enclave.getShard(api);
   const shardU8 = hexToU8a(shard);
-  const txHash = randomAsHex();
 
   const { call } = await createTrustedCallType(api.registry, {
     method: 'create_account_store',
@@ -61,8 +61,9 @@ export async function createAccountStore(
   const send = async (args: {
     signedPayload: string;
   }): Promise<{
-    response: Array<WorkerRpcReturnValue>;
-    txHash: string;
+    response: WorkerRpcReturnValue;
+    blockHash: string;
+    extrinsicHash: string;
   }> => {
     // prepare and encrypt request
 
@@ -81,16 +82,27 @@ export async function createAccountStore(
       params: [request.toHex()],
     };
 
-    const enclaveResult = await enclave.send(api, rpcRequest);
+    const [response] = await enclave.send(api, rpcRequest); // we expect 1 response only
+
+    const result: TrustedCallResult = api.createType(
+      'TrustedCallResult',
+      response.value
+    );
+
+    if (result.isErr) {
+      throw new Error(codecToString(result.asErr));
+    }
+
+    const { extrinsic_hash, block_hash } = result.asOk;
 
     return {
-      txHash,
-      response: enclaveResult,
+      response,
+      extrinsicHash: extrinsic_hash.toString(),
+      blockHash: block_hash.toString(),
     };
   };
 
   return {
-    txHash,
     payloadToSign,
     send,
   };

tee-worker/identity/client-sdk/packages/client-sdk/src/lib/requests/remark.request.ts

@@ -1,13 +1,14 @@
 import { assert, hexToU8a, stringToHex } from '@polkadot/util';
-import { randomAsHex } from '@polkadot/util-crypto';
 
 import type { ApiPromise } from '@polkadot/api';
 import type {
   LitentryIdentity,
+  TrustedCallResult,
   WorkerRpcReturnValue,
 } from '@litentry/parachain-api';
 
 import { enclave } from '../enclave';
+import { codecToString } from '../util/codec-to-string';
 import { createPayloadToSign } from '../util/create-payload-to-sign';
 import { createTrustedCallType } from '../type-creators/trusted-call';
 import { createRequestType } from '../type-creators/request';
@@ -30,17 +31,16 @@ export async function remark(
   }
 ): Promise<{
   payloadToSign: string;
-  txHash: string;
   send: (args: { signedPayload: string }) => Promise<{
-    response: Array<WorkerRpcReturnValue>;
-    txHash: string;
+    response: WorkerRpcReturnValue;
+    blockHash: string;
+    extrinsicHash: string;
   }>;
 }> {
   const { who, message, omniAccount } = data;
 
   const shard = await enclave.getShard(api);
   const shardU8 = hexToU8a(shard);
-  const txHash = randomAsHex();
 
   const { call } = await createTrustedCallType(api.registry, {
     method: 'request_intent',
@@ -68,8 +68,9 @@ export async function remark(
   const send = async (args: {
     signedPayload: string;
   }): Promise<{
-    response: Array<WorkerRpcReturnValue>;
-    txHash: string;
+    response: WorkerRpcReturnValue;
+    blockHash: string;
+    extrinsicHash: string;
   }> => {
     // prepare and encrypt request
 
@@ -88,16 +89,27 @@ export async function remark(
       params: [request.toHex()],
     };
 
-    const enclaveResult = await enclave.send(api, rpcRequest);
+    const [response] = await enclave.send(api, rpcRequest); // we expect 1 response only
+
+    const result: TrustedCallResult = api.createType(
+      'TrustedCallResult',
+      response.value
+    );
+
+    if (result.isErr) {
+      throw new Error(codecToString(result.asErr));
+    }
+
+    const { extrinsic_hash, block_hash } = result.asOk;
 
     return {
-      txHash,
-      response: enclaveResult,
+      response,
+      extrinsicHash: extrinsic_hash.toString(),
+      blockHash: block_hash.toString(),
     };
   };
 
   return {
-    txHash,
     payloadToSign,
     send,
   };