diff --git a/libs/remix-debug/src/solidity-decoder/localDecoder.ts b/libs/remix-debug/src/solidity-decoder/localDecoder.ts index 9564efc93b..70df3e9715 100644 --- a/libs/remix-debug/src/solidity-decoder/localDecoder.ts +++ b/libs/remix-debug/src/solidity-decoder/localDecoder.ts @@ -21,7 +21,7 @@ export async function solidityLocals (vmtraceIndex, internalTreeCall, stack, mem locals[name] = await variable.type.decodeFromStack(variable.stackDepth, stack, memory, storageResolver, calldata, cursor, variable) } catch (e) { console.log(e) - locals[name] = '' + locals[name] = { error: '' } } } } diff --git a/libs/remix-debug/src/solidity-decoder/stateDecoder.ts b/libs/remix-debug/src/solidity-decoder/stateDecoder.ts index b7908da3c3..709faff99c 100644 --- a/libs/remix-debug/src/solidity-decoder/stateDecoder.ts +++ b/libs/remix-debug/src/solidity-decoder/stateDecoder.ts @@ -25,7 +25,7 @@ export async function decodeState (stateVars, storageResolver) { ret[stateVar.name] = decoded } catch (e) { console.log(e) - ret[stateVar.name] = '' + ret[stateVar.name] = { error: '' } } } return ret @@ -64,6 +64,6 @@ export async function solidityState (storageResolver, astList, contractName) { try { return await decodeState(stateVars, storageResolver) } catch (e) { - return '' + return { error: '' } } } diff --git a/libs/remix-debug/src/solidity-decoder/types/ArrayType.ts b/libs/remix-debug/src/solidity-decoder/types/ArrayType.ts index 3792579531..eb5eff4d30 100644 --- a/libs/remix-debug/src/solidity-decoder/types/ArrayType.ts +++ b/libs/remix-debug/src/solidity-decoder/types/ArrayType.ts @@ -36,7 +36,7 @@ export class ArrayType extends RefType { } catch (e) { console.log(e) return { - value: '', + error: '', type: this.typeName } } @@ -56,7 +56,7 @@ export class ArrayType extends RefType { ret.push(await this.underlyingType.decodeFromStorage(currentLocation, storageResolver)) } catch (e) { return { - value: '', + error: '', type: this.typeName } } @@ -84,7 +84,7 @@ export class ArrayType extends RefType { } if (isNaN(length)) { return { - value: '', + error: '', type: 'Error' } } diff --git a/libs/remix-debug/src/solidity-decoder/types/DynamicByteArray.ts b/libs/remix-debug/src/solidity-decoder/types/DynamicByteArray.ts index 5ac37c1ea2..85cf69ef88 100644 --- a/libs/remix-debug/src/solidity-decoder/types/DynamicByteArray.ts +++ b/libs/remix-debug/src/solidity-decoder/types/DynamicByteArray.ts @@ -16,7 +16,7 @@ export class DynamicByteArray extends RefType { value = await extractHexValue(location, storageResolver, this.storageBytes) } catch (e) { console.log(e) - return { value: '', type: this.typeName } + return { error: '', type: this.typeName } } const length = new BN(value, 16) if (length.testn(0)) { @@ -27,7 +27,7 @@ export class DynamicByteArray extends RefType { currentSlot = await readFromStorage(dataPos, storageResolver) } catch (e) { console.log(e) - return { value: '', type: this.typeName } + return { error: '', type: this.typeName } } while (length.gt(new BN(ret.length)) && ret.length < 32000) { currentSlot = currentSlot.replace('0x', '') @@ -37,7 +37,7 @@ export class DynamicByteArray extends RefType { currentSlot = await readFromStorage(dataPos, storageResolver) } catch (e) { console.log(e) - return { value: '', type: this.typeName } + return { error: '', type: this.typeName } } } return { value: '0x' + ret.replace(/(00)+$/, ''), length: '0x' + length.toString(16), type: this.typeName } diff --git a/libs/remix-debug/src/solidity-decoder/types/StringType.ts b/libs/remix-debug/src/solidity-decoder/types/StringType.ts index 8e31b3d17f..2ca56484db 100644 --- a/libs/remix-debug/src/solidity-decoder/types/StringType.ts +++ b/libs/remix-debug/src/solidity-decoder/types/StringType.ts @@ -15,7 +15,7 @@ export class StringType extends DynamicByteArray { decoded = await super.decodeFromStorage(location, storageResolver) } catch (e) { console.log(e) - return '' + return { error: '' } } return format(decoded) } @@ -25,7 +25,7 @@ export class StringType extends DynamicByteArray { return await super.decodeFromStack(stackDepth, stack, memory, null, calldata, variableDetails) } catch (e) { console.log(e) - return '' + return { error: '' } } } diff --git a/libs/remix-debug/src/solidity-decoder/types/Struct.ts b/libs/remix-debug/src/solidity-decoder/types/Struct.ts index f6ea2748bc..1995471ffb 100644 --- a/libs/remix-debug/src/solidity-decoder/types/Struct.ts +++ b/libs/remix-debug/src/solidity-decoder/types/Struct.ts @@ -22,7 +22,7 @@ export class Struct extends RefType { ret[item.name] = await item.type.decodeFromStorage(globalLocation, storageResolver) } catch (e) { console.log(e) - ret[item.name] = '' + ret[item.name] = { error: '' } } } return { value: ret, type: this.typeName } diff --git a/libs/remix-debug/src/solidity-decoder/types/ValueType.ts b/libs/remix-debug/src/solidity-decoder/types/ValueType.ts index 63bd4ae0f0..262cfcbb10 100644 --- a/libs/remix-debug/src/solidity-decoder/types/ValueType.ts +++ b/libs/remix-debug/src/solidity-decoder/types/ValueType.ts @@ -31,7 +31,7 @@ export class ValueType { return { value: this.decodeValue(value), type: this.typeName } } catch (e) { console.log(e) - return { value: '', type: this.typeName } + return { error: '', type: this.typeName } } }