From 4571e5d01998fd9da3f7c7c4fcde2d9eef9db40f Mon Sep 17 00:00:00 2001 From: ben-chain Date: Thu, 18 Feb 2021 23:58:02 -0800 Subject: [PATCH] update plugins (#234) --- package.json | 2 +- .../OVM/bridge/OVM_L1MultiMessageRelayer.ts | 6 +-- yarn.lock | 53 ++++--------------- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 64f80e3b8..4ef961afa 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "glob": "^7.1.6" }, "devDependencies": { - "@eth-optimism/plugins": "^0.0.10", + "@eth-optimism/plugins": "^0.0.16", "@eth-optimism/smock": "0.2.1-alpha.0", "@nomiclabs/hardhat-ethers": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1", diff --git a/test/contracts/OVM/bridge/OVM_L1MultiMessageRelayer.ts b/test/contracts/OVM/bridge/OVM_L1MultiMessageRelayer.ts index 4e882b55e..886290e39 100644 --- a/test/contracts/OVM/bridge/OVM_L1MultiMessageRelayer.ts +++ b/test/contracts/OVM/bridge/OVM_L1MultiMessageRelayer.ts @@ -39,9 +39,9 @@ describe('OVM_L1MultiMessageRelayer', () => { // set the address of the mock contract to target await AddressManager.setAddress( - // 'Proxy__OVM_L1CrossDomainMessenger' is the string used by the contract under test to lookup + // 'Proxy__OVM_L1CrossDomainMessenger' is the string used by the contract under test to lookup // the target contract. On mainnet the target is a proxy which points to the implementation of - // the L1CrossDomainMessenger. + // the L1CrossDomainMessenger. // In order to keep the tests simple, we skip the proxy here, and point directly to the impl. 'Proxy__OVM_L1CrossDomainMessenger', Mock__OVM_L1CrossDomainMessenger.address @@ -102,7 +102,7 @@ describe('OVM_L1MultiMessageRelayer', () => { // check in its onlyRelayer modifier. // The string currently used in the AddressManager is 'OVM_L2MessageRelayer' await AddressManager.setAddress( - 'OVM_L2MessageRelayer', + 'OVM_L2MessageRelayer', OVM_L1MultiMessageRelayer.address ) // set the mock return value diff --git a/yarn.lock b/yarn.lock index 19eb89da5..d8120f4b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,10 +39,10 @@ resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89" integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA== -"@eth-optimism/contracts@^0.0.2-alpha.14": - version "0.0.2-alpha.15" - resolved "https://registry.yarnpkg.com/@eth-optimism/contracts/-/contracts-0.0.2-alpha.15.tgz#d602bdb6f1186d111ce9f7c282fc80e023086892" - integrity sha512-upJfYHDWQY7nM0AYT9MKQiuOus2uMUhvqS962qiBq3Ly/9GUq5mS0UALynsrZBGbzT6pflOMKFFEv7jQEORGmA== +"@eth-optimism/contracts@0.0.2-alpha.14": + version "0.0.2-alpha.14" + resolved "https://registry.yarnpkg.com/@eth-optimism/contracts/-/contracts-0.0.2-alpha.14.tgz#382ae9250e7d89e7729bcfe73ffdb85897e385c2" + integrity sha512-EeOKiQ+Tu/bZqlq2bsXJegRYHhBXlcDO+fNXG1NJyies23rcLrjR7LMocJmw/F9TpYJ08UqvOHttD5w//cntpg== dependencies: "@eth-optimism/solc" "^0.6.12-alpha.1" "@ethersproject/contracts" "^5.0.5" @@ -75,16 +75,13 @@ util.promisify "^1.0.0" uuid "^8.3.0" -"@eth-optimism/plugins@^0.0.10": - version "0.0.10" - resolved "https://registry.yarnpkg.com/@eth-optimism/plugins/-/plugins-0.0.10.tgz#c9cc24b484d64b4adfad8dc21d883b71ba563dde" - integrity sha512-OCJStdrTVLVlHHFLP+7WXyKt/dWyzxXzivIuf9V1xAGDavxCg8Y4CFzUq70pf3GpjBw230uFhn8vjq26cBppkA== +"@eth-optimism/plugins@^0.0.16": + version "0.0.16" + resolved "https://registry.yarnpkg.com/@eth-optimism/plugins/-/plugins-0.0.16.tgz#eae8a3e3be4d92aac866e31acad96291d4ae5c76" + integrity sha512-vXYljJzQu+kSUydG6WIgGxfnP54nbutKmzbAcy8j2GJgLLhtZSxCIA+UhBiO1mA4k/qFeUGJcf8kZfaddKygIQ== dependencies: - "@eth-optimism/contracts" "^0.0.2-alpha.14" + "@eth-optimism/contracts" "0.0.2-alpha.14" "@eth-optimism/ethereumjs-vm" "^4.2.0-alpha.2" - "@eth-optimism/solc-v0.5.16" "npm:@eth-optimism/solc@^0.5.16-alpha.7" - "@eth-optimism/solc-v0.6.12" "npm:@eth-optimism/solc@^0.6.12-alpha.1" - "@eth-optimism/solc-v0.7.6" "npm:@eth-optimism/solc@^0.7.6-alpha.0" "@nomiclabs/hardhat-truffle5" "^2.0.0" bn.js "^5.1.3" ethereumjs-account "^3.0.0" @@ -104,22 +101,7 @@ fs-extra "^9.0.1" hardhat "^2.0.3" -"@eth-optimism/solc-v0.5.16@npm:@eth-optimism/solc@^0.5.16-alpha.7": - version "0.5.16-alpha.7" - resolved "https://registry.yarnpkg.com/@eth-optimism/solc/-/solc-0.5.16-alpha.7.tgz#3767a34715dce6cb342ae66df834cc7ed6d9a6e3" - integrity sha512-Lzcd1379o4rN3vIdxyI0z2bbbG7SMEA+tOC78UwNak7uCbCUEaXN8Qo5+X5wSp01Ab6TjfrBku6jTUSTLlwZuA== - dependencies: - command-exists "^1.2.8" - commander "3.0.2" - follow-redirects "^1.12.1" - fs-extra "^0.30.0" - js-sha3 "0.8.0" - memorystream "^0.3.1" - require-from-string "^2.0.0" - semver "^5.5.0" - tmp "0.0.33" - -"@eth-optimism/solc-v0.6.12@npm:@eth-optimism/solc@^0.6.12-alpha.1", "@eth-optimism/solc@^0.6.12-alpha.1": +"@eth-optimism/solc@^0.6.12-alpha.1": version "0.6.12-alpha.1" resolved "https://registry.yarnpkg.com/@eth-optimism/solc/-/solc-0.6.12-alpha.1.tgz#041876f83b34c6afe2f19dfe9626568df6ed8590" integrity sha512-Ky73mo+2iNJs/VTaT751nMeZ7hXns0TBAlffTOxIOsScjAZ/zi/KWsDUo3r89aV2JKXcYAU/bLidxF40MVJeUw== @@ -134,21 +116,6 @@ semver "^5.5.0" tmp "0.0.33" -"@eth-optimism/solc-v0.7.6@npm:@eth-optimism/solc@^0.7.6-alpha.0": - version "0.7.6-alpha.1" - resolved "https://registry.yarnpkg.com/@eth-optimism/solc/-/solc-0.7.6-alpha.1.tgz#f503073161fdc0029dbc1dae6fae28eeb046b559" - integrity sha512-tVYeBtjwNRUDmaTdJNlKI0lTM0yV1hez0jPFOtACoepBwBEZOuuFLBgQLBOWPaR95UU2ke1YjqB7rrpkE3oRDg== - dependencies: - command-exists "^1.2.8" - commander "3.0.2" - follow-redirects "^1.12.1" - fs-extra "^0.30.0" - js-sha3 "0.8.0" - memorystream "^0.3.1" - require-from-string "^2.0.0" - semver "^5.5.0" - tmp "0.0.33" - "@ethereum-waffle/chai@^3.0.0", "@ethereum-waffle/chai@^3.2.2": version "3.2.2" resolved "https://registry.yarnpkg.com/@ethereum-waffle/chai/-/chai-3.2.2.tgz#33a349688386c9a8fdc4da5baea329036b9fe75e"