fix: resolve conflict

pull/5370/head
tizah 4 years ago
commit 16b29d33d2
  1. 2
      apps/remix-ide-e2e/src/tests/publishContract.test.ts
  2. 2
      apps/remix-ide-e2e/src/tests/recorder.spec.ts
  3. 2
      apps/remix-ide/src/app/components/plugin-manager-component.js
  4. 2
      apps/remix-ide/src/app/panels/tab-proxy.js
  5. 2
      apps/remix-ide/src/index.html
  6. 2
      apps/remix-ide/src/publishToStorage.js
  7. 10
      apps/remix-ide/src/remixAppManager.js
  8. 13
      libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
  9. 578
      package-lock.json
  10. 2
      package.json

@ -22,7 +22,7 @@ module.exports = {
.pause(8000)
.getModalBody((value, done) => {
if (value.indexOf('Metadata of "ballot" was published successfully.') === -1) browser.assert.fail('ipfs deploy failed', '', '')
if (value.indexOf('dweb:/ipfs') === -1) browser.assert.fail('ipfs deploy failed', '', '')
if (value.indexOf('ipfs://') === -1) browser.assert.fail('ipfs deploy failed', '', '')
done()
})
.modalFooterOKClick()

@ -83,7 +83,7 @@ module.exports = {
.testFunction('last',
{
status: 'true Transaction mined and execution succeed',
'decoded input': { 'uint256 _po': { type: 'BigNumber', hex: '0x0a' } }
'decoded input': { 'uint256 _po': '10' }
})
.end()
}

@ -108,7 +108,7 @@ class PluginManagerComponent extends ViewPlugin {
}
deactivateP (name) {
this.appManager.deactivatePlugin(name)
this.call('manager', 'deactivatePlugin', name)
_paq.push(['trackEvent', 'manager', 'deactivate', name])
}

@ -128,7 +128,7 @@ export class TabProxy extends Plugin {
() => this.event.emit('switchApp', name),
() => {
this.event.emit('closeApp', name)
this.appManager.deactivatePlugin(name)
this.call('manager', 'deactivatePlugin', name)
},
icon
)

@ -43,9 +43,9 @@
var _paq = window._paq = window._paq || []
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['disableCookies']);
_paq.push(['enableLinkTracking']);
_paq.push(['enableJSErrorTracking']);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="https://matomo.ethereum.org/";
_paq.push(['setTrackerUrl', u+'matomo.php'])

@ -34,7 +34,7 @@ export default function publish (storage, fileProvider, fileManager, contract) {
${err}</span>`)
} else {
var result = yo`<div>${uploaded.map((value) => {
return yo`<div><b>${value.filename}</b> : <pre>${value.output.url}</pre></div>`
return yo`<div><b>${value.filename}</b> : <pre>${value.output.url.replace('dweb:/ipfs/', 'ipfs://')}</pre></div>`
})}</div>`
modalDialogCustom.alert(`Published ${contract.name}'s Metadata`, yo`<span>Metadata of "${contract.name.toLowerCase()}" was published successfully.<br> <pre>${result}</pre> </span>`)
}

