Skip to content

feat: Add AMM amdendment support [DO NOT MERGE / sync 2.4.0] #30

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.

Sign up for GitHub

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

Open
tequdev wants to merge 5 commits into
base: main-xahau
Choose a base branch
from
Open

feat: Add AMM amdendment support [DO NOT MERGE / sync 2.4.0] #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3cfd32
feat: Add AMM amdendment support
tequdev Jul 24, 2025
3243c58
fix "Object is of type 'unknown'" error
tequdev Jul 24, 2025
682726f
fix lint
tequdev Jul 24, 2025
d2e7e5c
feat: add AMMClawback support (#2893)
khancode Feb 12, 2025
a759b23
Merge branch 'main-xahau' into amm
tequdev Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .ci-config/xahaud.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,23 @@ fixXahauV3
PaychanAndEscrowForTokens
DeepFreeze
Clawback
# 2.4.0 sync
XChainBridge
DID
fixNFTokenReserve
fixInnerObjTemplate
PriceOracle
fixPreviousTxnID
AMMClawback
Credentials
NFTokenMintOffer
MPTokensV1
fixNFTokenPageLinks
fixEnforceNFTokenTrustline
fixReducedOffersV2
DeepFreeze
DynamicNFT
PermissionedDomains

[network_id]
21337
2 changes: 2 additions & 0 deletions packages/xahau-binary-codec/HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

### Added
* Support for the AMMClawback amendment (XLS-73)
## 2.1.0 (2024-06-03)

### Added
Expand Down
192 changes: 191 additions & 1 deletion packages/xahau-binary-codec/src/enums/definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
"UInt192": 21,
"UInt384": 22,
"UInt512": 23,
"Issue": 24,
"Currency": 26,
"Transaction": 10001,
"LedgerEntry": 10002,
"Validation": 10003,
Expand All @@ -46,6 +48,7 @@
"NegativeUNL": 78,
"NFTokenPage": 80,
"NFTokenOffer": 55,
"AMM": 121,
"URIToken": 85,
"UNLReport": 82,
"Any": -3,
Expand Down Expand Up @@ -279,6 +282,26 @@
"type": "UInt16"
}
],
[
"TradingFee",
{
"nth": 5,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "UInt16"
}
],
[
"DiscountedFee",
{
"nth": 6,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "UInt16"
}
],
[
"Version",
{
Expand Down Expand Up @@ -1269,6 +1292,16 @@
"type": "Hash256"
}
],
[
"AMMID",
{
"nth": 14,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Hash256"
}
],
[
"ObjectID",
{
Expand Down Expand Up @@ -1639,6 +1672,36 @@
"type": "Amount"
}
],
[
"Amount2",
{
"nth": 11,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Amount"
}
],
[
"BidMin",
{
"nth": 12,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Amount"
}
],
[
"BidMax",
{
"nth": 13,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Amount"
}
],
[
"MinimumOffer",
{
Expand Down Expand Up @@ -1729,6 +1792,56 @@
"type": "Amount"
}
],
[
"LPTokenOut",
{
"nth": 25,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Amount"
}
],
[
"LPTokenIn",
{
"nth": 26,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Amount"
}
],
[
"EPrice",
{
"nth": 27,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Amount"
}
],
[
"Price",
{
"nth": 28,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Amount"
}
],
[
"LPTokenBalance",
{
"nth": 31,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Amount"
}
],
[
"PublicKey",
{
Expand Down Expand Up @@ -2179,6 +2292,26 @@
"type": "PathSet"
}
],
[
"Asset",
{
"nth": 3,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Issue"
}
],
[
"Asset2",
{
"nth": 4,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "Issue"
}
],
[
"TransactionMetaData",
{
Expand Down Expand Up @@ -2389,6 +2522,36 @@
"type": "STObject"
}
],
[
"VoteEntry",
{
"nth": 25,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "STObject"
}
],
[
"AuctionSlot",
{
"nth": 26,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "STObject"
}
],
[
"AuthAccount",
{
"nth": 27,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "STObject"
}
],
[
"Remark",
{
Expand Down Expand Up @@ -2549,6 +2712,16 @@
"type": "STArray"
}
],
[
"VoteSlots",
{
"nth": 12,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "STArray"
}
],
[
"Majorities",
{
Expand Down Expand Up @@ -2599,6 +2772,16 @@
"type": "STArray"
}
],
[
"AuthAccounts",
{
"nth": 25,
"isVLEncoded": false,
"isSerialized": true,
"isSigningField": true,
"type": "STArray"
}
],
[
"Remarks",
{
Expand Down Expand Up @@ -2719,7 +2902,7 @@
"temUNKNOWN": -264,
"temSEQ_AND_TICKET": -263,
"temBAD_NFTOKEN_TRANSFER_FEE": -262,
"temAMM_BAD_TOKENS": -261,
"temBAD_AMM_TOKENS": -261,
"temXCHAIN_EQUAL_DOOR_ACCOUNTS": -260,
"temXCHAIN_BAD_PROOF": -259,
"temXCHAIN_BRIDGE_BAD_ISSUES": -258,
Expand Down Expand Up @@ -2882,6 +3065,13 @@
"NFTokenCancelOffer": 28,
"NFTokenAcceptOffer": 29,
"Clawback": 30,
"AMMClawback": 31,
"AMMCreate": 35,
"AMMDeposit": 36,
"AMMWithdraw": 37,
"AMMVote": 38,
"AMMBid": 39,
"AMMDelete": 40,
"URITokenMint": 45,
"URITokenBurn": 46,
"URITokenBuy": 47,
Expand Down
8 changes: 4 additions & 4 deletions packages/xahau-binary-codec/test/signing-data-encoding.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ describe('Signing data', function () {
const customPaymentDefinitions = JSON.parse(
JSON.stringify(normalDefinitions),
)
customPaymentDefinitions.TRANSACTION_TYPES.Payment = 31
customPaymentDefinitions.TRANSACTION_TYPES.Payment = 200

const newDefs = new XrplDefinitions(customPaymentDefinitions)
const actual = encodeForSigning(tx_json, newDefs)
Expand All @@ -82,7 +82,7 @@ describe('Signing data', function () {
'53545800', // signingPrefix
// TransactionType
'12',
'001F',
'00C8',
// Flags
'22',
'80000000',
Expand Down Expand Up @@ -176,7 +176,7 @@ describe('Signing data', function () {
const customPaymentDefinitions = JSON.parse(
JSON.stringify(normalDefinitions),
)
customPaymentDefinitions.TRANSACTION_TYPES.Payment = 31
customPaymentDefinitions.TRANSACTION_TYPES.Payment = 200

const newDefs = new XrplDefinitions(customPaymentDefinitions)
const signingAccount = 'rJZdUusLDtY9NEsGea7ijqhVrXv98rYBYN'
Expand All @@ -187,7 +187,7 @@ describe('Signing data', function () {
'534D5400', // signingPrefix
// TransactionType
'12',
'001F',
'00C8',
// Flags
'22',
'80000000',
Expand Down
1 change: 1 addition & 0 deletions packages/xahau/HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Subscribe to [the **xrpl-announce** mailing list](https://groups.google.com/g/xr

### Added
* parseTransactionFlags as a utility function in the xrpl package to streamline transactions flags-to-map conversion
* Support for the AMMClawback amendment (XLS-73)
* Support for XLS-77d Deep-Freeze amendment

### Fixed
Expand Down
Loading
Loading