Skip to content

Commit

Permalink
Update TokenPropertiesRepository to ERC-7508
Browse files Browse the repository at this point in the history
Token properites repository has now been proposed as ERC-7508 and the
changes in the commit reflect the new proposal.
  • Loading branch information
ThunderDeliverer committed Sep 8, 2023
1 parent e113ebc commit 5e0ff58
Show file tree
Hide file tree
Showing 11 changed files with 2,385 additions and 2,360 deletions.
12 changes: 6 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ Core implementations updates include breaking changes as well; names and symbols
- All contracts now use solidity version 0.8.21.
- Upgrades dependencies.
- Increases Istanbul code coverage:
| | **Previous** | **Current** | **Change** |
|:--------------: |:------------: |:-----------: |------------ |
| **Statements** | 100.00 % | 100.00 % | + 0.00 % |
| **Branches** | 95.53 % | 96.78 % | + 1.25 % |
| **Functions** | 99.60 % | 99.72 % | + 0.12 % |
| **Lines** | 99.63 % | 99.46 % | - 0.17 % |
| | **Previous** | **Current** | **Change** |
|:--------------: |:------------: |:-----------: |------------ |
| **Statements** | 100.00 % | 100.00 % | + 0.00 % |
| **Branches** | 95.53 % | 96.78 % | + 1.25 % |
| **Functions** | 99.60 % | 99.72 % | + 0.12 % |
| **Lines** | 99.63 % | 99.46 % | - 0.17 % |

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions contracts/RMRK/emotable/RMRKEmotesRepository.sol
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ contract RMRKEmotesRepository is IRMRKEmotesRepository {
);

// Used to avoid double emoting and control undoing
mapping(address emoter => mapping(address collection => mapping(uint256 tokenId => mapping(string emoji => uint256 state))))
mapping(address => mapping(address => mapping(uint256 => mapping(string => uint256))))
private _emotesUsedByEmoter; // Cheaper than using a bool
mapping(address collection => mapping(uint256 tokenId => mapping(string emoji => uint256 count)))
mapping(address => mapping(uint256 => mapping(string => uint256)))
private _emotesPerToken;

/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/RMRK/extension/tokenHolder/RMRKTokenHolder.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ error InsufficientBalance();
* @dev The RMRKTokenHolder extension is capable of holding ERC-20, ERC-721, and ERC-1155 tokens.
*/
abstract contract RMRKTokenHolder is IRMRKTokenHolder {
mapping(uint256 tokenId => mapping(address tokenAddress => mapping(TokenType tokenType => mapping(uint256 heldTokenId => uint256 balance))))
mapping(uint256 => mapping(address => mapping(TokenType => mapping(uint256 => uint256))))
private _balances;

/**
Expand Down
Loading

0 comments on commit 5e0ff58

Please sign in to comment.