feat: update polkadot.js deps (#567)

Author: peterwht

package.json

@@ -33,11 +33,11 @@
   "dependencies": {
     "@headlessui/react": "^1.7.18",
     "@heroicons/react": "^1.0.6",
-    "@polkadot/api": "12.4.2",
-    "@polkadot/api-contract": "12.4.2",
-    "@polkadot/extension-dapp": "^0.52.3",
-    "@polkadot/ui-keyring": "^3.9.1",
-    "@polkadot/ui-shared": "^3.9.1",
+    "@polkadot/api": "15.8.1",
+    "@polkadot/api-contract": "15.8.1",
+    "@polkadot/extension-dapp": "^0.58.6",
+    "@polkadot/ui-keyring": "^3.12.2",
+    "@polkadot/ui-shared": "^3.12.2",
     "big.js": "^6.2.1",
     "buffer": "^6.0.3",
     "copy-to-clipboard": "^3.3.3",

src/ui/components/contract/Interact.tsx

@@ -21,6 +21,7 @@ import {
   SubmittableResult,
   UIContract,
 } from 'types';
+import { Text } from '@polkadot/types';
 import { AccountSelect } from 'ui/components/account';
 import { Button, Buttons, Dropdown } from 'ui/components/common';
 import { ArgumentForm, Form, FormField, OptionsForm } from 'ui/components/form';
@@ -100,8 +101,30 @@ export const InteractTab = ({
   useEffect((): void => {
     async function dryRun() {
       if (!message) return;
-      const o = await api.call.contractsApi.call(...params);
-      setOutcome(o);
+      const newOutcome = await api.call.contractsApi.call(...params);
+
+      // auto-generated @polkadot/type-augment data uses a different flag representation: `{"ok":{"flags":{"bits":0},"data":"0x00"}}`
+      let convertedFlags = api.registry.createType('ContractReturnFlags', 0);
+      if (newOutcome.result.isOk) {
+        const flags = newOutcome.result.asOk.flags;
+        const isRevert = flags.bits.toNumber();
+        convertedFlags = api.registry.createType('ContractReturnFlags', isRevert);
+      }
+
+      const convertedOutcome: ContractExecResult = api.registry.createType('ContractExecResult', {
+        registry: api.registry,
+        gasConsumed: newOutcome.gasConsumed,
+        gasRequired: newOutcome.gasRequired,
+        storageDeposit: newOutcome.storageDeposit,
+        // debugMessage is Bytes, must convert to Text
+        debugMessage: new Text(api.registry, newOutcome.debugMessage.toUtf8()),
+        result: newOutcome.result.isOk
+          ? { Ok: { flags: convertedFlags, data: newOutcome.result.asOk.data } }
+          : { Err: newOutcome.result.asErr },
+      });
+
+      // Update the state with the adapted outcome
+      setOutcome(convertedOutcome);
     }
 
     function debouncedDryRun() {

src/ui/components/instantiate/Step2.tsx

@@ -98,8 +98,39 @@ export function Step2() {
       try {
         const result = await api.call.contractsApi.instantiate(...params);
 
-        if (JSON.stringify(dryRunResult) !== JSON.stringify(result)) {
-          setDryRunResult(result);
+        // default is no revert
+        let convertedFlags = api.registry.createType('ContractReturnFlags', 0);
+        let instantiateResult;
+
+        // auto-generated @polkadot/type-augment data uses slightly different types
+        if (result.result.isOk) {
+          const okResult = result.result.asOk;
+          const flags = okResult.result.flags;
+          const isRevert = flags.bits.toNumber();
+          convertedFlags = api.registry.createType('ContractReturnFlags', isRevert);
+          instantiateResult = {
+            Ok: {
+              result: { flags: convertedFlags, data: okResult.result.data },
+              accountId: okResult.accountId,
+            },
+          };
+        } else {
+          instantiateResult = { Err: result.result.asErr };
+        }
+
+        const convertedOutcome = api.registry.createType('ContractInstantiateResult', {
+          gasConsumed: result.gasConsumed,
+          gasRequired: result.gasRequired,
+          storageDeposit: result.storageDeposit,
+          // debugMessage is Bytes, must convert to Text
+          debugMessage: api.registry.createType('Text', result.debugMessage.toU8a()),
+          result: instantiateResult,
+        });
+
+        const resultJson = JSON.stringify(convertedOutcome.toJSON());
+        const dryRunResultJson = JSON.stringify(dryRunResult?.toJSON());
+        if (dryRunResultJson !== resultJson) {
+          setDryRunResult(convertedOutcome);
         }
       } catch (e) {
         console.error(e);