Upgrade the repo to Cairo v2.6 #40
Merged
Conversation
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
Upgrade to Cairo v2.6.3 Upgrade to OpenZeppelin v0.10.0 Migrate most contracts except for presets to components (WiP)
4 tasks
tekkac
approved these changes
Mar 27, 2024
| @@ -292,15 +365,18 @@ mod ERC3525 { | |||
|
|
|||
| // [Effect] Update total value | |||
| let slot = self.slot_of(token_id); | |||
| let total = self._erc3525_total_value.read(slot); | |||
| let _total = self._erc3525_total_value.read(slot); | |||
There was a problem hiding this comment.
This line might be removed I guess.
| // [Effect] Merge token values | ||
| let erc721_comp = get_dep_component!(@self, ERC721); | ||
| let mut index = 0; | ||
| loop { |
| impl ExternalImpl of super::IExternal<ContractState> { | ||
| fn total_value(self: @ContractState, slot: u256) -> u256 { | ||
| let unsafe_state = ERC3525::unsafe_new_contract_state(); | ||
| ERC3525::InternalImpl::_total_value(@unsafe_state, slot) | ||
| self.erc3525._total_value(slot) | ||
| } | ||
|
|
||
| fn mint(ref self: ContractState, to: ContractAddress, slot: u256, value: u256) -> u256 { |
There was a problem hiding this comment.
Could this have been a IERC3525MintableComponent component too? ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Things already done:
ERC3525module and its extensions to componentsnameandsymbolmethods fromfelt252toByteArraydue to changes in OpenZeppelin ERC721 contractset_token_uriwithset_base_urifor the same reasonThings left:
Will fix #39