diff --git a/src/ripple/protocol/SField.h b/src/ripple/protocol/SField.h index c21b405c2..a39a89917 100644 --- a/src/ripple/protocol/SField.h +++ b/src/ripple/protocol/SField.h @@ -341,6 +341,7 @@ extern SF_UINT8 const sfTransactionResult; extern SF_UINT8 const sfTickSize; extern SF_UINT8 const sfUNLModifyDisabling; extern SF_UINT8 const sfHookResult; +extern SF_UINT8 const sfBatchIndex; // 16-bit integers (common) extern SF_UINT16 const sfLedgerEntryType; @@ -410,7 +411,7 @@ extern SF_UINT32 const sfRewardLgrLast; extern SF_UINT32 const sfFirstNFTokenSequence; extern SF_UINT32 const sfImportSequence; extern SF_UINT32 const sfXahauActivationLgrSeq; -extern SF_UINT32 const sfBatchIndex; +extern SF_UINT32 const sfOuterSequence; // 64-bit integers (common) extern SF_UINT64 const sfIndexNext; @@ -581,6 +582,7 @@ extern SField const sfSignerEntry; extern SField const sfNFToken; extern SField const sfEmitDetails; extern SField const sfHook; +extern SField const sfBatchTxn; extern SField const sfSigner; extern SField const sfMajority; diff --git a/src/ripple/protocol/impl/InnerObjectFormats.cpp b/src/ripple/protocol/impl/InnerObjectFormats.cpp index 2c6632798..63cbc2a5a 100644 --- a/src/ripple/protocol/impl/InnerObjectFormats.cpp +++ b/src/ripple/protocol/impl/InnerObjectFormats.cpp @@ -163,6 +163,13 @@ InnerObjectFormats::InnerObjectFormats() {sfDigest, soeOPTIONAL}, {sfFlags, soeOPTIONAL}, }); + + add(sfBatchTxn.jsonName.c_str(), + sfBatchTxn.getCode(), + {{sfAccount, soeREQUIRED}, + {sfOuterSequence, soeREQUIRED}, + {sfSequence, soeOPTIONAL}, + {sfBatchIndex, soeREQUIRED}}); } InnerObjectFormats const& diff --git a/src/ripple/protocol/impl/SField.cpp b/src/ripple/protocol/impl/SField.cpp index 6723206a7..a1470fa8c 100644 --- a/src/ripple/protocol/impl/SField.cpp +++ b/src/ripple/protocol/impl/SField.cpp @@ -89,6 +89,7 @@ CONSTRUCT_TYPED_SFIELD(sfTransactionResult, "TransactionResult", UINT8, CONSTRUCT_TYPED_SFIELD(sfTickSize, "TickSize", UINT8, 16); CONSTRUCT_TYPED_SFIELD(sfUNLModifyDisabling, "UNLModifyDisabling", UINT8, 17); CONSTRUCT_TYPED_SFIELD(sfHookResult, "HookResult", UINT8, 18); +CONSTRUCT_TYPED_SFIELD(sfBatchIndex, "BatchIndex", UINT8, 19); // 16-bit integers CONSTRUCT_TYPED_SFIELD(sfLedgerEntryType, "LedgerEntryType", UINT16, 1, SField::sMD_Never); @@ -157,7 +158,7 @@ CONSTRUCT_TYPED_SFIELD(sfLockCount, "LockCount", UINT32, CONSTRUCT_TYPED_SFIELD(sfFirstNFTokenSequence, "FirstNFTokenSequence", UINT32, 50); -CONSTRUCT_TYPED_SFIELD(sfBatchIndex, "BatchIndex", UINT32, 95); +CONSTRUCT_TYPED_SFIELD(sfOuterSequence, "OuterSequence", UINT32, 95); CONSTRUCT_TYPED_SFIELD(sfXahauActivationLgrSeq, "XahauActivationLgrSeq",UINT32, 96); CONSTRUCT_TYPED_SFIELD(sfImportSequence, "ImportSequence", UINT32, 97); CONSTRUCT_TYPED_SFIELD(sfRewardTime, "RewardTime", UINT32, 98); @@ -353,6 +354,7 @@ CONSTRUCT_UNTYPED_SFIELD(sfImportVLKey, "ImportVLKey", OBJECT, CONSTRUCT_UNTYPED_SFIELD(sfHookEmission, "HookEmission", OBJECT, 93); CONSTRUCT_UNTYPED_SFIELD(sfMintURIToken, "MintURIToken", OBJECT, 92); CONSTRUCT_UNTYPED_SFIELD(sfAmountEntry, "AmountEntry", OBJECT, 91); +CONSTRUCT_UNTYPED_SFIELD(sfBatchTxn, "BatchTxn", OBJECT, 90); // array of objects // ARRAY/1 is reserved for end of array diff --git a/src/ripple/protocol/impl/TxFormats.cpp b/src/ripple/protocol/impl/TxFormats.cpp index 09e3cc00c..047e2a3dc 100644 --- a/src/ripple/protocol/impl/TxFormats.cpp +++ b/src/ripple/protocol/impl/TxFormats.cpp @@ -45,7 +45,7 @@ TxFormats::TxFormats() {sfHookParameters, soeOPTIONAL}, {sfOperationLimit, soeOPTIONAL}, {sfCloseResolution, soeOPTIONAL}, - {sfBatchIndex, soeOPTIONAL}, + {sfBatchTxn, soeOPTIONAL}, }; add(jss::AccountSet,