diff --git a/libs/remix-lib/src/types/ICompilerApi.ts b/libs/remix-lib/src/types/ICompilerApi.ts index 259aa2547a..850c000744 100644 --- a/libs/remix-lib/src/types/ICompilerApi.ts +++ b/libs/remix-lib/src/types/ICompilerApi.ts @@ -49,7 +49,7 @@ export interface ICompilerApi { } export type terminalLog = { - type: 'info' | 'error' | 'warning' + type: 'info' | 'error' | 'warning' | 'log' value: string } 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 c8ea120bc3..74cc1ebffb 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts @@ -157,7 +157,7 @@ export class CompileTabLogic { this.api.writeFile(configFilePath, fileContent) _paq.push(['trackEvent', 'compiler', 'runCompile', 'compileWithHardhat']) this.api.compileWithHardhat(configFilePath).then((result) => { - this.api.logToTerminal({ type: 'info', value: result }) + this.api.logToTerminal({ type: 'log', value: result }) }).catch((error) => { this.api.logToTerminal({ type: 'error', value: error }) }) @@ -183,7 +183,7 @@ export class CompileTabLogic { this.api.writeFile(configFilePath, fileContent) _paq.push(['trackEvent', 'compiler', 'runCompile', 'compileWithTruffle']) this.api.compileWithTruffle(configFilePath).then((result) => { - this.api.logToTerminal({ type: 'info', value: result }) + this.api.logToTerminal({ type: 'log', value: result }) }).catch((error) => { this.api.logToTerminal({ type: 'error', value: error }) }) diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx index a188beccd0..98d297b8b9 100644 --- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx +++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx @@ -259,7 +259,7 @@ export const SolidityUnitTesting = (props: Record) => { // eslint-d finalLogs = finalLogs + ' ' + formattedLog + '\n' } _paq.push(['trackEvent', 'solidityUnitTesting', 'hardhat', 'console.log']) - testTab.call('terminal', 'log', { type: 'info', value: finalLogs }) + testTab.call('terminal', 'log', { type: 'log', value: finalLogs }) } const discardHighlight = async () => { 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 eafad3b92c..4692eaf8b2 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 @@ -280,11 +280,11 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { try { const compilerState = await props.analysisModule.call('solidity', 'getCompilerState') const { currentVersion, optimize, evmVersion } = compilerState - await props.analysisModule.call('terminal', 'log', { type: 'info', value: '[Slither Analysis]: Running...' }) + await props.analysisModule.call('terminal', 'log', { type: 'log', value: '[Slither Analysis]: Running...' }) _paq.push(['trackEvent', 'solidityStaticAnalyzer', 'analyze', 'slitherAnalyzer']) const result = await props.analysisModule.call('slither', 'analyse', state.file, { currentVersion, optimize, evmVersion }) if (result.status) { - props.analysisModule.call('terminal', 'log', { type: 'info', value: `[Slither Analysis]: Analysis Completed!! ${result.count} warnings found.` }) + props.analysisModule.call('terminal', 'log', { type: 'log', value: `[Slither Analysis]: Analysis Completed!! ${result.count} warnings found.` }) const report = result.data for (const item of report) { let location: any = {} diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx index 03b7ea99db..aa4c8c90b5 100644 --- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx +++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx @@ -90,7 +90,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { if (typeof message === 'string') { message = { value: message, - type: 'info' + type: 'log' } } scriptRunnerDispatch({ type: message.type ? message.type : 'log', payload: { message: [message.value] } }) diff --git a/libs/remixd/src/services/foundryClient.ts b/libs/remixd/src/services/foundryClient.ts index 4591a132c6..aa4e42f4c1 100644 --- a/libs/remixd/src/services/foundryClient.ts +++ b/libs/remixd/src/services/foundryClient.ts @@ -83,7 +83,7 @@ export class FoundryClient extends PluginClient { } if (!this.warnlog) { // @ts-ignore - this.call('terminal', 'log', { type: 'info', value: 'receiving compilation result from Foundry' }) + this.call('terminal', 'log', { type: 'log', value: 'receiving compilation result from Foundry' }) this.warnlog = true } } @@ -167,6 +167,6 @@ export class FoundryClient extends PluginClient { console.log('syncing from Foundry') this.processArtifact() // @ts-ignore - this.call('terminal', 'log', { type: 'info', value: 'synced with Foundry'}) + this.call('terminal', 'log', { type: 'log', value: 'synced with Foundry'}) } } diff --git a/libs/remixd/src/services/hardhatClient.ts b/libs/remixd/src/services/hardhatClient.ts index a9b944538c..abef18642f 100644 --- a/libs/remixd/src/services/hardhatClient.ts +++ b/libs/remixd/src/services/hardhatClient.ts @@ -105,12 +105,12 @@ export class HardhatClient extends PluginClient { } } if (!this.warnLog) { - this.call('terminal', 'log', { value: 'receiving compilation result from Hardhat', type: 'info'} ) + this.call('terminal', 'log', { value: 'receiving compilation result from Hardhat', type: 'log'} ) this.warnLog = true } if (targetsSynced.length) { console.log(`Processing artifacts for files: ${[...new Set(targetsSynced)].join(', ')}`) - this.call('terminal', 'log', { type: 'info', value: `synced with Hardhat: ${[...new Set(targetsSynced)].join(', ')}` }) + this.call('terminal', 'log', { type: 'log', value: `synced with Hardhat: ${[...new Set(targetsSynced)].join(', ')}` }) } } diff --git a/libs/remixd/src/services/truffleClient.ts b/libs/remixd/src/services/truffleClient.ts index 23ada4c9a9..1fa745042e 100644 --- a/libs/remixd/src/services/truffleClient.ts +++ b/libs/remixd/src/services/truffleClient.ts @@ -81,7 +81,7 @@ export class TruffleClient extends PluginClient { } if (!this.warnLog) { // @ts-ignore - this.call('terminal', 'log', { type: 'info', value: 'receiving compilation result from Truffle' }) + this.call('terminal', 'log', { type: 'log', value: 'receiving compilation result from Truffle' }) this.warnLog = true } } @@ -141,6 +141,6 @@ export class TruffleClient extends PluginClient { console.log('syncing from Truffle') this.processArtifact() // @ts-ignore - this.call('terminal', 'log', { type: 'info', value: 'synced with Truffle' }) + this.call('terminal', 'log', { type: 'log', value: 'synced with Truffle' }) } }