Merge pull request #7386 from ethereum-optimism/ctb/fix-factory-create2

contracts-bedrock: fix mintable erc20 factory bug

packages/contracts-bedrock/.gas-snapshot

@@ -435,10 +435,10 @@ OptimismMintableERC721_Test:test_safeMint_succeeds() (gas: 140547)
 OptimismMintableERC721_Test:test_supportsInterfaces_succeeds() (gas: 9005)
 OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163441)
 OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 9760)
-OptimismMintableTokenFactory_Test:test_createStandardL2TokenWithDecimals_succeeds() (gas: 1304000)
+OptimismMintableTokenFactory_Test:test_createStandardL2TokenWithDecimals_succeeds() (gas: 1303953)
 OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_reverts() (gas: 9570)
-OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_reverts() (gas: 8937393460516769330)
-OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1303990)
+OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_reverts() (gas: 8937393460516769327)
+OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1303943)
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitImpl_reverts() (gas: 11178)
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 16111)
 OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_succeeds() (gas: 26781)

packages/contracts-bedrock/semver-lock.json

@@ -28,7 +28,7 @@
   "src/periphery/op-nft/OptimistAllowlist.sol": "0x53e9a9dfecbae036fd468e8f34c80c7d9c35bd8908c8a6483db44dbc5128ad69",
   "src/periphery/op-nft/OptimistInviter.sol": "0xfdd5b9d45205ef9372ba37f7a6394724695e676d27a47cb154ee6e4148490013",
   "src/universal/OptimismMintableERC20.sol": "0x17fe6e955dc7e9e480e57bc62c227206838b204dcb660b8cb8f6f217319a22ba",
-  "src/universal/OptimismMintableERC20Factory.sol": "0xa8b1781116fd296a2630b94e4e18724b64094a70e2e716cb4c5bf5a8dbe32889",
+  "src/universal/OptimismMintableERC20Factory.sol": "0xceba817d4e4b27345525d9eaa1ef5e11952439278766b8bb1eb2b97c59fbb587",
   "src/universal/OptimismMintableERC721.sol": "0x49dc863caf3e002bf0c90b3af3873990fb282771f4c63735fd61a885b7873983",
   "src/universal/OptimismMintableERC721Factory.sol": "0x502438b009bfaf0ab187914662468261f10446fd85d44a79b29cdaef7b4982ba"
 }
\ No newline at end of file

packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol

 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { OptimismMintableERC20 } from "../universal/OptimismMintableERC20.sol";
+import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import { Semver } from "./Semver.sol";
+import { ISemver } from "src/universal/ISemver.sol";
 
 /// @custom:proxied
 /// @custom:predeployed 0x4200000000000000000000000000000000000012
@@ -12,7 +12,7 @@ import { Semver } from "./Semver.sol";
 ///         contracts on the network it's deployed to. Simplifies the deployment process for users
 ///         who may be less familiar with deploying smart contracts. Designed to be backwards
 ///         compatible with the older StandardL2ERC20Factory contract.
-contract OptimismMintableERC20Factory is Semver, Initializable {
+contract OptimismMintableERC20Factory is ISemver, Initializable {
     /// @notice Address of the StandardBridge on this chain.
     /// @custom:network-specific
     address public bridge;
@@ -30,11 +30,14 @@ contract OptimismMintableERC20Factory is Semver, Initializable {
     /// @param deployer    Address of the account that deployed the token.
     event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
 
-    /// @custom:semver 1.4.0
+    /// @notice Semantic version.
+    /// @custom:semver 1.5.0
+    string public constant version = "1.5.0";
+
     /// @notice The semver MUST be bumped any time that there is a change in
     ///         the OptimismMintableERC20 token contract since this contract
     ///         is responsible for deploying OptimismMintableERC20 contracts.
-    constructor() Semver(1, 4, 0) {
+    constructor() {
         initialize({ _bridge: address(0) });
     }
 
@@ -102,7 +105,7 @@ contract OptimismMintableERC20Factory is Semver, Initializable {
     {
         require(_remoteToken != address(0), "OptimismMintableERC20Factory: must provide remote token address");
 
-        bytes32 salt = keccak256(abi.encode(_remoteToken, _name, _symbol));
+        bytes32 salt = keccak256(abi.encode(_remoteToken, _name, _symbol, _decimals));
         address localToken =
             address(new OptimismMintableERC20{salt: salt}(bridge, _remoteToken, _name, _symbol, _decimals));
 

packages/contracts-bedrock/test/OptimismMintableERC20Factory.t.sol

@@ -81,7 +81,7 @@ contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
     {
         bytes memory constructorArgs = abi.encode(address(L2Bridge), _remote, _name, _symbol, _decimals);
         bytes memory bytecode = abi.encodePacked(type(OptimismMintableERC20).creationCode, constructorArgs);
-        bytes32 salt = keccak256(abi.encode(_remote, _name, _symbol));
+        bytes32 salt = keccak256(abi.encode(_remote, _name, _symbol, _decimals));
         bytes32 hash = keccak256(abi.encodePacked(bytes1(0xff), address(L2TokenFactory), salt, keccak256(bytecode)));
         return address(uint160(uint256(hash)));
     }