[erc721-and-erc1155-flattened] added erc721-and-erc115-flattened project #1208
Conversation
ChaituVR
changed the title
…merge conflicts" This reverts commit beebee9.
|
I can't seem to resolve the merge conflicts without making a new fork of the latest master branch. Let me know if that is something I need to do! The conflicts are pretty simple. The index.ts just needs to account for the seedifyHoldStakingFarming strategy and the yarn lock just just needs updated to the one on the master branch. |
|
Attempted to resolve the conflicts manually through this interface....Let me know if something is wrong. Thanks! |
I am not sure how to revert them back to their original states. They were updated by using the latest versions from snapshot-strategies main branch. I did so to resolve merge conflicts found within this PR. Not sure what the best action is here |
|
@Hotmanics Copy this file https:/snapshot-labs/snapshot-strategies/blob/master/yarn.lock and commit those changes, and delete package-lock |
Thank you @ChaituVR! I tried copying the file that you linked but there appear to be no changes to the yarn.lock at this point in time so it won't show in the commit -meaning that it should be properly set to your requirement. removed package-lock.json |
|
Hi @Hotmanics still see changes 🙈 Give us access by clicking on |
Can't seem to find where to allow that option |
| provider, | ||
| addresses, | ||
| options, | ||
| snapshot |
There was a problem hiding this comment.
It should depend on proposal snapshot
| const erc1155BlockTag = | ||
| typeof options.erc1155BlockTag === 'number' | ||
| ? options.erc1155BlockTag | ||
| : 'latest'; | ||
|
|
||
| const erc721BlockTag = | ||
| typeof options.erc721BlockTag === 'number' | ||
| ? options.erc721BlockTag | ||
| : 'latest'; |
There was a problem hiding this comment.
to avoid issues, better to use two https://snapshot.org/#/strategy/validation strategies inside voting validation https://docs.snapshot.org/user-guides/strategies/validation-strategies#voting-validation-in-space-settings
There was a problem hiding this comment.
to avoid issues, better to use two https://snapshot.org/#/strategy/validation strategies inside voting validation https://docs.snapshot.org/user-guides/strategies/validation-strategies#voting-validation-in-space-settings
Will the validation strategies flatten to 1 vote for X validations? Or is it X votes for X validations?
I am looking to do: if (user.erc721balance >= 1 && user.erc1155balance >= 10) { user.votingPower = 1 }
No description provided.