fix deploying, defining a correct type

pull/5370/head
yann300 3 years ago
parent a50b549a7f
commit 8d8544ef74
  1. 2
      libs/remix-analyzer/package.json
  2. 2
      libs/remix-astwalker/package.json
  3. 2
      libs/remix-debug/package.json
  4. 2
      libs/remix-lib/package.json
  5. 22
      libs/remix-lib/src/execution/txRunnerWeb3.ts
  6. 2
      libs/remix-simulator/package.json
  7. 2
      libs/remix-solidity/package.json
  8. 2
      libs/remix-tests/package.json
  9. 1293
      package-lock.json
  10. 2
      package.json

@ -28,7 +28,7 @@
"ethereumjs-util": "^7.0.10", "ethereumjs-util": "^7.0.10",
"ethers": "^5.4.2", "ethers": "^5.4.2",
"string-similarity": "^4.0.4", "string-similarity": "^4.0.4",
"web3": "1.2.4" "web3": "^1.5.1"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

@ -47,7 +47,7 @@
"tape": "^4.10.1", "tape": "^4.10.1",
"ts-node": "^8.0.3", "ts-node": "^8.0.3",
"typescript": "^3.4.3", "typescript": "^3.4.3",
"web3": "1.2.4" "web3": "^1.5.1"
}, },
"devDependencies": { "devDependencies": {
"tap-spec": "^5.0.0" "tap-spec": "^5.0.0"

@ -30,7 +30,7 @@
"ethereumjs-util": "^7.0.10", "ethereumjs-util": "^7.0.10",
"ethers": "^5.4.2", "ethers": "^5.4.2",
"string-similarity": "^4.0.4", "string-similarity": "^4.0.4",
"web3": "^1.2.4" "web3": "^1.5.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.4.5", "@babel/core": "^7.4.5",

@ -23,7 +23,7 @@
"events": "^3.0.0", "events": "^3.0.0",
"solc": "^0.7.4", "solc": "^0.7.4",
"string-similarity": "^4.0.4", "string-similarity": "^4.0.4",
"web3": "^1.2.4" "web3": "^1.5.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.4.5", "@babel/core": "^7.4.5",

@ -15,15 +15,21 @@ export class TxRunnerWeb3 {
this._api = api this._api = api
} }
_executeTx (tx, txFee, api, promptCb, callback) { _executeTx (tx, network, txFee, api, promptCb, callback) {
if (network && network.lastBlock && network.lastBlock.baseFeePerGas) {
// the sending stack (web3.js / metamask need to have the type defined)
// this is to avoid the following issue: https://github.com/MetaMask/metamask-extension/issues/11824
tx.type = '0x2'
}
if (txFee) { if (txFee) {
if (txFee.baseFeePerGas) { if (txFee.baseFeePerGas) {
tx.maxPriorityFee = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.maxPriorityFee, 'gwei')) tx.maxPriorityFee = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.maxPriorityFee, 'gwei'))
tx.maxFee = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.maxFee, 'gwei')) tx.maxFee = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.maxFee, 'gwei'))
tx.type = 2 tx.type = '0x2'
} else { } else {
tx.gasPrice = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.gasPrice, 'gwei')) tx.gasPrice = this.getWeb3().utils.toHex(this.getWeb3().utils.toWei(txFee.gasPrice, 'gwei'))
tx.type = 1 tx.type = '0x1'
} }
} }
@ -100,18 +106,18 @@ export class TxRunnerWeb3 {
// callback is called whenever no error // callback is called whenever no error
tx['gas'] = !gasEstimation ? gasLimit : gasEstimation tx['gas'] = !gasEstimation ? gasLimit : gasEstimation
if (this._api.config.getUnpersistedProperty('doNotShowTransactionConfirmationAgain')) {
return this._executeTx(tx, null, this._api, promptCb, callback)
}
this._api.detectNetwork((err, network) => { this._api.detectNetwork((err, network) => {
if (err) { if (err) {
console.log(err) console.log(err)
return return
} }
if (this._api.config.getUnpersistedProperty('doNotShowTransactionConfirmationAgain')) {
return this._executeTx(tx, network, null, this._api, promptCb, callback)
}
confirmCb(network, tx, tx['gas'], (txFee) => { confirmCb(network, tx, tx['gas'], (txFee) => {
return this._executeTx(tx, txFee, this._api, promptCb, callback) return this._executeTx(tx, network, txFee, this._api, promptCb, callback)
}, (error) => { }, (error) => {
callback(error) callback(error)
}) })

@ -32,7 +32,7 @@
"merge": "^1.2.0", "merge": "^1.2.0",
"string-similarity": "^4.0.4", "string-similarity": "^4.0.4",
"time-stamp": "^2.0.0", "time-stamp": "^2.0.0",
"web3": "^1.2.4" "web3": "^1.5.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.4.5", "@babel/core": "^7.4.5",

@ -25,7 +25,7 @@
"ethers": "^5.4.2", "ethers": "^5.4.2",
"solc": "^0.7.4", "solc": "^0.7.4",
"string-similarity": "^4.0.4", "string-similarity": "^4.0.4",
"web3": "1.2.4", "web3": "^1.5.1",
"webworkify-webpack": "^2.1.5" "webworkify-webpack": "^2.1.5"
}, },
"devDependencies": { "devDependencies": {

@ -57,7 +57,7 @@
"string-similarity": "^4.0.4", "string-similarity": "^4.0.4",
"time-stamp": "^2.2.0", "time-stamp": "^2.2.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"web3": "^1.2.4", "web3": "^1.5.1",
"winston": "^3.0.0" "winston": "^3.0.0"
}, },
"peerDependencies": { "peerDependencies": {

1293
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -175,7 +175,7 @@
"string-similarity": "^4.0.4", "string-similarity": "^4.0.4",
"time-stamp": "^2.2.0", "time-stamp": "^2.2.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"web3": "1.2.4", "web3": "^1.5.1",
"winston": "^3.3.3", "winston": "^3.3.3",
"ws": "^7.3.0" "ws": "^7.3.0"
}, },

Loading…
Cancel
Save