Skip to content

Commit

Permalink
reduce setter/getter in IPAccountStorage Interface
Browse files Browse the repository at this point in the history
  • Loading branch information
kingster-will committed Feb 28, 2024
1 parent 031d385 commit 65351a1
Show file tree
Hide file tree
Showing 6 changed files with 179 additions and 184 deletions.
53 changes: 1 addition & 52 deletions contracts/IPAccountStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,6 @@ contract IPAccountStorage is ERC165, IIPAccountStorage {
mapping(bytes32 => mapping(bytes32 => address)) public addressData;
mapping(bytes32 => mapping(bytes32 => bool)) public boolData;

/// @inheritdoc IIPAccountStorage
function setString(bytes32 key, string calldata value) external {
stringData[_toBytes32(msg.sender)][key] = value;
}
/// @inheritdoc IIPAccountStorage
function getString(bytes32 key) external view returns (string memory) {
return stringData[_toBytes32(msg.sender)][key];
}
/// @inheritdoc IIPAccountStorage
function getString(bytes32 namespace, bytes32 key) external view returns (string memory) {
return stringData[namespace][key];
}

/// @inheritdoc IIPAccountStorage
function setBytes(bytes32 key, bytes calldata value) external {
bytesData[_toBytes32(msg.sender)][key] = value;
Expand All @@ -59,45 +46,7 @@ contract IPAccountStorage is ERC165, IIPAccountStorage {
return bytes32Data[namespace][key];
}

/// @inheritdoc IIPAccountStorage
function setUint256(bytes32 key, uint256 value) external {
uint256Data[_toBytes32(msg.sender)][key] = value;
}
/// @inheritdoc IIPAccountStorage
function getUint256(bytes32 key) external view returns (uint256) {
return uint256Data[_toBytes32(msg.sender)][key];
}
/// @inheritdoc IIPAccountStorage
function getUint256(bytes32 namespace, bytes32 key) external view returns (uint256) {
return uint256Data[namespace][key];
}

/// @inheritdoc IIPAccountStorage
function setAddress(bytes32 key, address value) external {
addressData[_toBytes32(msg.sender)][key] = value;
}
/// @inheritdoc IIPAccountStorage
function getAddress(bytes32 key) external view returns (address) {
return addressData[_toBytes32(msg.sender)][key];
}
/// @inheritdoc IIPAccountStorage
function getAddress(bytes32 namespace, bytes32 key) external view returns (address) {
return addressData[namespace][key];
}

/// @inheritdoc IIPAccountStorage
function getBool(bytes32 key) external view returns (bool) {
return boolData[_toBytes32(msg.sender)][key];
}
/// @inheritdoc IIPAccountStorage
function getBool(bytes32 namespace, bytes32 key) external view returns (bool) {
return boolData[namespace][key];
}
/// @inheritdoc IIPAccountStorage
function setBool(bytes32 key, bool value) external {
boolData[_toBytes32(msg.sender)][key] = value;
}

/// @notice ERC165 interface identifier for IIPAccountStorage
function supportsInterface(bytes4 interfaceId) public view virtual override(ERC165) returns (bool) {
return interfaceId == type(IIPAccountStorage).interfaceId || super.supportsInterface(interfaceId);
}
Expand Down
64 changes: 0 additions & 64 deletions contracts/interfaces/IIPAccountStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,6 @@ pragma solidity ^0.8.23;
/// - Only the owning Module (i.e., the Module whose address is used as the namespace) can write data into
/// its respective namespace.
interface IIPAccountStorage {
/// @dev Sets a string value under a given key within the default namespace, determined by `msg.sender`.
/// @param key The key under which to store the value.
/// @param value The string value to be stored.
function setString(bytes32 key, string calldata value) external;

/// @dev Retrieves a string value by a given key from the default namespace.
/// @param key The key whose value is to be retrieved.
/// @return The string value stored under the specified key.
function getString(bytes32 key) external view returns (string memory);

/// @dev Retrieves a string value by a given key from a specified namespace.
/// @param namespace The namespace from which to retrieve the value.
/// @param key The key whose value is to be retrieved.
/// @return The string value stored under the specified key in the given namespace.
function getString(bytes32 namespace, bytes32 key) external view returns (string memory);

/// @dev Sets a bytes value under a given key within the default namespace, determined by `msg.sender`.
/// @param key The key under which to store the value.
/// @param value The bytes value to be stored.
Expand Down Expand Up @@ -63,52 +47,4 @@ interface IIPAccountStorage {
/// @param key The key whose value is to be retrieved.
/// @return The bytes32 value stored under the specified key in the given namespace.
function getBytes32(bytes32 namespace, bytes32 key) external view returns (bytes32);

/// @dev Sets a uint256 value under a given key within the default namespace, determined by `msg.sender`.
/// @param key The key under which to store the value.
/// @param value The uint256 value to be stored.
function setUint256(bytes32 key, uint256 value) external;

/// @dev Retrieves a uint256 value by a given key from the default namespace.
/// @param key The key whose value is to be retrieved.
/// @return The uint256 value stored under the specified key.
function getUint256(bytes32 key) external view returns (uint256);

/// @dev Retrieves a uint256 value by a given key from a specified namespace.
/// @param namespace The namespace from which to retrieve the value.
/// @param key The key whose value is to be retrieved.
/// @return The uint256 value stored under the specified key in the given namespace.
function getUint256(bytes32 namespace, bytes32 key) external view returns (uint256);

/// @dev Sets an address value under a given key within the default namespace, determined by `msg.sender`.
/// @param key The key under which to store the value.
/// @param value The address value to be stored.
function setAddress(bytes32 key, address value) external;

/// @dev Retrieves an address value by a given key from the default namespace.
/// @param key The key whose value is to be retrieved.
/// @return The address value stored under the specified key.
function getAddress(bytes32 key) external view returns (address);

/// @dev Retrieves an address value by a given key from a specified namespace.
/// @param namespace The namespace from which to retrieve the value.
/// @param key The key whose value is to be retrieved.
/// @return The address value stored under the specified key in the given namespace.
function getAddress(bytes32 namespace, bytes32 key) external view returns (address);

/// @dev Sets a boolean value under a given key within the default namespace, determined by `msg.sender`.
/// @param key The key under which to store the value.
/// @param value The boolean value to be stored.
function setBool(bytes32 key, bool value) external;

/// @dev Retrieves a boolean value by a given key from the default namespace.
/// @param key The key whose value is to be retrieved.
/// @return The boolean value stored under the specified key.
function getBool(bytes32 key) external view returns (bool);

/// @dev Retrieves a boolean value by a given key from a specified namespace.
/// @param namespace The namespace from which to retrieve the value.
/// @param key The key whose value is to be retrieved.
/// @return The boolean value stored under the specified key in the given namespace.
function getBool(bytes32 namespace, bytes32 key) external view returns (bool);
}
Loading

0 comments on commit 65351a1

Please sign in to comment.