Merge branch 'master' into lib-839-custom-errors

OpenZeppelin · Jun 12, 2023 · 1cd28fe · 1cd28fe
2 parents 007d6b0 + 08fd777
commit 1cd28fe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/contracts/token/ERC1155/IERC1155.sol b/contracts/token/ERC1155/IERC1155.sol
@@ -86,6 +86,11 @@ interface IERC1155 is IERC165 {
  /**
  * @dev Transfers `amount` tokens of token type `id` from `from` to `to`.
  *
+ * WARNING: This function can potentially allow a reentrancy attack when transferring tokens
+ * to an untrusted contract, when invoking {onERC1155Received} on the receiver.
+ * Ensure to follow the checks-effects-interactions pattern and consider employing
+ * reentrancy guards when interacting with untrusted contracts.
+ *
  * Emits a {TransferSingle} event.
  *
  * Requirements:
@@ -101,6 +106,12 @@ interface IERC1155 is IERC165 {
  /**
  * @dev xref:ROOT:erc1155.adoc#batch-operations[Batched] version of {safeTransferFrom}.
  *
+ *
+ * WARNING: This function can potentially allow a reentrancy attack when transferring tokens
+ * to an untrusted contract, when invoking {onERC1155BatchReceived} on the receiver.
+ * Ensure to follow the checks-effects-interactions pattern and consider employing
+ * reentrancy guards when interacting with untrusted contracts.
+ *
  * Emits a {TransferBatch} event.
  *
  * Requirements:

diff --git a/contracts/utils/cryptography/ECDSA.sol b/contracts/utils/cryptography/ECDSA.sol
@@ -50,7 +50,7 @@ library ECDSA {
  * @dev Returns the address that signed a hashed message (`hash`) with
  * `signature` or error string. This address can then be used for verification purposes.
  *
- * The `ecrecover` EVM opcode allows for malleable (non-unique) signatures:
+ * The `ecrecover` EVM precompile allows for malleable (non-unique) signatures:
  * this function rejects them by requiring the `s` value to be in the lower
  * half order, and the `v` value to be either 27 or 28.
  *
@@ -89,7 +89,7 @@ library ECDSA {
  * @dev Returns the address that signed a hashed message (`hash`) with
  * `signature`. This address can then be used for verification purposes.
  *
- * The `ecrecover` EVM opcode allows for malleable (non-unique) signatures:
+ * The `ecrecover` EVM precompile allows for malleable (non-unique) signatures:
  * this function rejects them by requiring the `s` value to be in the lower
  * half order, and the `v` value to be either 27 or 28.
  *