Skip to content

Commit b9beb9e

Browse files
authored
Merge branch 'master' into master
2 parents 9b7ff9f + 0c9da57 commit b9beb9e

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ contract TestContract is Test {
9191
assertEq(test.exists(), 100);
9292
}
9393
94-
// It supports arbitrary storage layouts, like assembly based storage locations
94+
// It supports arbitrary storage layouts, like assembly-based storage locations
9595
function testFindHidden() public {
96-
// `hidden` is a random hash of a bytes, iteration through slots would
96+
// `hidden` is a random hash of bytes; iterating through slots would
9797
// not find it. Our mechanism does
9898
// Also, you can use the selector instead of a string
9999
uint256 slot = stdstore.target(address(test)).sig(test.hidden.selector).find();
@@ -167,7 +167,7 @@ contract Storage {
167167

168168
### stdCheats
169169

170-
This is a wrapper over miscellaneous cheatcodes that need wrappers to be more dev friendly. Currently there are only functions related to `prank`. In general, users may expect ETH to be put into an address on `prank`, but this is not the case for safety reasons. Explicitly this `hoax` function should only be used for addresses that have expected balances as it will get overwritten. If an address already has ETH, you should just use `prank`. If you want to change that balance explicitly, just use `deal`. If you want to do both, `hoax` is also right for you.
170+
This is a wrapper around miscellaneous cheatcodes that need wrappers to be more dev-friendly. Currently there are only functions related to `prank`. In general, users may expect ETH to be put into an address on `prank`, but this is not the case for safety reasons. Explicitly, this `hoax` function should only be used for addresses that have expected balances as it will get overwritten. If an address already has ETH, you should just use `prank`. If you want to change that balance explicitly, just use `deal`. If you want to do both, `hoax` is also right for you.
171171

172172
#### Example usage:
173173

RELEASE_CHECKLIST.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ This checklist is meant to be used as a guide for the `forge-std` release proces
88
- [ ] Open and merge a PR with the version bump
99
- [ ] Tag the merged commit with the version number: `git tag v<X.Y.Z>`
1010
- [ ] Push the tag to the repository: `git push --tags`
11-
- [ ] Create a new GitHub release with the automatically generated changelog and with the name set to `v<X.Y.Z>`
11+
- [ ] Create a new GitHub release with the automatically generated changelog and the name set to `v<X.Y.Z>`
1212
- [ ] Add `## Featured Changes` section to the top of the release notes

src/StdToml.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import {VmSafe} from "./Vm.sol";
88
// ```
99
// using stdToml for string;
1010
// string memory toml = vm.readFile("<some_path>");
11-
// toml.readUint("<json_path>");
11+
// toml.readUint("<toml_path>");
1212
// ```
1313
// To write:
1414
// ```
1515
// using stdToml for string;
16-
// string memory json = "json";
17-
// json.serialize("a", uint256(123));
18-
// string memory semiFinal = json.serialize("b", string("test"));
19-
// string memory finalJson = json.serialize("c", semiFinal);
20-
// finalJson.write("<some_path>");
16+
// string memory toml = "toml";
17+
// toml.serialize("a", uint256(123));
18+
// string memory semiFinal = toml.serialize("b", string("test"));
19+
// string memory finalToml = toml.serialize("c", semiFinal);
20+
// finalToml.write("<some_path>");
2121
// ```
2222

2323
library stdToml {

src/Vm.sol

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/interfaces/IERC7540.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ interface IERC7540Deposit is IERC7540Operator {
4444
* @dev Transfers assets from sender into the Vault and submits a Request for asynchronous deposit.
4545
*
4646
* - MUST support ERC-20 approve / transferFrom on asset as a deposit Request flow.
47-
* - MUST revert if all of assets cannot be requested for deposit.
47+
* - MUST revert if all assets cannot be requested for deposit.
4848
* - owner MUST be msg.sender unless some unspecified explicit approval is given by the caller,
4949
* approval of ERC-20 tokens from owner to sender is NOT enough.
5050
*
@@ -107,7 +107,7 @@ interface IERC7540Redeem is IERC7540Operator {
107107
*
108108
* - MUST support a redeem Request flow where the control of shares is taken from sender directly
109109
* where msg.sender has ERC-20 approval over the shares of owner.
110-
* - MUST revert if all of shares cannot be requested for redeem.
110+
* - MUST revert if all shares cannot be requested for redeem.
111111
*
112112
* @param shares the amount of shares to be redeemed to transfer from owner
113113
* @param controller the controller of the request who will be able to operate the request

0 commit comments

Comments
 (0)