@ -52,6 +52,16 @@ export class RemixAppManager extends PluginManager {
return isNative(from.name)
}
async deactivatePlugin (name) {
const [to, from] = [
await this.getProfile(name),
await this.getProfile(this.requestFrom)
]
if (this.canDeactivatePlugin(from, to)) {
await this.toggleActive(name)
}
}
async canCall (from, to, method, message) {
// Make sure the caller of this methods is the target plugin
if (to !== this.currentRequest.from) {

@ -166,6 +166,19 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
}
const web3 = await debuggerModule.getDebugWeb3()
try {
if (await web3.eth.net.getId() === 42) {
setState(prevState => {
return {
...prevState,
validationError: 'The Kovan network is unfortunately not supported.'
}
})
return
}
} catch (e) {
console.error(e)
}
let currentReceipt
try {
currentReceipt = await web3.eth.getTransactionReceipt(txNumber)

578
package-lock.json generated

@ -2516,249 +2516,253 @@
}
},
"@ethersproject/abi": {
"version": "5.0.7",
"resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.7.tgz",
"integrity": "sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==",
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.1.2.tgz",
"integrity": "sha512-uMhoQVPX0UtfzTpekYQSEUcJGDgsJ25ifz+SV6PDETWaUFhcR8RNgb1QPTASP13inW8r6iy0/Xdq9D5hK2pNvA==",
"dev": true,
"requires": {
"@ethersproject/address": "^5.0.4",
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/constants": "^5.0.4",
"@ethersproject/hash": "^5.0.4",
"@ethersproject/keccak256": "^5.0.3",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/strings": "^5.0.4"
"@ethersproject/address": "^5.1.0",
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/constants": "^5.1.0",
"@ethersproject/hash": "^5.1.0",
"@ethersproject/keccak256": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/strings": "^5.1.0"
}
},
"@ethersproject/abstract-provider": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.0.5.tgz",
"integrity": "sha512-i/CjElAkzV7vQBAeoz+IpjGfcFYEP9eD7j3fzZ0fzTq03DO7PPnR+xkEZ1IoDXGwDS+55aLM1xvLDwB/Lx6IOQ==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.1.0.tgz",
"integrity": "sha512-8dJUnT8VNvPwWhYIau4dwp7qe1g+KgdRm4XTWvjkI9gAT2zZa90WF5ApdZ3vl1r6NDmnn6vUVvyphClRZRteTQ==",
"dev": true,
"requires": {
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/networks": "^5.0.3",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/transactions": "^5.0.5",
"@ethersproject/web": "^5.0.6"
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/networks": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/transactions": "^5.1.0",
"@ethersproject/web": "^5.1.0"
}
},
"@ethersproject/abstract-signer": {
"version": "5.0.6",
"resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.6.tgz",
"integrity": "sha512-h8TZBX3pL2Xx9tmsRxfWcaaI+FcJFHWvZ/vNvFjLp8zJ0kPD501LKTt2jo44LZ20N3EW68JMoyEmRQ6bpsn+iA==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.1.0.tgz",
"integrity": "sha512-qQDMkjGZSSJSKl6AnfTgmz9FSnzq3iEoEbHTYwjDlEAv+LNP7zd4ixCcVWlWyk+2siud856M5CRhAmPdupeN9w==",
"dev": true,
"requires": {
"@ethersproject/abstract-provider": "^5.0.4",
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/properties": "^5.0.3"
"@ethersproject/abstract-provider": "^5.1.0",
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0"
}
},
"@ethersproject/address": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.0.5.tgz",
"integrity": "sha512-DpkQ6rwk9jTefrRsJzEm6nhRiJd9pvhn1xN0rw5N/jswXG5r7BLk/GVA0mMAVWAsYfvi2xSc5L41FMox43RYEA==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.1.0.tgz",
"integrity": "sha512-rfWQR12eHn2cpstCFS4RF7oGjfbkZb0oqep+BfrT+gWEGWG2IowJvIsacPOvzyS1jhNF4MQ4BS59B04Mbovteg==",
"dev": true,
"requires": {
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/keccak256": "^5.0.3",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/rlp": "^5.0.3",
"bn.js": "^4.4.0"
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/keccak256": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/rlp": "^5.1.0"
}
},
"@ethersproject/base64": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.0.4.tgz",
"integrity": "sha512-4KRykQ7BQMeOXfvio1YITwHjxwBzh92UoXIdzxDE1p53CK28bbHPdsPNYo0wl0El7lJAMpT2SOdL0hhbWRnyIA==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.1.0.tgz",
"integrity": "sha512-npD1bLvK4Bcxz+m4EMkx+F8Rd7CnqS9DYnhNu0/GlQBXhWjvfoAZzk5HJ0f1qeyp8d+A86PTuzLOGOXf4/CN8g==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4"
"@ethersproject/bytes": "^5.1.0"
}
},
"@ethersproject/basex": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.0.4.tgz",
"integrity": "sha512-ixIr/kKiAoSzOnSc777AGIOAhKai5Ivqr4HO/Gz+YG+xkfv6kqD6AW4ga9vM20Wwb0QBhh3LoRWTu4V1K+x9Ew==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.1.0.tgz",
"integrity": "sha512-vBKr39bum7DDbOvkr1Sj19bRMEPA4FnST6Utt6xhDzI7o7L6QNkDn2yrCfP+hnvJGhZFKtLygWwqlTBZoBXYLg==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/properties": "^5.0.3"
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/properties": "^5.1.0"
}
},
"@ethersproject/bignumber": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.0.8.tgz",
"integrity": "sha512-KXFVAFKS1jdTXYN8BE5Oj+ZfPMh28iRdFeNGBVT6cUFdtiPVqeXqc0ggvBqA3A1VoFFGgM7oAeaagA393aORHA==",
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.1.1.tgz",
"integrity": "sha512-AVz5iqz7+70RIqoQTznsdJ6DOVBYciNlvO+AlQmPTB6ofCvoihI9bQdr6wljsX+d5W7Yc4nyvQvP4JMzg0Agig==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"bn.js": "^4.4.0"
}
},
"@ethersproject/bytes": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.0.5.tgz",
"integrity": "sha512-IEj9HpZB+ACS6cZ+QQMTqmu/cnUK2fYNE6ms/PVxjoBjoxc6HCraLpam1KuRvreMy0i523PLmjN8OYeikRdcUQ==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.1.0.tgz",
"integrity": "sha512-sGTxb+LVjFxJcJeUswAIK6ncgOrh3D8c192iEJd7mLr95V6du119rRfYT/b87WPkZ5I3gRBUYIYXtdgCWACe8g==",
"dev": true,
"requires": {
"@ethersproject/logger": "^5.0.5"
"@ethersproject/logger": "^5.1.0"
}
},
"@ethersproject/constants": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.0.5.tgz",
"integrity": "sha512-foaQVmxp2+ik9FrLUCtVrLZCj4M3Ibgkqvh+Xw/vFRSerkjVSYePApaVE5essxhoSlF1U9oXfWY09QI2AXtgKA==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.1.0.tgz",
"integrity": "sha512-0/SuHrxc8R8k+JiLmJymxHJbojUDWBQqO+b+XFdwaP0jGzqC09YDy/CAlSZB6qHsBifY8X3I89HcK/oMqxRdBw==",
"dev": true,
"requires": {
"@ethersproject/bignumber": "^5.0.7"
"@ethersproject/bignumber": "^5.1.0"
}
},
"@ethersproject/contracts": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.5.tgz",
"integrity": "sha512-tFI255lFbmbqMkgnuyhDWHl3yWqttPlReplYuVvDCT/SuvBjLR4ad2uipBlh1fh5X1ipK9ettAoV4S0HKim4Kw==",
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.1.1.tgz",
"integrity": "sha512-6WwktLJ0DFWU8pDkgH4IGttQHhQN4SnwKFu9h+QYVe48VGWtbDu4W8/q/7QA1u/HWlWMrKxqawPiZUJj0UMvOw==",
"dev": true,
"requires": {
"@ethersproject/abi": "^5.0.5",
"@ethersproject/abstract-provider": "^5.0.4",
"@ethersproject/abstract-signer": "^5.0.4",
"@ethersproject/address": "^5.0.4",
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/constants": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/properties": "^5.0.3"
"@ethersproject/abi": "^5.1.0",
"@ethersproject/abstract-provider": "^5.1.0",
"@ethersproject/abstract-signer": "^5.1.0",
"@ethersproject/address": "^5.1.0",
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/constants": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/transactions": "^5.1.0"
}
},
"@ethersproject/hash": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.0.5.tgz",
"integrity": "sha512-GpI80/h2HDpfNKpCZoxQJCjOQloGnlD5hM1G+tZe8FQDJhEvFjJoPDuWv+NaYjJfOciKS2Axqc4Q4WamdLoUgg==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.1.0.tgz",
"integrity": "sha512-fNwry20yLLPpnRRwm3fBL+2ksgO+KMadxM44WJmRIoTKzy4269+rbq9KFoe2LTqq2CXJM2CE70beGaNrpuqflQ==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/keccak256": "^5.0.3",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/strings": "^5.0.4"
"@ethersproject/abstract-signer": "^5.1.0",
"@ethersproject/address": "^5.1.0",
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/keccak256": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/strings": "^5.1.0"
}
},
"@ethersproject/hdnode": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.5.tgz",
"integrity": "sha512-Ho4HZaK+KijE5adayvjAGusWMnT0mgwGa5hGMBofBOgX9nqiKf6Wxx68SXBGI1/L3rmKo6mlAjxUd8gefs0teQ==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.1.0.tgz",
"integrity": "sha512-obIWdlujloExPHWJGmhJO/sETOOo7SEb6qemV4f8kyFoXg+cJK+Ta9SvBrj7hsUK85n3LZeZJZRjjM7oez3Clg==",
"dev": true,
"requires": {
"@ethersproject/abstract-signer": "^5.0.4",
"@ethersproject/basex": "^5.0.3",
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/pbkdf2": "^5.0.3",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/sha2": "^5.0.3",
"@ethersproject/signing-key": "^5.0.4",
"@ethersproject/strings": "^5.0.4",
"@ethersproject/transactions": "^5.0.5",
"@ethersproject/wordlists": "^5.0.4"
"@ethersproject/abstract-signer": "^5.1.0",
"@ethersproject/basex": "^5.1.0",
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/pbkdf2": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/sha2": "^5.1.0",
"@ethersproject/signing-key": "^5.1.0",
"@ethersproject/strings": "^5.1.0",
"@ethersproject/transactions": "^5.1.0",
"@ethersproject/wordlists": "^5.1.0"
}
},
"@ethersproject/json-wallets": {
"version": "5.0.7",
"resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.0.7.tgz",
"integrity": "sha512-dgOn9JtGgjT28mDXs4LYY2rT4CzS6bG/rxoYuPq3TLHIf6nmvBcr33Fee6RrM/y8UAx4gyIkf6wb2cXsOctvQQ==",
"dev": true,
"requires": {
"@ethersproject/abstract-signer": "^5.0.4",
"@ethersproject/address": "^5.0.4",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/hdnode": "^5.0.4",
"@ethersproject/keccak256": "^5.0.3",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/pbkdf2": "^5.0.3",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/random": "^5.0.3",
"@ethersproject/strings": "^5.0.4",
"@ethersproject/transactions": "^5.0.5",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.1.0.tgz",
"integrity": "sha512-00n2iBy27w8zrGZSiU762UOVuzCQZxUZxopsZC47++js6xUFuI74DHcJ5K/2pddlF1YBskvmMuboEu1geK8mnA==",
"dev": true,
"requires": {
"@ethersproject/abstract-signer": "^5.1.0",
"@ethersproject/address": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/hdnode": "^5.1.0",
"@ethersproject/keccak256": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/pbkdf2": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/random": "^5.1.0",
"@ethersproject/strings": "^5.1.0",
"@ethersproject/transactions": "^5.1.0",
"aes-js": "3.0.0",
"scrypt-js": "3.0.1"
}
},
"@ethersproject/keccak256": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.0.4.tgz",
"integrity": "sha512-GNpiOUm9PGUxFNqOxYKDQBM0u68bG9XC9iOulEQ8I0tOx/4qUpgVzvgXL6ugxr0RY554Gz/NQsVqknqPzUcxpQ==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.1.0.tgz",
"integrity": "sha512-vrTB1W6AEYoadww5c9UyVJ2YcSiyIUTNDRccZIgwTmFFoSHwBtcvG1hqy9RzJ1T0bMdATbM9Hfx2mJ6H0i7Hig==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/bytes": "^5.1.0",
"js-sha3": "0.5.7"
}
},
"@ethersproject/logger": {
"version": "5.0.6",
"resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.0.6.tgz",
"integrity": "sha512-FrX0Vnb3JZ1md/7GIZfmJ06XOAA8r3q9Uqt9O5orr4ZiksnbpXKlyDzQtlZ5Yv18RS8CAUbiKH9vwidJg1BPmQ==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.1.0.tgz",
"integrity": "sha512-wtUaD1lBX10HBXjjKV9VHCBnTdUaKQnQ2XSET1ezglqLdPdllNOIlLfhyCRqXm5xwcjExVI5ETokOYfjPtaAlw==",
"dev": true
},
"@ethersproject/networks": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.0.4.tgz",
"integrity": "sha512-/wHDTRms5mpJ09BoDrbNdFWINzONe05wZRgohCXvEv39rrH/Gd/yAnct8wC0RsW3tmFOgjgQxuBvypIxuUynTw==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.1.0.tgz",
"integrity": "sha512-A/NIrIED/G/IgU1XUukOA3WcFRxn2I4O5GxsYGA5nFlIi+UZWdGojs85I1VXkR1gX9eFnDXzjE6OtbgZHjFhIA==",
"dev": true,
"requires": {
"@ethersproject/logger": "^5.0.5"
"@ethersproject/logger": "^5.1.0"
}
},
"@ethersproject/pbkdf2": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.0.4.tgz",
"integrity": "sha512-9jVBjHXQKfr9+3bkCg01a8Cd1H9e+7Kw3ZMIvAxD0lZtuzrXsJxm1hVwY9KA+PRUvgS/9tTP4viXQYwLAax7zg==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.1.0.tgz",
"integrity": "sha512-B8cUbHHTgs8OtgJIafrRcz/YPDobVd5Ru8gTnShOiM9EBuFpYHQpq3+8iQJ6pyczDu6HP/oc/njAsIBhwFZYew==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/sha2": "^5.0.3"
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/sha2": "^5.1.0"
}
},
"@ethersproject/properties": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.4.tgz",
"integrity": "sha512-UdyX3GqBxFt15B0uSESdDNmhvEbK3ACdDXl2soshoPcneXuTswHDeA0LoPlnaZzhbgk4p6jqb4GMms5C26Qu6A==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.1.0.tgz",
"integrity": "sha512-519KKTwgmH42AQL3+GFV3SX6khYEfHsvI6v8HYejlkigSDuqttdgVygFTDsGlofNFchhDwuclrxQnD5B0YLNMg==",
"dev": true,
"requires": {
"@ethersproject/logger": "^5.0.5"
"@ethersproject/logger": "^5.1.0"
}
},
"@ethersproject/providers": {
"version": "5.0.11",
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.11.tgz",
"integrity": "sha512-SD82AMgUpDgqvSPJxjVgSqMBde9LsIAfroS3YcK2dE/VUuVeJQFWtjFbkFRF4pjTd2u+qYXh0eo1gq7LU7B1YQ==",
"dev": true,
"requires": {
"@ethersproject/abstract-provider": "^5.0.4",
"@ethersproject/abstract-signer": "^5.0.4",
"@ethersproject/address": "^5.0.4",
"@ethersproject/basex": "^5.0.3",
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/constants": "^5.0.4",
"@ethersproject/hash": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/networks": "^5.0.3",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/random": "^5.0.3",
"@ethersproject/rlp": "^5.0.3",
"@ethersproject/sha2": "^5.0.3",
"@ethersproject/strings": "^5.0.4",
"@ethersproject/transactions": "^5.0.5",
"@ethersproject/web": "^5.0.6",
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.1.2.tgz",
"integrity": "sha512-GqsS8rd+eyd4eNkcNgzZ4l9IRULBPUZa7JPnv22k4MHflMobUseyhfbVnmoN5bVNNkOxjV1IPTw9i0sV1hwdpg==",
"dev": true,
"requires": {
"@ethersproject/abstract-provider": "^5.1.0",
"@ethersproject/abstract-signer": "^5.1.0",
"@ethersproject/address": "^5.1.0",
"@ethersproject/basex": "^5.1.0",
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/constants": "^5.1.0",
"@ethersproject/hash": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/networks": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/random": "^5.1.0",
"@ethersproject/rlp": "^5.1.0",
"@ethersproject/sha2": "^5.1.0",
"@ethersproject/strings": "^5.1.0",
"@ethersproject/transactions": "^5.1.0",
"@ethersproject/web": "^5.1.0",
"bech32": "1.1.4",
"ws": "7.2.3"
},
@ -2772,33 +2776,33 @@
}
},
"@ethersproject/random": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.0.4.tgz",
"integrity": "sha512-AIZJhqs6Ba4/+U3lOjt3QZbP6b/kuuGLJUYFUonAgWmkTHwqsCwYnFvnHKQSUuHbXHvErp7WFXFlztx+yMn3kQ==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.1.0.tgz",
"integrity": "sha512-+uuczLQZ4+no9cP6TCoCktXx0u2YbNaRT7lRkSt12d8263e702f0u+4JnnRO8Qmv5nylWJebnqCHzyxP+6mLqw==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5"
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0"
}
},
"@ethersproject/rlp": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.0.4.tgz",
"integrity": "sha512-5qrrZad7VTjofxSsm7Zg/7Dr4ZOln4S2CqiDdOuTv6MBKnXj0CiBojXyuDy52M8O3wxH0CyE924hXWTDV1PQWQ==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.1.0.tgz",
"integrity": "sha512-vDTyHIwNPrecy55gKGZ47eJZhBm8LLBxihzi5ou+zrSvYTpkSTWRcKUlXFDFQVwfWB+P5PGyERAdiDEI76clxw==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5"
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0"
}
},
"@ethersproject/sha2": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.0.4.tgz",
"integrity": "sha512-0yFhf1mspxAfWdXXoPtK94adUeu1R7/FzAa+DfEiZTc76sz/vHXf0LSIazoR3znYKFny6haBxME+usbvvEcF3A==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.1.0.tgz",
"integrity": "sha512-+fNSeZRstOpdRJpdGUkRONFCaiAqWkc91zXgg76Nlp5ndBQE25Kk5yK8gCPG1aGnCrbariiPr5j9DmrYH78JCA==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"hash.js": "1.1.3"
},
"dependencies": {
@ -2815,116 +2819,134 @@
}
},
"@ethersproject/signing-key": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.0.5.tgz",
"integrity": "sha512-Z1wY7JC1HVO4CvQWY2TyTTuAr8xK3bJijZw1a9G92JEmKdv1j255R/0YLBBcFTl2J65LUjtXynNJ2GbArPGi5g==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.1.0.tgz",
"integrity": "sha512-tE5LFlbmdObG8bY04NpuwPWSRPgEswfxweAI1sH7TbP0ml1elNfqcq7ii/3AvIN05i5U0Pkm3Tf8bramt8MmLw==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/properties": "^5.0.3",
"elliptic": "6.5.3"
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"bn.js": "^4.4.0",
"elliptic": "6.5.4"
},
"dependencies": {
"elliptic": {
"version": "6.5.4",
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
"dev": true,
"requires": {
"bn.js": "^4.11.9",
"brorand": "^1.1.0",
"hash.js": "^1.0.0",
"hmac-drbg": "^1.0.1",
"inherits": "^2.0.4",
"minimalistic-assert": "^1.0.1",
"minimalistic-crypto-utils": "^1.0.1"
}
}
}
},
"@ethersproject/solidity": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.0.5.tgz",
"integrity": "sha512-DMFQ0ouXmNVoKWbGEUFGi8Urli4SJip9jXafQyFHWPRr5oJUqDVkNfwcyC37k+mhBG93k7qrYXCH2xJnGEOxHg==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.1.0.tgz",
"integrity": "sha512-kPodsGyo9zg1g9XSXp1lGhFaezBAUUsAUB1Vf6OkppE5Wksg4Et+x3kG4m7J/uShDMP2upkJtHNsIBK2XkVpKQ==",
"dev": true,
"requires": {
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/keccak256": "^5.0.3",
"@ethersproject/sha2": "^5.0.3",
"@ethersproject/strings": "^5.0.4"
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/keccak256": "^5.1.0",
"@ethersproject/sha2": "^5.1.0",
"@ethersproject/strings": "^5.1.0"
}
},
"@ethersproject/strings": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.0.5.tgz",
"integrity": "sha512-JED6WaIV00xM/gvj8vSnd+0VWtDYdidTmavFRCTQakqfz+4tDo6Jz5LHgG+dd45h7ah7ykCHW0C7ZXWEDROCXQ==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.1.0.tgz",
"integrity": "sha512-perBZy0RrmmL0ejiFGUOlBVjMsUceqLut3OBP3zP96LhiJWWbS8u1NqQVgN4/Gyrbziuda66DxiQocXhsvx+Sw==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/constants": "^5.0.4",
"@ethersproject/logger": "^5.0.5"
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/constants": "^5.1.0",
"@ethersproject/logger": "^5.1.0"
}
},
"@ethersproject/transactions": {
"version": "5.0.6",
"resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.0.6.tgz",
"integrity": "sha512-htsFhOD+NMBxx676A8ehSuwVV49iqpSB+CkjPZ02tpNew0K6p8g0CZ46Z1ZP946gIHAU80xQ0NACHYrjIUaCFA==",
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.1.1.tgz",
"integrity": "sha512-Nwgbp09ttIVN0OoUBatCXaHxR7grWPHbozJN8v7AXDLrl6nnOIBEMDh+yJTnosSQlFhcyjfTGGN+Mx6R8HdvMw==",
"dev": true,
"requires": {
"@ethersproject/address": "^5.0.4",
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/constants": "^5.0.4",
"@ethersproject/keccak256": "^5.0.3",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/rlp": "^5.0.3",
"@ethersproject/signing-key": "^5.0.4"
"@ethersproject/address": "^5.1.0",
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/constants": "^5.1.0",
"@ethersproject/keccak256": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/rlp": "^5.1.0",
"@ethersproject/signing-key": "^5.1.0"
}
},
"@ethersproject/units": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.0.5.tgz",
"integrity": "sha512-XHZZIA+o4Sfne9ycWWdoCpMQSpTAF1V1fxNIfgFAVYBp0JKZp4YypDdHCDleAP4rPuFgSNeJqZyb3kAe1VJMkg==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.1.0.tgz",
"integrity": "sha512-isvJrx6qG0nKWfxsGORNjmOq/nh175fStfvRTA2xEKrGqx8JNJY83fswu4GkILowfriEM/eYpretfJnfzi7YhA==",
"dev": true,
"requires": {
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/constants": "^5.0.4",
"@ethersproject/logger": "^5.0.5"
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/constants": "^5.1.0",
"@ethersproject/logger": "^5.1.0"
}
},
"@ethersproject/wallet": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.5.tgz",
"integrity": "sha512-NbrKmsW3w+5dVOEyVCN5VAAIp3y8ckutW6AV7Lo0Hn8RO9mLT8ZFzLGp4lzgJoxkm+EV8BE+x1N6NdiOgUzRng==",
"dev": true,
"requires": {
"@ethersproject/abstract-provider": "^5.0.4",
"@ethersproject/abstract-signer": "^5.0.4",
"@ethersproject/address": "^5.0.4",
"@ethersproject/bignumber": "^5.0.7",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/hash": "^5.0.4",
"@ethersproject/hdnode": "^5.0.4",
"@ethersproject/json-wallets": "^5.0.6",
"@ethersproject/keccak256": "^5.0.3",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/random": "^5.0.3",
"@ethersproject/signing-key": "^5.0.4",
"@ethersproject/transactions": "^5.0.5",
"@ethersproject/wordlists": "^5.0.4"
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.1.0.tgz",
"integrity": "sha512-ULmUtiYQLTUS+y3DgkLzRhFEK10zMwmjOthnjiZxee3Q/MVwr3rnmuAnXIUZrPjna6hvUPnyRIdW5XuF0Ld0YQ==",
"dev": true,
"requires": {
"@ethersproject/abstract-provider": "^5.1.0",
"@ethersproject/abstract-signer": "^5.1.0",
"@ethersproject/address": "^5.1.0",
"@ethersproject/bignumber": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/hash": "^5.1.0",
"@ethersproject/hdnode": "^5.1.0",
"@ethersproject/json-wallets": "^5.1.0",
"@ethersproject/keccak256": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/random": "^5.1.0",
"@ethersproject/signing-key": "^5.1.0",
"@ethersproject/transactions": "^5.1.0",
"@ethersproject/wordlists": "^5.1.0"
}
},
"@ethersproject/web": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.8.tgz",
"integrity": "sha512-5An1sar40zXUYmBLH+P1m0F3mTi8lNBV/usLKP3AYBdSxPQyQWymLAEPyX7x5/eBpQAwCInLtF7LPMm9HPI28g==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.1.0.tgz",
"integrity": "sha512-LTeluWgTq04+RNqAkVhpydPcRZK/kKxD2Vy7PYGrAD27ABO9kTqTBKwiOuzTyAHKUQHfnvZbXmxBXJAGViSDcA==",
"dev": true,
"requires": {
"@ethersproject/base64": "^5.0.3",
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/strings": "^5.0.4"
"@ethersproject/base64": "^5.1.0",
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/strings": "^5.1.0"
}
},
"@ethersproject/wordlists": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.0.5.tgz",
"integrity": "sha512-XA3ycFltVrCTQt04w5nHu3Xq5Z6HjqWsXaAYQHFdqtugyUsIumaO9S5MOwFFuUYTNkZUoT3jCRa/OBS+K4tLfA==",
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.1.0.tgz",
"integrity": "sha512-NsUCi/TpBb+oTFvMSccUkJGtp5o/84eOyqp5q5aBeiNBSLkYyw21znRn9mAmxZgySpxgruVgKbaapnYPgvctPQ==",
"dev": true,
"requires": {
"@ethersproject/bytes": "^5.0.4",
"@ethersproject/hash": "^5.0.4",
"@ethersproject/logger": "^5.0.5",
"@ethersproject/properties": "^5.0.3",
"@ethersproject/strings": "^5.0.4"
"@ethersproject/bytes": "^5.1.0",
"@ethersproject/hash": "^5.1.0",
"@ethersproject/logger": "^5.1.0",
"@ethersproject/properties": "^5.1.0",
"@ethersproject/strings": "^5.1.0"
}
},
"@evocateur/libnpmaccess": {
@ -16508,41 +16530,41 @@
}
},
"ethers": {
"version": "5.0.16",
"resolved": "https://registry.npmjs.org/ethers/-/ethers-5.0.16.tgz",
"integrity": "sha512-MsE/N07DRAq6LtvtXUougAPouGoLMWMoJ7iD4OoYXtyZpXG9UsWYPfvCrIEYeUhGBWOeaHBamrT5X9dQQ2NYqQ==",
"dev": true,
"requires": {
"@ethersproject/abi": "5.0.7",
"@ethersproject/abstract-provider": "5.0.5",
"@ethersproject/abstract-signer": "5.0.6",
"@ethersproject/address": "5.0.5",
"@ethersproject/base64": "5.0.4",
"@ethersproject/basex": "5.0.4",
"@ethersproject/bignumber": "5.0.8",
"@ethersproject/bytes": "5.0.5",
"@ethersproject/constants": "5.0.5",
"@ethersproject/contracts": "5.0.5",
"@ethersproject/hash": "5.0.5",
"@ethersproject/hdnode": "5.0.5",
"@ethersproject/json-wallets": "5.0.7",
"@ethersproject/keccak256": "5.0.4",
"@ethersproject/logger": "5.0.6",
"@ethersproject/networks": "5.0.4",
"@ethersproject/pbkdf2": "5.0.4",
"@ethersproject/properties": "5.0.4",
"@ethersproject/providers": "5.0.11",
"@ethersproject/random": "5.0.4",
"@ethersproject/rlp": "5.0.4",
"@ethersproject/sha2": "5.0.4",
"@ethersproject/signing-key": "5.0.5",
"@ethersproject/solidity": "5.0.5",
"@ethersproject/strings": "5.0.5",
"@ethersproject/transactions": "5.0.6",
"@ethersproject/units": "5.0.5",
"@ethersproject/wallet": "5.0.5",
"@ethersproject/web": "5.0.8",
"@ethersproject/wordlists": "5.0.5"
"version": "5.1.4",
"resolved": "https://registry.npmjs.org/ethers/-/ethers-5.1.4.tgz",
"integrity": "sha512-EAPQ/fgGRu0PoR/VNFnHTMOtG/IZ0AItdW55C9T8ffmVu0rnyllZL404eBF66elJehOLz2kxnUrhXpE7TCpW7g==",
"dev": true,
"requires": {
"@ethersproject/abi": "5.1.2",
"@ethersproject/abstract-provider": "5.1.0",
"@ethersproject/abstract-signer": "5.1.0",
"@ethersproject/address": "5.1.0",
"@ethersproject/base64": "5.1.0",
"@ethersproject/basex": "5.1.0",
"@ethersproject/bignumber": "5.1.1",
"@ethersproject/bytes": "5.1.0",
"@ethersproject/constants": "5.1.0",
"@ethersproject/contracts": "5.1.1",
"@ethersproject/hash": "5.1.0",
"@ethersproject/hdnode": "5.1.0",
"@ethersproject/json-wallets": "5.1.0",
"@ethersproject/keccak256": "5.1.0",
"@ethersproject/logger": "5.1.0",
"@ethersproject/networks": "5.1.0",
"@ethersproject/pbkdf2": "5.1.0",
"@ethersproject/properties": "5.1.0",
"@ethersproject/providers": "5.1.2",
"@ethersproject/random": "5.1.0",
"@ethersproject/rlp": "5.1.0",
"@ethersproject/sha2": "5.1.0",
"@ethersproject/signing-key": "5.1.0",
"@ethersproject/solidity": "5.1.0",
"@ethersproject/strings": "5.1.0",
"@ethersproject/transactions": "5.1.1",
"@ethersproject/units": "5.1.0",
"@ethersproject/wallet": "5.1.0",
"@ethersproject/web": "5.1.0",
"@ethersproject/wordlists": "5.1.0"
}
},
"ethjs-unit": {

@ -237,7 +237,7 @@
"eslint-plugin-promise": "4.2.1",
"eslint-plugin-standard": "4.0.1",
"ethereumjs-util": "^6.2.0",
"ethers": "^5.0.13",
"ethers": "^5.1.4",
"events": "^3.0.0",
"execr": "^1.0.1",
"exorcist": "^0.4.0",

Loading…
Cancel
Save