Merge branch 'dev_bakup' into auto-compound-sdk

AvaProtocol · Nov 28, 2023 · 5a06d73 · 5a06d73
2 parents 8d3cdbf + 2290bca
commit 5a06d73
Show file tree

Hide file tree

Showing 6 changed files with 1,683 additions and 1,080 deletions.
diff --git a/.eslintrc b/.eslintrc
diff --git a/demo/src/utils.js b/demo/src/utils.js
@@ -28,34 +28,48 @@ export const getKeyringPair = async (ss58Format) => {
   return keyringPair;
 };
 
-export const sendExtrinsic = (extrinsic, api, keyringPair) =>
+export const sendExtrinsic = (api, extrinsic, keyPair) =>
   new Promise((resolve, reject) => {
     const signAndSend = async () => {
-      const unsub = await extrinsic.signAndSend(keyringPair, (result) => {
-        const { status, events, dispatchError } = result;
-        console.log("status.type: ", status.type);
-
-        if (status?.isFinalized) {
-          unsub();
-          if (!_.isNil(dispatchError)) {
-            reject(dispatchError);
-          }
+      try {
+        const unsub = await extrinsic.signAndSend(keyPair, (result) => {
+          const { status, events, dispatchError } = result;
+          console.log("status.type: ", status.type);
+
+          if (status?.isFinalized) {
+            unsub();
+
+            if (dispatchError) {
+              if (dispatchError.isModule) {
+                const metaError = api.registry.findMetaError(
+                  dispatchError.asModule,
+                );
+                const { name, section } = metaError;
+                reject(new Error(`${section}.${name}`));
+              }
+
+              reject(new Error(dispatchError.toString()));
+            }
 
-          const event = _.find(events, ({ event: eventData }) =>
-            api.events.system.ExtrinsicSuccess.is(eventData),
-          );
-          if (event) {
-            resolve({
-              blockHash: status?.asFinalized?.toString(),
-              events,
-              extrinsicHash: extrinsic.hash,
-            });
-          } else {
-            reject(new Error("The event.ExtrinsicSuccess is not found"));
+            const event = _.find(events, ({ event: eventData }) =>
+              api.events.system.ExtrinsicSuccess.is(eventData),
+            );
+            if (event) {
+              resolve({
+                blockHash: status?.asFinalized?.toString(),
+                events,
+                extrinsicHash: extrinsic?.hash?.toString(),
+              });
+            }
+            reject(new Error(events.toString()));
           }
-        }
-      });
+        });
+      } catch (ex) {
+        // Handle signing error such as user manually cancel the transaction
+        reject(ex);
+      }
     };
+
     signAndSend();
   });