chore: patch ContractExecResult

Phala-Network · Nov 9, 2022 · 17d72ae · 17d72ae
1 parent fbc69f7
commit 17d72ae
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@phala/sdk",
-  "version": "0.3.5-beta.0",
+  "version": "0.3.5-beta.1",
   "description": "Phala JS SDK",
   "homepage": "https://github.com/Phala-Network/js-sdk/tree/main/packages/sdk#readme",
   "repository": {

diff --git a/packages/sdk/src/create.ts b/packages/sdk/src/create.ts
@@ -1,8 +1,8 @@
 import type {ApiPromise} from '@polkadot/api'
 import type {SubmittableExtrinsic} from '@polkadot/api/types'
-import type {Bytes} from '@polkadot/types-codec'
-import type {AccountId} from '@polkadot/types/interfaces'
-import type {ISubmittableResult} from '@polkadot/types/types'
+import type {Bytes, Compact, u64} from '@polkadot/types-codec'
+import type {AccountId, WeightV2} from '@polkadot/types/interfaces'
+import type {Codec, ISubmittableResult} from '@polkadot/types/types'
 import {
   hexAddPrefix,
   hexStripPrefix,
@@ -258,14 +258,27 @@ export const create: CreateFn = async ({api, baseURL, contractId}) => {
               .toHex(),
             origin
           ).then((data) => {
-            return api.createType(
-              'ContractExecResult',
-              (
-                api.createType('InkResponse', hexAddPrefix(data)).toJSON() as {
-                  result: {ok: {inkMessageReturn: string}}
-                }
-              ).result.ok.inkMessageReturn
-            )
+            const inkMessageReturn = (
+              api.createType('InkResponse', hexAddPrefix(data)).toJSON() as {
+                result: {ok: {inkMessageReturn: string}}
+              }
+            ).result.ok.inkMessageReturn
+
+            let result
+
+            try {
+              result = api.createType('ContractExecResult', inkMessageReturn)
+            } catch (err) {
+              result = api.createType(
+                'ContractExecResultV2',
+                inkMessageReturn
+              ) as any
+
+              result.gasConsumed = result.gasConsumed.proofSize
+              result.gasRequired = result.gasRequired.proofSize
+            }
+
+            return result
           })
         )
       },

diff --git a/packages/sdk/src/lib/types.ts b/packages/sdk/src/lib/types.ts
@@ -53,4 +53,11 @@ export const types: RegistryTypes = {
     message: 'Vec<u8>',
   },
   InkCommand: {_enum: {InkMessage: 'InkMessage'}},
+  ContractExecResultV2: {
+    gasConsumed: 'WeightV2',
+    gasRequired: 'WeightV2',
+    storageDeposit: 'StorageDeposit',
+    debugMessage: 'Text',
+    result: 'ContractExecResultResult',
+  },
 }