From 9c31432d7a1a9afe5c37dd397eb58066e8b744d0 Mon Sep 17 00:00:00 2001 From: Alejandro Santander Date: Sat, 12 Dec 2020 08:33:14 -0300 Subject: [PATCH] Updates deploy-ovm-pair cmd to latest optimism-integration (#964) --- package-lock.json | 204 +++++++++++++++++++++++++++------------- publish/src/Deployer.js | 14 --- 2 files changed, 139 insertions(+), 79 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04297385a8..4421d41d7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -515,6 +515,51 @@ "ethjs-util-v6": "npm:ethereumjs-util@6.2.1" }, "dependencies": { + "@ethereum-waffle/chai": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@ethereum-waffle/chai/-/chai-2.5.1.tgz", + "integrity": "sha512-g/PTnycTM5bODJCumO0XnccKeLITKELwuWOll3EAK+lE5u/OYvfVH5tAsDMJkB8m7J6wVKJ8iT+UiLEKb1qO1g==", + "dev": true, + "requires": { + "@ethereum-waffle/provider": "^2.5.1", + "ethers": "^4.0.45" + } + }, + "@ethereum-waffle/compiler": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@ethereum-waffle/compiler/-/compiler-2.5.1.tgz", + "integrity": "sha512-H08PgcJ+M4URDP2JBjDeYJRMtsh7PusEdRTaEQ7bHeVyjqqv18UEtFPBD7bR169sK9RGlkzjYmCeIRWomCQLlw==", + "dev": true, + "requires": { + "@resolver-engine/imports": "^0.3.3", + "@resolver-engine/imports-fs": "^0.3.3", + "@types/mkdirp": "^0.5.2", + "@types/node-fetch": "^2.5.5", + "ethers": "^4.0.45", + "mkdirp": "^0.5.1", + "node-fetch": "^2.6.0", + "solc": "^0.6.3" + } + }, + "@ethereum-waffle/mock-contract": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@ethereum-waffle/mock-contract/-/mock-contract-2.5.1.tgz", + "integrity": "sha512-KuUCaCaMRKOI9sJ/MqiJU9ne8wpMWN4NB3beGZpPEo66jK2Ythvz5mgYLNAwAZdzM531NPKc/cWmLUdEF7jnlw==", + "dev": true, + "requires": { + "ethers": "^4.0.45" + } + }, + "@ethereum-waffle/provider": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@ethereum-waffle/provider/-/provider-2.5.1.tgz", + "integrity": "sha512-J2yAB7F8eLIPHghcEKjPHBD4Zuix5mM8V4c5JHO20FTrqElWJbZ8pkg/aoztPms2JEt9gEvadAFTcxhd9eYDnA==", + "dev": true, + "requires": { + "ethers": "^4.0.45", + "ganache-core": "^2.10.2" + } + }, "@ethersproject/abi": { "version": "5.0.9", "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.9.tgz", @@ -544,19 +589,6 @@ "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==", "dev": true }, - "ethereum-waffle": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ethereum-waffle/-/ethereum-waffle-3.2.1.tgz", - "integrity": "sha512-Fhg7BaBuV+Xo5XT+NEC3UTKGunvpq+iQPglZbIAJF6ZcwQwkiKfJUDuB0ZSkg5ntbRS4gpahfoXj1nTzdtx8UA==", - "dev": true, - "requires": { - "@ethereum-waffle/chai": "^3.2.1", - "@ethereum-waffle/compiler": "^3.2.1", - "@ethereum-waffle/mock-contract": "^3.2.1", - "@ethereum-waffle/provider": "^3.2.1", - "ethers": "^5.0.1" - } - }, "ethereum-waffle-v2": { "version": "npm:ethereum-waffle@2.5.1", "resolved": "https://registry.npmjs.org/ethereum-waffle/-/ethereum-waffle-2.5.1.tgz", @@ -568,75 +600,132 @@ "@ethereum-waffle/mock-contract": "^2.5.1", "@ethereum-waffle/provider": "^2.5.1", "ethers": "^4.0.45" + } + }, + "ethereum-waffle-v3": { + "version": "npm:ethereum-waffle@3.2.1", + "resolved": "https://registry.npmjs.org/ethereum-waffle/-/ethereum-waffle-3.2.1.tgz", + "integrity": "sha512-Fhg7BaBuV+Xo5XT+NEC3UTKGunvpq+iQPglZbIAJF6ZcwQwkiKfJUDuB0ZSkg5ntbRS4gpahfoXj1nTzdtx8UA==", + "dev": true, + "requires": { + "@ethereum-waffle/chai": "^3.2.1", + "@ethereum-waffle/compiler": "^3.2.1", + "@ethereum-waffle/mock-contract": "^3.2.1", + "@ethereum-waffle/provider": "^3.2.1", + "ethers": "^5.0.1" }, "dependencies": { "@ethereum-waffle/chai": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@ethereum-waffle/chai/-/chai-2.5.1.tgz", - "integrity": "sha512-g/PTnycTM5bODJCumO0XnccKeLITKELwuWOll3EAK+lE5u/OYvfVH5tAsDMJkB8m7J6wVKJ8iT+UiLEKb1qO1g==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@ethereum-waffle/chai/-/chai-3.2.1.tgz", + "integrity": "sha512-0aG946J1+2Gg7WnEjtwPEWe+xwLTeBTy6LpCnGecosMf3YINkaf9Xv3Sd7CrXBR88ihCoUhfzfmOloMHIAQPAg==", "dev": true, "requires": { - "@ethereum-waffle/provider": "^2.5.1", - "ethers": "^4.0.45" + "@ethereum-waffle/provider": "^3.2.1", + "ethers": "^5.0.0" } }, "@ethereum-waffle/compiler": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@ethereum-waffle/compiler/-/compiler-2.5.1.tgz", - "integrity": "sha512-H08PgcJ+M4URDP2JBjDeYJRMtsh7PusEdRTaEQ7bHeVyjqqv18UEtFPBD7bR169sK9RGlkzjYmCeIRWomCQLlw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@ethereum-waffle/compiler/-/compiler-3.2.1.tgz", + "integrity": "sha512-URSsbTp4g8HPHAaA4KiAD6Aya9WPx/TULfOr+YpjCJ6YWXqE9wwi3ubf9qJUQxu6W6PsiczBaQhVhpI9RLoVUA==", "dev": true, "requires": { "@resolver-engine/imports": "^0.3.3", "@resolver-engine/imports-fs": "^0.3.3", "@types/mkdirp": "^0.5.2", "@types/node-fetch": "^2.5.5", - "ethers": "^4.0.45", + "ethers": "^5.0.1", "mkdirp": "^0.5.1", "node-fetch": "^2.6.0", "solc": "^0.6.3" } }, "@ethereum-waffle/mock-contract": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@ethereum-waffle/mock-contract/-/mock-contract-2.5.1.tgz", - "integrity": "sha512-KuUCaCaMRKOI9sJ/MqiJU9ne8wpMWN4NB3beGZpPEo66jK2Ythvz5mgYLNAwAZdzM531NPKc/cWmLUdEF7jnlw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@ethereum-waffle/mock-contract/-/mock-contract-3.2.1.tgz", + "integrity": "sha512-39GMp/IqsHF+3j3XK38cWA+nX7Q6ABfMsYkuAjtfpTguTFQKXx2C1/VJZwGOyb4de2pl4bssmN37VEraB3NWbQ==", "dev": true, "requires": { - "ethers": "^4.0.45" + "@ethersproject/abi": "^5.0.1", + "ethers": "^5.0.1" } }, "@ethereum-waffle/provider": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@ethereum-waffle/provider/-/provider-2.5.1.tgz", - "integrity": "sha512-J2yAB7F8eLIPHghcEKjPHBD4Zuix5mM8V4c5JHO20FTrqElWJbZ8pkg/aoztPms2JEt9gEvadAFTcxhd9eYDnA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@ethereum-waffle/provider/-/provider-3.2.1.tgz", + "integrity": "sha512-doG18hThqldsYcZIIO0YoiwV+ERx0dCVY6bkg4FKZtoymNelf15zNycb881c6QD9RnLuz6A2Jp9lmnrAD+IvYQ==", "dev": true, "requires": { - "ethers": "^4.0.45", - "ganache-core": "^2.10.2" + "@ethereum-waffle/ens": "^3.2.1", + "ethers": "^5.0.1", + "ganache-core": "^2.10.2", + "patch-package": "^6.2.2", + "postinstall-postinstall": "^2.1.0" } }, + "ethers": { + "version": "5.0.24", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.0.24.tgz", + "integrity": "sha512-77CEtVC88fJGEhxGXRvQqAEH6e2A+ZFiv2FBT6ikXndlty5sw6vMatAhg1v+w3CaaGZOf1CP81jl4Mc8Zrj08A==", + "dev": true, + "requires": { + "@ethersproject/abi": "5.0.9", + "@ethersproject/abstract-provider": "5.0.7", + "@ethersproject/abstract-signer": "5.0.9", + "@ethersproject/address": "5.0.8", + "@ethersproject/base64": "5.0.6", + "@ethersproject/basex": "5.0.6", + "@ethersproject/bignumber": "5.0.12", + "@ethersproject/bytes": "5.0.8", + "@ethersproject/constants": "5.0.7", + "@ethersproject/contracts": "5.0.8", + "@ethersproject/hash": "5.0.9", + "@ethersproject/hdnode": "5.0.7", + "@ethersproject/json-wallets": "5.0.9", + "@ethersproject/keccak256": "5.0.6", + "@ethersproject/logger": "5.0.8", + "@ethersproject/networks": "5.0.6", + "@ethersproject/pbkdf2": "5.0.6", + "@ethersproject/properties": "5.0.6", + "@ethersproject/providers": "5.0.17", + "@ethersproject/random": "5.0.6", + "@ethersproject/rlp": "5.0.6", + "@ethersproject/sha2": "5.0.6", + "@ethersproject/signing-key": "5.0.7", + "@ethersproject/solidity": "5.0.7", + "@ethersproject/strings": "5.0.7", + "@ethersproject/transactions": "5.0.8", + "@ethersproject/units": "5.0.8", + "@ethersproject/wallet": "5.0.9", + "@ethersproject/web": "5.0.11", + "@ethersproject/wordlists": "5.0.7" + } + } + } + }, + "ethers": { + "version": "4.0.48", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.48.tgz", + "integrity": "sha512-sZD5K8H28dOrcidzx9f8KYh8083n5BexIO3+SbE4jK83L85FxtpXZBCQdXb8gkg+7sBqomcLhhkU7UHL+F7I2g==", + "dev": true, + "requires": { + "aes-js": "3.0.0", + "bn.js": "^4.4.0", + "elliptic": "6.5.3", + "hash.js": "1.1.3", + "js-sha3": "0.5.7", + "scrypt-js": "2.0.4", + "setimmediate": "1.0.4", + "uuid": "2.0.1", + "xmlhttprequest": "1.8.0" + }, + "dependencies": { "bn.js": { "version": "4.11.9", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", "dev": true - }, - "ethers": { - "version": "4.0.48", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.48.tgz", - "integrity": "sha512-sZD5K8H28dOrcidzx9f8KYh8083n5BexIO3+SbE4jK83L85FxtpXZBCQdXb8gkg+7sBqomcLhhkU7UHL+F7I2g==", - "dev": true, - "requires": { - "aes-js": "3.0.0", - "bn.js": "^4.4.0", - "elliptic": "6.5.3", - "hash.js": "1.1.3", - "js-sha3": "0.5.7", - "scrypt-js": "2.0.4", - "setimmediate": "1.0.4", - "uuid": "2.0.1", - "xmlhttprequest": "1.8.0" - } } } }, @@ -790,21 +879,6 @@ "ethereum-waffle": "^3", "ethers": "^5", "fs-extra": "^9.0.1" - }, - "dependencies": { - "ethereum-waffle": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ethereum-waffle/-/ethereum-waffle-3.2.1.tgz", - "integrity": "sha512-Fhg7BaBuV+Xo5XT+NEC3UTKGunvpq+iQPglZbIAJF6ZcwQwkiKfJUDuB0ZSkg5ntbRS4gpahfoXj1nTzdtx8UA==", - "dev": true, - "requires": { - "@ethereum-waffle/chai": "^3.2.1", - "@ethereum-waffle/compiler": "^3.2.1", - "@ethereum-waffle/mock-contract": "^3.2.1", - "@ethereum-waffle/provider": "^3.2.1", - "ethers": "^5.0.1" - } - } } }, "@eth-optimism/solc": { @@ -6870,8 +6944,8 @@ } } }, - "ethereum-waffle-v3": { - "version": "npm:ethereum-waffle@3.2.1", + "ethereum-waffle": { + "version": "3.2.1", "resolved": "https://registry.npmjs.org/ethereum-waffle/-/ethereum-waffle-3.2.1.tgz", "integrity": "sha512-Fhg7BaBuV+Xo5XT+NEC3UTKGunvpq+iQPglZbIAJF6ZcwQwkiKfJUDuB0ZSkg5ntbRS4gpahfoXj1nTzdtx8UA==", "dev": true, diff --git a/publish/src/Deployer.js b/publish/src/Deployer.js index e275b55ff3..b6a7671f06 100644 --- a/publish/src/Deployer.js +++ b/publish/src/Deployer.js @@ -222,20 +222,6 @@ class Deployer { }); deployedContract.options.address = '0x' + this._dryRunCounter.toString().padStart(40, '0'); } else { - const nonce = await this.web3.eth.getTransactionCount(this.account); - - // Known OVM bug. EOA nonces start with 0, when they should start with 1. - // Compensate by sending a dummy tx. - if (this.useOvm && nonce === 0) { - console.log( - yellow( - `⚠ WARNING: Deployer nonce is 0. This will cause problems in deployments. Sending a dummy tx to increase the nonce...` - ) - ); - - await this.sendDummyTx(); - } - // If the contract creation will result in an address that's unsafe for OVM, // increment the tx nonce until its not. // Quite commonly, deployed contract addresses will be used as constructor arguments of