fix(wallet-gateway-remote): improve JsCantonError handling (#1014)

* feat(wallet-ui-components): persist last used custom kernel in discovery

Signed-off-by: Alex Matson <[email protected]>

* fix(wallet-gateway-remote): improve JsCantonError handling

Signed-off-by: Alex Matson <[email protected]>

* use logger

Signed-off-by: Alex Matson <[email protected]>

---------

Signed-off-by: Alex Matson <[email protected]>

Author: alexmatson-da

core/ledger-client/src/ledger-api-utils.ts

@@ -437,7 +437,11 @@ export async function retryable<T>(
 
 // Helper for differentiating ledger errors from others and satisfying TS when checking error properties
 export const isJsCantonError = (e: unknown): e is JsCantonError =>
-    typeof e === 'object' && e !== null && 'status' in e && 'errorCategory' in e
+    typeof e === 'object' &&
+    e !== null &&
+    'code' in e &&
+    'cause' in e &&
+    'errorCategory' in e
 
 export const asJsCantonError = (e: unknown): JsCantonError => {
     if (isJsCantonError(e)) {

wallet-gateway/remote/src/middleware/jsonRpcHandler.ts

@@ -14,6 +14,7 @@ import {
     JsonRpcResponse,
     jsonRpcResponse,
 } from '@canton-network/core-types'
+import { isJsCantonError } from '@canton-network/core-ledger-client'
 
 interface JsonRpcHttpOptions<T> {
     logger: Logger
@@ -52,6 +53,14 @@ const handleRpcError = (
         return [httpCode, jsonRpcResponse(id, response)]
     }
 
+    if (isJsCantonError(error)) {
+        response.error = {
+            code: rpcErrors.internal().code,
+            message: error.cause,
+            data: error,
+        }
+    }
+
     if (error instanceof Error) {
         response.error.message = error.message
     } else if (typeof error === 'string') {

wallet-gateway/remote/src/user-api/controller.ts

@@ -504,9 +504,8 @@ export const userController = (
 
                         return res
                     } catch (error) {
-                        throw new Error(
-                            'Failed to submit transaction: ' + error
-                        )
+                        logger.error(error, 'Failed to submit transaction')
+                        throw error
                     }
                 }
                 case SigningProvider.WALLET_KERNEL: {