fix: removed the tags and added the branch in .gitmodules #687
Conversation
ghost
requested a review
from 
|
am i supposed to commit the changes of that libs folder too ? @rndquu |
|
hm seems like openzeppelin-contracts are breaking |
|
hm how is this breaking ughh |
|
hm "operator-filter-registry" is the only one breaking the things |
|
@rndquu using the branch= v1.4.0 rather then main making the "operator-filter-registry" to create no errors should we go with it? |
|
@zgorizzo69 pls check this PR |
ghost
mentioned this pull request
Cool |
|
@rndquu when are we gonna merge this or is there anything left |
| } | ||
|
|
||
| function _beforeConsecutiveTokenTransfer( | ||
| address, | ||
| address, | ||
| uint256, | ||
| uint96 | ||
| ) internal override(ERC721, ERC721Enumerable) { |
There was a problem hiding this comment.
why remove the override? @rndquu it conflicts with the other branch, i think this would trigger compiler warning
There was a problem hiding this comment.
why remove the override? @rndquu it conflicts with the other branch, i think this would trigger compiler warning
it was not overriding anything
There was a problem hiding this comment.
let's retest, the idea is to avoid branching conflicts
There was a problem hiding this comment.
Error (4327): Function needs to specify overridden contracts "ERC721" and "ERC721Enumerable".
--> src/ubiquistick/UbiquiStick.sol:128:5
can you confirm. Not to dismiss your PR. i think its best to recheck!
@pavlovcik
@rndquu
this conflicted with #704
There was a problem hiding this comment.
it's not a good idea to rely on VSCode problems, the compiler shall tell you what's good and what's not
There was a problem hiding this comment.
@molecula451 if it conflicts with another branch then we should resolve conflicts and compiler warnings
There was a problem hiding this comment.
@molecula451 this PR updates dependencies so perhaps you should run forge update and check again
| @@ -103,7 +103,7 @@ contract UbiquiStick is | |||
| } | |||
| } | |||
|
|
|||
| function random() private view returns (uint256) { | |||
| function _random() private view returns (uint256) { | |||
There was a problem hiding this comment.
we're relying on block.prevrandao @rndquu to avoid compiling warnings as foundry.toml is shanghai
??
There was a problem hiding this comment.
Yes, your PR sets it to prevrandao but this PR merges into the development branch which uses the "old" difficulty. I still can't get what you mean
There was a problem hiding this comment.
yes no issues, what's trying to sync the whole thing, that's why asked
Resolves #643
removed the tags and added the branch in .gitmodules