Merge pull request #4276 from ethereum/fix-proxy-verification

Refactor Etherscan Contract Verification Plugin

apps/etherscan/src/app/AppContext.tsx

@@ -20,5 +20,6 @@ export const AppContext = React.createContext({
   themeType: 'dark' as ThemeType,
   setThemeType: (themeType: ThemeType) => {
     console.log('Calling Set Theme Type')
-  }
+  },
+  networkName: ''
 })

apps/etherscan/src/app/EtherscanPluginClient.ts

@@ -1,10 +1,21 @@
 import {PluginClient} from '@remixproject/plugin'
+import { createClient } from '@remixproject/plugin-webview'
 import {verify, EtherScanReturn} from './utils/verify'
 import {getReceiptStatus, getEtherScanApi, getNetworkName, getProxyContractReceiptStatus} from './utils'
+import EventManager from 'events'
 
-export class RemixClient extends PluginClient {
+export class EtherscanPluginClient extends PluginClient {
-  loaded() {
+  public internalEvents: EventManager
-    return this.onload()
+
+  constructor() {
+    super()
+    createClient(this)
+    this.internalEvents = new EventManager()
+    this.onload()
+  }
+
+  onActivation(): void {
+    this.internalEvents.emit('etherscan_activated')
   }
 
   async verify(

apps/etherscan/src/app/app.tsx

@@ -2,8 +2,7 @@ import React, {useState, useEffect, useRef} from 'react'
 
 import {CompilationFileSources, CompilationResult} from '@remixproject/plugin-api'
 
-import {RemixClient} from './RemixPlugin'
+import { EtherscanPluginClient } from './EtherscanPluginClient'
-import {createClient} from '@remixproject/plugin-webview'
 
 import {AppContext} from './AppContext'
 import {DisplayRoutes} from './routes'
@@ -21,32 +20,29 @@ export const getNewContractNames = (compilationResult: CompilationResult) => {
 
   for (const file of Object.keys(compiledContracts)) {
     const newContractNames = Object.keys(compiledContracts[file])
+
     result = [...result, ...newContractNames]
   }
 
   return result
 }
 
+const plugin = new EtherscanPluginClient()
+
 const App = () => {
   const [apiKey, setAPIKey] = useLocalStorage('apiKey', '')
-  const [clientInstance, setClientInstance] = useState(undefined as any)
+  const [receipts, setReceipts] = useLocalStorage('receipts', []) 
-  const [receipts, setReceipts] = useLocalStorage('receipts', [])
+  const [contracts, setContracts] = useState<string[]>([])
-  const [contracts, setContracts] = useState([] as string[])
+  const [themeType, setThemeType] = useState<ThemeType>('dark')
-  const [themeType, setThemeType] = useState('dark' as ThemeType)
+  const [networkName, setNetworkName] = useState('Loading...')
   const timer = useRef(null)
-
-  const clientInstanceRef = useRef(clientInstance)
-  clientInstanceRef.current = clientInstance
   const contractsRef = useRef(contracts)
+
   contractsRef.current = contracts
 
   useEffect(() => {
-    const client = new RemixClient()
+    plugin.internalEvents.on('etherscan_activated', () => {
-    createClient(client)
+      plugin.on('solidity', 'compilationFinished', (fileName: string, source: CompilationFileSources, languageVersion: string, data: CompilationResult) => {
-    const loadClient = async () => {
-      await client.onload()
-      setClientInstance(client)
-      client.on('solidity', 'compilationFinished', (fileName: string, source: CompilationFileSources, languageVersion: string, data: CompilationResult) => {
         const newContractsNames = getNewContractNames(data)
 
         const newContractsToSave: string[] = [...contractsRef.current, ...newContractsNames]
@@ -55,21 +51,16 @@ const App = () => {
 
         setContracts(uniqueContracts)
       })
-
+      plugin.on('blockchain' as any, 'networkStatus', (result) => {
-      //const currentTheme = await client.call("theme", "currentTheme")
+        setNetworkName(`${result.network.name} ${result.network.id !== '-' ? `(Chain id: ${result.network.id})` : '(Not supported)'}`)
-      //setThemeType(currentTheme.quality)
+      })
-      //client.on("theme", "themeChanged", (theme) => {
+      // @ts-ignore
-      //  setThemeType(theme.quality)
+      plugin.call('blockchain', 'getCurrentNetworkStatus').then((result: any) => setNetworkName(`${result.network.name} ${result.network.id !== '-' ? `(Chain id: ${result.network.id})` : '(Not supported)'}`))
-      //})
+    })
-    }
-
-    loadClient()
   }, [])
 
   useEffect(() => {
-    let receiptsNotVerified: Receipt[] = receipts.filter((item: Receipt) => {
+    let receiptsNotVerified: Receipt[] = receipts.filter((item: Receipt) => item.status === 'Pending in queue' || item.status === 'Max rate limit reached')
-      return item.status === 'Pending in queue' || item.status === 'Max rate limit reached'
-    })
 
     if (receiptsNotVerified.length > 0) {
       if (timer.current) {
@@ -77,15 +68,12 @@ const App = () => {
         timer.current = null
       }
       timer.current = setInterval(async () => {
-        const {network, networkId} = await getNetworkName(clientInstanceRef.current)
+        const {network, networkId} = await getNetworkName(plugin)
-        if (!clientInstanceRef.current) {
-          return
-        }
 
-        if (network === 'vm') {
+        if (!plugin) return
-          return
+        if (network === 'vm') return
-        }
         let newReceipts = receipts
+
         for (const item of receiptsNotVerified) {
           await new Promise((r) => setTimeout(r, 500)) // avoid api rate limit exceed.
           let status
@@ -110,9 +98,7 @@ const App = () => {
             })
           }
         }
-        receiptsNotVerified = newReceipts.filter((item: Receipt) => {
+        receiptsNotVerified = newReceipts.filter((item: Receipt) => item.status === 'Pending in queue' || item.status === 'Max rate limit reached')
-          return item.status === 'Pending in queue' || item.status === 'Max rate limit reached'
-        })
         if (timer.current && receiptsNotVerified.length === 0) {
           clearInterval(timer.current)
           timer.current = null
@@ -127,16 +113,17 @@ const App = () => {
       value={{
         apiKey,
         setAPIKey,
-        clientInstance,
+        clientInstance: plugin,
         receipts,
         setReceipts,
         contracts,
         setContracts,
         themeType,
-        setThemeType
+        setThemeType,
+        networkName
       }}
     >
-      <DisplayRoutes />
+      { plugin && <DisplayRoutes /> }
     </AppContext.Provider>
   )
 }

apps/etherscan/src/app/views/HomeView.tsx

@@ -10,7 +10,7 @@ import {VerifyView} from './VerifyView'
 export const HomeView: React.FC = () => {
   return (
     <AppContext.Consumer>
-      {({apiKey, clientInstance, setReceipts, receipts, contracts}) => {
+      {({apiKey, clientInstance, setReceipts, receipts, contracts, networkName}) => {
         return !apiKey ? (
           <Navigate
             to={{
@@ -26,6 +26,7 @@ export const HomeView: React.FC = () => {
               const newReceipts = [...receipts, receipt]
               setReceipts(newReceipts)
             }}
+            networkName={networkName}
           />
         )
       }}

apps/etherscan/src/app/views/VerifyView.tsx

@@ -14,7 +14,8 @@ interface Props {
   client: PluginClient
   apiKey: string
   onVerifiedContract: (receipt: Receipt) => void
-  contracts: string[]
+  contracts: string[],
+  networkName: string
 }
 
 interface FormValues {
@@ -23,27 +24,14 @@ interface FormValues {
   expectedImplAddress?: string
 }
 
-export const VerifyView: React.FC<Props> = ({apiKey, client, contracts, onVerifiedContract}) => {
+export const VerifyView: React.FC<Props> = ({apiKey, client, contracts, onVerifiedContract, networkName}) => {
   const [results, setResults] = useState('')
-  const [networkName, setNetworkName] = useState('Loading...')
   const [selectedContract, setSelectedContract] = useState('')
   const [showConstructorArgs, setShowConstructorArgs] = useState(false)
   const [isProxyContract, setIsProxyContract] = useState(false)
   const [constructorInputs, setConstructorInputs] = useState([])
   const verificationResult = useRef({})
 
-  useEffect(() => {
-    if (client && client.on) {
-      client.on('blockchain' as any, 'networkStatus', (result) => {
-        setNetworkName(`${result.network.name} ${result.network.id !== '-' ? `(Chain id: ${result.network.id})` : '(Not supported)'}`)
-      })
-    }
-    return () => {
-      // To fix memory leak
-      if (client && client.off) client.off('blockchain' as any, 'networkStatus')
-    }
-  }, [client])
-
   useEffect(() => {
     if (contracts.includes(selectedContract)) updateConsFields(selectedContract)
   }, [contracts])

apps/remix-ide/src/blockchain/blockchain.tsx

@@ -23,7 +23,7 @@ const profile = {
   name: 'blockchain',
   displayName: 'Blockchain',
   description: 'Blockchain - Logic',
-  methods: ['getCode', 'getTransactionReceipt', 'addProvider', 'removeProvider', 'getCurrentFork', 'getAccounts', 'web3VM', 'web3', 'getProvider'],
+  methods: ['getCode', 'getTransactionReceipt', 'addProvider', 'removeProvider', 'getCurrentFork', 'getAccounts', 'web3VM', 'web3', 'getProvider', 'getCurrentNetworkStatus'],
   version: packageJson.version
 }