diff --git a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
index 489707b28e..7b85038aa6 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
@@ -7,7 +7,7 @@ import { CopyToClipboard } from '@remix-ui/clipboard' // eslint-disable-line
import './css/style.css'
export const ContractSelection = (props: ContractSelectionProps) => {
- const { contractMap, fileProvider, fileManager, contractsDetails, modal } = props
+ const { api, contractMap, contractsDetails, modal } = props
const [contractList, setContractList] = useState([])
const [selectedContract, setSelectedContract] = useState('')
const [storage, setStorage] = useState(null)
@@ -234,7 +234,7 @@ export const ContractSelection = (props: ContractSelectionProps) => {
No Contract Compiled Yet
}
-
+
)
}
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 83b688f104..4b9be01c92 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -18,46 +18,46 @@ export class CompileTab extends Plugin {
public compilerImport
public event
- constructor (public queryParams, public fileManager, public editor, public config, public fileProvider, public contentImport) {
+ constructor (public api, public contentImport) {
super(profile)
this.event = new EventEmitter()
this.compiler = new Compiler((url, cb) => this.call('contentImport', 'resolveAndSave', url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
}
init () {
- this.optimize = this.queryParams.get().optimize
+ this.optimize = this.api.getParameters().optimize
this.optimize = this.optimize === 'true'
- this.queryParams.update({ optimize: this.optimize })
+ this.api.setParameters({ optimize: this.optimize })
this.compiler.set('optimize', this.optimize)
- this.runs = this.queryParams.get().runs
+ this.runs = this.api.getParameters().runs
this.runs = this.runs && this.runs !== 'undefined' ? this.runs : 200
- this.queryParams.update({ runs: this.runs })
+ this.api.setParameters({ runs: this.runs })
this.compiler.set('runs', this.runs)
- this.evmVersion = this.queryParams.get().evmVersion
+ this.evmVersion = this.api.getParameters().evmVersion
if (this.evmVersion === 'undefined' || this.evmVersion === 'null' || !this.evmVersion) {
this.evmVersion = null
}
- this.queryParams.update({ evmVersion: this.evmVersion })
+ this.api.setParameters({ evmVersion: this.evmVersion })
this.compiler.set('evmVersion', this.evmVersion)
}
setOptimize (newOptimizeValue) {
this.optimize = newOptimizeValue
- this.queryParams.update({ optimize: this.optimize })
+ this.api.setParameters({ optimize: this.optimize })
this.compiler.set('optimize', this.optimize)
}
setRuns (runs) {
this.runs = runs
- this.queryParams.update({ runs: this.runs })
+ this.api.setParameters({ runs: this.runs })
this.compiler.set('runs', this.runs)
}
setEvmVersion (newEvmVersion) {
this.evmVersion = newEvmVersion
- this.queryParams.update({ evmVersion: this.evmVersion })
+ this.api.setParameters({ evmVersion: this.evmVersion })
this.compiler.set('evmVersion', this.evmVersion)
}
@@ -79,7 +79,7 @@ export class CompileTab extends Plugin {
*/
compileFile (target) {
if (!target) throw new Error('No target provided for compiliation')
- const provider = this.fileManager.fileProviderOf(target)
+ const provider = this.api.fileProviderOf(target)
if (!provider) throw new Error(`cannot compile ${target}. Does not belong to any explorer`)
return new Promise((resolve, reject) => {
provider.get(target, (error, content) => {
@@ -93,14 +93,14 @@ export class CompileTab extends Plugin {
}
async isHardhatProject () {
- if (this.fileManager.mode === 'localhost') {
- return await this.fileManager.exists('hardhat.config.js')
+ if (this.api.getFileManagerMode() === 'localhost') {
+ return await this.api.fileExists('hardhat.config.js')
} else return false
}
runCompiler (hhCompilation) {
try {
- if (this.fileManager.mode === 'localhost' && hhCompilation) {
+ if (this.api.getFileManagerMode() === 'localhost' && hhCompilation) {
const { currentVersion, optimize, runs } = this.compiler.state
if (currentVersion) {
const fileContent = `module.exports = {
@@ -114,7 +114,7 @@ export class CompileTab extends Plugin {
}
`
const configFilePath = 'remix-compiler.config.js'
- this.fileManager.setFileContent(configFilePath, fileContent)
+ this.api.writeFile(configFilePath, fileContent)
this.call('hardhat', 'compile', configFilePath).then((result) => {
this.call('terminal', 'log', { type: 'info', value: result })
}).catch((error) => {
@@ -122,9 +122,9 @@ export class CompileTab extends Plugin {
})
}
}
- this.fileManager.saveCurrentFile()
+ this.api.saveCurrentFile()
this.event.emit('removeAnnotations')
- var currentFile = this.config.get('currentFile')
+ var currentFile = this.api.getConfiguration('currentFile')
return this.compileFile(currentFile)
} catch (err) {
console.error(err)
diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
index 3fd3f800fb..46c032d582 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
@@ -9,7 +9,7 @@ import { Renderer } from '@remix-ui/renderer' // eslint-disable-line
import './css/style.css'
export const SolidityCompiler = (props: SolidityCompilerProps) => {
- const { plugin, plugin: { editor, config, queryParams, compileTabLogic, currentFile, fileProvider, fileManager, contractsDetails, contractMap, compileErrors, isHardHatProject, setHardHatCompilation, configurationSettings } } = props
+ const { plugin, plugin: { compileTabLogic, contractsDetails, contractMap, compileErrors, configurationSettings } } = props
const [state, setState] = useState({
contractsDetails: {},
eventHandlers: {},
@@ -75,22 +75,23 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
)
+ const currentFile = plugin.getConfiguration('currentFile')
return (
<>
-
-
+
+
- { compileErrors.error && }
+ { compileErrors.error && }
{ compileErrors.error && (compileErrors.error.mode === 'panic') && modal('Error', panicMessage(compileErrors.error.formattedMessage), 'Close', null) }
{ compileErrors.errors && compileErrors.errors.length && compileErrors.errors.map((err, index) => {
- if (config.get('hideWarnings')) {
+ if (plugin.getConfiguration('hideWarnings')) {
if (err.severity !== 'warning') {
- return
+ return
}
} else {
- return
+ return
}
}) }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
index 31c95e9e1f..a2106e2205 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@@ -4,43 +4,32 @@ export interface SolidityCompilerProps {
file: string
} | Record
compileErrors: any,
- isHardHatProject: boolean,
- queryParams: any,
compileTabLogic: any,
- currentFile: string,
contractsDetails: Record,
- editor: any,
- config: any,
- fileProvider: any,
- fileManager: any,
contentImport: any,
call: (...args) => void
on: (...args) => void,
- setHardHatCompilation: (value: boolean) => void,
setSelectedVersion: (value: string) => void,
- configurationSettings: ConfigurationSettings
+ configurationSettings: ConfigurationSettings,
+ getConfiguration: (value: string) => string,
+ setConfiguration: (name: string, value: string) => void
},
}
export interface CompilerContainerProps {
- editor: any,
- config: any,
- queryParams: any,
+ api: any,
compileTabLogic: any,
tooltip: (message: string | JSX.Element) => void,
modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
compiledFileName: string,
- setHardHatCompilation: (value: boolean) => void,
updateCurrentVersion: any,
- isHardHatProject: boolean,
configurationSettings: ConfigurationSettings
}
export interface ContractSelectionProps {
+ api: any,
contractMap: {
file: string
} | Record,
- fileManager: any,
- fileProvider: any,
modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
contractsDetails: Record
}
diff --git a/libs/remix-ui/tree-view/src/lib/remix-ui-tree-view.css b/libs/remix-ui/tree-view/src/lib/remix-ui-tree-view.css
index 7e8fbee405..97b2f4fd48 100644
--- a/libs/remix-ui/tree-view/src/lib/remix-ui-tree-view.css
+++ b/libs/remix-ui/tree-view/src/lib/remix-ui-tree-view.css
@@ -23,7 +23,7 @@
word-break: break-all;
}
.label_key {
- min-width: 15%;
+ min-width: max-content;
max-width: 80%;
word-break: break-word;
}