From 898c7ac514fff10b8a955ec9f4fdb4ceda5399de Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Mon, 25 Jul 2022 11:46:47 -0700 Subject: [PATCH 1/2] contracts-bedrock: update hardhat forge dep --- .changeset/rare-suits-turn.md | 5 +++++ packages/contracts-bedrock/package.json | 6 ++---- yarn.lock | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .changeset/rare-suits-turn.md diff --git a/.changeset/rare-suits-turn.md b/.changeset/rare-suits-turn.md new file mode 100644 index 0000000000000..e0560db46a977 --- /dev/null +++ b/.changeset/rare-suits-turn.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/contracts-bedrock': patch +--- + +Update hardhat-forge dep, remove dead deps diff --git a/packages/contracts-bedrock/package.json b/packages/contracts-bedrock/package.json index 26a6f2209c7ed..1808e428dc6f9 100644 --- a/packages/contracts-bedrock/package.json +++ b/packages/contracts-bedrock/package.json @@ -47,14 +47,12 @@ "ethers": "^5.6.8", "excessively-safe-call": "https://github.com/nomad-xyz/ExcessivelySafeCall.git#4fcdfd3593d21381f696c790fa6180b8ef559c1e", "forge-std": "https://github.com/foundry-rs/forge-std.git#f18682b2874fc57d7c80a511fed0b35ec4201ffa", - "hardhat": "^2.9.6", - "merkle-patricia-tree": "^4.2.4", - "rlp": "^2.2.7" + "hardhat": "^2.9.6" }, "devDependencies": { "@eth-optimism/hardhat-deploy-config": "^0.2.1", "@defi-wonderland/smock": "^2.0.2", - "@foundry-rs/hardhat-forge": "^0.1.12", + "@foundry-rs/hardhat-forge": "^0.1.14", "@nomiclabs/hardhat-ethers": "^2.0.0", "@nomiclabs/hardhat-waffle": "^2.0.0", "@typechain/ethers-v5": "^10.1.0", diff --git a/yarn.lock b/yarn.lock index 42db9ca2b55e1..d9f7f215c960b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1636,10 +1636,10 @@ command-exists "^1.2.9" ts-interface-checker "^0.1.9" -"@foundry-rs/hardhat-forge@^0.1.12": - version "0.1.12" - resolved "https://registry.yarnpkg.com/@foundry-rs/hardhat-forge/-/hardhat-forge-0.1.12.tgz#0557909762b86033e4699b9dc8e4cb58ddfc3fff" - integrity sha512-y05JYP+uvBaWKZZPuMkzc7cWS0gPTb4JzwrBA++9cIe1Aae+atz340cREBsCV9joEUpcK0UMRMURBns3A5nhhQ== +"@foundry-rs/hardhat-forge@^0.1.14": + version "0.1.14" + resolved "https://registry.yarnpkg.com/@foundry-rs/hardhat-forge/-/hardhat-forge-0.1.14.tgz#0291db05b7205fc8c65c164394c50f23f10d7ee1" + integrity sha512-XZeD7fRPJIEVNl1oPUfb/NftQfY+i23e/uOUICAaKpuJF283ge+vTisEPPUyoOw4zVNLTNFZyVKuuC3npIQmFw== dependencies: "@foundry-rs/easy-foundryup" "^0.1.3" "@nomiclabs/hardhat-ethers" "^2.0.0" From 6cc63d6f147700686d0d765788b7daf45f55c373 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Mon, 25 Jul 2022 13:37:08 -0700 Subject: [PATCH 2/2] bindings + snapshot: update --- packages/contracts-bedrock/.gas-snapshot | 58 ++++++++++++------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/contracts-bedrock/.gas-snapshot b/packages/contracts-bedrock/.gas-snapshot index 4c1e8ca5ab3bf..49d7330ac4991 100644 --- a/packages/contracts-bedrock/.gas-snapshot +++ b/packages/contracts-bedrock/.gas-snapshot @@ -33,21 +33,21 @@ L1BlockTest:test_updateValues() (gas: 28193) L1BlockNumberTest:test_fallback() (gas: 18677) L1BlockNumberTest:test_getL1BlockNumber() (gas: 10668) L1BlockNumberTest:test_receive() (gas: 25340) -L1CrossDomainMessenger_Test:testCannot_L1MessengerPause() (gas: 24500) -L1CrossDomainMessenger_Test:testCannot_L1MessengerUnpause() (gas: 24536) +L1CrossDomainMessenger_Test:testCannot_L1MessengerPause() (gas: 24515) +L1CrossDomainMessenger_Test:testCannot_L1MessengerUnpause() (gas: 24562) L1CrossDomainMessenger_Test:test_L1MessengerMessageVersion() (gas: 24716) -L1CrossDomainMessenger_Test:test_L1MessengerPause() (gas: 48005) -L1CrossDomainMessenger_Test:test_L1MessengerRelayMessageFirstStuckSecondSucceeds() (gas: 201779) -L1CrossDomainMessenger_Test:test_L1MessengerRelayMessageRevertsOnReentrancy() (gas: 195102) -L1CrossDomainMessenger_Test:test_L1MessengerRelayMessageSucceeds() (gas: 77841) -L1CrossDomainMessenger_Test:test_L1MessengerRelayMessageToSystemContract() (gas: 67957) -L1CrossDomainMessenger_Test:test_L1MessengerRelayShouldRevertIfPaused() (gas: 60463) -L1CrossDomainMessenger_Test:test_L1MessengerReplayMessageWithValue() (gas: 38169) +L1CrossDomainMessenger_Test:test_L1MessengerPause() (gas: 48053) +L1CrossDomainMessenger_Test:test_L1MessengerRelayMessageFirstStuckSecondSucceeds() (gas: 201827) +L1CrossDomainMessenger_Test:test_L1MessengerRelayMessageRevertsOnReentrancy() (gas: 195126) +L1CrossDomainMessenger_Test:test_L1MessengerRelayMessageSucceeds() (gas: 77865) +L1CrossDomainMessenger_Test:test_L1MessengerRelayMessageToSystemContract() (gas: 68005) +L1CrossDomainMessenger_Test:test_L1MessengerRelayShouldRevertIfPaused() (gas: 60526) +L1CrossDomainMessenger_Test:test_L1MessengerReplayMessageWithValue() (gas: 38193) L1CrossDomainMessenger_Test:test_L1MessengerSendMessage() (gas: 301590) L1CrossDomainMessenger_Test:test_L1MessengerTwiceSendMessage() (gas: 1492584) -L1CrossDomainMessenger_Test:test_L1MessengerUnpause() (gas: 40872) -L1CrossDomainMessenger_Test:test_L1MessengerXDomainSenderReverts() (gas: 24316) -L1CrossDomainMessenger_Test:test_L1MessengerxDomainMessageSenderResets() (gas: 86376) +L1CrossDomainMessenger_Test:test_L1MessengerUnpause() (gas: 40948) +L1CrossDomainMessenger_Test:test_L1MessengerXDomainSenderReverts() (gas: 24305) +L1CrossDomainMessenger_Test:test_L1MessengerxDomainMessageSenderResets() (gas: 86378) L1StandardBridge_Test:test_depositERC20() (gas: 579497) L1StandardBridge_Test:test_depositERC20To() (gas: 581704) L1StandardBridge_Test:test_depositETH() (gas: 373955) @@ -61,39 +61,39 @@ L1StandardBridge_Test:test_onlyEOADepositETH() (gas: 40859) L1StandardBridge_Test:test_onlyL2BridgeFinalizeERC20Withdrawal() (gas: 36268) L1StandardBridge_Test:test_onlyPortalFinalizeERC20Withdrawal() (gas: 35573) L1StandardBridge_Test:test_receive() (gas: 520573) -L2CrossDomainMessenger_Test:testCannot_L2MessengerPause() (gas: 10845) -L2CrossDomainMessenger_Test:test_L1MessengerRelayMessageRevertsOnReentrancy() (gas: 171930) +L2CrossDomainMessenger_Test:testCannot_L2MessengerPause() (gas: 10860) +L2CrossDomainMessenger_Test:test_L1MessengerRelayMessageRevertsOnReentrancy() (gas: 171954) L2CrossDomainMessenger_Test:test_L2MessengerMessageVersion() (gas: 8411) -L2CrossDomainMessenger_Test:test_L2MessengerPause() (gas: 31749) -L2CrossDomainMessenger_Test:test_L2MessengerRelayMessageFirstStuckSecondSucceeds() (gas: 172920) -L2CrossDomainMessenger_Test:test_L2MessengerRelayMessageSucceeds() (gas: 57372) -L2CrossDomainMessenger_Test:test_L2MessengerRelayMessageToSystemContract() (gas: 36193) -L2CrossDomainMessenger_Test:test_L2MessengerRelayShouldRevertIfPaused() (gas: 41619) +L2CrossDomainMessenger_Test:test_L2MessengerPause() (gas: 31797) +L2CrossDomainMessenger_Test:test_L2MessengerRelayMessageFirstStuckSecondSucceeds() (gas: 172968) +L2CrossDomainMessenger_Test:test_L2MessengerRelayMessageSucceeds() (gas: 57396) +L2CrossDomainMessenger_Test:test_L2MessengerRelayMessageToSystemContract() (gas: 36217) +L2CrossDomainMessenger_Test:test_L2MessengerRelayShouldRevertIfPaused() (gas: 41682) L2CrossDomainMessenger_Test:test_L2MessengerSendMessage() (gas: 121684) L2CrossDomainMessenger_Test:test_L2MessengerTwiceSendMessage() (gas: 136258) -L2CrossDomainMessenger_Test:test_L2MessengerXDomainSenderReverts() (gas: 10609) -L2CrossDomainMessenger_Test:test_L2MessengerxDomainMessageSenderResets() (gas: 54887) +L2CrossDomainMessenger_Test:test_L2MessengerXDomainSenderReverts() (gas: 10598) +L2CrossDomainMessenger_Test:test_L2MessengerxDomainMessageSenderResets() (gas: 54889) L2OutputOracleTest:testCannot_ProposeWithUnmatchedBlockhash() (gas: 26829) -L2OutputOracleTest:testCannot_deleteL2Output_ifNotOwner() (gas: 25097) -L2OutputOracleTest:testCannot_deleteL2Output_withWrongRoot() (gas: 91432) -L2OutputOracleTest:testCannot_deleteL2Output_withWrongTime() (gas: 87426) +L2OutputOracleTest:testCannot_deleteL2Output_ifNotOwner() (gas: 25123) +L2OutputOracleTest:testCannot_deleteL2Output_withWrongRoot() (gas: 91445) +L2OutputOracleTest:testCannot_deleteL2Output_withWrongTime() (gas: 87450) L2OutputOracleTest:testCannot_proposeEmptyOutput() (gas: 24128) L2OutputOracleTest:testCannot_proposeFutureTimetamp() (gas: 26097) L2OutputOracleTest:testCannot_proposeL2OutputIfNotProposer() (gas: 23564) L2OutputOracleTest:testCannot_proposeOnWrongFork() (gas: 26424) L2OutputOracleTest:testCannot_proposeUnexpectedBlockNumber() (gas: 25983) -L2OutputOracleTest:test_changeProposer() (gas: 56052) +L2OutputOracleTest:test_changeProposer() (gas: 56139) L2OutputOracleTest:test_computeL2Timestamp() (gas: 30288) L2OutputOracleTest:test_constructor() (gas: 49046) -L2OutputOracleTest:test_deleteOutput() (gas: 77223) +L2OutputOracleTest:test_deleteOutput() (gas: 77242) L2OutputOracleTest:test_getL2Output() (gas: 88508) L2OutputOracleTest:test_latestBlockNumber() (gas: 76284) L2OutputOracleTest:test_nextBlockNumber() (gas: 15232) L2OutputOracleTest:test_proposeWithBlockhashAndHeight() (gas: 75046) L2OutputOracleTest:test_proposingAnotherOutput() (gas: 76881) -L2OutputOracleTest:test_updateOwner() (gas: 34580) -L2OutputOracleUpgradeable_Test:test_cannotInitImpl() (gas: 19428) -L2OutputOracleUpgradeable_Test:test_cannotInitProxy() (gas: 24427) +L2OutputOracleTest:test_updateOwner() (gas: 34619) +L2OutputOracleUpgradeable_Test:test_cannotInitImpl() (gas: 19555) +L2OutputOracleUpgradeable_Test:test_cannotInitProxy() (gas: 24554) L2OutputOracleUpgradeable_Test:test_initValuesOnProxy() (gas: 39086) L2OutputOracleUpgradeable_Test:test_upgrading() (gas: 230843) L2StandardBridge_Test:test_ERC20BridgeFailed_whenLocalTokenIsBridge() (gas: 134358)