Merge branch 'master' of https://github.com/ethereum/remix-project into editorcontext_merge

2 years ago · 50dd6b4a4b
parent 8f77e0aa13 5721068f82
commit 50dd6b4a4b
21 changed files with 60 additions and 61 deletions
--- a/README.md
+++ b/README.md
@ -56,7 +56,7 @@ Note: It contains the latest supported version of Solidity available at the time
 ```
 * Install [Nx CLI](https://nx.dev/using-nx/nx-cli) globally to enable running **nx executable commands**.
 ```bash
-yarn global add @nrwl/cli
+yarn global add nx
 ```
 * Clone the github repository (`wget` need to be installed first):

--- a/apps/etherscan/src/app/routes.tsx
+++ b/apps/etherscan/src/app/routes.tsx
@ -1,6 +1,6 @@
 import React from "react"
 import {
-  BrowserRouter as Router,
+  HashRouter as Router,
  Route,
  Routes,
  RouteProps,
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@ -246,6 +246,15 @@ module.exports = {
      .openFile('contracts')
      .openFile('contracts/governance')
      .openFile('contracts/governance/UnionGovernor.sol')
-      .end()
+  },
+
+  'Should execute function call from URL parameters #group2': function (browser: NightwatchBrowser) {
+    browser
+      .switchWorkspace('default_workspace')
+      .url('http://127.0.0.1:8080?calls=fileManager//open//contracts/3_Ballot.sol///terminal//log//log')
+      .refresh()
+      .waitForElementVisible('*[data-shared="tooltipPopup"]')
+      .waitForElementContainsText('*[data-shared="tooltipPopup"]', 'initiating fileManager and calling "open" ...')
+      .waitForElementContainsText('*[data-shared="tooltipPopup"]', 'initiating terminal and calling "log" ...')
  }
 }
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@ -414,7 +414,7 @@ class AppComponent {
            if (params.call) {
              const callDetails = params.call.split('//')
              if (callDetails.length > 1) {
-                this.appManager.call('notification', 'toast', `initiating ${callDetails[0]} ...`)
+                this.appManager.call('notification', 'toast', `initiating ${callDetails[0]} and calling "${callDetails[1]}" ...`)
                // @todo(remove the timeout when activatePlugin is on 0.3.0)
                this.appManager.call(...callDetails).catch(console.error)
              }
@ -430,7 +430,7 @@ class AppComponent {
                  this.appManager.call(
                    "notification",
                    "toast",
-                    `initiating ${callDetails[0]} ...`
+                    `initiating ${callDetails[0]} and calling "${callDetails[1]}" ...`
                  );

                  // @todo(remove the timeout when activatePlugin is on 0.3.0)
--- a/apps/remix-ide/src/app/files/dgitProvider.js
+++ b/apps/remix-ide/src/app/files/dgitProvider.js
@ -28,10 +28,10 @@ class DGitProvider extends Plugin {
  constructor () {
    super(profile)
    this.ipfsconfig = {
-      host: 'ipfs.remixproject.org',
+      host: 'jqgt.remixproject.org',
      port: 443,
      protocol: 'https',
-      ipfsurl: 'https://ipfs.remixproject.org/ipfs/'
+      ipfsurl: 'https://jqgt.remixproject.org/ipfs/'
    }
    this.globalIPFSConfig = {
      host: 'ipfs.io',
@ -40,10 +40,10 @@ class DGitProvider extends Plugin {
      ipfsurl: 'https://ipfs.io/ipfs/'
    }
    this.remixIPFS = {
-      host: 'ipfs.remixproject.org',
+      host: 'jqgt.remixproject.org',
      port: 443,
      protocol: 'https',
-      ipfsurl: 'https://ipfs.remixproject.org/ipfs/'
+      ipfsurl: 'https://jqgt.remixproject.org/ipfs/'
    }
    this.ipfsSources = [this.remixIPFS, this.globalIPFSConfig, this.ipfsconfig]
  }
--- a/libs/remix-lib/src/helpers/hhconsoleSigs.ts
+++ b/libs/remix-lib/src/helpers/hhconsoleSigs.ts
@ -375,5 +375,7 @@ export const ConsoleLogs = {
  3982404743: '(address,address,address,uint)',
  4161329696: '(address,address,address,string)',
  238520724: '(address,address,address,bool)',
-  1717301556: '(address,address,address,address)'
+  1717301556: '(address,address,address,address)',
+  4133908826: '(uint,uint)',
+  3054400204: '(string,uint)'
 }
--- a/libs/remix-ui/run-tab/src/lib/actions/actions.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/actions.ts
@ -1,5 +1,5 @@
 import { ContractData } from "@remix-project/core-plugin"
-import { addNewInstance, addProvider, clearAllInstances, clearRecorderCount, hidePopUp, removeExistingInstance, removeProvider, setBaseFeePerGas, setConfirmSettings, setCurrentContract, setExecutionEnvironment, setExternalEndpoint, setGasLimit, setGasPrice, setGasPriceStatus, setMatchPassphrase, setMaxFee, setMaxPriorityFee, setNetworkName, setPassphrase, setPathToScenario, setSelectedAccount, setSendUnit, setSendValue, setTxFeeContent } from "./payload"
+import { addNewInstance, addProvider, clearAllInstances, clearRecorderCount, hidePopUp, removeExistingInstance, removeProvider, setBaseFeePerGas, setConfirmSettings, setCurrentContract, setExecutionEnvironment, setExternalEndpoint, setGasLimit, setGasPrice, setGasPriceStatus, setMatchPassphrase, setMaxFee, setMaxPriorityFee, setNetworkName, setPassphrase, setPathToScenario, setSelectedAccount, setSendUnit, setSendValue } from "./payload"

 export const setAccount = (dispatch: React.Dispatch<any>, account: string) => {
  dispatch(setSelectedAccount(account))
@ -65,10 +65,6 @@ export const updateGasPrice = (dispatch: React.Dispatch<any>, price: string) =>
  dispatch(setGasPrice(price))
 }

-export const updateTxFeeContent = (dispatch: React.Dispatch<any>, content: string) => {
-  dispatch(setTxFeeContent(content))
-}
-
 export const addInstance = (dispatch: React.Dispatch<any>, instance: { contractData?: ContractData, address: string, name: string, abi?: any, decodedResponse?: Record<number, any> }) => {
  instance.decodedResponse = {}
  dispatch(addNewInstance(instance))
--- a/libs/remix-ui/run-tab/src/lib/actions/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/index.ts
@ -5,7 +5,7 @@ import { resetAndInit, setupEvents } from './events'
 import { createNewBlockchainAccount, fillAccountsList, setExecutionContext, signMessageWithAddress } from './account'
 import { clearInstances, clearPopUp, removeInstance, setAccount, setGasFee, setMatchPassphrasePrompt, 
  setNetworkNameFromProvider, setPassphrasePrompt, setSelectedContract, setSendTransactionValue, setUnit, 
-  updateBaseFeePerGas, updateConfirmSettings, updateGasPrice, updateGasPriceStatus, updateMaxFee, updateMaxPriorityFee, updateScenarioPath, updateTxFeeContent } from './actions'
+  updateBaseFeePerGas, updateConfirmSettings, updateGasPrice, updateGasPriceStatus, updateMaxFee, updateMaxPriorityFee, updateScenarioPath } from './actions'
 import { createInstance, getContext, getFuncABIInputs, getSelectedContract, loadAddress, runTransactions, updateInstanceBalance } from './deploy'
 import { CompilerAbstract as CompilerAbstractType } from '@remix-project/remix-solidity-ts'
 import { ContractData, FuncABI } from "@remix-project/core-plugin"
@ -50,7 +50,6 @@ export const setGasPrice = (price: string) => updateGasPrice(dispatch, price)
 export const setGasPriceStatus = (status: boolean) => updateGasPriceStatus(dispatch, status)
 export const setMaxFee = (fee: string) => updateMaxFee(dispatch, fee)
 export const setMaxPriorityFee = (fee: string) => updateMaxPriorityFee(dispatch, fee)
-export const setTxFeeContent = (content: string) => updateTxFeeContent(dispatch, content)
 export const removeInstances = () => clearInstances(dispatch)
 export const removeSingleInstance = (index: number) => removeInstance(dispatch, index)
 export const getExecutionContext = () => getContext(plugin)
--- a/libs/remix-ui/run-tab/src/lib/actions/payload.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/payload.ts
@ -1,6 +1,6 @@
 import { ContractList } from '../reducers/runTab'
 import { ContractData } from '@remix-project/core-plugin'
-import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_PROXY_ENV_ADDRESS, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT } from '../constants'
+import { ADD_DEPLOY_OPTION, ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_DEPLOY_OPTION, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_PROXY_ENV_ADDRESS, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE } from '../constants'
 import { DeployMode, DeployOptions } from '../types'

 export const fetchAccountsListRequest = () => {
@ -216,13 +216,6 @@ export const setGasPrice = (price: string) => {
  }
 }

-export const setTxFeeContent = (content: string) => {
-  return {
-    type: SET_TX_FEE_CONTENT,
-    payload: content
-  }
-}
-
 export const addNewInstance = (instance: { contractData?: ContractData, address: string, name: string, abi?: any }) => {
  return {
    type: ADD_INSTANCE,
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@ -28,6 +28,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
  const [constructorInterface, setConstructorInterface] = useState<FuncABI>(null)
  const [constructorInputs, setConstructorInputs] = useState(null)
  const contractsRef = useRef<HTMLSelectElement>(null)
+  const atAddressValue = useRef<HTMLInputElement>(null)
  const { contractList, loadType, currentFile, currentContract, compilationCount, deployOptions, proxyKey } = props.contracts

  useEffect(() => {
@ -52,7 +53,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
  }, [loadedAddress])

  useEffect(() => {
-    if (/.(.abi)$/.exec(currentFile)) {
+    if (/.(.abi)$/.exec(currentFile) && "" !== atAddressValue.current.value) {
      setAbiLabel({
        display: 'block',
        content: currentFile
@ -175,7 +176,6 @@ export function ContractDropdownUI (props: ContractDropdownProps) {

  const atAddressChanged = (event) => {
    const value = event.target.value
-
    if (!value) {
      enableAtAddress(false)
    } else {
@ -282,6 +282,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
        <div className="udapp_button udapp_atAddressSect">
          <button className="udapp_atAddress btn btn-sm btn-info" id="runAndDeployAtAdressButton" disabled={atAddressOptions.disabled} title={atAddressOptions.title} onClick={loadFromAddress}>At Address</button>
          <input
+            ref={atAddressValue}
            className="udapp_input udapp_ataddressinput ataddressinput form-control"
            placeholder="Load contract from Address"
            title="address of contract"
--- a/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/mainnet.tsx
@ -6,13 +6,14 @@ import { MainnetProps } from '../types'

 export function MainnetPrompt (props: MainnetProps) {
  const [baseFee, setBaseFee] = useState<string>('')
+  const [transactionFee, setTransactionFee] = useState<string>('')

  useEffect(() => {
    props.init((txFeeText, gasPriceValue, gasPriceStatus) => {
-      if (txFeeText) props.setTxFeeContent(txFeeText)
+      if (txFeeText) setTransactionFee(txFeeText)
      if (gasPriceValue) onGasPriceChange(gasPriceValue)
      if (props.network && props.network.lastBlock && props.network.lastBlock.baseFeePerGas) {
-        const baseFee = Web3.utils.fromWei(Web3.utils.toBN(parseInt(props.network.lastBlock.baseFeePerGas, 16)), 'Gwei')
+        const baseFee = Web3.utils.fromWei(Web3.utils.toBN(props.network.lastBlock.baseFeePerGas), 'Gwei')

        setBaseFee(baseFee)
        onMaxFeeChange(baseFee)
@ -24,8 +25,8 @@ export function MainnetPrompt (props: MainnetProps) {
  const onMaxFeeChange = (value: string) => {
    const maxFee = value
    // @ts-ignore
-    if (parseInt(props.network.lastBlock.baseFeePerGas, 16) > Web3.utils.toWei(maxFee, 'Gwei')) {
-      props.setTxFeeContent('Transaction is invalid. Max fee should not be less than Base fee')
+    if (Web3.utils.toBN(props.network.lastBlock.baseFeePerGas).gt(Web3.utils.toBN(Web3.utils.toWei(maxFee, 'Gwei')))) {
+      setTransactionFee('Transaction is invalid. Max fee should not be less than Base fee')
      props.updateGasPriceStatus(false)
      props.updateConfirmSettings(true)
      return
@ -35,7 +36,7 @@ export function MainnetPrompt (props: MainnetProps) {
    }

    props.setNewGasPrice(maxFee, (txFeeText, priceStatus) => {
-      props.setTxFeeContent(txFeeText)
+      setTransactionFee(txFeeText)
      if (priceStatus) {
        props.updateConfirmSettings(false)
      } else {
@ -51,7 +52,7 @@ export function MainnetPrompt (props: MainnetProps) {
    const gasPrice = value

    props.setNewGasPrice(gasPrice, (txFeeText, priceStatus) => {
-      props.setTxFeeContent(txFeeText)
+      setTransactionFee(txFeeText)
      props.updateGasPriceStatus(priceStatus)
      props.updateGasPrice(gasPrice)
    })
@ -105,7 +106,7 @@ export function MainnetPrompt (props: MainnetProps) {
              </div>
              <div className="align-items-center my-1" title="Represents the maximum amount of fee that you will pay for this transaction. The minimun needs to be set to base fee.">
                <div className='d-flex'>
-                  <span className="text-dark mr-2 text-nowrap">Max fee (Not less than base fee {Web3.utils.fromWei(Web3.utils.toBN(parseInt(props.network.lastBlock.baseFeePerGas, 16)), 'Gwei')} Gwei):</span>
+                  <span className="text-dark mr-2 text-nowrap">Max fee (Not less than base fee {Web3.utils.fromWei(Web3.utils.toBN(props.network.lastBlock.baseFeePerGas), 'Gwei')} Gwei):</span>
                  <input className="form-control mr-1 text-right" style={{ height: '1.2rem', width: '6rem' }} id='maxfee' onInput={(e: any) => onMaxFeeChange(e.target.value)} defaultValue={baseFee} />
                  <span>Gwei</span>
                  <span className="text-dark ml-2"></span>
@ -120,7 +121,7 @@ export function MainnetPrompt (props: MainnetProps) {
        }
        <div className="mb-3">
          <span className="text-dark mr-2">Max transaction fee:</span>
-          <span className="text-warning" id='txfee'>{ props.txFeeContent }</span>
+          <span className="text-warning" id='txfee'>{ transactionFee }</span>
        </div>
      </div>
      <div className="d-flex py-1 align-items-center custom-control custom-checkbox remixui_checkbox">
--- a/libs/remix-ui/run-tab/src/lib/constants/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/constants/index.ts
@ -32,7 +32,6 @@ export const SET_MAX_FEE = 'SET_MAX_FEE'
 export const SET_MAX_PRIORITY_FEE = 'SET_MAX_PRIORITY_FEE'
 export const SET_BASE_FEE_PER_GAS = 'SET_BASE_FEE_PER_GAS'
 export const SET_GAS_PRICE = 'SET_GAS_PRICE'
-export const SET_TX_FEE_CONTENT = 'SET_TX_FEE_CONTENT'
 export const ADD_INSTANCE = 'ADD_INSTANCE'
 export const REMOVE_INSTANCE = 'REMOVE_INSTANCE'
 export const CLEAR_INSTANCES = 'CLEAR_INSTANCES'
--- a/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
+++ b/libs/remix-ui/run-tab/src/lib/reducers/runTab.ts
@ -1,7 +1,7 @@
 import { CompilerAbstract } from '@remix-project/remix-solidity-ts'
 import { ContractData } from '@remix-project/core-plugin'
 import { DeployOptions } from '../types'
-import { ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_TX_FEE_CONTENT, SET_PROXY_ENV_ADDRESS, ADD_DEPLOY_OPTION, REMOVE_DEPLOY_OPTION } from '../constants'
+import { ADD_INSTANCE, ADD_PROVIDER, CLEAR_INSTANCES, CLEAR_RECORDER_COUNT, DISPLAY_NOTIFICATION, DISPLAY_POPUP_MESSAGE, FETCH_ACCOUNTS_LIST_FAILED, FETCH_ACCOUNTS_LIST_REQUEST, FETCH_ACCOUNTS_LIST_SUCCESS, FETCH_CONTRACT_LIST_FAILED, FETCH_CONTRACT_LIST_REQUEST, FETCH_CONTRACT_LIST_SUCCESS, FETCH_PROVIDER_LIST_FAILED, FETCH_PROVIDER_LIST_REQUEST, FETCH_PROVIDER_LIST_SUCCESS, HIDE_NOTIFICATION, HIDE_POPUP_MESSAGE, REMOVE_INSTANCE, REMOVE_PROVIDER, RESET_STATE, SET_BASE_FEE_PER_GAS, SET_CONFIRM_SETTINGS, SET_CURRENT_CONTRACT, SET_CURRENT_FILE, SET_DECODED_RESPONSE, SET_DEPLOY_OPTIONS, SET_EXECUTION_ENVIRONMENT, SET_EXTERNAL_WEB3_ENDPOINT, SET_GAS_LIMIT, SET_GAS_PRICE, SET_GAS_PRICE_STATUS, SET_IPFS_CHECKED_STATE, SET_LOAD_TYPE, SET_MATCH_PASSPHRASE, SET_MAX_FEE, SET_MAX_PRIORITY_FEE, SET_NETWORK_NAME, SET_PASSPHRASE, SET_PATH_TO_SCENARIO, SET_PERSONAL_MODE, SET_RECORDER_COUNT, SET_SELECTED_ACCOUNT, SET_SEND_UNIT, SET_SEND_VALUE, SET_PROXY_ENV_ADDRESS, ADD_DEPLOY_OPTION, REMOVE_DEPLOY_OPTION } from '../constants'

 declare const window: any
 interface Action {
@ -82,7 +82,6 @@ export interface RunTabState {
  maxFee: string,
  maxPriorityFee: string,
  baseFeePerGas: string,
-  txFeeContent: string,
  gasPrice: string,
  instances: {
    instanceList: {
@ -171,7 +170,6 @@ export const runTabInitialState: RunTabState = {
  maxFee: '',
  maxPriorityFee: '1',
  baseFeePerGas: '',
-  txFeeContent: '',
  gasPrice: '',
  instances: {
    instanceList: [],
@ -582,15 +580,6 @@ export const runTabReducer = (state: RunTabState = runTabInitialState, action: A
      }
    }

-    case SET_TX_FEE_CONTENT: {
-      const payload: string = action.payload
-
-      return {
-        ...state,
-        txFeeContent: payload
-      }
-    }
-
    case ADD_INSTANCE: {
      const payload: { contractData: ContractData, address: string, name: string, abi?: any, decodedResponse?: Record<number, any> } = action.payload

--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@ -21,7 +21,7 @@ import {
  setBaseFeePerGas, setConfirmSettings,
  setGasPrice, setGasPriceStatus,
  setMaxFee, setMaxPriorityFee,
-  setTxFeeContent, removeInstances,
+  removeInstances,
  removeSingleInstance, getExecutionContext,
  executeTransactions, loadFromAddress,
  storeNewScenario, runScenario,
@ -189,8 +189,6 @@ export function RunTabUI (props: RunTabProps) {
      updateGasPriceStatus={setGasPriceStatus}
      updateMaxFee={setMaxFee}
      updateMaxPriorityFee={setMaxPriorityFee}
-      setTxFeeContent={setTxFeeContent}
-      txFeeContent={runTab.txFeeContent}
      maxFee={runTab.maxFee}
      maxPriorityFee={runTab.maxPriorityFee}
    />
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@ -270,10 +270,8 @@ export interface MainnetProps {
  updateMaxFee: (fee: string) => void,
  updateBaseFeePerGas: (fee: string) => void,
  init: (cb: (txFeeText: string, gasPriceValue: string, gasPriceStatus: boolean) => void) => void,
-  setTxFeeContent: (content: string) => void,
  updateGasPrice: (price: string) => void,
  updateMaxPriorityFee: (fee: string) => void
-  txFeeContent: string,
  maxFee: string,
  maxPriorityFee: string
 }
--- a/libs/remix-ui/settings/src/lib/github-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/github-settings.tsx
@ -10,7 +10,7 @@ export function GithubSettings (props: GithubSettingsProps) {
  useEffect(() => {
    if (props.config) {
      const githubToken = props.config.get('settings/gist-access-token') || ''
-      const githubUserName = props.config.get('settings/github-user-name')|| ''
+      const githubUserName = props.config.get('settings/github-user-name') || ''
      const githubEmail = props.config.get('settings/github-email') || ''
  
      setGithubToken(githubToken)
--- a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
@ -253,7 +253,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
        <p className="mb-1"><a className="text-primary" target="_blank" href={labels[type].link}>{labels[type].link}</a></p>
        <div className=""><label>TOKEN:</label>
          <div className="text-secondary mb-0 h6">
-            <input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" className="form-control" onChange={(e) => handleSaveTokenState(e, type)} value={tokenValue[type]} />
+            <input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" className="form-control" onChange={(e) => handleSaveTokenState(e, type)} value={ tokenValue[type] || '' } />
            <div className="d-flex justify-content-end pt-2">
              <CopyToClipboard content={tokenValue[type]} data-id='copyToClipboardCopyIcon' />
              <input className="btn btn-sm btn-primary ml-2" id="savegisttoken" data-id="settingsTabSaveGistToken" onClick={() => saveToken(type)} value="Save" type="button" disabled={tokenValue === ''}></input>
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@ -86,8 +86,8 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
        scriptRunnerDispatch({ type: 'html', payload: { message: [html ? html.innerText ? html.innerText : html : null] } })
      },

-      log: (message, type) => {
-        scriptRunnerDispatch({ type: type ? type : 'log', payload: { message: [message] } })
+      log: (message) => {
+        scriptRunnerDispatch({ type: 'log', payload: { message: [message] } })
      }
    })
  }, [])
@ -549,6 +549,11 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
                      <div className="px-4 block" data-id="block" key={i}><span className={x.style}>{ msg }</span></div>
                    )
                  } else if (typeof msg === 'object') {
+                    if (msg.value && isHtml(msg.value)) {
+                      return (
+                        <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ parse(msg.value) } </span></div>
+                      )
+                    }
                    let stringified
                    try {
                      stringified = JSON.stringify(msg)
@ -609,4 +614,13 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
  )
 }

-export default RemixUiTerminal
+function isHtml (value) {
+  if (!value.indexOf) return false
+  return value.indexOf('<div') !== -1
+    || value.indexOf('<span') !== -1
+    || value.indexOf('<p') !== -1
+    || value.indexOf('<label') !== -1
+    || value.indexOf('<b') !== -1
+}
+
+export default RemixUiTerminal
--- a/libs/remix-ui/workspace/src/lib/actions/events.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/events.ts
@ -209,6 +209,6 @@ const rootFolderChanged = async (path) => {
 }

 const setFileDecorators = async (items: fileDecoration[], cb?: (err: Error, result?: string | number | boolean | Record<string, any>) => void) => {
-  await dispatch(setFileDecorationSuccess(items))
+  dispatch && await dispatch(setFileDecorationSuccess(items))
  cb && cb(null, true)
 }
--- a/libs/remix-url-resolver/src/resolve.ts
+++ b/libs/remix-url-resolver/src/resolve.ts
@ -113,7 +113,7 @@ export class RemixURLResolver {
    url = url.replace(/^ipfs:\/\/?/, 'ipfs/')
    // eslint-disable-next-line no-useless-catch
    try {
-      const req = 'https://ipfs.remixproject.org/' + url
+      const req = 'https://jqgt.remixproject.org/' + url
      // If you don't find greeter.sol on ipfs gateway use local
      // const req = 'http://localhost:8080/' + url
      const response: AxiosResponse = await axios.get(req, { transformResponse: [] })
--- a/libs/remixd/src/origins.json
+++ b/libs/remixd/src/origins.json
@ -9,6 +9,6 @@
        "package://a7df6d3c223593f3550b35e90d7b0b1f.mod",
        "package://6fd22d6fe5549ad4c4d8fd3ca0b7816b.mod",
        "https://ipfsgw.komputing.org",
-        "https://ipfs.remixproject.org"
+        "https://jqgt.remixproject.org"
    ]
 }