Skip to content

Main -> Staging (One Address One Vote)#255

Merged
dbslone merged 1 commit intostagingfrom
main
Jul 22, 2022
Merged

Main -> Staging (One Address One Vote)#255
dbslone merged 1 commit intostagingfrom
main

Conversation

@dbslone
Copy link
Copy Markdown
Contributor

@dbslone dbslone commented Jul 22, 2022

  • updated makeFile and flow.json

  • updated float import paths

  • updated flow nft contracts

  • updated flow nfts contracts to latest versions

  • CAS-204: Add FE changes for One Address One Vote information

  • CAS-204: Add BE changes for One Address One Vote restrictions

  • updated the ExampleNFT flow to run successfuly on emulator

  • fixed issue with GetVoteWeightForBalance balance_of_nfts

  • added flow contracts and updated Makefile

  • updated cadence script for new ExampleNFT

  • created processThreshold logic

  • updated NFT ID to type interface to handle string or uint

  • clean up

  • handle nft balance return type in EnforceToken

  • overflow breaking changes fixes

  • added in wrongly deleted make command

  • updated NFT Test

  • updated Makefile

  • CAS-204: Add NFT/FT restrictions to One Address One Vote strategies

  • CAS-204: Fix strategy display text and migration file bug

  • CAS-204: Update descriptions for one address one vote nft/ft

Co-authored-by: Richard Melkonian r.v.melkonian@gmail.com
Co-authored-by: Jonathan Bluks jonathan.bluks@dapperlabs.com

* updated makeFile and flow.json

* updated float import paths

* updated flow nft contracts

* updated flow nfts contracts to latest versions

* CAS-204: Add FE changes for One Address One Vote information

* CAS-204: Add BE changes for One Address One Vote restrictions

* updated the ExampleNFT flow to run successfuly on emulator

* fixed issue with GetVoteWeightForBalance balance_of_nfts

* added flow contracts and updated Makefile

* updated cadence script for new ExampleNFT

* created processThreshold logic

* updated NFT ID to type interface to handle string or uint

* clean up

* handle nft balance return type in EnforceToken

* overflow breaking changes fixes

* added in wrongly deleted make command

* updated NFT Test

* updated Makefile

* CAS-204: Add NFT/FT restrictions to One Address One Vote strategies

* CAS-204: Fix strategy display text and migration file bug

* CAS-204: Update descriptions for one address one vote nft/ft

Co-authored-by: Richard Melkonian <r.v.melkonian@gmail.com>
Co-authored-by: Jonathan Bluks <jonathan.bluks@dapperlabs.com>
@dbslone dbslone merged commit e31b6d4 into staging Jul 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants