Skip to content

Commit

Permalink
fix(ct): correct constructor parameters (ethereum-optimism#12158)
Browse files Browse the repository at this point in the history
Certain constructor parameters were not being inserted correctly.
Although this didn't cause a failure during deployment, it did
cause Kontrol tests to fail.
  • Loading branch information
smartcontracts authored and samlaf committed Nov 10, 2024
1 parent 572bb6f commit e490e0d
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "SuperchainConfig",
_args: abi.encodeCall(ISuperchainConfig.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(ISuperchainConfig.__constructor__, ()))
})
);

Expand All @@ -694,7 +694,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "L1CrossDomainMessenger",
_args: abi.encodeCall(IL1CrossDomainMessenger.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IL1CrossDomainMessenger.__constructor__, ()))
})
);

Expand All @@ -718,7 +718,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "OptimismPortal",
_args: abi.encodeCall(IOptimismPortal.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IOptimismPortal.__constructor__, ()))
});

// Override the `OptimismPortal` contract to the deployed implementation. This is necessary
Expand Down Expand Up @@ -778,7 +778,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "L2OutputOracle",
_args: abi.encodeCall(IL2OutputOracle.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IL2OutputOracle.__constructor__, ()))
})
);

Expand All @@ -804,7 +804,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "OptimismMintableERC20Factory",
_args: abi.encodeCall(IOptimismMintableERC20Factory.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IOptimismMintableERC20Factory.__constructor__, ()))
})
);

Expand All @@ -825,7 +825,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "DisputeGameFactory",
_args: abi.encodeCall(IDisputeGameFactory.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IDisputeGameFactory.__constructor__, ()))
})
);

Expand Down Expand Up @@ -872,7 +872,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "ProtocolVersions",
_args: abi.encodeCall(IProtocolVersions.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IProtocolVersions.__constructor__, ()))
})
);

Expand Down Expand Up @@ -951,15 +951,15 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "SystemConfigInterop",
_args: abi.encodeCall(ISystemConfigInterop.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfigInterop.__constructor__, ()))
});
save("SystemConfig", addr_);
} else {
addr_ = DeployUtils.create2AndSave({
_save: this,
_salt: _implSalt(),
_name: "SystemConfig",
_args: abi.encodeCall(ISystemConfig.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfig.__constructor__, ()))
});
}

Expand All @@ -978,7 +978,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "L1StandardBridge",
_args: abi.encodeCall(IL1StandardBridge.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IL1StandardBridge.__constructor__, ()))
})
);

Expand All @@ -999,7 +999,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "L1ERC721Bridge",
_args: abi.encodeCall(IL1ERC721Bridge.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IL1ERC721Bridge.__constructor__, ()))
})
);

Expand Down Expand Up @@ -1035,7 +1035,7 @@ contract Deploy is Deployer {
_save: this,
_salt: _implSalt(),
_name: "DataAvailabilityChallenge",
_args: abi.encodeCall(IDataAvailabilityChallenge.__constructor__, ())
_args: DeployUtils.encodeConstructor(abi.encodeCall(IDataAvailabilityChallenge.__constructor__, ()))
})
);
addr_ = address(dac);
Expand Down

0 comments on commit e490e0d

Please sign in to comment.