+
{
try {
await fileManager.remove(p)
} catch (e) {
- const isDir = state.fileManager.isDirectory(p)
+ const isDir = await state.fileManager.isDirectory(p)
toast(`Failed to remove ${isDir ? 'folder' : 'file'} ${p}.`)
}
}
diff --git a/libs/remix-ui/solidity-compiler/src/lib/css/style.css b/libs/remix-ui/solidity-compiler/src/lib/css/style.css
index 3846ca0f0f..d2bbe9e606 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/css/style.css
+++ b/libs/remix-ui/solidity-compiler/src/lib/css/style.css
@@ -103,7 +103,6 @@
}
.remixui_container {
margin: 0;
- margin-bottom: 2%;
}
.remixui_optimizeContainer {
display: flex;
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index 50fc98410a..83b688f104 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -7,6 +7,7 @@ const profile = {
name: 'solidity-logic',
displayName: 'Solidity compiler logic',
description: 'Compile solidity contracts - Logic',
+ methods: ['getCompilerState'],
version: packageJson.version
}
export class CompileTab extends Plugin {
@@ -60,6 +61,10 @@ export class CompileTab extends Plugin {
this.compiler.set('evmVersion', this.evmVersion)
}
+ getCompilerState () {
+ return this.compiler.state
+ }
+
/**
* Set the compiler to using Solidity or Yul (default to Solidity)
* @params lang {'Solidity' | 'Yul'} ...
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 8060310c46..a4419dc6f8 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -55,10 +55,12 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
return indexOfCategory
}
const [autoRun, setAutoRun] = useState(true)
+ const [slitherEnabled, setSlitherEnabled] = useState(false)
+ const [showSlither, setShowSlither] = useState('hidden')
const [categoryIndex, setCategoryIndex] = useState(groupedModuleIndex(groupedModules))
const warningContainer = React.useRef(null)
- const [warningState, setWarningState] = useState([])
+ const [warningState, setWarningState] = useState({})
const [state, dispatch] = useReducer(analysisReducer, initialState)
useEffect(() => {
@@ -66,7 +68,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
}, [])
useEffect(() => {
- setWarningState([])
+ setWarningState({})
if (autoRun) {
if (state.data !== null) {
run(state.data, state.source, state.file)
@@ -78,13 +80,15 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
}, [state])
useEffect(() => {
- props.analysisModule.on('filePanel', 'setWorkspace', () => {
+ props.analysisModule.on('filePanel', 'setWorkspace', (currentWorkspace) => {
// Reset warning state
setWarningState([])
// Reset badge
props.event.trigger('staticAnaysisWarning', [])
// Reset state
dispatch({ type: '', payload: {} })
+ // Show 'Enable Slither Analysis' checkbox
+ if (currentWorkspace && currentWorkspace.isLocalhost === true) setShowSlither('visible')
})
return () => { }
}, [props.analysisModule])
@@ -103,12 +107,35 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
)
}
+ const showWarnings = (warningMessage, groupByKey) => {
+ const resultArray = []
+ warningMessage.map(x => {
+ resultArray.push(x)
+ })
+ function groupBy (objectArray, property) {
+ return objectArray.reduce((acc, obj) => {
+ const key = obj[property]
+ if (!acc[key]) {
+ acc[key] = []
+ }
+ // Add object to list for given key's value
+ acc[key].push(obj)
+ return acc
+ }, {})
+ }
+
+ const groupedCategory = groupBy(resultArray, groupByKey)
+ setWarningState(groupedCategory)
+ }
+
const run = (lastCompilationResult, lastCompilationSource, currentFile) => {
if (state.data !== null) {
- if (lastCompilationResult && categoryIndex.length > 0) {
+ if (lastCompilationResult && (categoryIndex.length > 0 || slitherEnabled)) {
let warningCount = 0
const warningMessage = []
+ const warningErrors = []
+ // Remix Analysis
runner.run(lastCompilationResult, categoryIndex, results => {
results.map((result) => {
let moduleName
@@ -119,7 +146,6 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
}
})
})
- const warningErrors = []
result.report.map((item) => {
let location: any = {}
let locationString = 'not available'
@@ -163,28 +189,73 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
warningMessage.push({ msg, options, hasWarning: true, warningModuleName: moduleName })
})
})
- const resultArray = []
- warningMessage.map(x => {
- resultArray.push(x)
- })
- function groupBy (objectArray, property) {
- return objectArray.reduce((acc, obj) => {
- const key = obj[property]
- if (!acc[key]) {
- acc[key] = []
- }
- // Add object to list for given key's value
- acc[key].push(obj)
- return acc
- }, {})
- }
+ // Slither Analysis
+ if (slitherEnabled) {
+ props.analysisModule.call('solidity-logic', 'getCompilerState').then((compilerState) => {
+ const { currentVersion, optimize, evmVersion } = compilerState
+ props.analysisModule.call('terminal', 'log', { type: 'info', value: '[Slither Analysis]: Running...' })
+ props.analysisModule.call('slither', 'analyse', state.file, { currentVersion, optimize, evmVersion }).then((result) => {
+ if (result.status) {
+ props.analysisModule.call('terminal', 'log', { type: 'info', value: `[Slither Analysis]: Analysis Completed!! ${result.count} warnings found.` })
+ const report = result.data
+ report.map((item) => {
+ let location: any = {}
+ let locationString = 'not available'
+ let column = 0
+ let row = 0
+ let fileName = currentFile
- const groupedCategory = groupBy(resultArray, 'warningModuleName')
- setWarningState(groupedCategory)
+ if (item.sourceMap && item.sourceMap.length) {
+ const fileIndex = Object.keys(lastCompilationResult.sources).indexOf(item.sourceMap[0].source_mapping.filename_relative)
+ if (fileIndex >= 0) {
+ location = {
+ start: item.sourceMap[0].source_mapping.start,
+ length: item.sourceMap[0].source_mapping.length
+ }
+ location = props.analysisModule._deps.offsetToLineColumnConverter.offsetToLineColumn(
+ location,
+ fileIndex,
+ lastCompilationSource.sources,
+ lastCompilationResult.sources
+ )
+ row = location.start.line
+ column = location.start.column
+ locationString = row + 1 + ':' + column + ':'
+ fileName = Object.keys(lastCompilationResult.sources)[fileIndex]
+ }
+ }
+ warningCount++
+ const msg = message(item.title, item.description, item.more, fileName, locationString)
+ const options = {
+ type: 'warning',
+ useSpan: true,
+ errFile: fileName,
+ fileName,
+ errLine: row,
+ errCol: column,
+ item: { warning: item.description },
+ name: item.title,
+ locationString,
+ more: item.more,
+ location: location
+ }
+ warningErrors.push(options)
+ warningMessage.push({ msg, options, hasWarning: true, warningModuleName: 'Slither Analysis' })
+ })
+ showWarnings(warningMessage, 'warningModuleName')
+ props.event.trigger('staticAnaysisWarning', [warningCount])
+ }
+ }).catch((error) => {
+ console.log('Error found:', error) // This should be removed once testing done
+ props.analysisModule.call('terminal', 'log', { type: 'error', value: '[Slither Analysis]: Error occured! See remixd console for details.' })
+ showWarnings(warningMessage, 'warningModuleName')
+ })
+ })
+ } else {
+ showWarnings(warningMessage, 'warningModuleName')
+ props.event.trigger('staticAnaysisWarning', [warningCount])
+ }
})
- if (categoryIndex.length > 0) {
- props.event.trigger('staticAnaysisWarning', [warningCount])
- }
} else {
if (categoryIndex.length) {
warningContainer.current.innerText = 'No compiled AST available'
@@ -220,6 +291,14 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
}
}
+ const handleSlitherEnabled = () => {
+ if (slitherEnabled) {
+ setSlitherEnabled(false)
+ } else {
+ setSlitherEnabled(true)
+ }
+ }
+
const handleAutoRun = () => {
if (autoRun) {
setAutoRun(false)
@@ -317,7 +396,18 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
label="Autorun"
onChange={() => {}}
/>
-
+
+ {}}
+ visibility = {showSlither}
+ />
@@ -330,7 +420,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
}