Commit b296f5b5 authored by Mark Tyneway's avatar Mark Tyneway

contracts-bedrock: remove deposit pausable

Regenerate bindings, fix deployment
parent 7be28f9d
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -362,8 +362,8 @@ func l1Deployer(backend *backends.SimulatedBackend, opts *bind.TransactOpts, dep
opts,
backend,
deployment.Args[0].(common.Address),
deployment.Args[1].(common.Address),
deployment.Args[2].(*big.Int),
deployment.Args[1].(common.Address),
deployment.Args[3].(bool),
)
case "L1CrossDomainMessenger":
......
......@@ -154,8 +154,8 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
*/
constructor(
L2OutputOracle _l2Oracle,
address _guardian,
uint256 _finalizationPeriodSeconds,
address _guardian,
bool _paused
) Semver(1, 1, 0) {
L2_ORACLE = _l2Oracle;
......@@ -425,7 +425,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
uint64 _gasLimit,
bool _isCreation,
bytes memory _data
) public payable whenNotPaused metered(_gasLimit) {
) public payable metered(_gasLimit) {
// Just to be safe, make sure that people specify address(0) as the target when doing
// contract creations.
if (_isCreation) {
......
......@@ -103,23 +103,6 @@ contract OptimismPortal_Test is Portal_Initializer {
assertEq(address(op).balance, 100);
}
/**
* @notice Deposit transactions should revert when paused
*/
function test_depositTransaction_paused_reverts() external {
vm.prank(op.GUARDIAN());
op.pause();
vm.expectRevert("OptimismPortal: paused");
op.depositTransaction({
_to: address(1),
_value: 100,
_gasLimit: 200_000,
_isCreation: false,
_data: hex""
});
}
// Test: depositTransaction fails when contract creation has a non-zero destination address
function test_depositTransaction_contractCreation_reverts() external {
// contract creation must have a target of address(0)
......
......@@ -41,8 +41,8 @@ const deployFn: DeployFunction = async (hre) => {
name: 'OptimismPortal',
args: [
L2OutputOracleProxy.address,
finalSystemOwner,
hre.deployConfig.finalizationPeriodSeconds,
finalSystemOwner,
true, // paused
],
postDeployAction: async (contract) => {
......
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