-
Notifications
You must be signed in to change notification settings - Fork 11.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Memory
utility library
#5189
Open
ernestognw
wants to merge
5
commits into
OpenZeppelin:master
Choose a base branch
from
ernestognw:utils/memory
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'openzeppelin-solidity': minor | ||
--- | ||
|
||
`Memory`: Add library with utilities to manipulate memory |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
// SPDX-License-Identifier: MIT | ||
|
||
pragma solidity ^0.8.20; | ||
|
||
/// @dev Utilities to manipulate memory. | ||
/// | ||
/// Memory is a contiguous and dynamic byte array in which Solidity stores non-primitive types. | ||
/// This library provides functions to manipulate pointers to this dynamic array. | ||
/// | ||
/// WARNING: When manipulating memory, make sure to follow the Solidity documentation | ||
/// guidelines for https://docs.soliditylang.org/en/v0.8.20/assembly.html#memory-safety[Memory Safety]. | ||
library Memory { | ||
type Pointer is bytes32; | ||
|
||
/// @dev Returns a memory pointer to the current free memory pointer. | ||
function getFreePointer() internal pure returns (Pointer ptr) { | ||
assembly ("memory-safe") { | ||
ptr := mload(0x40) | ||
} | ||
} | ||
|
||
/// @dev Sets the free memory pointer to a specific value. | ||
/// | ||
/// WARNING: Everything after the pointer may be overwritten. | ||
function setFreePointer(Pointer ptr) internal pure { | ||
assembly ("memory-safe") { | ||
mstore(0x40, ptr) | ||
} | ||
} | ||
|
||
/// @dev Pointer to `bytes32`. | ||
function asBytes32(Pointer ptr) internal pure returns (bytes32) { | ||
return Pointer.unwrap(ptr); | ||
} | ||
|
||
/// @dev `bytes32` to pointer. | ||
function asPointer(bytes32 value) internal pure returns (Pointer) { | ||
return Pointer.wrap(value); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// SPDX-License-Identifier: MIT | ||
|
||
pragma solidity ^0.8.20; | ||
|
||
import {Test} from "forge-std/Test.sol"; | ||
import {Memory} from "@openzeppelin/contracts/utils/Memory.sol"; | ||
|
||
contract MemoryTest is Test { | ||
using Memory for *; | ||
|
||
function testSymbolicGetSetFreePointer(bytes32 ptr) public { | ||
Memory.setFreePointer(ptr.asPointer()); | ||
assertEq(Memory.getFreePointer().asBytes32(), ptr); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
const { ethers } = require('hardhat'); | ||
const { expect } = require('chai'); | ||
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers'); | ||
|
||
async function fixture() { | ||
const mock = await ethers.deployContract('$Memory'); | ||
|
||
return { mock }; | ||
} | ||
|
||
describe('Memory', function () { | ||
beforeEach(async function () { | ||
Object.assign(this, await loadFixture(fixture)); | ||
}); | ||
|
||
describe('free pointer', function () { | ||
it('sets memory pointer', async function () { | ||
const ptr = '0x00000000000000000000000000000000000000000000000000000000000000a0'; | ||
expect(await this.mock.$setFreePointer(ptr)).to.not.be.reverted; | ||
}); | ||
|
||
it('gets memory pointer', async function () { | ||
expect(await this.mock.$getFreePointer()).to.equal( | ||
// Default pointer | ||
'0x0000000000000000000000000000000000000000000000000000000000000080', | ||
); | ||
}); | ||
|
||
it('asBytes32', async function () { | ||
const ptr = ethers.toBeHex('0x1234', 32); | ||
await this.mock.$setFreePointer(ptr); | ||
expect(await this.mock.$asBytes32(ptr)).to.equal(ptr); | ||
}); | ||
|
||
it('asPointer', async function () { | ||
const ptr = ethers.toBeHex('0x1234', 32); | ||
await this.mock.$setFreePointer(ptr); | ||
expect(await this.mock.$asPointer(ptr)).to.equal(ptr); | ||
}); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we call that type
type FMP is bytes32;
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd be better with
FreePointer
asFMP
is not obvious at first.EDIT: Acutally I do prefer just
Pointer
, since it's not always the free memory pointer. Anyone can get a point to wherever they want withasPointer
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would we rename the
getFreePointer
andsetFreePointer
togetFreeMemoryPointer
andsetFreeMemoryPointer
?