@xyo-network/xl1-rpc 1.7.11 → 1.7.12

package/src/transport/HttpRpcTransport.ts

@@ -2,7 +2,8 @@ import type {
   JsonRpcFailure, JsonRpcRequest, JsonRpcSuccess,
 } from '@metamask/utils'
 import { AxiosJson } from '@xylabs/axios'
-import { isUndefinedOrNull } from '@xylabs/typeof'
+import { isError, isUndefinedOrNull } from '@xylabs/typeof'
+import { isAxiosError } from 'axios'
 import { v4 } from 'uuid'
 import type { z } from 'zod'
 
@@ -37,24 +38,32 @@ export class HttpRpcTransport<T extends RpcSchemaMap = RpcSchemaMap> implements
     method: TMethod,
     params?: z.infer<TSchemas[TMethod]['params']['to']>,
   ): Promise<z.infer<TSchemas[TMethod]['result']['from']>> {
-    const id = v4()
-    const body: JsonRpcRequest = {
-      jsonrpc,
-      id,
-      method: method as string,
-    }
+    try {
+      const id = v4()
+      const body: JsonRpcRequest = {
+        jsonrpc,
+        id,
+        method: method as string,
+      }
 
-    if (params) {
-      body.params = schemas[method].params.to.parse(params)
-    }
+      if (params) {
+        body.params = schemas[method].params.to.parse(params)
+      }
 
-    const res = await new AxiosJson().post(url, body)
+      const res = await new AxiosJson().post(url, body)
 
-    const json = res.data
-    if (isUndefinedOrNull(json) || (json as Partial<JsonRpcFailure>).error) {
-      throw new Error((json as JsonRpcFailure).error.message)
-    }
+      const json = res.data
+      if (isUndefinedOrNull(json) || (json as Partial<JsonRpcFailure>).error) {
+        throw new Error((json as JsonRpcFailure).error.message)
+      }
 
-    return schemas[method].result.from.parse((json as JsonRpcSuccess).result)
+      return schemas[method].result.from.parse((json as JsonRpcSuccess).result)
+    } catch (ex) {
+      let message = isError(ex) ? ex.message : String(ex)
+      if (isAxiosError(ex)) {
+        message = `Http error occurred [${ex.status}|${ex.code ?? '<unknown>'}]: ${ex.message}`
+      }
+      throw new Error(`Error occurred while calling RPC method ${String(method)}: ${message}`)
+    }
   }
 }

package/src/types/schema/XyoSignerRpcSchemas.ts

@@ -2,7 +2,10 @@ import { z } from 'zod'
 
 import type { XyoSignerRpcMethodName } from '../XyoSignerRpc.ts'
 import {
-  AddressFromStringSchema, AddressToStringSchema, PayloadSchema, SignedTransactionBoundWitnessSchema, TransactionFeesFromStingSchema,
+  AddressFromStringSchema, AddressToStringSchema,
+  HydratedTransactionSchema,
+  PayloadSchema, SignedHydratedTransactionSchema, SignedTransactionBoundWitnessSchema,
+  TransactionFeesFromStingSchema,
   TransactionFeesToStingSchema,
 } from './common/index.ts'
 import type { RpcSchemaMap } from './RpcSchemaMap.ts'
@@ -44,4 +47,14 @@ export const XyoSignerRpcSchemas: RpcSchemaMap<XyoSignerRpcMethodName> = {
       from: SignedTransactionBoundWitnessSchema,
     },
   },
+  xyoSigner_signTransaction: {
+    params: {
+      to: z.tuple([HydratedTransactionSchema]),
+      from: z.tuple([HydratedTransactionSchema]),
+    },
+    result: {
+      to: SignedHydratedTransactionSchema,
+      from: SignedHydratedTransactionSchema,
+    },
+  },
 }