mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

add evmCheck

Browse Source
pull/5367/head
Joseph Izang 3 weeks ago committed by Aniket
parent 91850e4699
commit db26b53327
6 changed files with 89 additions and 58 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 66
      libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
  2. 13
      libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
  3. 13
      libs/remix-ui/run-tab/src/lib/components/environment.tsx
  4. 9
      libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
  5. 44
      libs/remix-ui/run-tab/src/lib/run-tab.tsx
  6. 2
      libs/remix-ui/run-tab/src/lib/types/index.ts

66
libs/remix-ui/run-tab/src/lib/actions/evmmap.ts
Unescape View File

@ -3,6 +3,12 @@ export type ChainInfo = {
name: string
}
export type ChainCompatibleInfo = {
chain: ChainInfo
minCompilerVersion: string
evmVersion: HardFork
}
export type HardFork =
| 'cancun'
| 'shanghai'
@ -37,7 +43,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 534352, name: "Scroll" },
{ id: 11155111, name: "Sepolia" }
],
minCompilerVersion: "0.8.24+commit.e11b9ed9"
minCompilerVersion: "0.8.24+commit.e11b9ed9",
evmVersion: 'cancun'
}],
['shanghai', {
chainId: [
@ -65,11 +72,13 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 59141, name: "Linea Testnet" },
{ id: 59902, name: "Metis Sepolia Testnet" },
{ id: 421614, name: "Arbitrum Sepolia" },
{ id: 534352, name: "Scroll" },
{ id: 11155111, name: "Sepolia" },
{ id: 11155420, name: "Optimism Sepolia Testnet" },
{ id: 1666600000, name: "Harmony Mainnet Shard 0" }
],
minCompilerVersion: "0.8.20+commit.a1b79de6"
minCompilerVersion: "0.8.20+commit.a1b79de6",
evmVersion: 'shanghai'
}],
['paris', {
chainId: [
@ -99,11 +108,13 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 59141, name: "Linea Testnet" },
{ id: 59902, name: "Metis Sepolia Testnet" },
{ id: 421614, name: "Arbitrum Sepolia" },
{ id: 534352, name: "Scroll" },
{ id: 11155111, name: "Sepolia" },
{ id: 11155420, name: "Optimism Sepolia Testnet" },
{ id: 1666600000, name: "Harmony Mainnet Shard 0" }
],
minCompilerVersion: "0.8.18+commit.87f61d96"
minCompilerVersion: "0.8.18+commit.87f61d96",
evmVersion: 'paris'
}],
['london', {
chainId: [
@ -123,7 +134,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 59141, name: "Linea Testnet" },
{ id: 11155111, name: "Sepolia" },
],
minCompilerVersion: "0.8.7+commit.e28d00a7"
minCompilerVersion: "0.8.7+commit.e28d00a7",
evmVersion: 'london'
}],
['berlin', {
chainId: [
@ -143,7 +155,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 59141, name: "Linea Testnet" },
{ id: 11155111, name: "Sepolia" }
],
minCompilerVersion: "0.8.5+commit.a4f2e591"
minCompilerVersion: "0.8.5+commit.a4f2e591",
evmVersion: 'berlin'
}],
['istanbul', {
chainId: [
@ -163,7 +176,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 59141, name: "Linea Testnet" },
{ id: 11155111, name: "Sepolia" }
],
minCompilerVersion: "0.5.14+commit.01f1aaa4"
minCompilerVersion: "0.5.14+commit.01f1aaa4",
evmVersion: 'istanbul'
}],
['petersburg', {
chainId: [
@ -171,7 +185,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 5, name: "Goerli" },
{ id: 11155111, name: "Sepolia" }
],
minCompilerVersion: "0.5.5+commit.47a71e8f"
minCompilerVersion: "0.5.5+commit.47a71e8f",
evmVersion: 'petersburg'
}],
['constantinople', {
chainId: [
@ -179,25 +194,29 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 5, name: "Goerli" },
{ id: 11155111, name: "Sepolia" }
],
minCompilerVersion: "0.5.5+commit.47a71e8f"
minCompilerVersion: "0.5.5+commit.47a71e8f",
evmVersion: 'constantinople'
}],
['byzantium', {
chainId: [
{ id: 1, name: "Ethereum Mainnet" }
],
minCompilerVersion: "0.4.21+commit.dfe3193c"
minCompilerVersion: "0.4.21+commit.dfe3193c",
evmVersion: 'byzantium'
}],
['spuriousDragon', {
chainId: [
{ id: 1, name: "Ethereum Mainnet" }
],
minCompilerVersion: "0.4.9+commit.364da425"
minCompilerVersion: "0.4.9+commit.364da425",
evmVersion: 'spuriousDragon'
}],
['tangerineWhistle', {
chainId: [
{ id: 1, name: "Ethereum Mainnet" }
],
minCompilerVersion: "0.4.0+commit.acd334c9"
minCompilerVersion: "0.4.0+commit.acd334c9",
evmVersion: 'tangerineWhistle'
}],
['homestead', {
chainId: [
@ -205,7 +224,8 @@ export const evmMap: Map<HardFork, { chainId: ChainInfo[], minCompilerVersion: s
{ id: 5, name: "Goerli" },
{ id: 11155111, name: "Sepolia" }
],
minCompilerVersion: "0.1.2+commit.d0d36e3"
minCompilerVersion: "0.1.2+commit.d0d36e3",
evmVersion: 'homestead'
}],
])
@ -223,9 +243,21 @@ export function isChainCompatibleWithAnyFork(chainId: number, forks: HardFork[])
return forks.some(fork => isChainCompatible(fork, chainId))
}
export function getCompatibleChain(fork: HardFork, chainId: number): ChainInfo | undefined {
const compatibleChains = getCompatibleChains(fork)
console.log('fork in getCompatibleChain', fork)
console.log('compatibleChains', compatibleChains)
return compatibleChains.find(chain => chain.id === chainId)
export function getCompatibleChain(
fork: HardFork,
chainId: number
): ChainCompatibleInfo | undefined {
const forkData = evmMap.get(fork)
if (!forkData) return undefined
const compatibleChain = forkData.chainId.find(chain => chain.id === chainId)
if (compatibleChain) {
return {
chain: compatibleChain,
minCompilerVersion: forkData.minCompilerVersion,
evmVersion: fork
}
}
return undefined;
}

13
libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
Unescape View File

@ -172,20 +172,9 @@ export function ContractGUI(props: ContractGUIProps) {
}
}
const checkUrlLocationForEvmVersion = async () => {
// if the evmVersion is not provided in the url, we use the default value
// and the default would be the latest evmFork, which is now cancun.
// checking both url and compiler details
const url = window.location.href
const regVersion = url.match(/evmVersion=([a-zA-Z]+)/)?.[1]
const fetched = await props.getCompilerDetails()
return { regVersion, fetched }
}
const handleActionClick = async () => {
props.getVersion()
const { regVersion, fetched } = await checkUrlLocationForEvmVersion()
console.log('checkUrlLocationForEvmVersion', { regVersion, fetched })
await props.getCompilerDetails()
if (deployState.deploy) {
const proxyInitializeString = getMultiValsString(initializeFields.current)
props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])

13
libs/remix-ui/run-tab/src/lib/components/environment.tsx
Unescape View File

@ -11,6 +11,16 @@ export function EnvironmentUI(props: EnvironmentProps) {
Object.entries(props.providers.providerList.filter((provider) => { return provider.isInjected }))
Object.entries(props.providers.providerList.filter((provider) => { return !(provider.isVM || provider.isInjected) }))
const EvaluateSelectionForCorrectness = async () => {
// if the evmVersion is not provided in the url, we use the default value
// and the default would be the latest evmFork, which is now cancun.
// checking both url and compiler details
const url = window.location.href
const regVersion = url.match(/evmVersion=([a-zA-Z]+)/)?.[1]
const fetched = await props.checkSelectionCorrectness()
return { regVersion, fetched }
}
const handleChangeExEnv = (env: string) => {
const provider = props.providers.providerList.find((exEnv) => exEnv.name === env)
const context = provider.name
@ -69,6 +79,9 @@ export function EnvironmentUI(props: EnvironmentProps) {
onClick={() => {
handleChangeExEnv(name)
}}
onSelect={() => {
EvaluateSelectionForCorrectness()
}}
data-id={`dropdown-item-${name}`}
>
<span className="">

9
libs/remix-ui/run-tab/src/lib/components/settingsUI.tsx
Unescape View File

@ -1,5 +1,5 @@
// eslint-disable-next-line no-use-before-define
import React from 'react'
import React, { useEffect } from 'react'
import { SettingsProps } from '../types'
import { EnvironmentUI } from './environment'
import { NetworkUI } from './network'
@ -10,9 +10,14 @@ import { ValueUI } from './value'
export function SettingsUI(props: SettingsProps) {
// this._deps.config.events.on('settings/personal-mode_changed', this.onPersonalChange.bind(this))
useEffect(() => {
// listen for chainId change on window.ethereum and call EvaluateEnvironmentSelection
// (window as any).ethereum?.on('chainChanged', console.log('metamask did something')) //props.EvaluateEnvironmentSelection)
}, [])
return (
<div className="udapp_settings">
<EnvironmentUI runTabPlugin={props.runTabPlugin} selectedEnv={props.selectExEnv} providers={props.providers} setExecutionContext={props.setExecutionContext} />
<EnvironmentUI runTabPlugin={props.runTabPlugin} selectedEnv={props.selectExEnv} providers={props.providers} setExecutionContext={props.setExecutionContext} checkSelectionCorrectness={props.EvaluateEnvironmentSelection} />
<NetworkUI networkName={props.networkName} />
<AccountUI
addFile={props.addFile}

44
libs/remix-ui/run-tab/src/lib/run-tab.tsx
Unescape View File

@ -56,7 +56,7 @@ import { PassphrasePrompt } from './components/passphrase'
import { MainnetPrompt } from './components/mainnet'
import { ScenarioPrompt } from './components/scenario'
import { setIpfsCheckedState, setRemixDActivated } from './actions/payload'
import { getCompatibleChain, getCompatibleChains, HardFork, isChainCompatible, isChainCompatibleWithAnyFork } from './actions/evmmap'
import { ChainCompatibleInfo, getCompatibleChain, getCompatibleChains, HardFork, isChainCompatible, isChainCompatibleWithAnyFork } from './actions/evmmap'
export function RunTabUI(props: RunTabProps) {
const { plugin } = props
@ -107,45 +107,34 @@ export function RunTabUI(props: RunTabProps) {
const getCompilerDetails = async () => await checkEvmChainCompatibility()
const returnCompatibleChain = async (evmVersion: HardFork, targetChainId: number) => {
return getCompatibleChain(evmVersion ?? 'cancun', targetChainId)
return getCompatibleChain(evmVersion ?? 'paris', targetChainId) // using paris evm as a default fallback version
}
const checkEvmChainCompatibilityOkFunction = async (targetChainId: number, fetchDetails: any) => {
const checkEvmChainCompatibilityOkFunction = async (fetchDetails: ChainCompatibleInfo) => {
const compilerParams = {
evmVersion: 'paris',
evmVersion: fetchDetails.evmVersion,
optimize: false,
language: 'Solidity',
runs: 200,
version: '0.8.27+commit.40a35a09'
runs: '200',
version: fetchDetails.minCompilerVersion
}
await plugin.call('solidity', 'setCompilerConfig', compilerParams)
const compilerState = await plugin.call('solidity', 'getCompilerState')
console.log('compilerState', compilerState)
const currentFile = await plugin.call('fileManager', 'getCurrentFile')
await plugin.call('solidity', 'compile', currentFile)
}
const checkEvmChainCompatibilityCancelFunction = async (targetChainId: number, fetchDetails: any, currentFile: string) => {
() => {
console.log('cancel')
}
}
const checkEvmChainCompatibility = async () => {
const isVm = await plugin.call('blockchain', 'getProvider') // vms are exempt from this treatment
const fetchDetails = await plugin.call('solidity', 'getCompilerQueryParameters') //compiler details including evmVersion
console.log('isVm', isVm)
if (!isVm.startsWith('vm')) {
const isVm = await plugin.call('blockchain', 'getProvider')
const fetchDetails = await plugin.call('solidity', 'getCompilerQueryParameters')
const compilerState = await plugin.call('solidity', 'getCompilerState')
console.log('compilerState', compilerState)
console.log('runTab', runTab)
if (!isVm.startsWith('vm') && compilerState.target !== null) { //vms are exempt from this treatment & if no contract file is open, don't do anything
const targetChainId = runTab.chainId ? parseInt(runTab.chainId) : runTab.chainId
console.log('targetChainId', runTab.chainId)
const IsCompatible = isChainCompatible(fetchDetails.evmVersion ?? 'cancun', targetChainId)
console.log('evmVersion matches everywhere', fetchDetails.evmVersion)
console.log('compiler stuff', fetchDetails)
console.log('chain is compatible', IsCompatible)
const currentFile = await plugin.call('fileManager', 'getCurrentFile')
if (!IsCompatible) {
console.log('chain is undefined')
const chain = await returnCompatibleChain(fetchDetails.evmVersion, targetChainId)
console.log('chain obtained', { chain, targetChainId, fetchDetails })
//show modal
plugin.call('notification', 'modal', {
id: 'evm-chainId-incompatible',
@ -161,8 +150,8 @@ export function RunTabUI(props: RunTabProps) {
modalType: 'modal',
okLabel: 'Switch EVM and Recompile',
cancelLabel: 'Cancel',
okFn: checkEvmChainCompatibilityOkFunction,
cancelFn: checkEvmChainCompatibilityCancelFunction
okFn: () => checkEvmChainCompatibilityOkFunction(chain),
cancelFn: () => {}
})
}
}
@ -351,6 +340,7 @@ export function RunTabUI(props: RunTabProps) {
networkName={runTab.networkName}
personalMode={runTab.personalMode}
selectExEnv={runTab.selectExEnv}
EvaluateEnvironmentSelection={checkEvmChainCompatibility}
accounts={runTab.accounts}
setAccount={setAccountAddress}
setUnit={setUnitValue}

2
libs/remix-ui/run-tab/src/lib/types/index.ts
Unescape View File

@ -125,6 +125,7 @@ export interface RunTabState {
export interface SettingsProps {
runTabPlugin: RunTab,
selectExEnv: string,
EvaluateEnvironmentSelection: any
accounts: {
loadedAccounts: Record<string, any>,
selectedAccount: string,
@ -159,6 +160,7 @@ export interface SettingsProps {
}
export interface EnvironmentProps {
checkSelectionCorrectness: any
runTabPlugin: RunTab,
selectedEnv: string,
providers: {

Write Preview
Loading…
Cancel
Save