Merge branch 'next-v5.0' into next/refactor/safeIncrDecrAllowance

OpenZeppelin · May 19, 2023 · 7c28604 · 7c28604
2 parents b46a616 + 0f10efe
commit 7c28604
Show file tree

Hide file tree

Showing 125 changed files with 700 additions and 7,389 deletions.
diff --git a/.changeset/beige-ducks-flow.md b/.changeset/beige-ducks-flow.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove deprecated GovernorProposalThreshold module.
diff --git a/.changeset/fluffy-gifts-build.md b/.changeset/fluffy-gifts-build.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove ERC1820Implementer.
diff --git a/.changeset/friendly-suits-camp.md b/.changeset/friendly-suits-camp.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove Checkpoints.History.
diff --git a/.changeset/selfish-queens-rest.md b/.changeset/selfish-queens-rest.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove PullPayment and Escrow contracts (Escrow, ConditionalEscrow, RefundEscrow).
diff --git a/.changeset/spicy-ducks-cough.md b/.changeset/spicy-ducks-cough.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove the Timers library.
diff --git a/.changeset/swift-berries-sort.md b/.changeset/swift-berries-sort.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove ERC777 implementation.
diff --git a/.changeset/tame-geckos-search.md b/.changeset/tame-geckos-search.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove SafeMath and SignedSafeMath libraries.
diff --git a/.changeset/three-weeks-double.md b/.changeset/three-weeks-double.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove CrossChain contracts, including AccessControlCrossChain and all the vendored bridge interfaces.
diff --git a/contracts/access/AccessControl.sol b/contracts/access/AccessControl.sol
@@ -183,30 +183,6 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
  _revokeRole(role, account);
  }
 
- /**
- * @dev Grants `role` to `account`.
- *
- * If `account` had not been already granted `role`, emits a {RoleGranted}
- * event. Note that unlike {grantRole}, this function doesn't perform any
- * checks on the calling account.
- *
- * May emit a {RoleGranted} event.
- *
- * [WARNING]
- * ====
- * This function should only be called from the constructor when setting
- * up the initial roles for the system.
- *
- * Using this function in any other way is effectively circumventing the admin
- * system imposed by {AccessControl}.
- * ====
- *
- * NOTE: This function is deprecated in favor of {_grantRole}.
- */
- function _setupRole(bytes32 role, address account) internal virtual {
- _grantRole(role, account);
- }
-
  /**
  * @dev Sets `adminRole` as ``role``'s admin role.
  *

diff --git a/contracts/access/AccessControlCrossChain.sol b/contracts/access/AccessControlCrossChain.sol
diff --git a/contracts/access/README.adoc b/contracts/access/README.adoc
@@ -18,8 +18,6 @@ This directory provides ways to restrict who can access the functions of a contr
 
 {{AccessControl}}
 
-{{AccessControlCrossChain}}
-
 {{IAccessControlEnumerable}}
 
 {{AccessControlEnumerable}}

diff --git a/contracts/crosschain/CrossChainEnabled.sol b/contracts/crosschain/CrossChainEnabled.sol
diff --git a/contracts/crosschain/README.adoc b/contracts/crosschain/README.adoc
diff --git a/contracts/crosschain/amb/CrossChainEnabledAMB.sol b/contracts/crosschain/amb/CrossChainEnabledAMB.sol
diff --git a/contracts/crosschain/amb/LibAMB.sol b/contracts/crosschain/amb/LibAMB.sol
diff --git a/contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL1.sol b/contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL1.sol
diff --git a/contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol b/contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol