pull/5343/head
bunsenstraat 3 weeks ago committed by Aniket
parent 5f9ac0483a
commit 876f381926
  1. 22
      apps/remix-ide/src/app/providers/abstract-provider.tsx

@ -26,8 +26,8 @@ export type RejectRequest = (error: JsonDataResult) => void
export type SuccessRequest = (data: JsonDataResult) => void export type SuccessRequest = (data: JsonDataResult) => void
export interface IProvider { export interface IProvider {
options: {[id: string]: any} options: { [id: string]: any }
init(): Promise<{[id: string]: any}> init(): Promise<{ [id: string]: any }>
body(): JSX.Element body(): JSX.Element
sendAsync(data: JsonDataRequest): Promise<JsonDataResult> sendAsync(data: JsonDataRequest): Promise<JsonDataResult>
} }
@ -38,7 +38,7 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
defaultUrl: string defaultUrl: string
connected: boolean connected: boolean
nodeUrl: string nodeUrl: string
options: {[id: string]: any} = {} options: { [id: string]: any } = {}
constructor(profile, blockchain, defaultUrl) { constructor(profile, blockchain, defaultUrl) {
super(profile) super(profile)
@ -124,7 +124,21 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
resolve({ jsonrpc: '2.0', result, id: data.id }) resolve({ jsonrpc: '2.0', result, id: data.id })
} catch (error) { } catch (error) {
if (error && error.message && error.message.includes('SERVER_ERROR')) { if (error && error.message && error.message.includes('SERVER_ERROR')) {
this.switchAway(true, error.message) try {
// replace escaped quotes with normal quotes
const errorString = String(error.message).replace(/\\"/g, '"');
const messageMatches = Array.from(errorString.matchAll(/"message":"(.*?)"/g));
// Extract the message values
const messages = messageMatches.map(match => match[1]);
if (messages && messages.length > 0) {
this.switchAway(true, messages[0])
} else {
this.switchAway(true, error.message ? error.message : error.error ? error.error : error)
}
} catch (error) {
this.switchAway(true, error.message ? error.message : error.error ? error.error : error)
}
} }
error.code = -32603 error.code = -32603
reject({ jsonrpc: '2.0', error, id: data.id }) reject({ jsonrpc: '2.0', error, id: data.id })

Loading…
Cancel
Save