Skip to content

Commit ca7a4e3

Browse files
ernestognwBilogweb3FallengirlAmxxreject-i
authored
Group typo fixes (#5466)
Co-authored-by: Bilog WEB3 <[email protected]> Co-authored-by: Fallengirl <[email protected]> Co-authored-by: Hadrien Croubois <[email protected]> Co-authored-by: XxAlex74xX <[email protected]> Co-authored-by: Arr00 <[email protected]> Co-authored-by: PixelPilot <[email protected]> Co-authored-by: kilavvy <[email protected]> Co-authored-by: Devkuni <[email protected]> Co-authored-by: Danbo <[email protected]> Co-authored-by: Ann Wagner <[email protected]> Co-authored-by: comfsrt <[email protected]> Co-authored-by: Bob <[email protected]> Co-authored-by: JohnBonny <[email protected]> Co-authored-by: moonman <[email protected]> Co-authored-by: kazak <[email protected]> Co-authored-by: Wei <[email protected]> Co-authored-by: Maxim Evtush <[email protected]> Co-authored-by: Vitalyr <[email protected]> Co-authored-by: pendrue <[email protected]> Co-authored-by: Tronica <[email protected]> Co-authored-by: emmmm <[email protected]> Co-authored-by: bigbear <[email protected]> Co-authored-by: Tomás Andróil <[email protected]> Co-authored-by: GooseMatrix <[email protected]> Co-authored-by: jasmy <[email protected]> Co-authored-by: SITADRITA1 <[email protected]> Co-authored-by: Ocenka <[email protected]>
1 parent fa995ef commit ca7a4e3

34 files changed

+57
-57
lines changed

.changeset/brown-turkeys-marry.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
'openzeppelin-solidity': minor
33
---
44

5-
`ER6909TokenSupply`: Add an extension of ERC6909 which tracks total supply for each token id.
5+
`ERC6909TokenSupply`: Add an extension of ERC6909 which tracks total supply for each token id.

.github/actions/gas-compare/action.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ name: Compare gas costs
22
description: Compare gas costs between branches
33
inputs:
44
token:
5-
description: github token
5+
description: GitHub token, required to access GitHub API
66
required: true
77
report:
8-
description: report to read from
8+
description: Path to the report to compare
99
required: false
1010
default: gasReporterOutput.json
1111
out_report:
12-
description: report to read
12+
description: Path to save the output report
1313
required: false
1414
default: ${{ github.ref_name }}.gasreport.json
1515
ref_report:
16-
description: report to read from
16+
description: Path to the reference report for comparison
1717
required: false
1818
default: ${{ github.base_ref }}.gasreport.json
1919

.github/workflows/checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
run: npm run test:inheritance
4444
- name: Check pragma consistency between files
4545
run: npm run test:pragma
46-
- name: Check proceduraly generated contracts are up-to-date
46+
- name: Check procedurally generated contracts are up-to-date
4747
run: npm run test:generation
4848
- name: Compare gas costs
4949
uses: ./.github/actions/gas-compare

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ Instead, contracts now revert with custom errors. Systems that interact with sma
427427

428428
##### Relying on storage locations for retrieving data
429429

430-
After 5.0, the storage location of some variables were changed. This is the case for `Initializable` and all the upgradeable contracts since they now use namespaced storaged locations. Any system relying on storage locations for retrieving data or detecting capabilities should be updated to support these new locations.
430+
After 5.0, the storage location of some variables was changed. This is the case for `Initializable` and all the upgradeable contracts since they now use namespaced storage locations. Any system relying on storage locations for retrieving data or detecting capabilities should be updated to support these new locations.
431431

432432
## 4.9.6 (2024-02-29)
433433

GUIDELINES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Code must be thoroughly tested with quality unit tests.
66

77
We defer to the [Moloch Testing Guide](https://github.com/MolochVentures/moloch/tree/master/test#readme) for specific recommendations, though not all of it is relevant here. Note the introduction:
88

9-
> Tests should be written, not only to verify correctness of the target code, but to be comprehensively reviewed by other programmers. Therefore, for mission critical Solidity code, the quality of the tests are just as important (if not more so) than the code itself, and should be written with the highest standards of clarity and elegance.
9+
> Tests should be written, not only to verify correctness of the target code, but to be comprehensively reviewed by other programmers. Therefore, for mission critical Solidity code, the quality of the tests is just as important (if not more so) than the code itself, and should be written to the highest standards of clarity and elegance.
1010
1111
Every addition or change to the code must come with relevant and comprehensive tests.
1212

RELEASING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Releasing
22

3-
OpenZeppelin Contracts uses a fully automated release process that takes care of compiling, packaging, and publishing the library, all of which is carried out in a clean CI environment (GitHub Actions), implemented in the ([`release-cycle`](.github/workflows/release-cycle.yml)) workflow. This helps to reduce the potential for human error and inconsistencies, and ensures that the release process is ongoing and reliable.
3+
OpenZeppelin Contracts uses a fully automated release process that takes care of compiling, packaging, and publishing the library, all of which is carried out in a clean CI environment (GitHub Actions), implemented in the [`release-cycle`](.github/workflows/release-cycle.yml) workflow. This helps to reduce the potential for human error and inconsistencies, and ensures that the release process is consistent and reliable.
44

55
## Changesets
66

audits/2017-03.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The git commit hash we evaluated is:
2020

2121
# Disclaimer
2222

23-
The audit makes no statements or warrantees about utility of the code, safety of the code, suitability of the business model, regulatory regime for the business model, or any other statements about fitness of the contracts to purpose, or their bug free status. The audit documentation is for discussion purposes only.
23+
The audit makes no statements or warranties about utility of the code, safety of the code, suitability of the business model, regulatory regime for the business model, or any other statements about fitness of the contracts to purpose, or their bug free status. The audit documentation is for discussion purposes only.
2424

2525
# Executive Summary
2626

@@ -90,7 +90,7 @@ We are still working through the confirmation protocol in `Shareable.sol`, but w
9090
This bug has a number of causes that need to be addressed:
9191

9292
1. `resetSpentToday` and `confirm` together do not limit the days on which the function can be called or (it appears) the number of times it can be called.
93-
1. Once a call has been confirmed and `execute`d it appears that it can be re-executed. This is not good.
93+
1. Once a call has been confirmed and executed it appears that it can be re-executed. This is not good.
9494
3. `confirmandCheck` doesn't seem to have logic about whether or not the function in question has been called.
9595
4. Even if it did, `revoke` would need updates and logic to deal with revocation requests after a function call had been completed.
9696

@@ -109,7 +109,7 @@ It would be nice to see how many payments are pending. This would imply a bit of
109109

110110
## Shareable Contract
111111

112-
We do not believe the `Shareable.sol` contract is ready for primetime. It is missing functions, and as written may be vulnerable to a reordering attack -- an attack in which a miner or other party "racing" with a smart contract participant inserts their own information into a list or mapping.
112+
We do not believe the `Shareable.sol` contract is ready for prime time. It is missing functions, and as written may be vulnerable to a reordering attack -- an attack in which a miner or other party "racing" with a smart contract participant inserts their own information into a list or mapping.
113113

114114
The confirmation and revocation code needs to be looked over with a very careful eye imagining extraordinarily bad behavior by shared owners before this contract can be called safe.
115115

@@ -159,7 +159,7 @@ Allows owner to set a public string of contract information. No issues.
159159

160160
This needs some work. Doesn't check if `_required <= len(_owners)` for instance, that would be a bummer. What if _required were like `MAX - 1`?
161161

162-
I have a general concern about the difference between `owners`, `_owners`, and `owner` in `Ownable.sol`. I recommend "Owners" be renamed. In general we do not recomment single character differences in variable names, although a preceding underscore is not uncommon in Solidity code.
162+
I have a general concern about the difference between `owners`, `_owners`, and `owner` in `Ownable.sol`. I recommend "Owners" be renamed. In general we do not recommend single character differences in variable names, although a preceding underscore is not uncommon in Solidity code.
163163

164164
Line 34: "this contract only has six types of events"...actually only two.
165165

@@ -224,7 +224,7 @@ Transfer() and transferFrom() use SafeMath functions, which will cause them to t
224224

225225
### SimpleToken
226226

227-
Sample instantiation of StandardToken. Note that in this sample, decimals is 18 and supply only 10,000, so the supply is a small fraction of a single nominal token.
227+
Sample instantiation of StandardToken. Note that in this sample, decimals is 18 and supply is only 10,000, so the supply is a small fraction of a single nominal token.
228228

229229
### CrowdsaleToken
230230

contracts/access/IAccessControl.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ interface IAccessControl {
2323
* @dev Emitted when `newAdminRole` is set as ``role``'s admin role, replacing `previousAdminRole`
2424
*
2525
* `DEFAULT_ADMIN_ROLE` is the starting admin for all roles, despite
26-
* {RoleAdminChanged} not being emitted signaling this.
26+
* {RoleAdminChanged} not being emitted to signal this.
2727
*/
2828
event RoleAdminChanged(bytes32 indexed role, bytes32 indexed previousAdminRole, bytes32 indexed newAdminRole);
2929

contracts/governance/extensions/GovernorTimelockControl.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {SafeCast} from "../../utils/math/SafeCast.sol";
1717
* the assets and permissions must be attached to the {TimelockController}. Any asset sent to the {Governor} will be
1818
* inaccessible from a proposal, unless executed via {Governor-relay}.
1919
*
20-
* WARNING: Setting up the TimelockController to have additional proposers or cancellers besides the governor is very
20+
* WARNING: Setting up the TimelockController to have additional proposers or cancelers besides the governor is very
2121
* risky, as it grants them the ability to: 1) execute operations as the timelock, and thus possibly performing
2222
* operations or accessing funds that are expected to only be accessible through a vote, and 2) block governance
2323
* proposals that have been approved by the voters, effectively executing a Denial of Service attack.

contracts/interfaces/IERC4626.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ interface IERC4626 is IERC20, IERC20Metadata {
198198
function maxRedeem(address owner) external view returns (uint256 maxShares);
199199

200200
/**
201-
* @dev Allows an on-chain or off-chain user to simulate the effects of their redeemption at the current block,
201+
* @dev Allows an on-chain or off-chain user to simulate the effects of their redemption at the current block,
202202
* given current on-chain conditions.
203203
*
204204
* - MUST return as close to and no more than the exact amount of assets that would be withdrawn in a redeem call

contracts/proxy/Clones.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ library Clones {
2121
error CloneArgumentsTooLong();
2222

2323
/**
24-
* @dev Deploys and returns the address of a clone that mimics the behaviour of `implementation`.
24+
* @dev Deploys and returns the address of a clone that mimics the behavior of `implementation`.
2525
*
2626
* This function uses the create opcode, which should never revert.
2727
*/
@@ -54,7 +54,7 @@ library Clones {
5454
}
5555

5656
/**
57-
* @dev Deploys and returns the address of a clone that mimics the behaviour of `implementation`.
57+
* @dev Deploys and returns the address of a clone that mimics the behavior of `implementation`.
5858
*
5959
* This function uses the create2 opcode and a `salt` to deterministically deploy
6060
* the clone. Using the same `implementation` and `salt` multiple times will revert, since
@@ -158,7 +158,7 @@ library Clones {
158158
}
159159

160160
/**
161-
* @dev Deploys and returns the address of a clone that mimics the behaviour of `implementation` with custom
161+
* @dev Deploys and returns the address of a clone that mimics the behavior of `implementation` with custom
162162
* immutable arguments. These are provided through `args` and cannot be changed after deployment. To
163163
* access the arguments within the implementation, use {fetchCloneArgs}.
164164
*

contracts/proxy/utils/Initializable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ abstract contract Initializable {
112112
// Allowed calls:
113113
// - initialSetup: the contract is not in the initializing state and no previous version was
114114
// initialized
115-
// - construction: the contract is initialized at version 1 (no reininitialization) and the
115+
// - construction: the contract is initialized at version 1 (no reinitialization) and the
116116
// current contract is just being deployed
117117
bool initialSetup = initialized == 0 && isTopLevelCall;
118118
bool construction = initialized == 1 && address(this).code.length == 0;

contracts/token/ERC20/ERC20.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ abstract contract ERC20 is Context, IERC20, IERC20Metadata, IERC20Errors {
241241
}
242242

243243
/**
244-
* @dev Sets `value` as the allowance of `spender` over the `owner` s tokens.
244+
* @dev Sets `value` as the allowance of `spender` over the `owner`'s tokens.
245245
*
246246
* This internal function is equivalent to `approve`, and can be used to
247247
* e.g. set automatic allowances for certain subsystems, etc.
@@ -291,7 +291,7 @@ abstract contract ERC20 is Context, IERC20, IERC20Metadata, IERC20Errors {
291291
}
292292

293293
/**
294-
* @dev Updates `owner` s allowance for `spender` based on spent `value`.
294+
* @dev Updates `owner`'s allowance for `spender` based on spent `value`.
295295
*
296296
* Does not update the allowance value in case of infinite allowance.
297297
* Revert if not enough allowance is available.

contracts/token/ERC20/extensions/draft-ERC20TemporaryApproval.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ abstract contract ERC20TemporaryApproval is ERC20, IERC7674 {
6161
}
6262

6363
/**
64-
* @dev Sets `value` as the temporary allowance of `spender` over the `owner` s tokens.
64+
* @dev Sets `value` as the temporary allowance of `spender` over the `owner`'s tokens.
6565
*
6666
* This internal function is equivalent to `temporaryApprove`, and can be used to e.g. set automatic allowances
6767
* for certain subsystems, etc.

contracts/token/ERC6909/README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Implementations are provided for each of the 4 interfaces defined in the ERC.
2424

2525
{{ERC6909Metadata}}
2626

27-
{{ERC6909TokenSupply}}
27+
{{ERC6909TokenSupply}}

contracts/utils/README.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ Miscellaneous contracts and libraries containing utility functions you can use t
1818
* {ReentrancyGuardTransient}: Variant of {ReentrancyGuard} that uses transient storage (https://eips.ethereum.org/EIPS/eip-1153[EIP-1153]).
1919
* {Pausable}: A common emergency response mechanism that can pause functionality while a remediation is pending.
2020
* {Nonces}: Utility for tracking and verifying address nonces that only increment.
21-
* {NoncesKeyed}: Alternative to {Nonces}, that support key-ed nonces following https://eips.ethereum.org/EIPS/eip-4337#semi-abstracted-nonce-support[ERC-4337 speciciations].
21+
* {NoncesKeyed}: Alternative to {Nonces}, that support keyed nonces following https://eips.ethereum.org/EIPS/eip-4337#semi-abstracted-nonce-support[ERC-4337 specifications].
2222
* {ERC165}, {ERC165Checker}: Utilities for inspecting interfaces supported by contracts.
2323
* {BitMaps}: A simple library to manage boolean value mapped to a numerical index in an efficient way.
2424
* {EnumerableMap}: A type like Solidity's https://solidity.readthedocs.io/en/latest/types.html#mapping-types[`mapping`], but with key-value _enumeration_: this will let you know how many entries a mapping has, and iterate over them (which is not possible with `mapping`).
2525
* {EnumerableSet}: Like {EnumerableMap}, but for https://en.wikipedia.org/wiki/Set_(abstract_data_type)[sets]. Can be used to store privileged accounts, issued IDs, etc.
26-
* {DoubleEndedQueue}: An implementation of a https://en.wikipedia.org/wiki/Double-ended_queue[double ended queue] whose values can be removed added or remove from both sides. Useful for FIFO and LIFO structures.
26+
* {DoubleEndedQueue}: An implementation of a https://en.wikipedia.org/wiki/Double-ended_queue[double ended queue] whose values can be added or removed from both sides. Useful for FIFO and LIFO structures.
2727
* {CircularBuffer}: A data structure to store the last N values pushed to it.
2828
* {Checkpoints}: A data structure to store values mapped to a strictly increasing key. Can be used for storing and accessing values over time.
2929
* {Heap}: A library that implements a https://en.wikipedia.org/wiki/Binary_heap[binary heap] in storage.

contracts/utils/SlotDerivation.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pragma solidity ^0.8.20;
1919
* using SlotDerivation for bytes32;
2020
*
2121
* // Declare a namespace
22-
* string private constant _NAMESPACE = "<namespace>" // eg. OpenZeppelin.Slot
22+
* string private constant _NAMESPACE = "<namespace>"; // eg. OpenZeppelin.Slot
2323
*
2424
* function setValueInNamespace(uint256 key, address newValue) internal {
2525
* _NAMESPACE.erc7201Slot().deriveMapping(key).getAddressSlot().value = newValue;

contracts/utils/TransientSlot.sol

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pragma solidity ^0.8.24;
3232
*/
3333
library TransientSlot {
3434
/**
35-
* @dev UDVT that represent a slot holding a address.
35+
* @dev UDVT that represents a slot holding a address.
3636
*/
3737
type AddressSlot is bytes32;
3838

@@ -44,7 +44,7 @@ library TransientSlot {
4444
}
4545

4646
/**
47-
* @dev UDVT that represent a slot holding a bool.
47+
* @dev UDVT that represents a slot holding a bool.
4848
*/
4949
type BooleanSlot is bytes32;
5050

@@ -56,7 +56,7 @@ library TransientSlot {
5656
}
5757

5858
/**
59-
* @dev UDVT that represent a slot holding a bytes32.
59+
* @dev UDVT that represents a slot holding a bytes32.
6060
*/
6161
type Bytes32Slot is bytes32;
6262

@@ -68,7 +68,7 @@ library TransientSlot {
6868
}
6969

7070
/**
71-
* @dev UDVT that represent a slot holding a uint256.
71+
* @dev UDVT that represents a slot holding a uint256.
7272
*/
7373
type Uint256Slot is bytes32;
7474

@@ -80,7 +80,7 @@ library TransientSlot {
8080
}
8181

8282
/**
83-
* @dev UDVT that represent a slot holding a int256.
83+
* @dev UDVT that represents a slot holding a int256.
8484
*/
8585
type Int256Slot is bytes32;
8686

contracts/utils/math/Math.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ library Math {
4646
}
4747

4848
/**
49-
* @dev Returns the addition of two unsigned integers, with an success flag (no overflow).
49+
* @dev Returns the addition of two unsigned integers, with a success flag (no overflow).
5050
*/
5151
function tryAdd(uint256 a, uint256 b) internal pure returns (bool success, uint256 result) {
5252
unchecked {
@@ -57,7 +57,7 @@ library Math {
5757
}
5858

5959
/**
60-
* @dev Returns the subtraction of two unsigned integers, with an success flag (no overflow).
60+
* @dev Returns the subtraction of two unsigned integers, with a success flag (no overflow).
6161
*/
6262
function trySub(uint256 a, uint256 b) internal pure returns (bool success, uint256 result) {
6363
unchecked {
@@ -68,7 +68,7 @@ library Math {
6868
}
6969

7070
/**
71-
* @dev Returns the multiplication of two unsigned integers, with an success flag (no overflow).
71+
* @dev Returns the multiplication of two unsigned integers, with a success flag (no overflow).
7272
*/
7373
function tryMul(uint256 a, uint256 b) internal pure returns (bool success, uint256 result) {
7474
unchecked {

contracts/utils/structs/Checkpoints.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ library Checkpoints {
114114
}
115115

116116
/**
117-
* @dev Returns the number of checkpoint.
117+
* @dev Returns the number of checkpoints.
118118
*/
119119
function length(Trace224 storage self) internal view returns (uint256) {
120120
return self._checkpoints.length;
@@ -317,7 +317,7 @@ library Checkpoints {
317317
}
318318

319319
/**
320-
* @dev Returns the number of checkpoint.
320+
* @dev Returns the number of checkpoints.
321321
*/
322322
function length(Trace208 storage self) internal view returns (uint256) {
323323
return self._checkpoints.length;
@@ -520,7 +520,7 @@ library Checkpoints {
520520
}
521521

522522
/**
523-
* @dev Returns the number of checkpoint.
523+
* @dev Returns the number of checkpoints.
524524
*/
525525
function length(Trace160 storage self) internal view returns (uint256) {
526526
return self._checkpoints.length;

contracts/utils/structs/CircularBuffer.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ library CircularBuffer {
6262
}
6363

6464
/**
65-
* @dev Initialize a new CircularBuffer of given size.
65+
* @dev Initialize a new CircularBuffer of a given size.
6666
*
6767
* If the CircularBuffer was already setup and used, calling that function again will reset it to a blank state.
6868
*

scripts/generate/templates/Checkpoints.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function latestCheckpoint(${opts.historyTypeName} storage self) internal view re
119119
}
120120
121121
/**
122-
* @dev Returns the number of checkpoint.
122+
* @dev Returns the number of checkpoints.
123123
*/
124124
function length(${opts.historyTypeName} storage self) internal view returns (uint256) {
125125
return self.${opts.checkpointFieldName}.length;

scripts/generate/templates/Checkpoints.t.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {Checkpoints} from "@openzeppelin/contracts/utils/structs/Checkpoints.sol
1414
const template = opts => `\
1515
using Checkpoints for Checkpoints.${opts.historyTypeName};
1616
17-
// Maximum gap between keys used during the fuzzing tests: the \`_prepareKeys\` function with make sure that
17+
// Maximum gap between keys used during the fuzzing tests: the \`_prepareKeys\` function will make sure that
1818
// key#n+1 is in the [key#n, key#n + _KEY_MAX_GAP] range.
1919
uint8 internal constant _KEY_MAX_GAP = 64;
2020

0 commit comments

Comments
 (0)