diff --git a/apps/remix-ide/src/blockchain/execution-context.js b/apps/remix-ide/src/blockchain/execution-context.js index 97f8e09d654..7c33bb4f27e 100644 --- a/apps/remix-ide/src/blockchain/execution-context.js +++ b/apps/remix-ide/src/blockchain/execution-context.js @@ -7,12 +7,14 @@ const _paq = window._paq = window._paq || [] let web3 +const config = { defaultTransactionType: '0x0' } if (typeof window !== 'undefined' && typeof window.ethereum !== 'undefined') { var injectedProvider = window.ethereum web3 = new Web3(injectedProvider) } else { web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545')) } +web3.eth.setConfig(config) /* trigger contextChanged, web3EndpointChanged @@ -59,6 +61,7 @@ export class ExecutionContext { } setWeb3 (context, web3) { + web3.setConfig(config) this.customWeb3[context] = web3 } diff --git a/libs/ghaction-helper/src/methods.ts b/libs/ghaction-helper/src/methods.ts index b6558f4eb0c..9bfa470033f 100644 --- a/libs/ghaction-helper/src/methods.ts +++ b/libs/ghaction-helper/src/methods.ts @@ -11,12 +11,14 @@ const providerConfig = { blockNumber: global.blockNumber || null } +const config = { defaultTransactionType: '0x0' } global.remixProvider = new Provider(providerConfig) global.remixProvider.init() global.web3Provider = new ethers.providers.Web3Provider(global.remixProvider) global.provider = global.web3Provider global.ethereum = global.web3Provider global.web3 = new Web3(global.web3Provider) +global.web3.eth.setConfig(config) const isFactoryOptions = (signerOrOptions: any) => { if (!signerOrOptions || signerOrOptions === undefined || signerOrOptions instanceof ethers.Signer) return false diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts index cd4a42ae386..914c40fa521 100644 --- a/libs/remix-lib/src/execution/txRunnerWeb3.ts +++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts @@ -23,7 +23,7 @@ export class TxRunnerWeb3 { // this is to avoid the following issue: https://github.com/MetaMask/metamask-extension/issues/11824 tx.type = '0x2' } else { - tx.type = '0x1' + // tx.type = '0x1' } if (txFee) { if (txFee.baseFeePerGas) { @@ -81,7 +81,7 @@ export class TxRunnerWeb3 { ) } else { try { - const res = await this.getWeb3().eth.sendTransaction(tx) + const res = await this.getWeb3().eth.sendTransaction(tx, null, { checkRevertBeforeSending: false }) cb(null, res.transactionHash) } catch (e) { console.log(`Send transaction failed: ${e.message} . if you use an injected provider, please check it is properly unlocked. `) diff --git a/libs/remix-ui/terminal/src/lib/components/Table.tsx b/libs/remix-ui/terminal/src/lib/components/Table.tsx index 35dd5d47ea9..25055662ee0 100644 --- a/libs/remix-ui/terminal/src/lib/components/Table.tsx +++ b/libs/remix-ui/terminal/src/lib/components/Table.tsx @@ -75,8 +75,8 @@ const showTable = (opts, showTableHash) => { - {opts.blockNumber} - + {opts.blockNumber.toString()} + ) : null}