From 4746b5a79005d02295b9bd66cb4e7f289698a4c8 Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Tue, 4 Oct 2022 12:42:41 +0100
Subject: [PATCH] Prevent proxy upgrade for invalid proxy address

---
 .../src/lib/components/contractGUI.tsx        | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
index cccbbbbb2e..f06a2e1d6c 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -1,6 +1,7 @@
 // eslint-disable-next-line no-use-before-define
 import React, { useEffect, useRef, useState } from 'react'
 import * as remixLib from '@remix-project/remix-lib'
+import Web3 from 'web3'
 import { ContractGUIProps } from '../types'
 import { CopyToClipboard } from '@remix-ui/clipboard'
 import { OverlayTrigger, Tooltip } from 'react-bootstrap'
@@ -22,6 +23,7 @@ export function ContractGUI (props: ContractGUIProps) {
   const [deployState, setDeployState] = useState<{ deploy: boolean, upgrade: boolean }>({ deploy: false, upgrade: false })
   const [useLastProxy, setUseLastProxy] = useState<boolean>(false)
   const [proxyAddress, setProxyAddress] = useState<string>('')
+  const [proxyAddressError, setProxyAddressError] = useState<string>('')
   const multiFields = useRef<Array<HTMLInputElement | null>>([])
   const initializeFields = useRef<Array<HTMLInputElement | null>>([])
   const basicInputRef = useRef<HTMLInputElement>()
@@ -174,7 +176,7 @@ export function ContractGUI (props: ContractGUIProps) {
 
       props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])
     } else if (deployState.upgrade) {
-      props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
+      !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy'])
     } else {
       props.clickCallBack(props.funcABI.inputs, basicInput)
     }
@@ -223,16 +225,36 @@ export function ContractGUI (props: ContractGUIProps) {
     const value = e.target.checked
     const address = props.savedProxyAddress
 
+    if (value) {
+      if (address) {
+        setProxyAddress(address)
+        setProxyAddressError('')
+      } else {
+        setProxyAddressError('No proxy address available')
+        setProxyAddress('')
+      }
+    }
     setUseLastProxy(value)
-    setProxyAddress(address || '')
   }
 
   const handleSetProxyAddress = (e) => {
     const value = e.target.value
-
+    
     setProxyAddress(value)
   }
 
+  const validateProxyAddress = (address: string) => {
+    if (address === '') {
+      setProxyAddressError('proxy address cannot be empty')
+    } else {
+      if (Web3.utils.isAddress(address)) {
+        setProxyAddressError('')
+      } else {
+        setProxyAddressError('not a valid contract address')
+      }
+    }
+  }
+
   return (
     <div
       className={`udapp_contractProperty ${
@@ -539,27 +561,12 @@ export function ContractGUI (props: ContractGUIProps) {
               </div>
               {!useLastProxy ? (
                 <div className="mb-2">
-                  <label className="mt-2 text-left d-block">
-                    Proxy Address:{" "}
-                  </label>
-                  <input
-                    style={{ height: 32 }}
-                    className="form-control udapp_input"
-                    data-id="ERC1967AddressInput"
-                    placeholder="proxy address"
-                    title="Enter previously deployed proxy address on the selected network"
-                    onChange={handleSetProxyAddress}
-                  />
-                </div>
-              ) : (
-                <span
-                  className="text-capitalize"
-                  data-id="lastDeployedERC1967Address"
-                  style={{ fontSize: ".8em" }}
-                >
-                  {proxyAddress || "No proxy address available"}
-                </span>
-              )}
+                  <label className='mt-2 text-left d-block'>Proxy Address: </label>
+                  <input style={{ height: 32 }} className="form-control udapp_input" data-id="ERC1967AddressInput" placeholder='proxy address' title='Enter previously deployed proxy address on the selected network' onChange={handleSetProxyAddress} onBlur={() => validateProxyAddress(proxyAddress) } />
+                  { proxyAddressError && <span className='text-lowercase' data-id="errorMsgProxyAddress" style={{ fontSize: '.8em' }}>{ proxyAddressError }</span> }
+                </div> :
+                <span className='text-capitalize' data-id="lastDeployedERC1967Address" style={{ fontSize: '.8em' }}>{ proxyAddress || proxyAddressError }</span>
+              }
             </div>
           </div>
         </>