Skip to content

contracts-bedrock: standard initializable#3109

Merged
mergify[bot] merged 1 commit intodevelopfrom
ctb/single-initializable
Jul 27, 2022
Merged

contracts-bedrock: standard initializable#3109
mergify[bot] merged 1 commit intodevelopfrom
ctb/single-initializable

Conversation

@tynes
Copy link
Contributor

@tynes tynes commented Jul 27, 2022

Description

Use only 1 initializable instead of two different initializable
imports. Using contracts with the same name will break hardhat.

The two different initializable imports were:

import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";

This standardizes on not using contracts-upgradeable.

Use only 1 initializable instead of two different initializable
imports. Using contracts with the same name will break hardhat.

The two different initializable imports were:

```solidity
import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
```

```solidity
import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
```

This standardizes on not using `contracts-upgradeable`.
@changeset-bot
Copy link

changeset-bot bot commented Jul 27, 2022

🦋 Changeset detected

Latest commit: 6196d97

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@eth-optimism/contracts-bedrock Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@tynes tynes requested review from maurelian and mslipper July 27, 2022 16:11
@github-actions github-actions bot added 2-reviewers A-pkg-contracts-bedrock Area: packages/contracts-bedrock labels Jul 27, 2022
@mergify
Copy link
Contributor

mergify bot commented Jul 27, 2022

This PR has been added to the merge queue, and will be merged soon.

@mergify mergify bot merged commit d544f80 into develop Jul 27, 2022
@mergify mergify bot deleted the ctb/single-initializable branch July 27, 2022 16:26
@mergify
Copy link
Contributor

mergify bot commented Jul 27, 2022

This PR is next in line to be merged, and will be merged as soon as checks pass.

@mergify mergify bot removed the on-merge-train label Jul 27, 2022
tynes added a commit that referenced this pull request Jul 27, 2022
Use only 1 initializable instead of two different initializable
imports. Using contracts with the same name will break hardhat.

The two different initializable imports were:

```solidity
import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
```

```solidity
import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
```

This standardizes on not using `contracts-upgradeable`.
@mslipper mslipper mentioned this pull request Aug 4, 2022
maurelian pushed a commit that referenced this pull request Sep 15, 2022
Use only 1 initializable instead of two different initializable
imports. Using contracts with the same name will break hardhat.

The two different initializable imports were:

```solidity
import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
```

```solidity
import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
```

This standardizes on not using `contracts-upgradeable`.
sam-goldman pushed a commit that referenced this pull request Sep 15, 2022
Use only 1 initializable instead of two different initializable
imports. Using contracts with the same name will break hardhat.

The two different initializable imports were:

```solidity
import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
```

```solidity
import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
```

This standardizes on not using `contracts-upgradeable`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-pkg-contracts-bedrock Area: packages/contracts-bedrock

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants