Merge branch 'master' into fix/erc7930/reject-empty-reference-and-addresse

Amxx · web-flow · commit 54440155a586 · 2026-02-10T15:16:17.000+01:00
diff --git a/.changeset/bright-cooks-brush.md b/.changeset/bright-cooks-brush.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': minor
+---
+
+`RLP`: Perform a memory copy when decoding `bytes` objects containing a single byte instead of returning a reference to the input.
diff --git a/.changeset/happy-pants-decide.md b/.changeset/happy-pants-decide.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': patch
+---
+
+Rename `BridgeERC20Core` to `BridgeFungible`
diff --git a/.changeset/spicy-seals-bake.md b/.changeset/spicy-seals-bake.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': minor
+---
+
+`WebAuthn`: Verification now returns `false` instead of reverting when client data contains an out-of-bounds `challengeIndex`.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - `ERC721` and `ERC1155`: Prevent setting an operator for `address(0)`. In the case of `ERC721` this type of operator allowance could lead to obfuscated mint permission. ([#6171](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/6171))
 - `RLP`: The `encode(bytes32)` function now encodes `bytes32` as a fixed size item and not as a scalar in `encode(uint256)`. Users must replace calls to `encode(bytes32)` with `encode(uint256(bytes32))` to preserve the same behavior. ([#6167](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/6167))
 - `ERC4337Utils`: The `parseValidationData` now returns a `ValidationRange` as the last return tuple value indicating whether the `validationData` is compared against a timestamp or block number. Developers must update their code to handle this new return value (e.g. `(aggregator, validAfter, validUntil) -> (aggregator, validAfter, validUntil, range)`).
+- `SignerWebAuthn`: The `_rawSignatureValidation` function now returns `false` when the signature is not a valid WebAuthn authentication assertion. P256 fallback is removed. Developers can add it back by overriding the function.
 
 ## 5.5.0 (2025-10-31)
 
diff --git a/contracts/crosschain/CrosschainLinked.sol b/contracts/crosschain/CrosschainLinked.sol
@@ -12,7 +12,7 @@ import {ERC7786Recipient} from "./ERC7786Recipient.sol";
  *
  * This contract contains the logic to register and send messages to counterparts on remote chains using ERC-7786
  * gateways. It ensure received messages originate from a counterpart. This is the base of token bridges such as
- * {BridgeERC20Core}.
+ * {BridgeFungible}.
  *
  * Contracts that inherit from this contract can use the internal {_sendMessageToCounterpart} to send messages to their
  * counterpart on a foreign chain. They must override the {_processMessage} function to handle messages that have
diff --git a/contracts/crosschain/README.adoc b/contracts/crosschain/README.adoc
@@ -10,7 +10,7 @@ This directory contains contracts for sending and receiving cross chain messages
 
 Additionally there are multiple bridge constructions:
 
-* {BridgeERC20Core}: Core bridging logic for crosschain ERC-20 transfer. Used by {BridgeERC20}, {BridgeERC7802} and {ERC20Crosschain},
+* {BridgeFungible}: Core bridging logic for crosschain ERC-20 transfer. Used by {BridgeERC20}, {BridgeERC7802} and {ERC20Crosschain},
 * {BridgeERC20}: Standalone bridge contract to connect an ERC-20 token contract with counterparts on remote chains,
 * {BridgeERC7802}: Standalone bridge contract to connect an ERC-7802 token contract with counterparts on remote chains.
 
@@ -22,7 +22,7 @@ Additionally there are multiple bridge constructions:
 
 == Bridges
 
-{{BridgeERC20Core}}
+{{BridgeFungible}}
 
 {{BridgeERC20}}
 
diff --git a/contracts/crosschain/bridges/BridgeERC20.sol b/contracts/crosschain/bridges/BridgeERC20.sol
@@ -3,14 +3,14 @@
 pragma solidity ^0.8.26;
 
 import {IERC20, SafeERC20} from "../../token/ERC20/utils/SafeERC20.sol";
-import {BridgeERC20Core} from "./BridgeERC20Core.sol";
+import {BridgeFungible} from "./abstract/BridgeFungible.sol";
 
 /**
- * @dev This is a variant of {BridgeERC20Core} that implements the bridge logic for ERC-20 tokens that do not expose a
+ * @dev This is a variant of {BridgeFungible} that implements the bridge logic for ERC-20 tokens that do not expose a
  * crosschain mint and burn mechanism. Instead, it takes custody of bridged assets.
  */
 // slither-disable-next-line locked-ether
-abstract contract BridgeERC20 is BridgeERC20Core {
+abstract contract BridgeERC20 is BridgeFungible {
     using SafeERC20 for IERC20;
 
     IERC20 private immutable _token;
diff --git a/contracts/crosschain/bridges/BridgeERC7802.sol b/contracts/crosschain/bridges/BridgeERC7802.sol
@@ -3,13 +3,13 @@
 pragma solidity ^0.8.26;
 
 import {IERC7802} from "../../interfaces/draft-IERC7802.sol";
-import {BridgeERC20Core} from "./BridgeERC20Core.sol";
+import {BridgeFungible} from "./abstract/BridgeFungible.sol";
 
 /**
- * @dev This is a variant of {BridgeERC20Core} that implements the bridge logic for ERC-7802 compliant tokens.
+ * @dev This is a variant of {BridgeFungible} that implements the bridge logic for ERC-7802 compliant tokens.
  */
 // slither-disable-next-line locked-ether
-abstract contract BridgeERC7802 is BridgeERC20Core {
+abstract contract BridgeERC7802 is BridgeFungible {
     IERC7802 private immutable _token;
 
     constructor(IERC7802 token_) {
diff --git a/contracts/crosschain/bridges/abstract/BridgeFungible.sol b/contracts/crosschain/bridges/abstract/BridgeFungible.sol
@@ -2,10 +2,10 @@
 
 pragma solidity ^0.8.26;
 
-import {InteroperableAddress} from "../../utils/draft-InteroperableAddress.sol";
-import {Context} from "../../utils/Context.sol";
-import {ERC7786Recipient} from "../ERC7786Recipient.sol";
-import {CrosschainLinked} from "../CrosschainLinked.sol";
+import {InteroperableAddress} from "../../../utils/draft-InteroperableAddress.sol";
+import {Context} from "../../../utils/Context.sol";
+import {ERC7786Recipient} from "../../ERC7786Recipient.sol";
+import {CrosschainLinked} from "../../CrosschainLinked.sol";
 
 /**
  * @dev Base contract for bridging ERC-20 between chains using an ERC-7786 gateway.
@@ -18,11 +18,11 @@ import {CrosschainLinked} from "../CrosschainLinked.sol";
  * which interface with ERC-7802 to provide an approve-free user experience. It is also used by the {ERC20Crosschain}
  * extension, which embeds the bridge logic directly in the token contract.
  */
-abstract contract BridgeERC20Core is Context, CrosschainLinked {
+abstract contract BridgeFungible is Context, CrosschainLinked {
     using InteroperableAddress for bytes;
 
-    event CrosschainERC20TransferSent(bytes32 indexed sendId, address indexed from, bytes to, uint256 amount);
-    event CrosschainERC20TransferReceived(bytes32 indexed receiveId, bytes from, address indexed to, uint256 amount);
+    event CrosschainFungibleTransferSent(bytes32 indexed sendId, address indexed from, bytes to, uint256 amount);
+    event CrosschainFungibleTransferReceived(bytes32 indexed receiveId, bytes from, address indexed to, uint256 amount);
 
     /**
      * @dev Transfer `amount` tokens to a crosschain receiver.
@@ -50,7 +50,7 @@ abstract contract BridgeERC20Core is Context, CrosschainLinked {
             new bytes[](0)
         );
 
-        emit CrosschainERC20TransferSent(sendId, from, to, amount);
+        emit CrosschainFungibleTransferSent(sendId, from, to, amount);
 
         return sendId;
     }
@@ -68,7 +68,7 @@ abstract contract BridgeERC20Core is Context, CrosschainLinked {
 
         _onReceive(to, amount);
 
-        emit CrosschainERC20TransferReceived(receiveId, from, to, amount);
+        emit CrosschainFungibleTransferReceived(receiveId, from, to, amount);
     }
 
     /// @dev Virtual function: implementation is required to handle token being burnt or locked on the source chain.
diff --git a/contracts/token/ERC20/README.adoc b/contracts/token/ERC20/README.adoc
@@ -19,7 +19,7 @@ Additionally there are multiple custom extensions, including:
 * {ERC20Bridgeable}: compatibility with crosschain bridges through ERC-7802.
 * {ERC20Burnable}: destruction of own tokens.
 * {ERC20Capped}: enforcement of a cap to the total supply when minting tokens.
-* {ERC20Crosschain}: embedded {BridgeERC20Core} bridge, making the token crosschain through the use of ERC-7786 gateways.
+* {ERC20Crosschain}: embedded {BridgeFungible} bridge, making the token crosschain through the use of ERC-7786 gateways.
 * {ERC20Pausable}: ability to pause token transfers.
 * {ERC20FlashMint}: token level support for flash loans through the minting and burning of ephemeral tokens (standardized as ERC-3156).
 * {ERC20Votes}: support for voting and vote delegation. xref:governance.adoc#token[See the governance guide for a minimal example (with the required overrides when combining ERC20 + ERC20Permit + ERC20Votes)].
diff --git a/contracts/token/ERC20/extensions/ERC20Crosschain.sol b/contracts/token/ERC20/extensions/ERC20Crosschain.sol
@@ -3,10 +3,10 @@
 pragma solidity ^0.8.26;
 
 import {ERC20} from "../ERC20.sol";
-import {BridgeERC20Core} from "../../../crosschain/bridges/BridgeERC20Core.sol";
+import {BridgeFungible} from "../../../crosschain/bridges/abstract/BridgeFungible.sol";
 
 /**
- * @dev Extension of {ERC20} that makes it natively cross-chain using the ERC-7786 based {BridgeERC20Core}.
+ * @dev Extension of {ERC20} that makes it natively cross-chain using the ERC-7786 based {BridgeFungible}.
  *
  * This extension makes the token compatible with counterparts on other chains, which can be:
  * * {ERC20Crosschain} instances,
@@ -19,7 +19,7 @@ import {BridgeERC20Core} from "../../../crosschain/bridges/BridgeERC20Core.sol";
  * * `_checkTokenBridge` (on the {ERC20Bridgeable} side) is implemented such that it only accepts self-calls.
  */
 // slither-disable-next-line locked-ether
-abstract contract ERC20Crosschain is ERC20, BridgeERC20Core {
+abstract contract ERC20Crosschain is ERC20, BridgeFungible {
     /// @dev Variant of {crosschainTransfer} that allows an authorized account (using ERC20 allowance) to operate on `from`'s assets.
     function crosschainTransferFrom(address from, bytes memory to, uint256 amount) public virtual returns (bytes32) {
         _spendAllowance(from, _msgSender(), amount);
diff --git a/contracts/utils/RLP.sol b/contracts/utils/RLP.sol
@@ -207,7 +207,8 @@ library RLP {
 
     /// @dev Encode a bytes buffer as RLP.
     function encode(bytes memory input) internal pure returns (bytes memory) {
-        return (input.length == 1 && uint8(input[0]) < SHORT_OFFSET) ? input : _encode(input, SHORT_OFFSET);
+        return
+            (input.length == 1 && uint8(input[0]) < SHORT_OFFSET) ? bytes.concat(input) : _encode(input, SHORT_OFFSET);
     }
 
     /// @dev Encode a string as RLP. Type alias for {encode-bytes-}.
diff --git a/contracts/utils/cryptography/WebAuthn.sol b/contracts/utils/cryptography/WebAuthn.sol
@@ -4,6 +4,7 @@
 pragma solidity ^0.8.24;
 
 import {P256} from "./P256.sol";
+import {Math} from "../math/Math.sol";
 import {Base64} from "../Base64.sol";
 import {Bytes} from "../Bytes.sol";
 import {Strings} from "../Strings.sol";
@@ -156,7 +157,11 @@ library WebAuthn {
         // solhint-disable-next-line quotes
         string memory expectedChallenge = string.concat('"challenge":"', Base64.encodeURL(challenge), '"');
         string memory actualChallenge = string(
-            Bytes.slice(bytes(clientDataJSON), challengeIndex, challengeIndex + bytes(expectedChallenge).length)
+            Bytes.slice(
+                bytes(clientDataJSON),
+                challengeIndex,
+                Math.saturatingAdd(challengeIndex, bytes(expectedChallenge).length)
+            )
         );
 
         return Strings.equal(actualChallenge, expectedChallenge);
diff --git a/contracts/utils/cryptography/signers/SignerWebAuthn.sol b/contracts/utils/cryptography/signers/SignerWebAuthn.sol
@@ -32,20 +32,15 @@ abstract contract SignerWebAuthn is SignerP256 {
     /**
      * @dev Validates a raw signature using the WebAuthn authentication assertion.
      *
-     * In case the signature can't be validated, it falls back to the
-     * {SignerP256-_rawSignatureValidation} method for raw P256 signature validation by passing
-     * the raw `r` and `s` values from the signature.
+     * Returns `false` if the signature is not a valid WebAuthn authentication assertion.
      */
     function _rawSignatureValidation(
         bytes32 hash,
         bytes calldata signature
     ) internal view virtual override returns (bool) {
         (bool decodeSuccess, WebAuthn.WebAuthnAuth calldata auth) = WebAuthn.tryDecodeAuth(signature);
-        if (decodeSuccess) {
-            (bytes32 qx, bytes32 qy) = signer();
-            return WebAuthn.verify(abi.encodePacked(hash), auth, qx, qy);
-        } else {
-            return super._rawSignatureValidation(hash, signature);
-        }
+        if (!decodeSuccess) return false;
+        (bytes32 qx, bytes32 qy) = signer();
+        return WebAuthn.verify(abi.encodePacked(hash), auth, qx, qy);
     }
 }
diff --git a/test/account/AccountWebAuthn.test.js b/test/account/AccountWebAuthn.test.js
@@ -72,17 +72,4 @@ describe('AccountWebAuthn', function () {
     shouldBehaveLikeERC1271({ erc7739: true });
     shouldBehaveLikeERC7821();
   });
-
-  describe('as regular P256 validator', function () {
-    beforeEach(async function () {
-      this.signer = p256Signer;
-      this.mock = this.p256Mock;
-      this.domain.verifyingContract = this.mock.address;
-    });
-
-    shouldBehaveLikeAccountCore();
-    shouldBehaveLikeAccountHolder();
-    shouldBehaveLikeERC1271({ erc7739: true });
-    shouldBehaveLikeERC7821();
-  });
 });
diff --git a/test/crosschain/BridgeERC20.behavior.js b/test/crosschain/BridgeERC20.behavior.js
@@ -37,12 +37,12 @@ function shouldBehaveLikeBridgeERC20({ chainAIsCustodial = false, chainBIsCustod
       .to.emit(this.tokenA, 'Transfer')
       .withArgs(alice, chainAIsCustodial ? this.bridgeA : ethers.ZeroAddress, amount)
       // crosschain transfer sent
-      .to.emit(this.bridgeA, 'CrosschainERC20TransferSent')
+      .to.emit(this.bridgeA, 'CrosschainFungibleTransferSent')
       .withArgs(anyValue, alice, this.chain.toErc7930(bruce), amount)
       // ERC-7786 event
       .to.emit(this.gateway, 'MessageSent')
       // crosschain transfer received
-      .to.emit(this.bridgeB, 'CrosschainERC20TransferReceived')
+      .to.emit(this.bridgeB, 'CrosschainFungibleTransferReceived')
       .withArgs(anyValue, this.chain.toErc7930(alice), bruce, amount)
       // crosschain mint event
       .to.emit(this.tokenB, 'CrosschainMint')
@@ -60,12 +60,12 @@ function shouldBehaveLikeBridgeERC20({ chainAIsCustodial = false, chainBIsCustod
       .to.emit(this.tokenB, 'CrosschainBurn')
       .withArgs(bruce, amount, this.bridgeB)
       // crosschain transfer sent
-      .to.emit(this.bridgeB, 'CrosschainERC20TransferSent')
+      .to.emit(this.bridgeB, 'CrosschainFungibleTransferSent')
       .withArgs(anyValue, bruce, this.chain.toErc7930(chris), amount)
       // ERC-7786 event
       .to.emit(this.gateway, 'MessageSent')
       // crosschain transfer received
-      .to.emit(this.bridgeA, 'CrosschainERC20TransferReceived')
+      .to.emit(this.bridgeA, 'CrosschainFungibleTransferReceived')
       .withArgs(anyValue, this.chain.toErc7930(bruce), chris, amount)
       // bridge on chain A releases custody of the funds
       .to.emit(this.tokenA, 'Transfer')
@@ -114,7 +114,7 @@ function shouldBehaveLikeBridgeERC20({ chainAIsCustodial = false, chainBIsCustod
       // first time works
       await expect(
         this.bridgeA.connect(this.gatewayAsEOA).receiveMessage(id, this.chain.toErc7930(this.bridgeB), payload),
-      ).to.emit(this.bridgeA, 'CrosschainERC20TransferReceived');
+      ).to.emit(this.bridgeA, 'CrosschainFungibleTransferReceived');
 
       // second time fails
       await expect(
diff --git a/test/token/ERC20/extensions/ERC20Crosschain.test.js b/test/token/ERC20/extensions/ERC20Crosschain.test.js
@@ -54,12 +54,12 @@ describe('ERC20Crosschain', function () {
         .to.emit(this.tokenA, 'Transfer')
         .withArgs(alice, ethers.ZeroAddress, amount)
         // crosschain transfer sent
-        .to.emit(this.tokenA, 'CrosschainERC20TransferSent')
+        .to.emit(this.tokenA, 'CrosschainFungibleTransferSent')
         .withArgs(anyValue, alice, this.chain.toErc7930(bruce), amount)
         // ERC-7786 event
         .to.emit(this.gateway, 'MessageSent')
         // crosschain transfer received
-        .to.emit(this.bridgeB, 'CrosschainERC20TransferReceived')
+        .to.emit(this.bridgeB, 'CrosschainFungibleTransferReceived')
         .withArgs(anyValue, this.chain.toErc7930(alice), bruce, amount)
         // crosschain mint event
         .to.emit(this.tokenB, 'CrosschainMint')
diff --git a/test/utils/cryptography/WebAuthn.t.sol b/test/utils/cryptography/WebAuthn.t.sol
@@ -141,12 +141,54 @@ contract WebAuthnTest is Test {
         );
     }
 
+    /// forge-config: default.fuzz.runs = 512
+    function testVerifyIndexOutOfBounds(bytes memory challenge, uint256 seed) public view {
+        bytes memory authenticatorData = _encodeAuthenticatorData(WebAuthn.AUTH_DATA_FLAGS_UP);
+        string memory clientDataJSON = _encodeClientDataJSON(challenge);
+
+        assertFalse(
+            _runVerify(
+                seed,
+                challenge,
+                bytes(clientDataJSON).length, // end of the clientDataJSON, no more room slicing
+                1,
+                authenticatorData,
+                clientDataJSON,
+                false
+            )
+        );
+
+        assertFalse(
+            _runVerify(
+                seed,
+                challenge,
+                type(uint256).max, // way out of bound, causing an overflow when figuring out the end of the slice
+                1,
+                authenticatorData,
+                clientDataJSON,
+                false
+            )
+        );
+    }
+
     function _runVerify(
         uint256 seed,
         bytes memory challenge,
         bytes memory authenticatorData,
         string memory clientDataJSON,
         bool requireUV
+    ) private view returns (bool) {
+        return _runVerify(seed, challenge, 23, 1, authenticatorData, clientDataJSON, requireUV);
+    }
+
+    function _runVerify(
+        uint256 seed,
+        bytes memory challenge,
+        uint256 challengeIndex,
+        uint256 typeIndex,
+        bytes memory authenticatorData,
+        string memory clientDataJSON,
+        bool requireUV
     ) private view returns (bool) {
         // Generate private key and get public key
         uint256 privateKey = bound(seed, 1, P256.N - 1);
@@ -163,8 +205,8 @@ contract WebAuthnTest is Test {
                 WebAuthn.WebAuthnAuth({
                     authenticatorData: authenticatorData,
                     clientDataJSON: clientDataJSON,
-                    challengeIndex: 23, // Position of challenge in clientDataJSON
-                    typeIndex: 1, // Position of type in clientDataJSON
+                    challengeIndex: challengeIndex, // Position of challenge in clientDataJSON
+                    typeIndex: typeIndex, // Position of type in clientDataJSON
                     r: r,
                     s: bytes32(Math.min(uint256(s), P256.N - uint256(s)))
                 }),

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'openzeppelin-solidity': minor
 +---
++
 +`RLP`: Perform a memory copy when decoding `bytes` objects containing a single byte instead of returning a reference to the input.
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import {ERC7786Recipient} from "./ERC7786Recipient.sol";`
`12`	`12`	`*`
`13`	`13`	`* This contract contains the logic to register and send messages to counterparts on remote chains using ERC-7786`
`14`	`14`	`* gateways. It ensure received messages originate from a counterpart. This is the base of token bridges such as`
`15`		`- * {BridgeERC20Core}.`
	`15`	`+ * {BridgeFungible}.`
`16`	`16`	`*`
`17`	`17`	`* Contracts that inherit from this contract can use the internal {_sendMessageToCounterpart} to send messages to their`
`18`	`18`	`* counterpart on a foreign chain. They must override the {_processMessage} function to handle messages that have`