Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[erc721-and-erc1155-flattened] added erc721-and-erc115-flattened project #1208

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

JacobHomanics
Copy link
Contributor

No description provided.

@ChaituVR ChaituVR changed the title added erc721-and-erc115-flattened project [erc721-and-erc1155-flattened] added erc721-and-erc115-flattened project Jul 4, 2023
@JacobHomanics JacobHomanics marked this pull request as ready for review July 13, 2023 03:32
@JacobHomanics
Copy link
Contributor Author

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.

@JacobHomanics
Copy link
Contributor Author

Attempted to resolve the conflicts manually through this interface....Let me know if something is wrong. Thanks!

Copy link
Member

@ChaituVR ChaituVR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Hotmanics There should not be any changes on package-lock or yarn.lock. can update?

@JacobHomanics
Copy link
Contributor Author

Hi @Hotmanics There should not be any changes on package-lock or yarn.lock. can update?

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

@ChaituVR
Copy link
Member

@Hotmanics Copy this file https://github.com/snapshot-labs/snapshot-strategies/blob/master/yarn.lock and commit those changes, and delete package-lock

@JacobHomanics
Copy link
Contributor Author

JacobHomanics commented Jul 19, 2023

@Hotmanics Copy this file https://github.com/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

@ChaituVR
Copy link
Member

Hi @Hotmanics still see changes 🙈

Give us access by clicking on Allow edits from maintainers - i will update
image

@JacobHomanics
Copy link
Contributor Author

JacobHomanics commented Jul 19, 2023

Hi @Hotmanics still see changes 🙈

Give us access by clicking on Allow edits from maintainers - i will update image

Screenshot 2023-07-19 at 3 19 11 PM

Can't seem to find where to allow that option
@ChaituVR

provider,
addresses,
options,
snapshot
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should depend on proposal snapshot

Comment on lines +23 to +31
const erc1155BlockTag =
typeof options.erc1155BlockTag === 'number'
? options.erc1155BlockTag
: 'latest';

const erc721BlockTag =
typeof options.erc721BlockTag === 'number'
? options.erc721BlockTag
: 'latest';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 }

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that should work

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants