)
diff --git a/libs/remix-ui/debugger-ui/src/lib/vm-debugger/vm-debugger.tsx b/libs/remix-ui/debugger-ui/src/lib/vm-debugger/vm-debugger.tsx
index 00642d864b..a02b95a377 100644
--- a/libs/remix-ui/debugger-ui/src/lib/vm-debugger/vm-debugger.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/vm-debugger/vm-debugger.tsx
@@ -1,11 +1,11 @@
-import React, { useState, useEffect } from 'react'
-import CalldataPanel from './calldata-panel'
-import MemoryPanel from './memory-panel'
-import CallstackPanel from './callstack-panel'
-import StackPanel from './stack-panel'
-import StoragePanel from './storage-panel'
-import ReturnValuesPanel from './dropdown-panel'
-import FullStoragesChangesPanel from './full-storages-changes'
+import React, { useState, useEffect } from 'react' // eslint-disable-line
+import CalldataPanel from './calldata-panel' // eslint-disable-line
+import MemoryPanel from './memory-panel' // eslint-disable-line
+import CallstackPanel from './callstack-panel' // eslint-disable-line
+import StackPanel from './stack-panel' // eslint-disable-line
+import StoragePanel from './storage-panel' // eslint-disable-line
+import ReturnValuesPanel from './dropdown-panel' // eslint-disable-line
+import FullStoragesChangesPanel from './full-storages-changes' // eslint-disable-line
export const VmDebugger = ({ vmDebugger: { registerEvent } }) => {
const [calldataPanel, setCalldataPanel] = useState(null)
@@ -51,14 +51,14 @@ export const VmDebugger = ({ vmDebugger: { registerEvent } }) => {
}, [registerEvent])
return (
-
+
diff --git a/libs/remix-ui/debugger-ui/src/reducers/assembly-items.ts b/libs/remix-ui/debugger-ui/src/reducers/assembly-items.ts
index 12af113a14..4038cce2d9 100644
--- a/libs/remix-ui/debugger-ui/src/reducers/assembly-items.ts
+++ b/libs/remix-ui/debugger-ui/src/reducers/assembly-items.ts
@@ -1,4 +1,4 @@
-import { default as deepEqual } from 'deep-equal'
+import { default as deepEqual } from 'deep-equal' // eslint-disable-line
interface Action {
type: string;
@@ -6,18 +6,18 @@ interface Action {
}
export const initialState = {
- opCodes: {
- code: [],
- index: 0,
- address: ''
- },
- display: [],
+ opCodes: {
+ code: [],
index: 0,
- top: 0,
- bottom: 0,
- isRequesting: false,
- isSuccessful: false,
- hasError: null
+ address: ''
+ },
+ display: [],
+ index: 0,
+ top: 0,
+ bottom: 0,
+ isRequesting: false,
+ isSuccessful: false,
+ hasError: null
}
export const reducer = (state = initialState, action: Action) => {
@@ -28,36 +28,36 @@ export const reducer = (state = initialState, action: Action) => {
isRequesting: true,
isSuccessful: false,
hasError: null
- };
+ }
}
case 'FETCH_OPCODES_SUCCESS': {
- const opCodes = action.payload.address === state.opCodes.address ? {
- ...state.opCodes, index: action.payload.index
+ const opCodes = action.payload.address === state.opCodes.address ? {
+ ...state.opCodes, index: action.payload.index
} : deepEqual(action.payload.code, state.opCodes.code) ? state.opCodes : action.payload
const top = opCodes.index - 3 > 0 ? opCodes.index - 3 : 0
const bottom = opCodes.index + 4 < opCodes.code.length ? opCodes.index + 4 : opCodes.code.length
- const display = opCodes.code.slice(top, bottom)
+ const display = opCodes.code.slice(top, bottom)
return {
- opCodes,
- display,
- index: display.findIndex(code => code === opCodes.code[opCodes.index]),
- top,
- bottom,
- isRequesting: false,
- isSuccessful: true,
- hasError: null
- };
+ opCodes,
+ display,
+ index: display.findIndex(code => code === opCodes.code[opCodes.index]),
+ top,
+ bottom,
+ isRequesting: false,
+ isSuccessful: true,
+ hasError: null
+ }
}
case 'FETCH_OPCODES_ERROR': {
return {
- ...state,
- isRequesting: false,
- isSuccessful: false,
- hasError: action.payload
- };
+ ...state,
+ isRequesting: false,
+ isSuccessful: false,
+ hasError: action.payload
+ }
}
default:
- throw new Error();
+ throw new Error()
}
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/debugger-ui/src/reducers/calldata.ts b/libs/remix-ui/debugger-ui/src/reducers/calldata.ts
index aa37739a7a..e33425d8fd 100644
--- a/libs/remix-ui/debugger-ui/src/reducers/calldata.ts
+++ b/libs/remix-ui/debugger-ui/src/reducers/calldata.ts
@@ -4,58 +4,58 @@ interface Action {
}
export const initialState = {
- calldata: {},
- isRequesting: false,
- isSuccessful: false,
- hasError: null
+ calldata: {},
+ isRequesting: false,
+ isSuccessful: false,
+ hasError: null
}
export const reducer = (state = initialState, action: Action) => {
switch (action.type) {
case 'FETCH_CALLDATA_REQUEST':
return {
- ...state,
- isRequesting: true,
- isSuccessful: false,
- hasError: null
- };
+ ...state,
+ isRequesting: true,
+ isSuccessful: false,
+ hasError: null
+ }
case 'FETCH_CALLDATA_SUCCESS':
return {
- calldata: action.payload,
- isRequesting: false,
- isSuccessful: true,
- hasError: null
- };
+ calldata: action.payload,
+ isRequesting: false,
+ isSuccessful: true,
+ hasError: null
+ }
case 'FETCH_CALLDATA_ERROR':
- return {
- ...state,
- isRequesting: false,
- isSuccessful: false,
- hasError: action.payload
- };
+ return {
+ ...state,
+ isRequesting: false,
+ isSuccessful: false,
+ hasError: action.payload
+ }
case 'UPDATE_CALLDATA_REQUEST':
return {
- ...state,
- isRequesting: true,
- isSuccessful: false,
- hasError: null
- };
+ ...state,
+ isRequesting: true,
+ isSuccessful: false,
+ hasError: null
+ }
case 'UPDATE_CALLDATA_SUCCESS':
return {
- calldata: mergeLocals(action.payload, state.calldata),
- isRequesting: false,
- isSuccessful: true,
- hasError: null
- };
+ calldata: mergeLocals(action.payload, state.calldata),
+ isRequesting: false,
+ isSuccessful: true,
+ hasError: null
+ }
case 'UPDATE_CALLDATA_ERROR':
- return {
- ...state,
- isRequesting: false,
- isSuccessful: false,
- hasError: action.payload
- };
+ return {
+ ...state,
+ isRequesting: false,
+ isSuccessful: false,
+ hasError: action.payload
+ }
default:
- throw new Error();
+ throw new Error()
}
}
@@ -69,4 +69,4 @@ function mergeLocals (locals1, locals2) {
}
})
return locals2
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/debugger-ui/src/types/index.ts b/libs/remix-ui/debugger-ui/src/types/index.ts
index 7b3861b251..45a26384dc 100644
--- a/libs/remix-ui/debugger-ui/src/types/index.ts
+++ b/libs/remix-ui/debugger-ui/src/types/index.ts
@@ -30,4 +30,4 @@ export interface DropdownPanelProps {
loadMoreCompletedEvent?: string
}
-export type FormatSelfFunc = (key: string | number, data: ExtractData) => JSX.Element
\ No newline at end of file
+export type FormatSelfFunc = (key: string | number, data: ExtractData) => JSX.Element
diff --git a/libs/remix-ui/debugger-ui/src/utils/solidityTypeFormatter.ts b/libs/remix-ui/debugger-ui/src/utils/solidityTypeFormatter.ts
index c0d0dfcb3b..65ad0d61a0 100644
--- a/libs/remix-ui/debugger-ui/src/utils/solidityTypeFormatter.ts
+++ b/libs/remix-ui/debugger-ui/src/utils/solidityTypeFormatter.ts
@@ -1,44 +1,44 @@
import { BN } from 'ethereumjs-util'
-import { ExtractData } from '../types'
+import { ExtractData } from '../types' // eslint-disable-line
export function extractData (item, parent): ExtractData {
- const ret: ExtractData = {}
+ const ret: ExtractData = {}
- if (item.isProperty) {
- return item
- }
- if (item.type.lastIndexOf(']') === item.type.length - 1) {
- ret.children = (item.value || []).map(function (item, index) {
- return {key: index, value: item}
- })
- ret.children.unshift({
- key: 'length',
- value: {
- self: (new BN(item.length.replace('0x', ''), 16)).toString(10),
- type: 'uint',
- isProperty: true
- }
- })
- ret.isArray = true
- ret.self = parent.isArray ? '' : item.type
- ret.cursor = item.cursor
- ret.hasNext = item.hasNext
- } else if (item.type.indexOf('struct') === 0) {
- ret.children = Object.keys((item.value || {})).map(function (key) {
- return {key: key, value: item.value[key]}
- })
- ret.self = item.type
- ret.isStruct = true
- } else if (item.type.indexOf('mapping') === 0) {
- ret.children = Object.keys((item.value || {})).map(function (key) {
- return {key: key, value: item.value[key]}
- })
- ret.isMapping = true
- ret.self = item.type
- } else {
- ret.children = null
- ret.self = item.value
- ret.type = item.type
- }
- return ret
-}
\ No newline at end of file
+ if (item.isProperty) {
+ return item
+ }
+ if (item.type.lastIndexOf(']') === item.type.length - 1) {
+ ret.children = (item.value || []).map(function (item, index) {
+ return { key: index, value: item }
+ })
+ ret.children.unshift({
+ key: 'length',
+ value: {
+ self: (new BN(item.length.replace('0x', ''), 16)).toString(10),
+ type: 'uint',
+ isProperty: true
+ }
+ })
+ ret.isArray = true
+ ret.self = parent.isArray ? '' : item.type
+ ret.cursor = item.cursor
+ ret.hasNext = item.hasNext
+ } else if (item.type.indexOf('struct') === 0) {
+ ret.children = Object.keys((item.value || {})).map(function (key) {
+ return { key: key, value: item.value[key] }
+ })
+ ret.self = item.type
+ ret.isStruct = true
+ } else if (item.type.indexOf('mapping') === 0) {
+ ret.children = Object.keys((item.value || {})).map(function (key) {
+ return { key: key, value: item.value[key] }
+ })
+ ret.isMapping = true
+ ret.self = item.type
+ } else {
+ ret.children = null
+ ret.self = item.value
+ ret.type = item.type
+ }
+ return ret
+}
diff --git a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css
index e9385c251c..6f6cd9b221 100644
--- a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css
+++ b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css
@@ -1,5 +1,5 @@
.remixModalContent {
- box-shadow: 0 0 8px 1000px rgba(0,0,0,0.6),0 6px 20px 0 rgba(0,0,0,0.19);
+ box-shadow: 0 0 8px 10000px rgba(0,0,0,0.6),0 6px 20px 0 rgba(0,0,0,0.19);
-webkit-animation-name: animatetop;
-webkit-animation-duration: 0.4s;
animation-name: animatetop;
diff --git a/package.json b/package.json
index 04c5887ac2..783ad4b020 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"workspace-schematic": "nx workspace-schematic",
"dep-graph": "nx dep-graph",
"help": "nx help",
- "lint:libs": "nx run-many --target=lint --projects=remixd,remix-ui-tree-view,remix-ui-modal-dialog,remix-ui-toaster,remix-ui-file-explorer",
+ "lint:libs": "nx run-many --target=lint --projects=remixd,remix-ui-tree-view,remix-ui-modal-dialog,remix-ui-toaster,remix-ui-file-explorer,remix-ui-debugger-ui",
"build:libs": "nx run-many --target=build --parallel=false --with-deps=true --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd",
"test:libs": "nx run-many --target=test --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd",
"publish:libs": "npm run build:libs & lerna publish --skip-git & npm run bumpVersion:libs",