diff --git a/apps/remix-ide/src/app/tabs/locales/en/udapp.json b/apps/remix-ide/src/app/tabs/locales/en/udapp.json index 77e264d98f4..3e0571c0b01 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/udapp.json +++ b/apps/remix-ide/src/app/tabs/locales/en/udapp.json @@ -4,7 +4,8 @@ "udapp.account": "Account", "udapp.value": "Value", "udapp.contract": "Contract", - "udapp.compiledBy": "Compiled by {compilerName}", + "udapp.compiledBy": "compiled by {compilerName}", + "udapp.warningEvmVersion": "Please make sure that the current network is compatible with this evm version: {evmVersion}. Otherwise any deployment will fail.", "udapp.infoSyncCompiledContractTooltip": "Click here to import contracts compiled from an external framework.This action is enabled when Remix is connected to an external framework (hardhat, truffle, foundry) through remixd.", "udapp.remixIpfsUdappTooltip": "Publishing the source code and metadata to IPFS facilitates source code verification using Sourcify and will greatly foster contract adoption (auditing, debugging, calling it, etc...)", "udapp.signAMessage": "Sign a message", diff --git a/apps/remix-ide/src/app/tabs/locales/es/udapp.json b/apps/remix-ide/src/app/tabs/locales/es/udapp.json index 77e264d98f4..2787d3bd220 100644 --- a/apps/remix-ide/src/app/tabs/locales/es/udapp.json +++ b/apps/remix-ide/src/app/tabs/locales/es/udapp.json @@ -4,7 +4,7 @@ "udapp.account": "Account", "udapp.value": "Value", "udapp.contract": "Contract", - "udapp.compiledBy": "Compiled by {compilerName}", + "udapp.compiledBy": "compiled by {compilerName}", "udapp.infoSyncCompiledContractTooltip": "Click here to import contracts compiled from an external framework.This action is enabled when Remix is connected to an external framework (hardhat, truffle, foundry) through remixd.", "udapp.remixIpfsUdappTooltip": "Publishing the source code and metadata to IPFS facilitates source code verification using Sourcify and will greatly foster contract adoption (auditing, debugging, calling it, etc...)", "udapp.signAMessage": "Sign a message", diff --git a/apps/remix-ide/src/app/tabs/locales/fr/udapp.json b/apps/remix-ide/src/app/tabs/locales/fr/udapp.json index 77e264d98f4..2787d3bd220 100644 --- a/apps/remix-ide/src/app/tabs/locales/fr/udapp.json +++ b/apps/remix-ide/src/app/tabs/locales/fr/udapp.json @@ -4,7 +4,7 @@ "udapp.account": "Account", "udapp.value": "Value", "udapp.contract": "Contract", - "udapp.compiledBy": "Compiled by {compilerName}", + "udapp.compiledBy": "compiled by {compilerName}", "udapp.infoSyncCompiledContractTooltip": "Click here to import contracts compiled from an external framework.This action is enabled when Remix is connected to an external framework (hardhat, truffle, foundry) through remixd.", "udapp.remixIpfsUdappTooltip": "Publishing the source code and metadata to IPFS facilitates source code verification using Sourcify and will greatly foster contract adoption (auditing, debugging, calling it, etc...)", "udapp.signAMessage": "Sign a message", diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx index 0ffb8789a71..d5521cec835 100644 --- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx @@ -263,6 +263,10 @@ export function ContractDropdownUI (props: ContractDropdownProps) { ) } + let evmVersion = null + try { + evmVersion = JSON.parse(loadedContractData.metadata).settings.evmVersion + } catch (err) {} return (
@@ -270,7 +274,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) { -
{compilerName && compilerName !== '' && }
+ {compilerName && compilerName !== '' && }
{props.remixdActivated ? ( {abiLabel.content}
+ { evmVersion && loadedContractData && + + } + > + evm version: {evmVersion} + }
{((contractList[currentFile] && contractList[currentFile].filter(contract => contract)) || []).length <= 0 ? intl.formatMessage({ id: 'udapp.noCompiledContracts' }) diff --git a/libs/remix-ui/run-tab/src/lib/css/run-tab.css b/libs/remix-ui/run-tab/src/lib/css/run-tab.css index c39dfb18900..86176155128 100644 --- a/libs/remix-ui/run-tab/src/lib/css/run-tab.css +++ b/libs/remix-ui/run-tab/src/lib/css/run-tab.css @@ -22,6 +22,9 @@ margin-bottom: 4px; text-transform: uppercase; } +.udapp_settingsCompiledBy { + margin-bottom: 4px; +} .udapp_environment { display: flex; align-items: center; @@ -75,11 +78,14 @@ width: 100%; border: 1px solid } +.udapp_evmVersion { + cursor: default; +} .udapp_subcontainer { display: flex; flex-direction: row; align-items: center; - margin-bottom: 8px; + margin-bottom: 2px; } .udapp_subcontainer i { width: 16px; @@ -181,7 +187,6 @@ display: inline; } .udapp_network { - margin-left: 8px; pointer-events: none; } .udapp_networkItem {