Skip to content

N
nebula
Commit a6181251 authored by clabby's avatar clabby
Browse files
Options

Resolve conflicts

parent b2202f6f
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 68 deletions
packages/contracts-bedrock/.gas-snapshot
View file @ a6181251
...@@ -89,50 +89,50 @@ FaucetTest:test_nonAdmin_drip_fails() (gas: 262520) ...@@ -89,50 +89,50 @@ FaucetTest:test_nonAdmin_drip_fails() (gas: 262520)
FaucetTest:test_receive_succeeds() (gas: 17423) FaucetTest:test_receive_succeeds() (gas: 17423)
FaucetTest:test_withdraw_nonAdmin_reverts() (gas: 13167) FaucetTest:test_withdraw_nonAdmin_reverts() (gas: 13167)
FaucetTest:test_withdraw_succeeds() (gas: 78381) FaucetTest:test_withdraw_succeeds() (gas: 78381)
FaultDisputeGame_ResolvesCorrectly_CorrectRoot1:test_resolvesCorrectly_succeeds() (gas: 660030) FaultDisputeGame_ResolvesCorrectly_CorrectRoot1:test_resolvesCorrectly_succeeds() (gas: 660096)
FaultDisputeGame_ResolvesCorrectly_CorrectRoot2:test_resolvesCorrectly_succeeds() (gas: 666890) FaultDisputeGame_ResolvesCorrectly_CorrectRoot2:test_resolvesCorrectly_succeeds() (gas: 666956)
FaultDisputeGame_ResolvesCorrectly_CorrectRoot3:test_resolvesCorrectly_succeeds() (gas: 663593) FaultDisputeGame_ResolvesCorrectly_CorrectRoot3:test_resolvesCorrectly_succeeds() (gas: 663659)
FaultDisputeGame_ResolvesCorrectly_CorrectRoot4:test_resolvesCorrectly_succeeds() (gas: 666766) FaultDisputeGame_ResolvesCorrectly_CorrectRoot4:test_resolvesCorrectly_succeeds() (gas: 666832)
FaultDisputeGame_ResolvesCorrectly_CorrectRoot5:test_resolvesCorrectly_succeeds() (gas: 666079) FaultDisputeGame_ResolvesCorrectly_CorrectRoot5:test_resolvesCorrectly_succeeds() (gas: 666145)
FaultDisputeGame_ResolvesCorrectly_IncorrectRoot1:test_resolvesCorrectly_succeeds() (gas: 652788) FaultDisputeGame_ResolvesCorrectly_IncorrectRoot1:test_resolvesCorrectly_succeeds() (gas: 652840)
FaultDisputeGame_ResolvesCorrectly_IncorrectRoot2:test_resolvesCorrectly_succeeds() (gas: 658276) FaultDisputeGame_ResolvesCorrectly_IncorrectRoot2:test_resolvesCorrectly_succeeds() (gas: 658328)
FaultDisputeGame_ResolvesCorrectly_IncorrectRoot3:test_resolvesCorrectly_succeeds() (gas: 655638) FaultDisputeGame_ResolvesCorrectly_IncorrectRoot3:test_resolvesCorrectly_succeeds() (gas: 655691)
FaultDisputeGame_ResolvesCorrectly_IncorrectRoot4:test_resolvesCorrectly_succeeds() (gas: 656576) FaultDisputeGame_ResolvesCorrectly_IncorrectRoot4:test_resolvesCorrectly_succeeds() (gas: 656629)
FaultDisputeGame_ResolvesCorrectly_IncorrectRoot5:test_resolvesCorrectly_succeeds() (gas: 656027) FaultDisputeGame_ResolvesCorrectly_IncorrectRoot5:test_resolvesCorrectly_succeeds() (gas: 656080)
FaultDisputeGame_Test:test_addLocalData_static_succeeds() (gas: 642366) FaultDisputeGame_Test:test_addLocalData_static_succeeds() (gas: 642385)
FaultDisputeGame_Test:test_createdAt_succeeds() (gas: 10432) FaultDisputeGame_Test:test_createdAt_succeeds() (gas: 10388)
FaultDisputeGame_Test:test_extraData_succeeds() (gas: 32407) FaultDisputeGame_Test:test_extraData_succeeds() (gas: 32363)
FaultDisputeGame_Test:test_gameData_succeeds() (gas: 32857) FaultDisputeGame_Test:test_gameData_succeeds() (gas: 32835)
FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8287) FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8288)
FaultDisputeGame_Test:test_initialize_correctData_succeeds() (gas: 57851) FaultDisputeGame_Test:test_initialize_correctData_succeeds() (gas: 57873)
FaultDisputeGame_Test:test_initialize_firstOutput_reverts() (gas: 213853) FaultDisputeGame_Test:test_initialize_firstOutput_reverts() (gas: 213831)
FaultDisputeGame_Test:test_initialize_l1HeadTooOld_reverts() (gas: 228595) FaultDisputeGame_Test:test_initialize_l1HeadTooOld_reverts() (gas: 228573)
FaultDisputeGame_Test:test_move_clockCorrectness_succeeds() (gas: 594223) FaultDisputeGame_Test:test_move_clockCorrectness_succeeds() (gas: 594267)
FaultDisputeGame_Test:test_move_clockTimeExceeded_reverts() (gas: 23197) FaultDisputeGame_Test:test_move_clockTimeExceeded_reverts() (gas: 23175)
FaultDisputeGame_Test:test_move_defendRoot_reverts() (gas: 13322) FaultDisputeGame_Test:test_move_defendRoot_reverts() (gas: 13344)
FaultDisputeGame_Test:test_move_duplicateClaim_reverts() (gas: 147390) FaultDisputeGame_Test:test_move_duplicateClaim_reverts() (gas: 147368)
FaultDisputeGame_Test:test_move_duplicateClaimsDifferentSubgames_succeeds() (gas: 556832) FaultDisputeGame_Test:test_move_duplicateClaimsDifferentSubgames_succeeds() (gas: 556854)
FaultDisputeGame_Test:test_move_gameDepthExceeded_reverts() (gas: 585875) FaultDisputeGame_Test:test_move_gameDepthExceeded_reverts() (gas: 585831)
FaultDisputeGame_Test:test_move_gameNotInProgress_reverts() (gas: 11010) FaultDisputeGame_Test:test_move_gameNotInProgress_reverts() (gas: 11032)
FaultDisputeGame_Test:test_move_nonExistentParent_reverts() (gas: 24668) FaultDisputeGame_Test:test_move_nonExistentParent_reverts() (gas: 24690)
FaultDisputeGame_Test:test_move_simpleAttack_succeeds() (gas: 152008) FaultDisputeGame_Test:test_move_simpleAttack_succeeds() (gas: 151964)
FaultDisputeGame_Test:test_resolve_challengeContested_succeeds() (gas: 269473) FaultDisputeGame_Test:test_resolve_challengeContested_succeeds() (gas: 269456)
FaultDisputeGame_Test:test_resolve_claimAlreadyResolved_reverts() (gas: 272356) FaultDisputeGame_Test:test_resolve_claimAlreadyResolved_reverts() (gas: 272379)
FaultDisputeGame_Test:test_resolve_claimAtMaxDepthAlreadyResolved_reverts() (gas: 586606) FaultDisputeGame_Test:test_resolve_claimAtMaxDepthAlreadyResolved_reverts() (gas: 586629)
FaultDisputeGame_Test:test_resolve_notInProgress_reverts() (gas: 9776) FaultDisputeGame_Test:test_resolve_notInProgress_reverts() (gas: 9754)
FaultDisputeGame_Test:test_resolve_outOfOrderResolution_reverts() (gas: 309015) FaultDisputeGame_Test:test_resolve_outOfOrderResolution_reverts() (gas: 308993)
FaultDisputeGame_Test:test_resolve_rootContested_succeeds() (gas: 139119) FaultDisputeGame_Test:test_resolve_rootContested_succeeds() (gas: 139141)
FaultDisputeGame_Test:test_resolve_rootUncontestedButUnresolved_reverts() (gas: 15935) FaultDisputeGame_Test:test_resolve_rootUncontestedButUnresolved_reverts() (gas: 15958)
FaultDisputeGame_Test:test_resolve_rootUncontestedClockNotExpired_succeeds() (gas: 18428) FaultDisputeGame_Test:test_resolve_rootUncontestedClockNotExpired_succeeds() (gas: 18406)
FaultDisputeGame_Test:test_resolve_rootUncontested_succeeds() (gas: 51484) FaultDisputeGame_Test:test_resolve_rootUncontested_succeeds() (gas: 51462)
FaultDisputeGame_Test:test_resolve_stepReached_succeeds() (gas: 498448) FaultDisputeGame_Test:test_resolve_stepReached_succeeds() (gas: 498465)
FaultDisputeGame_Test:test_resolve_teamDeathmatch_succeeds() (gas: 443399) FaultDisputeGame_Test:test_resolve_teamDeathmatch_succeeds() (gas: 443381)
FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8232) FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8277)
FeeVault_Test:test_constructor_baseFeeVault_succeeds() (gas: 17450) FeeVault_Test:test_constructor_baseFeeVault_succeeds() (gas: 17406)
FeeVault_Test:test_constructor_l1FeeVault_succeeds() (gas: 17418) FeeVault_Test:test_constructor_l1FeeVault_succeeds() (gas: 17374)
GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352336) GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352379)
GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2950586) GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2950542)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 540752) GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 540708)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4052922) GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4052922)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 442085) GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 442085)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3487812) GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3487812)
...@@ -140,7 +140,7 @@ GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (g ...@@ -140,7 +140,7 @@ GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (g
GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 86653) GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 86653)
GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68485) GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68485)
GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68988) GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68988)
GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 143255) GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 143259)
GasPriceOracle_Test:test_baseFee_succeeds() (gas: 8392) GasPriceOracle_Test:test_baseFee_succeeds() (gas: 8392)
GasPriceOracle_Test:test_decimals_succeeds() (gas: 6212) GasPriceOracle_Test:test_decimals_succeeds() (gas: 6212)
GasPriceOracle_Test:test_gasPrice_succeeds() (gas: 8340) GasPriceOracle_Test:test_gasPrice_succeeds() (gas: 8340)
...@@ -468,13 +468,13 @@ OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutp ...@@ -468,13 +468,13 @@ OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutp
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 181461) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 181461)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalNotProven_reverts() (gas: 41777) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalNotProven_reverts() (gas: 41777)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 173449) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 173449)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 180336) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 180332)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 154191) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 154169)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 218388) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 218362)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 219614) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 219592)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_paused_reverts() (gas: 53666) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_paused_reverts() (gas: 53622)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_succeeds() (gas: 208960) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_succeeds() (gas: 208938)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 8797746687696162666) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 8797746687696162663)
OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 170961) OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 170961)
OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 85714) OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 85714)
OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidWithdrawalProof_reverts() (gas: 111248) OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidWithdrawalProof_reverts() (gas: 111248)
...@@ -690,3 +690,4 @@ TransactorTest:test_constructor_succeeds() (gas: 9673) ...@@ -690,3 +690,4 @@ TransactorTest:test_constructor_succeeds() (gas: 9673)
TransactorTest:test_delegateCall_succeeds() (gas: 20931) TransactorTest:test_delegateCall_succeeds() (gas: 20931)
TransactorTest:test_delegateCall_unauthorized_reverts() (gas: 18124) TransactorTest:test_delegateCall_unauthorized_reverts() (gas: 18124)
TransferOnionTest:test_constructor_succeeds() (gas: 564789) TransferOnionTest:test_constructor_succeeds() (gas: 564789)
TransferOnionTest:test_unwrap_succeeds() (gas: 724955)
\ No newline at end of file
packages/contracts-bedrock/scripts/ChainAssertions.sol
View file @ a6181251
...@@ -23,33 +23,32 @@ library ChainAssertions { ...@@ -23,33 +23,32 @@ library ChainAssertions {
/// @notice Asserts the correctness of an L1 deployment. This function expects that all contracts /// @notice Asserts the correctness of an L1 deployment. This function expects that all contracts
/// within the `prox` ContractSet are proxies that have been setup and initialized. /// within the `prox` ContractSet are proxies that have been setup and initialized.
function postDeployAssertions( function postDeployAssertions(
Types.ContractSet memory prox, Types.ContractSet memory _prox,
DeployConfig cfg, DeployConfig _cfg,
uint256 l2OutputOracleStartingBlockNumber, uint256 _l2OutputOracleStartingBlockNumber,
uint256 l2OutputOracleStartingTimestamp, uint256 _l2OutputOracleStartingTimestamp,
Vm vm Vm _vm
) )
internal internal
view view
{ {
ResourceMetering.ResourceConfig memory rcfg = SystemConfig(prox.SystemConfig).resourceConfig(); ResourceMetering.ResourceConfig memory rcfg = SystemConfig(_prox.SystemConfig).resourceConfig();
ResourceMetering.ResourceConfig memory dflt = Constants.DEFAULT_RESOURCE_CONFIG(); ResourceMetering.ResourceConfig memory dflt = Constants.DEFAULT_RESOURCE_CONFIG();
require(keccak256(abi.encode(rcfg)) == keccak256(abi.encode(dflt))); require(keccak256(abi.encode(rcfg)) == keccak256(abi.encode(dflt)));
checkSystemConfig(prox, cfg, true); checkSystemConfig(_prox, _cfg, true);
checkL1CrossDomainMessenger(prox, vm); checkL1CrossDomainMessenger(_prox, _vm);
checkL1StandardBridge(prox); checkL1StandardBridge(_prox);
checkL2OutputOracle(prox, cfg, l2OutputOracleStartingTimestamp, l2OutputOracleStartingBlockNumber); checkL2OutputOracle(_prox, _cfg, _l2OutputOracleStartingTimestamp, _l2OutputOracleStartingBlockNumber);
checkOptimismMintableERC20Factory(prox); checkOptimismMintableERC20Factory(_prox);
checkL1ERC721Bridge(prox); checkL1ERC721Bridge(_prox);
checkOptimismPortal(prox, cfg, false); checkOptimismPortal(_prox, _cfg, false);
checkProtocolVersions(prox, cfg, true); checkProtocolVersions(_prox, _cfg, true);
} }
/// @notice Asserts that the SystemConfig is setup correctly /// @notice Asserts that the SystemConfig is setup correctly
function checkSystemConfig(Types.ContractSet memory _contracts, DeployConfig _cfg, bool _proxy) internal view { function checkSystemConfig(Types.ContractSet memory _contracts, DeployConfig _cfg, bool _proxy) internal view {
ISystemConfigV0 config = ISystemConfigV0(_contracts.SystemConfig); ISystemConfigV0 config = ISystemConfigV0(_contracts.SystemConfig);
ResourceMetering.ResourceConfig memory rconfig = Constants.DEFAULT_RESOURCE_CONFIG();
if (_proxy) { if (_proxy) {
require(config.owner() == _cfg.finalSystemOwner()); require(config.owner() == _cfg.finalSystemOwner());
...@@ -65,6 +64,7 @@ library ChainAssertions { ...@@ -65,6 +64,7 @@ library ChainAssertions {
require(config.unsafeBlockSigner() == address(0)); require(config.unsafeBlockSigner() == address(0));
} }
ResourceMetering.ResourceConfig memory rconfig = Constants.DEFAULT_RESOURCE_CONFIG();
ResourceMetering.ResourceConfig memory resourceConfig = config.resourceConfig(); ResourceMetering.ResourceConfig memory resourceConfig = config.resourceConfig();
require(resourceConfig.maxResourceLimit == rconfig.maxResourceLimit); require(resourceConfig.maxResourceLimit == rconfig.maxResourceLimit);
require(resourceConfig.elasticityMultiplier == rconfig.elasticityMultiplier); require(resourceConfig.elasticityMultiplier == rconfig.elasticityMultiplier);
......
packages/contracts-bedrock/scripts/Deploy.s.sol
View file @ a6181251
...@@ -130,7 +130,6 @@ contract Deploy is Deployer { ...@@ -130,7 +130,6 @@ contract Deploy is Deployer {
}); });
} }
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
// State Changing Helper Functions // // State Changing Helper Functions //
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment