diff --git a/README.md b/README.md index 0408a9fdad9..7d045498f6f 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Add `@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/` in `remappi Once installed, you can use the contracts in the library by importing them: ```solidity -pragma solidity ^0.8.20; +pragma solidity ^0.8.24; import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; diff --git a/contracts/governance/README.adoc b/contracts/governance/README.adoc index 28bf35756db..79651a985ad 100644 --- a/contracts/governance/README.adoc +++ b/contracts/governance/README.adoc @@ -44,7 +44,7 @@ Timelock extensions add a delay for governance decisions to be executed. The wor Other extensions can customize the behavior or interface in multiple ways. -* {GovernorCrosschain}: Helps with the execution of crosschain operation using {CrosschainRemoteExector} and ERC-7786 gateways. +* {GovernorCrosschain}: Helps with the execution of crosschain operation using {CrosschainRemoteExecutor} and ERC-7786 gateways. * {GovernorNoncesKeyed}: An extension of {Governor} with support for keyed nonces in addition to traditional nonces when voting by signature. diff --git a/contracts/utils/cryptography/EIP712.sol b/contracts/utils/cryptography/EIP712.sol index a2e7bf4c7bf..eeb707647ea 100644 --- a/contracts/utils/cryptography/EIP712.sol +++ b/contracts/utils/cryptography/EIP712.sol @@ -23,7 +23,7 @@ import {IERC5267} from "../../interfaces/IERC5267.sol"; * the chain id to protect against replay attacks on an eventual fork of the chain. * * NOTE: This contract implements the version of the encoding known as "v4", as implemented by the JSON RPC method - * https://docs.metamask.io/guide/signing-data.html[`eth_signTypedDataV4` in MetaMask]. + * https://docs.metamask.io/wallet/how-to/sign-data/[`eth_signTypedDataV4` in MetaMask]. * * NOTE: In the upgradeable version of this contract, the cached values will correspond to the address, and the domain * separator of the implementation contract. This will cause the {_domainSeparatorV4} function to always rebuild the diff --git a/contracts/utils/cryptography/WebAuthn.sol b/contracts/utils/cryptography/WebAuthn.sol index 085a78320e7..301f2cb253a 100644 --- a/contracts/utils/cryptography/WebAuthn.sol +++ b/contracts/utils/cryptography/WebAuthn.sol @@ -138,7 +138,7 @@ library WebAuthn { // clientDataJson.length >= typeIndex + 21 gt(mload(clientDataJSON), add(typeIndex, 20)), eq( - // get 32 bytes starting at index typexIndex in clientDataJSON, and keep the leftmost 21 bytes + // get 32 bytes starting at index typeIndex in clientDataJSON, and keep the leftmost 21 bytes and(mload(add(add(clientDataJSON, 0x20), typeIndex)), shl(88, not(0))), // solhint-disable-next-line quotes '"type":"webauthn.get"' diff --git a/scripts/upgradeable/upgradeable.patch b/scripts/upgradeable/upgradeable.patch index e70c1dcebeb..fc2384176ab 100644 --- a/scripts/upgradeable/upgradeable.patch +++ b/scripts/upgradeable/upgradeable.patch @@ -220,7 +220,7 @@ index a2e7bf4c7..44cfa054b 100644 /** @@ -25,43 +24,18 @@ import {IERC5267} from "../../interfaces/IERC5267.sol"; * NOTE: This contract implements the version of the encoding known as "v4", as implemented by the JSON RPC method - * https://docs.metamask.io/guide/signing-data.html[`eth_signTypedDataV4` in MetaMask]. + * https://docs.metamask.io/wallet/how-to/sign-data/[`eth_signTypedDataV4` in MetaMask]. * - * NOTE: In the upgradeable version of this contract, the cached values will correspond to the address, and the domain - * separator of the implementation contract. This will cause the {_domainSeparatorV4} function to always rebuild the