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

Update NBA contracts & txs to Cadence 1.0 #248

Merged
merged 59 commits into from
Sep 3, 2024
Merged

Conversation

bshahid331
Copy link
Contributor

No description provided.

@bshahid331 bshahid331 requested a review from rrrkren March 13, 2024 17:19
@bshahid331 bshahid331 requested a review from a team as a code owner March 13, 2024 17:19
Copy link

@sisyphusSmiling sisyphusSmiling left a comment

Choose a reason for hiding this comment

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

Only had a chance to look through FastBreakV1, but leaving initial comments (some nits)

contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
Copy link
Collaborator

@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.

Great start! I only reviewed the contracts and left comments on them. You'll need to find someone on the studio team to review the rest of the code

contracts/MarketTopShotOldVersion.cdc Outdated Show resolved Hide resolved
contracts/TopShot.cdc Outdated Show resolved Hide resolved
contracts/TopShot.cdc Outdated Show resolved Hide resolved
contracts/TopShot.cdc Outdated Show resolved Hide resolved
contracts/TopShot.cdc Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
Copy link
Collaborator

@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.

Followed up on a few of my comments that were never addressed and left a few more. The changes will require the contracts to be re-staged on testnet after you address them. Let me know before you want to re-stage so I can verify that everything has been addressed

contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
Comment on lines 30 to 32
access(all) event Withdraw(id: UInt64, from: Address?)

pub event Deposit(id: UInt64, to: Address?)
access(all) event Deposit(id: UInt64, to: Address?)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'd recommend removing these because the default NonFungibleToken events are much better

contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/FastBreakV1.cdc Outdated Show resolved Hide resolved
contracts/TopShot.cdc Show resolved Hide resolved
contracts/TopShot.cdc Show resolved Hide resolved
contracts/TopShot.cdc Outdated Show resolved Hide resolved
@@ -1191,7 +1224,7 @@ pub contract TopShot: NonFungibleToken {

// lock takes a token id and a duration in seconds and locks
// the moment for that duration
pub fun lock(id: UInt64, duration: UFix64) {
access(NonFungibleToken.Update | NonFungibleToken.Owner) fun lock(id: UInt64, duration: UFix64) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you include this event emission here?

contracts/TopShot.cdc Show resolved Hide resolved
fkenji and others added 16 commits August 7, 2024 12:25
* Bump golang.org/x/net from 0.19.0 to 0.23.0 in /lib/go/test

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.19.0 to 0.23.0.
- [Commits](golang/net@v0.19.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* generated

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Taylor Petrychyn <taylor.petrychyn@dapperlabs.com>
* Fix tests

* ci

* Update go version
…nftUpdated event call, as it was already being called
judezhu and others added 29 commits August 12, 2024 03:56
* save cap on storage

* fix var / entitlements

* add comments and V1 Sale handling to create and start sale collection (#266)

---------

Co-authored-by: Joshua Hannan <hannanjoshua19@gmail.com>
@judezhu judezhu merged commit 96b859a into master Sep 3, 2024
1 check passed
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.

6 participants