Merge branch 'master' into aa/executeUserOp-delegate

OpenZeppelin · Dec 24, 2024 · dce8151 · dce8151
2 parents c349719 + dc1556f
commit dce8151
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 - `AccountERC7821`: Account implementation that implements ERC-7821 for minimal batch execution interface. No support for additional `opData` is included.
 
-## XX-XX-2024
+## 16-12-2024
 
 - `AccountCore`: Added a simple ERC-4337 account implementation with minimal logic to process user operations.
-- `Account`: Extensions of {AccountCore} with recommended features that most accounts should have.
-- `AbstractSigner`, `SignerECDSA`, `SignerP256`, and `SignerRSA`: Add an abstract contract, and various implementations, for contracts that deal with signature verification. Used by {AccountCore} and {ERC7739Utils}.
+- `Account`: Extensions of AccountCore with recommended features that most accounts should have.
+- `AbstractSigner`, `SignerECDSA`, `SignerP256`, and `SignerRSA`: Add an abstract contract, and various implementations, for contracts that deal with signature verification. Used by AccountCore and `ERC7739Utils.
 - `AccountSignerERC7702`: Implementation of `AbstractSigner` for ERC-7702 compatible accounts.
 
 ## 06-11-2024

diff --git a/contracts/token/ERC20/extensions/ERC20Custodian.sol b/contracts/token/ERC20/extensions/ERC20Custodian.sol
@@ -7,16 +7,15 @@ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 /**
  * @dev Extension of {ERC20} that allows to implement a custodian
  * mechanism that can be managed by an authorized account with the
- * {freeze} and {unfreeze} functions.
+ * {freeze} function.
  *
  * This mechanism allows a custodian (e.g. a DAO or a
  * well-configured multisig) to freeze and unfreeze the balance
  * of a user.
  *
  * The frozen balance is not available for transfers or approvals
- * to other entities to operate on its behalf if {freeze} was not
- * called with such account as an argument. Similarly, the account
- * will be unfrozen again if {unfreeze} is called.
+ * to other entities to operate on its behalf if. The frozen balance
+ * can be reduced by calling {freeze} again with a lower amount.
  */
 abstract contract ERC20Custodian is ERC20 {
     /**

diff --git a/contracts/token/README.adoc b/contracts/token/README.adoc
@@ -24,6 +24,6 @@ Set of extensions and utilities for tokens (e.g ERC-20, ERC-721, ERC-1155) and d
 
 {{ERC20Collateral}}
 
-{{ERC20Custodial}}
+{{ERC20Custodian}}
 
 {{ERC4626Fees}}