Skip to content

Commit 2dad2f0

Browse files
committed
remove static list of providers
1 parent 9945adc commit 2dad2f0

File tree

2 files changed

+9
-47
lines changed

2 files changed

+9
-47
lines changed

apps/remix-ide/src/app/udapp/run-tab.tsx

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,6 @@ import { Recorder } from '../tabs/runTab/model/recorder'
1616
import { EnvDropdownLabelStateType } from 'libs/remix-ui/run-tab/src/lib/types'
1717
const _paq = (window._paq = window._paq || [])
1818

19-
const selectedEnvs: EnvDropdownLabelStateType[] = [
20-
{ name: 'Remix VM (Cancun)', value: 'vm-cancun', chainId: 'vm-cancun' },
21-
{ name: 'Gnosis Mainnet - MetaMask', value: 'injected-metamask-gnosis', chainId: 100 },
22-
{ name: 'L2 - Optimism - MetaMask', value: 'injected-metamask-optimism', chainId: 10 },
23-
{ name: 'L2 - Arbitrum - MetaMask', value: 'injected-metamask-arbitrum', chainId: 42161 },
24-
{ name: 'Ephemery Testnet - MetaMask', value: 'injected-metamask-ephemery', chainId: 39438143 },
25-
{ name: 'Sepolia Testnet - MetaMask', value: 'injected-metamask-sepolia', chainId: 11155111 },
26-
{ name: 'L2 - Linea - MetaMask', value: 'injected-metamask-linea', chainId: 59144 },
27-
{ name: 'Injected Provider - MetaMask', value: 'injected-MetaMask' },
28-
{ name: 'WalletConnect', value: 'walletconnect' },
29-
{ name: 'Remix VM - Mainnet fork', value: 'vm-mainnet-fork', chainId: 'vm-mainnet-fork' },
30-
{ name: 'Remix VM - Sepolia fork', value: 'vm-sepolia-fork', chainId: 'vm-sepolia-fork' },
31-
{ name: 'Remix VM - Custom fork', value: 'vm-custom-fork', chainId: 'vm-custom-fork' },
32-
{ name: 'Remix VM (Shanghai)', value: 'vm-shanghai', chainId: 'vm-shanghai' },
33-
{ name: 'Remix VM (Paris)', value: 'vm-paris', chainId: 'vm-paris' },
34-
{ name: 'Remix VM (London)', value: 'vm-london', chainId: 'vm-london' },
35-
{ name: 'Remix VM (Berlin)', value: 'vm-berlin', chainId: 'vm-berlin' },
36-
{ name: 'Custom - External Http Provider', value: 'basic-http-provider', chainId: 1741104841094 },
37-
{ name: 'Dev - Hardhat Provider', value: 'hardhat-provider', chainId: 31337 },
38-
{ name: 'Dev - Foundry Provider', value: 'foundry-provider', chainId: 31337 },
39-
{ name: 'Dev - Ganache Provider', value: 'ganache-provider', chainId: 1741104841094 },
40-
]
41-
4219
const profile = {
4320
name: 'udapp',
4421
displayName: 'Deploy & run transactions',
@@ -61,8 +38,7 @@ const profile = {
6138
'clearAllInstances',
6239
'addInstance',
6340
'resolveContractAndAddInstance',
64-
'showPluginDetails',
65-
'getEnvironmentDropdownLabels'
41+
'showPluginDetails'
6642
]
6743
}
6844

@@ -79,7 +55,6 @@ export class RunTab extends ViewPlugin {
7955
fileProvider: any
8056
recorder: any
8157
REACT_API: any
82-
envDropdownLabelState: EnvDropdownLabelStateType[]
8358
el: any
8459
constructor(blockchain: Blockchain, config: any, fileManager: any, editor: any, filePanel: any, compilersArtefacts: CompilerArtefacts, networkModule: any, fileProvider: any, engine: any) {
8560
super(profile)
@@ -95,7 +70,6 @@ export class RunTab extends ViewPlugin {
9570
this.fileProvider = fileProvider
9671
this.recorder = new Recorder(blockchain)
9772
this.REACT_API = {}
98-
this.setEnvironmentDropdownLabels()
9973
this.setupEvents()
10074
this.el = document.createElement('div')
10175
}
@@ -140,14 +114,6 @@ export class RunTab extends ViewPlugin {
140114
return this.blockchain.createVMAccount(newAccount)
141115
}
142116

143-
setEnvironmentDropdownLabels() {
144-
this.envDropdownLabelState = selectedEnvs
145-
}
146-
147-
getEnvironmentDropdownLabels() {
148-
return this.envDropdownLabelState
149-
}
150-
151117
sendTransaction(tx) {
152118
_paq.push(['trackEvent', 'udapp', 'sendTx', 'udappTransaction'])
153119
return this.blockchain.sendTransaction(tx)

libs/remix-ui/run-tab/src/lib/components/dropdownLabel.tsx

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,20 @@ export type DropDownLabelProps = {
2121
export function DropdownLabel({ label, bridges, currentProvider, chainId, runTabState, setExecutionEnv, isL2, plugin }: DropDownLabelProps) {
2222

2323
const [renderLabel, setRenderLabel] = useState(label)
24-
const [selectedEnvs, setSelectedEnvs] = useState<EnvDropdownLabelStateType[]>([])
2524

2625
useEffect(() => {
2726
const checkEnvLabels = async () => {
28-
if (selectedEnvs.length === 0) {
29-
const envLabels = await plugin.call('udapp', 'getEnvironmentDropdownLabels')
30-
setSelectedEnvs(envLabels)
27+
const selectedEnvs = await plugin.call('blockchain', 'getAllProviders')
28+
const selectedEnv = selectedEnvs[runTabState.selectExEnv]
29+
if (selectedEnv) {
30+
setRenderLabel(selectedEnv.displayName)
31+
setExecutionEnv({ context: selectedEnv.value })
32+
} else {
33+
setRenderLabel('No provider set')
3134
}
3235
}
3336
checkEnvLabels()
34-
const selectedEnv = selectedEnvs.find(env => (env.chainId === chainId && env.value === runTabState.selectExEnv) || (env.value === 'walletconnect' && env.value === currentProvider?.name))
35-
if (selectedEnv) {
36-
setRenderLabel(selectedEnv.name)
37-
setExecutionEnv({ context: selectedEnv.value })
38-
} else {
39-
setRenderLabel('Injected Provider - MetaMask')
40-
}
41-
}, [chainId, currentProvider && currentProvider.name])
37+
}, [chainId])
4238

4339
return (
4440
<>

0 commit comments

Comments
 (0)