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

Support NFTokenMintOffer #2875

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Support NFTokenMintOffer #2875

wants to merge 4 commits into from

Conversation

tequdev
Copy link
Contributor

@tequdev tequdev commented Jan 10, 2025

High Level Overview of Change

Support NFTokenMintOffer

Context of Change

add fields to NFTokenMint transaction

  • Amount
  • Destination
  • Expiration

Type of Change

  • New feature (non-breaking change which adds functionality)
  • Tests (You added tests for code that already exists, or your new feature included in this PR)

Did you update HISTORY.md?

  • Yes
  • No, this change does not impact library users

Test Plan

add unit test

Copy link

coderabbitai bot commented Jan 10, 2025

Walkthrough

This pull request introduces enhancements to the xrpl.js library by adding support for XLS-52 (NFTokenMintOffer). Key changes include the addition of new optional properties such as Amount, Expiration, and Destination to the NFTokenMint interface, along with corresponding validation logic to ensure proper transaction creation. The HISTORY.md file has been updated to document these changes, including the introduction of the utility function convertTxFlagsToNumber and the deprecation of setTransactionFlagsToNumber.

Changes

File Change Summary
packages/xrpl/HISTORY.md Added entry for XLS-52 support and utility function convertTxFlagsToNumber; deprecated setTransactionFlagsToNumber.
packages/xrpl/src/models/transactions/NFTokenMint.ts - Added optional Amount?: Amount property
- Added optional Expiration?: number property
- Added optional Destination?: Account property
- Added validation for new properties in validateNFTokenMint function.
packages/xrpl/test/models/NFTokenMint.test.ts Added test cases for:
- Validation errors when Amount is null with Expiration or Destination
- Successful validation of NFTokenMint with Amount, Destination, and Expiration.
packages/xrpl/test/integration/transactions/nftokenMint.test.ts Added integration test for NFTokenMint with Amount, Expiration, and Destination.

Possibly related PRs

  • support DynamicNFT #2726: The changes in the main PR regarding the NFTokenMint transaction and its validation logic are directly related to the modifications in the retrieved PR, which also introduces the NFTokenModify transaction and updates to the NFTokenMint flags.
  • Fix: parseTransactionFlags unintentionally modifies transaction #2825: The changes in the main PR regarding the deprecation of setTransactionFlagsToNumber and the introduction of convertTxFlagsToNumber are directly related to the modifications in the retrieved PR, which also focuses on replacing setTransactionFlagsToNumber with convertTxFlagsToNumber in the transaction flag handling logic.

Suggested reviewers

  • mvadari
  • achowdhry-ripple
  • khancode
  • shawnxie999

Poem

🐰 Hop, hop, a token mint so bright,
XLS-52 takes magical flight!
New fields dance with glee,
Validation's key, you'll see
NFT magic takes its might! 🌟


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (4)
packages/xrpl/test/models/NFTokenMint.test.ts (4)

113-129: Consider adding edge cases for Expiration validation.

While the test correctly validates that Amount is required when Expiration is present, consider adding test cases for:

  • Invalid Expiration values (negative numbers, zero)
  • Expiration values in the past
  • Maximum allowed Expiration value

131-147: Add test cases for invalid Destination formats.

While the test correctly validates that Amount is required when Destination is present, consider adding test cases for:

  • Invalid Destination address format
  • Destination same as Account
  • Destination same as Issuer

149-163: Enhance test coverage for field combinations.

While the test correctly validates a transaction with all new fields, consider adding test cases for:

  • Different Amount formats (drops vs XRP)
  • Various combinations of optional fields:
    • Amount only
    • Amount + Destination only
    • Amount + Expiration only
  • Edge cases when all fields are present:
    • Minimum/maximum values
    • Different currency codes for Amount

112-163: Improve organization of XLS-52 related tests.

Consider grouping the new XLS-52 related tests in a nested describe block for better organization and documentation:

