Merge pull request #1975 from ethereum/injected-web3

Fixed Terminal logs for udapp transactions
ethereum · Jan 20, 2022 · adbb7a5 · adbb7a5
2 parents b0ac1b7 + 960c9e4
commit adbb7a5
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 23 deletions.
diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
@@ -353,7 +353,7 @@ export class Blockchain extends Plugin {
         if (network.name === 'VM') return
         this.call('terminal', 'logHtml',
           (<a href={etherScanLink(network.name, txhash)} target="_blank">
-            open in etherscan
+            view on etherscan
           </a>))        
       })
     })

diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -153,7 +153,7 @@ async function tryTillReceiptAvailable (txhash, web3) {
 async function tryTillTxAvailable (txhash, web3) {
   try {
     const tx = await web3.eth.getTransaction(txhash)
-    if (tx) return tx
+    if (tx && tx.blockHash) return tx
   } catch (e) {}
   return await tryTillTxAvailable(txhash, web3)
 }

diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -237,7 +237,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
         </div>
         <div className="udapp_orLabel mt-2" style={{ display: loadType === 'abi' ? 'none' : 'block' }}>or</div>
         <div className="udapp_button udapp_atAddressSect">
-          <button className="udapp_atAddress btn btn-sm btn-info" id="runAndDeployAtAdressButton" disabled={atAddressOptions.disabled} onClick={loadFromAddress}>At Address</button>
+          <button className="udapp_atAddress btn btn-sm btn-info" id="runAndDeployAtAdressButton" disabled={atAddressOptions.disabled} title={atAddressOptions.title} onClick={loadFromAddress}>At Address</button>
           <input
             className="udapp_input udapp_ataddressinput ataddressinput form-control"
             placeholder="Load contract from Address"

diff --git a/libs/remix-ui/terminal/src/lib/actions/terminalAction.ts b/libs/remix-ui/terminal/src/lib/actions/terminalAction.ts
@@ -111,9 +111,11 @@ export const listenOnNetworkAction = async (plugins, isListening) => {
 }
 
 export const initListeningOnNetwork = (plugins, dispatch: React.Dispatch<any>) => {
+  const provider = plugins.blockchain.getProvider()
+
   plugins.txListener.event.register(NEW_BLOCK, (block) => {
     if (!block.transactions || (block.transactions && !block.transactions.length)) {
-      dispatch({ type: EMPTY_BLOCK, payload: { message: 0 } })
+      dispatch({ type: EMPTY_BLOCK, payload: { message: 0, provider } })
     }
   })
   plugins.txListener.event.register(KNOWN_TRANSACTION, () => {
@@ -128,18 +130,20 @@ export const initListeningOnNetwork = (plugins, dispatch: React.Dispatch<any>) =
 
   const log = async (plugins, tx, receipt, dispatch: React.Dispatch<any>) => {
     const resolvedTransaction = await plugins.txListener.resolvedTransaction(tx.hash)
+    const provider = plugins.blockchain.getProvider()
+
     if (resolvedTransaction) {
       let compiledContracts = null
       if (plugins._deps.compilersArtefacts.__last) {
         compiledContracts = await plugins._deps.compilersArtefacts.__last.getContracts()
       }
       await plugins.eventsDecoder.parseLogs(tx, resolvedTransaction.contractName, compiledContracts, async (error, logs) => {
         if (!error) {
-          await dispatch({ type: KNOWN_TRANSACTION, payload: { message: [{ tx: tx, receipt: receipt, resolvedData: resolvedTransaction, logs: logs }] } })
+          await dispatch({ type: KNOWN_TRANSACTION, payload: { message: [{ tx: tx, receipt: receipt, resolvedData: resolvedTransaction, logs: logs }], provider } })
         }
       })
     } else {
-      await dispatch({ type: UNKNOWN_TRANSACTION, payload: { message: [{ tx: tx, receipt: receipt }] } })
+      await dispatch({ type: UNKNOWN_TRANSACTION, payload: { message: [{ tx: tx, receipt: receipt }], provider } })
     }
   }
 

diff --git a/libs/remix-ui/terminal/src/lib/components/Context.tsx b/libs/remix-ui/terminal/src/lib/components/Context.tsx
@@ -4,7 +4,7 @@ import helper from 'apps/remix-ide/src/lib/helper'
 const remixLib = require('@remix-project/remix-lib')
 const typeConversion = remixLib.execution.typeConversion
 
-const Context = ({ opts, blockchain }) => {
+const Context = ({ opts, provider }: { opts, provider: string }) => {
   const data = opts.tx || ''
   const from = opts.from ? helper.shortenHexData(opts.from) : ''
   let to = opts.to
@@ -16,7 +16,8 @@ const Context = ({ opts, blockchain }) => {
   const block = data.receipt ? data.receipt.blockNumber : data.blockNumber || ''
   const i = data.receipt ? data.transactionIndex : data.transactionIndex
   const value = val ? typeConversion.toInt(val) : 0
-  if (blockchain.getProvider() === 'vm') {
+
+  if (provider === 'vm') {
     return (
       <div>
         <span>
@@ -29,7 +30,7 @@ const Context = ({ opts, blockchain }) => {
           <div className='remix_ui_terminal_txItem'><span className='remix_ui_terminal_txItemTitle'>hash:</span> {hash}</div>
         </span>
       </div>)
-  } else if (blockchain.getProvider() !== 'vm' && data.resolvedData) {
+  } else if (provider !== 'vm' && data.resolvedData) {
     return (
       <div>
         <span>

diff --git a/libs/remix-ui/terminal/src/lib/components/RenderKnownTransactions.tsx b/libs/remix-ui/terminal/src/lib/components/RenderKnownTransactions.tsx
@@ -8,7 +8,7 @@ import showTable from './Table'
 const remixLib = require('@remix-project/remix-lib')
 const typeConversion = remixLib.execution.typeConversion
 
-const RenderKnownTransactions = ({ tx, receipt, resolvedData, logs, index, plugin, showTableHash, txDetails, modal }) => {
+const RenderKnownTransactions = ({ tx, receipt, resolvedData, logs, index, plugin, showTableHash, txDetails, modal, provider }) => {
   const debug = (event, tx) => {
     event.stopPropagation()
     if (tx.isCall && tx.envMode !== 'vm') {
@@ -26,7 +26,7 @@ const RenderKnownTransactions = ({ tx, receipt, resolvedData, logs, index, plugi
     <span id={`tx${tx.hash}`} key={index}>
       <div className="remix_ui_terminal_log" onClick={(event) => txDetails(event, tx)}>
         <CheckTxStatus tx={receipt} type={txType} />
-        <Context opts = { options } blockchain={plugin.blockchain} />
+        <Context opts = { options } provider={provider} />
         <div className='remix_ui_terminal_buttons'>
           <div
             className='remix_ui_terminal_debug btn btn-primary btn-sm'

diff --git a/libs/remix-ui/terminal/src/lib/components/RenderUnknownTransactions.tsx b/libs/remix-ui/terminal/src/lib/components/RenderUnknownTransactions.tsx
@@ -3,7 +3,7 @@ import CheckTxStatus from './ChechTxStatus' // eslint-disable-line
 import Context from './Context' // eslint-disable-line
 import showTable from './Table'
 
-const RenderUnKnownTransactions = ({ tx, receipt, index, plugin, showTableHash, txDetails, modal }) => {
+const RenderUnKnownTransactions = ({ tx, receipt, index, plugin, showTableHash, txDetails, modal, provider }) => {
   const debug = (event, tx) => {
     event.stopPropagation()
     if (tx.isCall && tx.envMode !== 'vm') {
@@ -21,7 +21,7 @@ const RenderUnKnownTransactions = ({ tx, receipt, index, plugin, showTableHash,
     <span id={`tx${tx.hash}`} key={index}>
       <div className="remix_ui_terminal_log" onClick={(event) => txDetails(event, tx)}>
         <CheckTxStatus tx={receipt || tx} type={txType} />
-        <Context opts = { options } blockchain={plugin.blockchain} />
+        <Context opts = { options } provider={provider} />
         <div className='remix_ui_terminal_buttons'>
           <div className='remix_ui_terminal_debug btn btn-primary btn-sm'
             data-shared='txLoggerDebugButton'

diff --git a/libs/remix-ui/terminal/src/lib/reducers/terminalReducer.ts b/libs/remix-ui/terminal/src/lib/reducers/terminalReducer.ts
@@ -144,52 +144,52 @@ export const registerScriptRunnerReducer = (state, action) => {
     case HTML:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-log' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-log', provider: action.payload.provider })
       }
     case LOG:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-info' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-info', provider: action.payload.provider })
       }
     case INFO:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-info' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-info', provider: action.payload.provider })
       }
     case WARN:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-warning' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-warning', provider: action.payload.provider })
       }
     case ERROR:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-danger' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-danger', provider: action.payload.provider })
       }
     case SCRIPT:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-log' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: 'text-log', provider: action.payload.provider })
       }
     case KNOWN_TRANSACTION:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: '', name: 'knownTransaction' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: '', name: 'knownTransaction', provider: action.payload.provider })
       }
     case UNKNOWN_TRANSACTION:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: '', name: 'unknownTransaction' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: '', name: 'unknownTransaction', provider: action.payload.provider })
       }
     case EMPTY_BLOCK:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: '', name: 'emptyBlock' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: '', name: 'emptyBlock', provider: action.payload.provider })
       }
     case NEW_TRANSACTION:
       return {
         ...state,
-        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: '' })
+        journalBlocks: initialState.journalBlocks.push({ message: action.payload.message, style: '', provider: action.payload.provider })
       }
   }
 }
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -500,6 +500,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
                         showTableHash={showTableHash}
                         txDetails={txDetails}
                         modal={modal}
+                        provider={x.provider}
                       />}
                     </div>
                   )
@@ -527,6 +528,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
                         showTableHash = { showTableHash }
                         txDetails = { txDetails }
                         modal={modal}
+                        provider={x.provider}
                       />) }
                     </div>
                   )