-
Notifications
You must be signed in to change notification settings - Fork 45
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 XRPFees amendment #508
Open
nkramer44
wants to merge
9
commits into
main
Choose a base branch
from
nk/xrp-fees
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d3592e4
take notes
nkramer44 e62cb8e
Merge branch 'main' of https://github.com/XRPLF/xrpl4j into nk/xrp-fees
nkramer44 91f0bb0
Merge branch 'main' of https://github.com/XRPLF/xrpl4j into nk/xrp-fees
nkramer44 d86ce4b
adjust SetFee to work with post-XRPFees amendment format
nkramer44 4e29d83
checkstyle
nkramer44 a54ba7a
re introduce custom Deserializer for BaseFee/BaseFeeDrops because Bas…
nkramer44 a8ce66c
Merge branch 'main' into nk/xrp-fees
sappenin c123274
Merge branch 'main' into nk/xrp-fees
sappenin e5a77dd
Update Javadoc and comments
sappenin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
60 changes: 60 additions & 0 deletions
60
...4j-core/src/main/java/org/xrpl/xrpl4j/model/jackson/modules/BaseFeeDropsDeserializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
package org.xrpl.xrpl4j.model.jackson.modules; | ||
|
||
/*- | ||
* ========================LICENSE_START================================= | ||
* xrpl4j :: model | ||
* %% | ||
* Copyright (C) 2020 - 2022 XRPL Foundation and its contributors | ||
* %% | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* =========================LICENSE_END================================== | ||
*/ | ||
|
||
import com.fasterxml.jackson.core.JsonParser; | ||
import com.fasterxml.jackson.databind.DeserializationContext; | ||
import com.fasterxml.jackson.databind.deser.std.StdDeserializer; | ||
import com.google.common.primitives.UnsignedLong; | ||
import org.xrpl.xrpl4j.model.transactions.XrpCurrencyAmount; | ||
|
||
import java.io.IOException; | ||
|
||
/** | ||
* Custom Jackson deserializer for {@link XrpCurrencyAmount} instances found in {@link SetFee}. | ||
* <p> | ||
* Before the <a href="https://xrpl.org/resources/known-amendments/#xrpfees">XRPFees amendment</a>, a {@link SetFee} | ||
* transaction serializes its `BaseFee` to a hex string. After the | ||
* <a href="https://xrpl.org/resources/known-amendments/#xrpfees">XRPFees amendment</a>, a {@link SetFee} transaction | ||
* serializes its `BaseFee` to a decimal string. | ||
* | ||
* @see "https://xrpl.org/resources/known-amendments/#xrpfees" | ||
*/ | ||
public class BaseFeeDropsDeserializer extends StdDeserializer<XrpCurrencyAmount> { | ||
|
||
/** | ||
* No-args constructor. | ||
*/ | ||
public BaseFeeDropsDeserializer() { | ||
super(XrpCurrencyAmount.class); | ||
} | ||
|
||
@Override | ||
public XrpCurrencyAmount deserialize(JsonParser jsonParser, DeserializationContext ctxt) throws IOException { | ||
// Pre-XRPFees, SetFee transactions serialize `BaseFee` to a hex string. Post XRPFees SetFee transactions | ||
// have a `BaseFeeDrops` field which is a decimal string. | ||
if (jsonParser.currentName().equals("BaseFee")) { | ||
return XrpCurrencyAmount.of(UnsignedLong.valueOf(jsonParser.getText(), 16)); | ||
} else { | ||
return XrpCurrencyAmount.ofDrops(jsonParser.getValueAsLong()); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This feels like a breaking change.
E.g., imagine an application using an older version of xrpl4j is calling
referenceFeeUnits
. Then, that code upgrades to the version of xrpl4j that has this change (but the application usage of xrpl4j isn't changed because there's just a deprecation warning). If that application starts talking to a server withXRPFees
amendment enabled, that code will throw a NPE likely.I need to think more about this one -- unless the argument is that what I wrote above can't happen? Or maybe just is unlikely to happen?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you're right. Anyone using this method and not checking for null will get a NPE if XRPFees is enabled. Unfortunately I can't think of a way to support the XRPFees change without making this
@Nullable
. We could@Value.Default
it toUnsignedInteger.ZERO
to avoid creating NPE, but that almost seems harder to catch as a developer than getting a bunch of NPE in your logs.