Use asset and asset2 to navigate AMM

XRPLF · Sep 24, 2024 · 3be6878 · 3be6878
1 parent 9b30183
commit 3be6878
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 288 deletions.
diff --git a/src/libxrpl/protocol/SField.cpp b/src/libxrpl/protocol/SField.cpp
@@ -320,7 +320,6 @@ CONSTRUCT_TYPED_SFIELD(sfRegularKey,            "RegularKey",           ACCOUNT,
 CONSTRUCT_TYPED_SFIELD(sfNFTokenMinter,         "NFTokenMinter",        ACCOUNT,    9);
 CONSTRUCT_TYPED_SFIELD(sfEmitCallback,          "EmitCallback",         ACCOUNT,   10);
 CONSTRUCT_TYPED_SFIELD(sfHolder,                "Holder",               ACCOUNT,   11);
-CONSTRUCT_TYPED_SFIELD(sfAMMAccount,            "AMMAccount",           ACCOUNT,   12);
 
 // account (uncommon)
 CONSTRUCT_TYPED_SFIELD(sfHookAccount,           "HookAccount",          ACCOUNT,   16);

diff --git a/src/libxrpl/protocol/TxFormats.cpp b/src/libxrpl/protocol/TxFormats.cpp
@@ -385,8 +385,8 @@ TxFormats::TxFormats()
         ttAMM_CLAWBACK,
         {
             {sfHolder, soeREQUIRED},
-            {sfAMMAccount, soeREQUIRED},
             {sfAsset, soeREQUIRED},
+            {sfAsset2, soeREQUIRED},
             {sfAmount, soeOPTIONAL},
         },
         commonFields);