Merge branch 'master' into react-plugin-manager

apps/remix-ide/src/app/tabs/runTab/contractDropdown.js

@@ -319,7 +319,7 @@ class ContractDropdownUI {
     try {
       contractMetadata = await this.runView.call('compilerMetadata', 'deployMetadataOf', selectedContract.name, selectedContract.contract.file)
     } catch (error) {
-      return statusCb(`creation of ${selectedContract.name} errored: ` + (error.message ? error.message : error))
+      return statusCb(`creation of ${selectedContract.name} errored: ${error.message ? error.message : error}`)
     }
 
     const compilerContracts = this.dropdownLogic.getCompilerContracts()

apps/remix-ide/src/app/ui/confirmDialog.js

@@ -89,7 +89,7 @@ function confirmDialog (tx, network, amount, gasEstimation, newGasPriceCb, initi
           <div class="align-items-center my-1" title="Represents the part of the tx fee that goes to the miner.">
             <div class='d-flex'>
               <span class="text-dark mr-2 text-nowrap">Max Priority fee:</span>
-              <input class="form-control mr-1 text-right" style='height: 1.2rem; width: 6rem;' value="0" id='maxpriorityfee' />
+              <input class="form-control mr-1 text-right" style='height: 1.2rem; width: 6rem;' value="1" id='maxpriorityfee' />
               <span title="visit https://ethgasstation.info for current gas price info.">Gwei</span>
             </div>            
           </div>

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

@@ -108,7 +108,7 @@ class Blockchain extends Plugin {
     const { continueCb, promptCb, statusCb, finalCb } = callbacks
     const constructor = selectedContract.getConstructorInterface()
     txFormat.buildData(selectedContract.name, selectedContract.object, compilerContracts, true, constructor, args, (error, data) => {
-      if (error) return statusCb(`creation of ${selectedContract.name} errored: ` + error)
+      if (error) return statusCb(`creation of ${selectedContract.name} errored: ${error.message ? error.message : error}`)
 
       statusCb(`creation of ${selectedContract.name} pending...`)
       this.createContract(selectedContract, data, continueCb, promptCb, confirmationCb, finalCb)
@@ -122,7 +122,7 @@ class Blockchain extends Plugin {
     const { continueCb, promptCb, statusCb, finalCb } = callbacks
     const constructor = selectedContract.getConstructorInterface()
     txFormat.encodeConstructorCallAndLinkLibraries(selectedContract.object, args, constructor, contractMetadata.linkReferences, selectedContract.bytecodeLinkReferences, (error, data) => {
-      if (error) return statusCb(`creation of ${selectedContract.name} errored: ` + (error.message ? error.message : error))
+      if (error) return statusCb(`creation of ${selectedContract.name} errored: ${error.message ? error.message : error}`)
 
       statusCb(`creation of ${selectedContract.name} pending...`)
       this.createContract(selectedContract, data, continueCb, promptCb, confirmationCb, finalCb)
@@ -139,7 +139,7 @@ class Blockchain extends Plugin {
     this.runTx({ data: data, useCall: false }, confirmationCb, continueCb, promptCb,
       (error, txResult, address) => {
         if (error) {
-          return finalCb(`creation of ${selectedContract.name} errored: ${(error.message ? error.message : error)}`)
+          return finalCb(`creation of ${selectedContract.name} errored: ${error.message ? error.message : error}`)
         }
         if (txResult.receipt.status === false || txResult.receipt.status === '0x0') {
           return finalCb(`creation of ${selectedContract.name} errored: transaction execution failed`)
@@ -265,7 +265,7 @@ class Blockchain extends Plugin {
     // contractsDetails is used to resolve libraries
     txFormat.buildData(contractName, contractAbi, {}, false, funABI, callType, (error, data) => {
       if (error) {
-        return logCallback(`${logMsg} errored: ${error} `)
+        return logCallback(`${logMsg} errored: ${error.message ? error.message : error}`)
       }
       if (!lookupOnly) {
         logCallback(`${logMsg} pending ... `)
@@ -282,7 +282,7 @@ class Blockchain extends Plugin {
       const useCall = funABI.stateMutability === 'view' || funABI.stateMutability === 'pure'
       this.runTx({ to: address, data, useCall }, confirmationCb, continueCb, promptCb, (error, txResult, _address, returnValue) => {
         if (error) {
-          return logCallback(`${logMsg} errored: ${error} `)
+          return logCallback(`${logMsg} errored: ${error.message ? error.message : error}`)
         }
         if (lookupOnly) {
           outputCb(returnValue)