describe('XLS-52 NFTokenMintOffer', () => {
  // Group the three new test cases here
})

Also, consider adding JSDoc comments to document the XLS-52 requirements and validation rules.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 84943ae and c1a73fe.

📒 Files selected for processing (3)
  • packages/xrpl/HISTORY.md (1 hunks)
  • packages/xrpl/src/models/transactions/NFTokenMint.ts (3 hunks)
  • packages/xrpl/test/models/NFTokenMint.test.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: snippets (22.x)
  • GitHub Check: unit (18.x)
  • GitHub Check: integration (22.x)
  • GitHub Check: snippets (20.x)
  • GitHub Check: integration (20.x)
  • GitHub Check: snippets (18.x)
  • GitHub Check: integration (18.x)
  • GitHub Check: browser (18.x)
🔇 Additional comments (3)
packages/xrpl/src/models/transactions/NFTokenMint.ts (2)

105-124: Interface additions look good!

The new fields are well documented with clear descriptions:

  • Amount: Optional amount for the token
  • Expiration: Optional expiration time in seconds since Ripple Epoch
  • Destination: Optional account restriction

164-174: Validation logic is correct

The validation properly enforces that Amount must be present when either Expiration or Destination is specified.

packages/xrpl/HISTORY.md (1)

7-9: Changelog entry is appropriate

The addition of XLS-52 support is properly documented under Unreleased Changes.

Copy link
Collaborator

@mvadari mvadari left a comment

Choose a reason for hiding this comment

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

Please add an integration test

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (2)
packages/xrpl/test/integration/transactions/nftokenMint.test.ts (2)

103-111: Consider extracting test constants.

The test uses hardcoded values that could be extracted as constants for better maintainability:

  • xrpToDrops(1) for Amount
  • 1000 * 60 * 60 * 24 for expiration duration
+ const TEST_AMOUNT_XRP = 1
+ const ONE_DAY_IN_SECONDS = 24 * 60 * 60
  const tx: NFTokenMint = {
    // ...
-   Amount: xrpToDrops(1),
-   Expiration: unixTimeToRippleTime(Date.now() + 1000 * 60 * 60 * 24),
+   Amount: xrpToDrops(TEST_AMOUNT_XRP),
+   Expiration: unixTimeToRippleTime(Date.now() + ONE_DAY_IN_SECONDS * 1000),
    // ...
  }

144-154: Enhance offer verification.

The test only verifies the existence of the offer but not its details. Consider adding assertions for:

  • Amount matches the specified value
  • Destination matches the specified address
  • Expiration matches the specified time
  const existsOffer = sellOffers.result.offers.some(
-   (value) => value.nft_offer_index === nftokenOfferID,
+   (value) => 
+     value.nft_offer_index === nftokenOfferID &&
+     value.amount === xrpToDrops(TEST_AMOUNT_XRP) &&
+     value.destination === destinationWallet.address &&
+     value.expiration === tx.Expiration
  )
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between c1a73fe and 3a3b0e4.

