Fixed signMessage, recorder test

apps/remix-ide-e2e/src/commands/signMessage.ts

@@ -20,25 +20,28 @@ function signMsg (browser: NightwatchBrowser, msg: string, cb: (hash: { value: s
   browser
     .waitForElementPresent('i[id="remixRunSignMsg"]')
     .click('i[id="remixRunSignMsg"]')
-    .waitForElementVisible('textarea[id="prompt_text"]')
-    .setValue('textarea[id="prompt_text"]', msg, () => {
-      browser.modalFooterOKClick().perform(
-        (client, done) => {
-          browser.waitForElementVisible('span[id="remixRunSignMsgHash"]').getText('span[id="remixRunSignMsgHash"]', (v) => { hash = v; done() })
-        }
-      )
-        .perform(
-          (client, done) => {
-            browser.waitForElementVisible('span[id="remixRunSignMsgSignature"]').getText('span[id="remixRunSignMsgSignature"]', (v) => { signature = v; done() })
-          }
-        )
-        .modalFooterOKClick()
-        .perform(
-          () => {
-            cb(hash, signature)
-          }
-        )
-    })
+    .waitForElementVisible('*[data-id="signMessageTextarea"]', 120000)
+    .click('*[data-id="signMessageTextarea"]')
+    .setValue('*[data-id="signMessageTextarea"]', msg)
+    .waitForElementPresent('[data-id="udappNotify-modal-footer-ok-react"]')
+    .click('[data-id="udappNotify-modal-footer-ok-react"]')
+    .perform(
+      (client, done) => {
+        browser.waitForElementVisible('span[id="remixRunSignMsgHash"]').getText('span[id="remixRunSignMsgHash"]', (v) => { hash = v; done() })
+      }
+    )
+    .perform(
+      (client, done) => {
+        browser.waitForElementVisible('span[id="remixRunSignMsgSignature"]').getText('span[id="remixRunSignMsgSignature"]', (v) => { signature = v; done() })
+      }
+    )
+    .waitForElementPresent('[data-id="udappNotify-modal-footer-ok-react"]')
+    .click('[data-id="udappNotify-modal-footer-ok-react"]')
+    .perform(
+      () => {
+        cb(hash, signature)
+      }
+    )
 }
 
 module.exports = SelectContract

apps/remix-ide-e2e/src/commands/verifyCallReturnValue.ts

@@ -15,7 +15,7 @@ class VerifyCallReturnValue extends EventEmitter {
 
 function verifyCallReturnValue (browser: NightwatchBrowser, address: string, checks: string[], done: VoidFunction) {
   browser.execute(function (address: string) {
-    const nodes = document.querySelectorAll('#instance' + address + ' div[class^="contractActionsContainer"] div[class^="value"]') as NodeListOf<HTMLElement>
+    const nodes = document.querySelectorAll('#instance' + address + ' [data-id="udapp_value"]') as NodeListOf<HTMLElement>
     const ret = []
     for (let k = 0; k < nodes.length; k++) {
       const text = nodes[k].innerText ? nodes[k].innerText : nodes[k].textContent
@@ -23,7 +23,6 @@ function verifyCallReturnValue (browser: NightwatchBrowser, address: string, che
     }
     return ret
   }, [address], function (result) {
-    console.log('verifyCallReturnValue', result)
     for (const k in checks) {
       browser.assert.equal(result.value[k].trim(), checks[k].trim())
     }

apps/remix-ide-e2e/src/tests/recorder.test.ts

@@ -17,16 +17,14 @@ module.exports = {
       .pause(5000)
       .clickLaunchIcon('udapp')
       .selectAccount('0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c') // this account will be used for this test suite
-      .click('div[class^="cardContainer"] i[class^="arrow"]')
-      .click('#runTabView .runtransaction')
-      .waitForElementPresent('.instance:nth-of-type(2)')
-      .click('.instance:nth-of-type(2) > div > button')
-      .waitForElementPresent('.instance:nth-of-type(3)')
-      .click('.instance:nth-of-type(3) > div > button')
+      .click('[data-id="udapp_arrow"]')
+      .click('[data-id="runtransaction"]')
+      .clickInstance(0)
+      .clickInstance(1)
       .clickFunction('getInt - call')
       .clickFunction('getAddress - call')
       .clickFunction('getFromLib - call')
-      .waitForElementPresent('div[class^="contractActionsContainer"] div[class^="value"] ul')
+      .waitForElementPresent('[data-id="udapp_value"]')
       .getAddressAtPosition(1, (address) => {
         console.log('Test Recorder ' + address)
         addressRef = address
@@ -39,11 +37,15 @@ module.exports = {
       .testContracts('testRecorder.sol', sources[0]['testRecorder.sol'], ['testRecorder'])
       .clickLaunchIcon('udapp')
       .createContract('12')
-      .waitForElementPresent('.instance:nth-of-type(2)')
-      .click('.instance:nth-of-type(2) > div > button')
+      .clickInstance(0)
       .clickFunction('set - transact (not payable)', { types: 'uint256 _p', values: '34' })
       .click('i.savetransaction')
-      .modalFooterOKClick()
+      .waitForElementVisible('[data-id="udappNotify-modal-footer-ok-react"]')
+      .execute(function () {
+        const modalOk = document.querySelector('[data-id="udappNotify-modal-footer-ok-react"]') as any
+
+        modalOk.click()
+      })
       .getEditorValue(function (result) {
         const parsed = JSON.parse(result)
         browser.assert.equal(JSON.stringify(parsed.transactions[0].record.parameters), JSON.stringify(scenario.transactions[0].record.parameters))
@@ -73,11 +75,16 @@ module.exports = {
       .pause(1000)
       .createContract('')
       .click('i.savetransaction')
-      .modalFooterOKClick()
+      .waitForElementVisible('[data-id="udappNotify-modal-footer-ok-react"]')
+      .execute(function () {
+        const modalOk = document.querySelector('[data-id="udappNotify-modal-footer-ok-react"]') as any
+
+        modalOk.click()
+      })
       .click('*[data-id="deployAndRunClearInstances"]') // clear udapp
       .click('*[data-id="terminalClearConsole"]') // clear terminal
-      .click('#runTabView .runtransaction')
-      .clickInstance(1)
+      .click('[data-id="runtransaction"]')
+      .clickInstance(2)
       .pause(1000)
       .clickFunction('set2 - transact (not payable)', { types: 'uint256 _po', values: '10' })
       .testFunction('last',

libs/remix-ui/run-tab/src/lib/actions/index.ts

@@ -550,7 +550,8 @@ export const updateTxFeeContent = (content: string) => {
   dispatch(setTxFeeContent(content))
 }
 
-const addInstance = (instance: { contractData?: ContractData, address: string, name: string, abi?: any, decodedResponse?: any }) => {
+const addInstance = (instance: { contractData?: ContractData, address: string, name: string, abi?: any, decodedResponse?: Record<number, any> }) => {
+  instance.decodedResponse = {}
   dispatch(addNewInstance(instance))
 }
 
@@ -590,7 +591,7 @@ export const getContext = () => {
 }
 
 export const runTransactions = (
-  index: number,
+  instanceIndex: number,
   lookupOnly: boolean,
   funcABI: FuncABI,
   inputsValues: string,
@@ -601,7 +602,8 @@ export const runTransactions = (
   logBuilder: (msg: string) => JSX.Element,
   mainnetPrompt: MainnetPrompt,
   gasEstimationPrompt: (msg: string) => JSX.Element,
-  passphrasePrompt: (msg: string) => JSX.Element) => {
+  passphrasePrompt: (msg: string) => JSX.Element,
+  funcIndex?: number) => {
   let callinfo = ''
   if (lookupOnly) callinfo = 'call'
   else if (funcABI.type === 'fallback' || funcABI.type === 'receive') callinfo = 'lowLevelInteracions'
@@ -625,9 +627,9 @@ export const runTransactions = (
       return terminalLogger(log)
     },
     (returnValue) => {
-      const decodedResponse = txFormat.decodeResponse(returnValue, funcABI)
+      const response = txFormat.decodeResponse(returnValue, funcABI)
 
-      dispatch(setDecodedResponse(index, decodedResponse))
+      dispatch(setDecodedResponse(instanceIndex, response, funcIndex))
     },
     (network, tx, gasEstimation, continueTxExecution, cancelCb) => {
       confirmationHandler(mainnetPrompt, network, tx, gasEstimation, continueTxExecution, cancelCb)
@@ -651,9 +653,7 @@ const saveScenario = (promptCb, cb) => {
     if (!fileProvider) return
     const newFile = path + '/' + plugin.REACT_API.recorder.pathToScenario
     try {
-      console.log('newFile: ', newFile)
       const newPath = await createNonClashingNameAsync(newFile, plugin.fileManager)
-      console.log('newPath: ', newPath)
       // eslint-disable-next-line standard/no-callback-literal
       if (!fileProvider.set(newPath, txJSON)) return cb('Failed to create file ' + newFile)
       plugin.fileManager.open(newFile)

libs/remix-ui/run-tab/src/lib/actions/payload.ts

@@ -240,12 +240,13 @@ export const clearAllInstances = () => {
   }
 }
 
-export const setDecodedResponse = (index: number, decodedResponse) => {
+export const setDecodedResponse = (instanceIndex: number, response, funcIndex?: number) => {
   return {
     type: 'SET_DECODED_RESPONSE',
     payload: {
-      index,
-      decodedResponse
+      instanceIndex,
+      funcIndex,
+      response
     }
   }
 }

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

@@ -16,7 +16,7 @@ export function RecorderUI (props: RecorderProps) {
           </div>
         </div>
         <div>
-          <div><i className="udapp_arrow fas fa-angle-down"></i></div>
+          <div><i className="udapp_arrow fas fa-angle-down" data-id="udapp_arrow"></i></div>
         </div>
       </div>
     )
@@ -43,7 +43,7 @@ export function RecorderUI (props: RecorderProps) {
               <i className="fas fa-save savetransaction udapp_recorder udapp_icon"
                 onClick={triggerRecordButton} title="Save Transactions" aria-hidden="true">
               </i>
-              <i className="fas fa-play runtransaction udapp_runTxs udapp_icon" title="Run Transactions" aria-hidden="true" onClick={handleClickRunButton}></i>
+              <i className="fas fa-play runtransaction udapp_runTxs udapp_icon" title="Run Transactions" data-id="runtransaction" aria-hidden="true" onClick={handleClickRunButton}></i>
             </div>
           </div>
         </TreeViewItem>

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

@@ -104,7 +104,7 @@ export function UniversalDappUI (props: UdappProps) {
     props.removeInstance(props.index)
   }
 
-  const runTransaction = (lookupOnly, funcABI: FuncABI, valArr, inputsValues) => {
+  const runTransaction = (lookupOnly, funcABI: FuncABI, valArr, inputsValues, funcIndex?: number) => {
     const functionName = funcABI.type === 'function' ? funcABI.name : `(${funcABI.type})`
     const logMsg = `${lookupOnly ? 'call' : 'transact'} to ${props.instance.name}.${functionName}`
 
@@ -121,7 +121,8 @@ export function UniversalDappUI (props: UdappProps) {
       props.logBuilder,
       props.mainnetPrompt,
       props.gasEstimationPrompt,
-      props.passphrasePrompt)
+      props.passphrasePrompt,
+      funcIndex)
   }
 
   const extractDataDefault = (item, parent?) => {
@@ -235,27 +236,34 @@ export function UniversalDappUI (props: UdappProps) {
               const lookupOnly = funcABI.stateMutability === 'view' || funcABI.stateMutability === 'pure' || isConstant
               const inputs = props.getFuncABIInputs(funcABI)
 
-              return <ContractGUI
-                funcABI={funcABI}
-                clickCallBack={(valArray: { name: string, type: string }[], inputsValues: string) => {
-                  runTransaction(lookupOnly, funcABI, valArray, inputsValues)
-                }}
-                inputs={inputs}
-                evmBC={evmBC}
-                lookupOnly={lookupOnly}
-                key={index}
-              />
+              return <>
+                <ContractGUI
+                  funcABI={funcABI}
+                  clickCallBack={(valArray: { name: string, type: string }[], inputsValues: string) => {
+                    runTransaction(lookupOnly, funcABI, valArray, inputsValues, index)
+                  }}
+                  inputs={inputs}
+                  evmBC={evmBC}
+                  lookupOnly={lookupOnly}
+                  key={index}
+                />
+                <div className="udapp_value" data-id="udapp_value">
+                  <TreeView id="treeView">
+                    {
+                      Object.keys(props.instance.decodedResponse || {}).map((key) => {
+                        const funcIndex = index.toString()
+                        const response = props.instance.decodedResponse[key]
+
+                        return key === funcIndex ? Object.keys(response || {}).map((innerkey) => {
+                          return renderData(props.instance.decodedResponse[key][innerkey], response, innerkey, innerkey)
+                        }) : null
+                      })
+                    }
+                  </TreeView>
+                </div>
+              </>
             })
           }
-          <div className="udapp_value">
-            <TreeView id="treeView">
-              {
-                Object.keys(props.instance.decodedResponse || {}).map((innerkey) => {
-                  return renderData(props.instance.decodedResponse[innerkey], props.instance.decodedResponse, innerkey, innerkey)
-                })
-              }
-            </TreeView>
-          </div>
         </div>
         <div className="d-flex flex-column">
           <div className="d-flex flex-row justify-content-between mt-2">

libs/remix-ui/run-tab/src/lib/reducers/runTab.ts

@@ -69,7 +69,7 @@ export interface RunTabState {
       contractData?: ContractData,
       address: string,
       name: string,
-      decodedResponse?: any,
+      decodedResponse?: Record<number, any>,
       abi?: any
     }[],
     error: string
@@ -553,7 +553,7 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
     }
 
     case 'ADD_INSTANCE': {
-      const payload: { contractData: ContractData, address: string, name: string, abi?: any, decodedResponse?: any } = action.payload
+      const payload: { contractData: ContractData, address: string, name: string, abi?: any, decodedResponse?: Record<number, any> } = action.payload
 
       return {
         ...state,
@@ -587,14 +587,14 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
     }
 
     case 'SET_DECODED_RESPONSE': {
-      const payload: any = action.payload
+      const payload: { instanceIndex: number, funcIndex: number, response: any } = action.payload
 
       return {
         ...state,
         instances: {
           ...state.instances,
           instanceList: state.instances.instanceList.map((instance, index) => {
-            if (payload.index === index) instance.decodedResponse = payload.decodedResponse
+            if (payload.instanceIndex === index) instance.decodedResponse[payload.funcIndex] = payload.response
             return instance
           })
         }

libs/remix-ui/run-tab/src/lib/types/index.ts

@@ -204,7 +204,7 @@ export interface InstanceContainerProps {
       contractData?: ContractData,
       address: string,
       name: string,
-      decodedResponse?: any,
+      decodedResponse?: Record<number, any>,
       abi?: any
     }[],
     error: string
@@ -213,7 +213,7 @@ export interface InstanceContainerProps {
   removeInstance: (index: number) => void,
   getContext: () => 'memory' | 'blockchain',
   runTransactions: (
-    index: number,
+    instanceIndex: number,
     lookupOnly: boolean,
     funcABI: FuncABI,
     inputsValues: string,
@@ -224,7 +224,8 @@ export interface InstanceContainerProps {
     logBuilder: (msg: string) => JSX.Element,
     mainnetPrompt: MainnetPrompt,
     gasEstimationPrompt: (msg: string) => JSX.Element,
-    passphrasePrompt: (msg: string) => JSX.Element) => void,
+    passphrasePrompt: (msg: string) => JSX.Element,
+    funcIndex?: number) => void,
   gasEstimationPrompt: (msg: string) => JSX.Element,
   logBuilder: (msg: string) => JSX.Element,
   passphrasePrompt: (message: string) => JSX.Element,
@@ -277,7 +278,7 @@ export interface UdappProps {
     contractData?: ContractData,
     address: string,
     name: string,
-    decodedResponse?: any,
+    decodedResponse?: Record<number, any>,
     abi?: any
   },
   context: 'memory' | 'blockchain',
@@ -288,7 +289,7 @@ export interface UdappProps {
   passphrasePrompt: (message: string) => JSX.Element,
   mainnetPrompt: (tx: Tx, network: Network, amount: string, gasEstimation: string, gasFees: (maxFee: string, cb: (txFeeText: string, priceStatus: boolean) => void) => void, determineGasPrice: (cb: (txFeeText: string, gasPriceValue: string, gasPriceStatus: boolean) => void) => void) => JSX.Element,
   runTransactions: (
-    index: number,
+    instanceIndex: number,
     lookupOnly: boolean,
     funcABI: FuncABI,
     inputsValues: string,
@@ -299,7 +300,8 @@ export interface UdappProps {
     logBuilder: (msg: string) => JSX.Element,
     mainnetPrompt: MainnetPrompt,
     gasEstimationPrompt: (msg: string) => JSX.Element,
-    passphrasePrompt: (msg: string) => JSX.Element) => void,
+    passphrasePrompt: (msg: string) => JSX.Element,
+    funcIndex?: number) => void,
   sendValue: string,
   getFuncABIInputs: (funcABI: FuncABI) => string
 }