Merge remote-tracking branch 'upstream/master' into deploy-web-test

AcalaNetwork · Sep 13, 2023 · 70e17ab · 70e17ab
2 parents bd02c39 + d5f0e15
commit 70e17ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/packages/chopsticks/src/rpc/substrate/author.ts b/packages/chopsticks/src/rpc/substrate/author.ts
@@ -47,18 +47,17 @@ const handlers: Handlers = {
       done(id)
     }
 
-    context.chain
-      .submitExtrinsic(extrinsic)
-      .then(() => {
-        callback({
-          Ready: null,
-        })
-      })
-      .catch((error: TransactionValidityError) => {
-        logger.error({ error }, 'ExtrinsicFailed')
-        callback(error?.toJSON() ?? error)
-        done(id)
+    try {
+      await context.chain.submitExtrinsic(extrinsic)
+      callback({
+        Ready: null,
       })
+    } catch (error) {
+      logger.error({ error }, 'ExtrinsicFailed')
+      const code = (error as TransactionValidityError).isInvalid ? 1010 : 1011
+      done(id)
+      throw new ResponseError(code, (error as TransactionValidityError).toString())
+    }
     return id
   },
   author_unwatchExtrinsic: async (_context, [subid], { unsubscribe }) => {

diff --git a/packages/e2e/src/author.test.ts b/packages/e2e/src/author.test.ts
@@ -86,6 +86,12 @@ describe('author rpc', async () => {
     await expect(tx.send()).rejects.toThrow('1010: {"invalid":{"badProof":null}}')
   })
 
+  it('reject unsigned extrinsic', async () => {
+    const tx = api.tx.balances.transfer(bob.address, 100)
+
+    await expect(tx.send()).rejects.toThrow('1011: {"unknown":{"noUnsignedValidator":null}}')
+  })
+
   it('failed apply extirinsic', async () => {
     const finalized = defer<void>()
     const invalid = defer<string>()