📒 Files selected for processing (1)
  • packages/xrpl/test/integration/transactions/nftokenMint.test.ts (3 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: integration (22.x)
  • GitHub Check: snippets (22.x)
  • GitHub Check: unit (18.x)
  • GitHub Check: integration (20.x)
  • GitHub Check: snippets (20.x)
  • GitHub Check: integration (18.x)
  • GitHub Check: snippets (18.x)
  • GitHub Check: browser (18.x)
🔇 Additional comments (2)
packages/xrpl/test/integration/transactions/nftokenMint.test.ts (2)

9-11: LGTM! Imports are well-organized.

The new imports are properly grouped with other imports from the same source and are essential for the new NFTokenMintOffer functionality.


27-27: LGTM! Test setup is well-structured.

Good practice to:

  • Use a typed wallet variable
  • Generate a fresh funded wallet for each test
  • Initialize in beforeEach

Also applies to: 31-31

Comment on lines +100 to +157
it(
'test with Amount',
async function () {
const tx: NFTokenMint = {
TransactionType: 'NFTokenMint',
Account: testContext.wallet.address,
URI: convertStringToHex('https://www.google.com'),
NFTokenTaxon: 0,
Amount: xrpToDrops(1),
Expiration: unixTimeToRippleTime(Date.now() + 1000 * 60 * 60 * 24),
Destination: destinationWallet.address,
}
const response = await testTransaction(
testContext.client,
tx,
testContext.wallet,
)
assert.equal(response.type, 'response')

const txRequest: TxRequest = {
command: 'tx',
transaction: hashSignedTx(response.result.tx_blob),
}
const txResponse = await testContext.client.request(txRequest)

assert.equal(
(txResponse.result.meta as TransactionMetadata).TransactionResult,
'tesSUCCESS',
)

const nftokenID =
getNFTokenID(
txResponse.result.meta as TransactionMetadata<NFTokenMint>,
) ?? 'undefined'

const nftokenOfferID = (
txResponse.result.meta as TransactionMetadata<NFTokenMint>
).offer_id

const sellOffers = await testContext.client.request({
command: 'nft_sell_offers',
nft_id: nftokenID,
})

const existsOffer = sellOffers.result.offers.some(
(value) => value.nft_offer_index === nftokenOfferID,
)

assert.isTrue(
existsOffer,
`Expected to exist an offer for NFT with NFTokenID ${nftokenID} but did not find it.
\n\nHere's what was returned from 'nft_sell_offers': ${JSON.stringify(
sellOffers,
)}`,
)
},
TIMEOUT,
)
Copy link

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Add negative test cases.

The test suite would benefit from additional test cases that verify error handling:

  • Invalid Amount (zero or negative)
  • Expired timestamp
  • Invalid destination address

Would you like me to help generate these negative test cases?

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (3)
packages/xrpl/HISTORY.md (1)

13-15: Ensure Consistent and Concise Heading Structure

The new "### Added" section reporting "* Support for XLS-52 (NFTokenMintOffer)" clearly documents the new feature. However, note that there is an earlier "### Added" heading (line 7) in the "Unreleased" section. To avoid duplicate headings—which may trigger markdownlint warnings (MD024)—consider merging these entries under a single "### Added" heading. This will improve readability and consistency of the release history.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

13-13: Multiple headings with the same content
null

(MD024, no-duplicate-heading)

packages/xrpl/src/models/transactions/NFTokenMint.ts (2)

136-137: Enhance the comment for offer_id field.

The comment could be more specific about when the offer_id is present.

-  // if Amount is present
+  // Present when Amount is specified, representing the ID of the NFTokenMintOffer
   offer_id?: string

169-179: Consider adding more robust validations.

While the current validations are good, consider adding these additional checks:

  1. Validate that Expiration is a non-negative number (since it represents seconds since Ripple Epoch)
  2. If applicable, validate that Amount is non-negative

Example implementation:

   validateOptionalField(tx, 'Amount', isAmount)
-  validateOptionalField(tx, 'Expiration', isNumber)
+  validateOptionalField(tx, 'Expiration', (value: unknown): boolean => {
+    return isNumber(value) && (value as number) >= 0
+  })
   validateOptionalField(tx, 'Destination', isAccount)
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 3a3b0e4 and b6eb061.

📒 Files selected for processing (2)
  • packages/xrpl/HISTORY.md (1 hunks)
  • packages/xrpl/src/models/transactions/NFTokenMint.ts (3 hunks)
🧰 Additional context used
🪛 markdownlint-cli2 (0.17.2)
packages/xrpl/HISTORY.md

13-13: Multiple headings with the same content
null

(MD024, no-duplicate-heading)

⏰ Context from checks skipped due to timeout of 90000ms (12)
  • GitHub Check: unit (22.x)
  • GitHub Check: snippets (22.x)
  • GitHub Check: unit (20.x)
  • GitHub Check: snippets (20.x)
  • GitHub Check: unit (18.x)
  • GitHub Check: integration (22.x)
  • GitHub Check: snippets (18.x)
  • GitHub Check: integration (20.x)
  • GitHub Check: build-and-lint (18.x)
  • GitHub Check: integration (18.x)
  • GitHub Check: browser (18.x)
  • GitHub Check: Analyze (javascript)
🔇 Additional comments (2)
packages/xrpl/src/models/transactions/NFTokenMint.ts (2)

2-2: LGTM! Import changes are appropriate.

The new imports are correctly added to support the validation of new fields.

Also applies to: 10-11


110-129: LGTM! Interface changes are well-documented and properly typed.

The new optional fields (Amount, Expiration, Destination) are appropriately added with comprehensive JSDoc comments explaining their purpose and constraints.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/xrpl/HISTORY.md (1)

13-15: Merge duplicate "### Added" headings for clarity and markdown compliance
The new entry for NFTokenMintOffer is introduced as a separate "### Added" section, but there is already an "### Added" block earlier. This duplicate heading can trigger markdownlint MD024 and may confuse readers. Consider merging the two "Added" sections—for example, by appending the bullet for XLS-52 support to the first "### Added" list or by renaming one of them to differentiate the groups.

Suggested diff to merge the sections (assuming merging into the first "### Added"):

@@ In the Unreleased section:
-### Added
-* Adds utility function `convertTxFlagsToNumber`
-
-### Changed
-* Deprecated `setTransactionFlagsToNumber`. Start using convertTxFlagsToNumber instead
-
-### Added
-* Support for XLS-52 (NFTokenMintOffer)
+### Added
+* Adds utility function `convertTxFlagsToNumber`
+* Support for XLS-52 (NFTokenMintOffer)
+
+### Changed
+* Deprecated `setTransactionFlagsToNumber`. Start using convertTxFlagsToNumber instead

Feel free to adjust the grouping if the intent was to separate distinct types of additions.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

13-13: Multiple headings with the same content
null

(MD024, no-duplicate-heading)

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b6eb061 and 62d224e.

📒 Files selected for processing (1)
  • packages/xrpl/HISTORY.md (1 hunks)
🧰 Additional context used
🪛 markdownlint-cli2 (0.17.2)
packages/xrpl/HISTORY.md

13-13: Multiple headings with the same content
null

(MD024, no-duplicate-heading)

⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: integration (22.x)
  • GitHub Check: integration (20.x)
  • GitHub Check: unit (20.x)
  • GitHub Check: integration (18.x)
  • GitHub Check: unit (18.x)
  • GitHub Check: build-and-lint (18.x)
  • GitHub Check: Analyze (javascript)
  • GitHub Check: browser (18.x)

@ckeshava ckeshava self-requested a review February 7, 2025 01:37
@@ -140,4 +165,16 @@ export function validateNFTokenMint(tx: Record<string, unknown>): void {
if (tx.NFTokenTaxon == null) {
throw new ValidationError('NFTokenMint: missing field NFTokenTaxon')
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
if (!((tx.Amount == null && tx.Expiration == null && tx.Destination == null) || (tx.Amount != null && tx.Expiration != null && tx.Destination != null))) {
if (tx.Expiration != null || tx.Destination != null) {
throw new ValidationError(
'NFTokenMint: All three fields Amount, Expiration, Destination must be present',
)
}
}

We will need all three fields to be present (or) absent to make logical sense, isn't it? Isn't this a more comprehensive check?

I'm guessing this is already checked in rippled, so perhaps there is no need for a rigorous check here.

@ckeshava
Copy link
Collaborator

ckeshava commented Feb 7, 2025

@tequdev if you would like to fix the integration test, please check this file: https://github.com/XRPLF/xrpl.js/pull/2874/files#diff-aed00401282930e11f525e026ee0128d91284d95586aaee7c741f9ba0c8d409e

The server_info and server_state RPC has been updated to include a new git field.

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.

3 participants