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

Add metadata discovery & resolution paths to escrow contracts #113

Merged
merged 4 commits into from
Sep 2, 2024

Conversation

sisyphusSmiling
Copy link
Contributor

@sisyphusSmiling sisyphusSmiling commented Aug 31, 2024

Closes:  #112 cc: @bjartek
Related: #99

ℹ️ Cadence CI seems to be failing on CLI install because there was a recent release of Flow CLI which isn't yet available. I'll run CI again after some time to confirm passing tests.

Description

  • Enhances error messages in escrow contracts & scripts
  • Adds the ability to discover supported metadata views from NFTs in locked in escrow
  • Adds supporting scripts for new and existing escrow functionality

For contributor use:

  • Targeted PR against main branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the standards mentioned here.
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

@sisyphusSmiling sisyphusSmiling self-assigned this Aug 31, 2024
@sisyphusSmiling sisyphusSmiling marked this pull request as ready for review August 31, 2024 01:35
@sisyphusSmiling sisyphusSmiling requested a review from a team as a code owner August 31, 2024 01:35
Copy link
Member

@joshuahannan joshuahannan left a comment

Choose a reason for hiding this comment

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

Beautiful error messages! 👏 🥳

@bjartek
Copy link
Contributor

bjartek commented Aug 31, 2024

Would it be possible to have a method here to get do the two following things?

https://github.com/onflow/flow-nft/blob/0ce4125dcb5c351c64706edd5b210d1e22691ef5/contracts/NonFungibleToken.cdc#L123

and to get the views and resolve them for subnfts aswell?

Maybe that is another issue. Granted not very many people have subnfts that are bridge but it would still be nice to have if that ever happends.

@codecov-commenter
Copy link

codecov-commenter commented Sep 1, 2024

Codecov Report

Attention: Patch coverage is 55.55556% with 4 lines in your changes missing coverage. Please review.

Project coverage is 87.28%. Comparing base (f7c98ea) to head (db65396).

Files with missing lines Patch % Lines
...adence/contracts/bridge/FlowEVMBridgeNFTEscrow.cdc 40.00% 3 Missing ⚠️
...ence/contracts/bridge/FlowEVMBridgeTokenEscrow.cdc 75.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #113      +/-   ##
==========================================
+ Coverage   86.33%   87.28%   +0.94%     
==========================================
  Files          17       17              
  Lines         922      920       -2     
==========================================
+ Hits          796      803       +7     
+ Misses        126      117       -9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sisyphusSmiling
Copy link
Contributor Author

@bjartek updated based on recent convos (thanks for sharing!) and created #115 to add support for sub-NFTs

@sisyphusSmiling
Copy link
Contributor Author

Merging in preparation for mainnet migration test today, but feel free to review and request changes after the fact @joshuahannan

@sisyphusSmiling sisyphusSmiling merged commit 45c5da5 into main Sep 2, 2024
2 checks passed
@sisyphusSmiling sisyphusSmiling deleted the update-escrow branch September 2, 2024 18:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

4 participants