Merge branch 'master' into next-v5.0
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
// OpenZeppelin Contracts (last updated v4.7.0) (utils/StorageSlot.sol)
|
||||
// This file was procedurally generated from scripts/generate/templates/StorageSlot.js.
|
||||
|
||||
pragma solidity ^0.8.0;
|
||||
|
||||
@ -12,7 +13,7 @@ pragma solidity ^0.8.0;
|
||||
* The functions in this library return Slot structs that contain a `value` member that can be used to read or write.
|
||||
*
|
||||
* Example usage to set ERC1967 implementation slot:
|
||||
* ```
|
||||
* ```solidity
|
||||
* contract ERC1967 {
|
||||
* bytes32 internal constant _IMPLEMENTATION_SLOT = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
|
||||
*
|
||||
@ -27,7 +28,8 @@ pragma solidity ^0.8.0;
|
||||
* }
|
||||
* ```
|
||||
*
|
||||
* _Available since v4.1 for `address`, `bool`, `bytes32`, and `uint256`._
|
||||
* _Available since v4.1 for `address`, `bool`, `bytes32`, `uint256`._
|
||||
* _Available since v4.9 for `string`, `bytes`._
|
||||
*/
|
||||
library StorageSlot {
|
||||
struct AddressSlot {
|
||||
@ -46,6 +48,14 @@ library StorageSlot {
|
||||
uint256 value;
|
||||
}
|
||||
|
||||
struct StringSlot {
|
||||
string value;
|
||||
}
|
||||
|
||||
struct BytesSlot {
|
||||
bytes value;
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Returns an `AddressSlot` with member `value` located at `slot`.
|
||||
*/
|
||||
@ -85,4 +95,44 @@ library StorageSlot {
|
||||
r.slot := slot
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Returns an `StringSlot` with member `value` located at `slot`.
|
||||
*/
|
||||
function getStringSlot(bytes32 slot) internal pure returns (StringSlot storage r) {
|
||||
/// @solidity memory-safe-assembly
|
||||
assembly {
|
||||
r.slot := slot
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Returns an `StringSlot` representation of the string storage pointer `store`.
|
||||
*/
|
||||
function getStringSlot(string storage store) internal pure returns (StringSlot storage r) {
|
||||
/// @solidity memory-safe-assembly
|
||||
assembly {
|
||||
r.slot := store.slot
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Returns an `BytesSlot` with member `value` located at `slot`.
|
||||
*/
|
||||
function getBytesSlot(bytes32 slot) internal pure returns (BytesSlot storage r) {
|
||||
/// @solidity memory-safe-assembly
|
||||
assembly {
|
||||
r.slot := slot
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Returns an `BytesSlot` representation of the bytes storage pointer `store`.
|
||||
*/
|
||||
function getBytesSlot(bytes storage store) internal pure returns (BytesSlot storage r) {
|
||||
/// @solidity memory-safe-assembly
|
||||
assembly {
|
||||
r.slot := store.slot
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user