From ed4e9de731439145defaba97ac0a48bcb4167428 Mon Sep 17 00:00:00 2001 From: JCW Date: Tue, 13 Jan 2026 15:29:34 +0000 Subject: [PATCH] Move app/tx to libxrpl Signed-off-by: JCW --- cmake/XrplCore.cmake | 7 + cmake/XrplInstall.cmake | 1 + .../xrpl/ledger}/AmendmentTable.h | 7 +- include/xrpl/protocol/Protocol.h | 8 ++ .../xrpl/protocol/detail/transactions.macro | 124 +++++++++--------- include/xrpl/rdb/RelationalDatabase.h | 2 +- .../xrpl/server}/LoadFeeTrack.h | 0 .../detail => include/xrpl/tx}/ApplyContext.h | 0 .../xrpl/tx}/InvariantCheck.h | 4 +- .../xrpl/tx}/SignerEntries.h | 6 +- .../detail => include/xrpl/tx}/Transactor.h | 9 +- {src/xrpld/app => include/xrpl}/tx/apply.h | 3 +- .../app => include/xrpl}/tx/applySteps.h | 0 .../xrpl/tx/paths}/BookTip.h | 4 +- .../app => include/xrpl/tx}/paths/Flow.h | 5 +- .../detail => include/xrpl/tx/paths}/Offer.h | 0 .../xrpl/tx/paths}/OfferStream.h | 9 +- .../xrpl/tx}/paths/RippleCalc.h | 0 .../xrpl/tx}/paths/detail/AmountSpec.h | 0 .../xrpl/tx}/paths/detail/FlatSets.h | 0 .../xrpl/tx}/paths/detail/FlowDebugInfo.h | 3 +- .../xrpl/tx}/paths/detail/Steps.h | 3 +- .../xrpl/tx}/paths/detail/StrandFlow.h | 15 +-- .../xrpl/tx/transactors/AMM}/AMMBid.h | 2 +- .../xrpl/tx/transactors/AMM}/AMMClawback.h | 2 +- .../xrpl/tx/transactors/AMM}/AMMContext.h | 0 .../xrpl/tx/transactors/AMM}/AMMCreate.h | 2 +- .../xrpl/tx/transactors/AMM}/AMMDelete.h | 2 +- .../xrpl/tx/transactors/AMM}/AMMDeposit.h | 2 +- .../xrpl/tx/transactors/AMM}/AMMHelpers.h | 0 .../xrpl/tx/transactors/AMM}/AMMUtils.h | 0 .../xrpl/tx/transactors/AMM}/AMMVote.h | 2 +- .../xrpl/tx/transactors/AMM}/AMMWithdraw.h | 3 +- .../xrpl/tx/transactors}/Batch.h | 3 +- .../xrpl/tx/transactors}/Change.h | 2 +- .../xrpl/tx/transactors/Check}/CancelCheck.h | 2 +- .../xrpl/tx/transactors/Check}/CashCheck.h | 2 +- .../xrpl/tx/transactors/Check}/CreateCheck.h | 2 +- .../xrpl/tx/transactors}/Clawback.h | 2 +- .../xrpl/tx/transactors}/CreateTicket.h | 2 +- .../xrpl/tx/transactors}/Credentials.h | 2 +- .../xrpl/tx/transactors}/DID.h | 2 +- .../tx/transactors/Delegate}/DelegateSet.h | 2 +- .../tx/transactors/Delegate}/DelegateUtils.h | 0 .../xrpl/tx/transactors}/DeleteAccount.h | 2 +- .../xrpl/tx/transactors}/DeleteOracle.h | 2 +- .../xrpl/tx/transactors}/DepositPreauth.h | 2 +- .../xrpl/tx/transactors}/Escrow.h | 2 +- .../xrpl/tx/transactors}/LedgerStateFix.h | 2 +- .../tx/transactors/Lending}/LendingHelpers.h | 0 .../Lending}/LoanBrokerCoverClawback.h | 2 +- .../Lending}/LoanBrokerCoverDeposit.h | 2 +- .../Lending}/LoanBrokerCoverWithdraw.h | 2 +- .../transactors/Lending}/LoanBrokerDelete.h | 2 +- .../tx/transactors/Lending}/LoanBrokerSet.h | 2 +- .../xrpl/tx/transactors/Lending}/LoanDelete.h | 2 +- .../xrpl/tx/transactors/Lending}/LoanManage.h | 2 +- .../xrpl/tx/transactors/Lending}/LoanPay.h | 2 +- .../xrpl/tx/transactors/Lending}/LoanSet.h | 4 +- .../tx/transactors/MPT}/MPTokenAuthorize.h | 2 +- .../transactors/MPT}/MPTokenIssuanceCreate.h | 3 +- .../transactors/MPT}/MPTokenIssuanceDestroy.h | 2 +- .../tx/transactors/MPT}/MPTokenIssuanceSet.h | 2 +- .../tx/transactors/NFT}/NFTokenAcceptOffer.h | 2 +- .../xrpl/tx/transactors/NFT}/NFTokenBurn.h | 2 +- .../tx/transactors/NFT}/NFTokenCancelOffer.h | 2 +- .../tx/transactors/NFT}/NFTokenCreateOffer.h | 2 +- .../xrpl/tx/transactors/NFT}/NFTokenMint.h | 5 +- .../xrpl/tx/transactors/NFT}/NFTokenModify.h | 2 +- .../xrpl/tx/transactors/NFT}/NFTokenUtils.h | 3 +- .../xrpl/tx/transactors/Offer}/CancelOffer.h | 3 +- .../xrpl/tx/transactors/Offer}/CreateOffer.h | 3 +- .../xrpl/tx/transactors}/PayChan.h | 2 +- .../xrpl/tx/transactors}/Payment.h | 2 +- .../tx/transactors}/PermissionedDEXHelpers.h | 0 .../PermissionedDomainDelete.h | 2 +- .../PermissionedDomainSet.h | 2 +- .../xrpl/tx/transactors}/SetAccount.h | 3 +- .../xrpl/tx/transactors}/SetOracle.h | 2 +- .../xrpl/tx/transactors}/SetRegularKey.h | 2 +- .../xrpl/tx/transactors}/SetSignerList.h | 5 +- .../xrpl/tx/transactors}/SetTrust.h | 3 +- .../tx/transactors/Vault}/VaultClawback.h | 2 +- .../xrpl/tx/transactors/Vault}/VaultCreate.h | 2 +- .../xrpl/tx/transactors/Vault}/VaultDelete.h | 2 +- .../xrpl/tx/transactors/Vault}/VaultDeposit.h | 2 +- .../xrpl/tx/transactors/Vault}/VaultSet.h | 2 +- .../tx/transactors/Vault}/VaultWithdraw.h | 2 +- .../xrpl/tx/transactors}/XChainBridge.h | 3 +- src/libxrpl/protocol/Protocol.cpp | 15 +++ .../server}/LoadFeeTrack.cpp | 3 +- .../tx/detail => libxrpl/tx}/ApplyContext.cpp | 5 +- .../detail => libxrpl/tx}/InvariantCheck.cpp | 11 +- .../detail => libxrpl/tx}/SignerEntries.cpp | 3 +- .../tx/detail => libxrpl/tx}/Transactor.cpp | 13 +- .../app/tx/detail => libxrpl/tx}/apply.cpp | 5 +- .../tx/detail => libxrpl/tx}/applySteps.cpp | 2 +- .../detail => libxrpl/tx/paths}/BookTip.cpp | 2 +- src/{xrpld/app => libxrpl/tx}/paths/Flow.cpp | 11 +- .../tx/paths}/OfferStream.cpp | 5 +- .../app => libxrpl/tx}/paths/RippleCalc.cpp | 7 +- .../tx/transactors/AMM}/AMMBid.cpp | 7 +- .../tx/transactors/AMM}/AMMClawback.cpp | 9 +- .../tx/transactors/AMM}/AMMCreate.cpp | 7 +- .../tx/transactors/AMM}/AMMDelete.cpp | 5 +- .../tx/transactors/AMM}/AMMDeposit.cpp | 7 +- .../tx/transactors/AMM}/AMMHelpers.cpp | 2 +- .../tx/transactors/AMM}/AMMUtils.cpp | 5 +- .../tx/transactors/AMM}/AMMVote.cpp | 5 +- .../tx/transactors/AMM}/AMMWithdraw.cpp | 7 +- .../tx/transactors}/Batch.cpp | 5 +- .../tx/transactors}/Change.cpp | 5 +- .../tx/transactors/Check}/CancelCheck.cpp | 3 +- .../tx/transactors/Check}/CashCheck.cpp | 5 +- .../tx/transactors/Check}/CreateCheck.cpp | 3 +- .../tx/transactors}/Clawback.cpp | 3 +- .../tx/transactors}/CreateTicket.cpp | 4 +- .../tx/transactors}/Credentials.cpp | 3 +- .../detail => libxrpl/tx/transactors}/DID.cpp | 3 +- .../tx/transactors/Delegate}/DelegateSet.cpp | 3 +- .../transactors/Delegate}/DelegateUtils.cpp | 3 +- .../tx/transactors}/DeleteAccount.cpp | 15 +-- .../tx/transactors}/DeleteOracle.cpp | 3 +- .../tx/transactors}/DepositPreauth.cpp | 3 +- .../tx/transactors}/Escrow.cpp | 5 +- .../tx/transactors}/LedgerStateFix.cpp | 5 +- .../transactors/Lending}/LendingHelpers.cpp | 4 +- .../Lending}/LoanBrokerCoverClawback.cpp | 5 +- .../Lending}/LoanBrokerCoverDeposit.cpp | 5 +- .../Lending}/LoanBrokerCoverWithdraw.cpp | 7 +- .../transactors/Lending}/LoanBrokerDelete.cpp | 5 +- .../tx/transactors/Lending}/LoanBrokerSet.cpp | 5 +- .../tx/transactors/Lending}/LoanDelete.cpp | 5 +- .../tx/transactors/Lending}/LoanManage.cpp | 5 +- .../tx/transactors/Lending}/LoanPay.cpp | 7 +- .../tx/transactors/Lending}/LoanSet.cpp | 5 +- .../tx/transactors/MPT}/MPTokenAuthorize.cpp | 3 +- .../MPT}/MPTokenIssuanceCreate.cpp | 3 +- .../MPT}/MPTokenIssuanceDestroy.cpp | 3 +- .../transactors/MPT}/MPTokenIssuanceSet.cpp | 5 +- .../transactors/NFT}/NFTokenAcceptOffer.cpp | 5 +- .../tx/transactors/NFT}/NFTokenBurn.cpp | 5 +- .../transactors/NFT}/NFTokenCancelOffer.cpp | 5 +- .../transactors/NFT}/NFTokenCreateOffer.cpp | 5 +- .../tx/transactors/NFT}/NFTokenMint.cpp | 3 +- .../tx/transactors/NFT}/NFTokenModify.cpp | 5 +- .../tx/transactors/NFT}/NFTokenUtils.cpp | 3 +- .../tx/transactors/Offer}/CancelOffer.cpp | 3 +- .../tx/transactors/Offer}/CreateOffer.cpp | 7 +- .../tx/transactors}/PayChan.cpp | 3 +- .../tx/transactors}/Payment.cpp | 9 +- .../PermissionedDEXHelpers.cpp | 3 +- .../PermissionedDomainDelete.cpp | 3 +- .../PermissionedDomainSet.cpp | 3 +- .../tx/transactors}/SetAccount.cpp | 5 +- .../tx/transactors}/SetOracle.cpp | 3 +- .../tx/transactors}/SetRegularKey.cpp | 3 +- .../tx/transactors}/SetSignerList.cpp | 3 +- .../tx/transactors}/SetTrust.cpp | 5 +- .../tx/transactors/Vault}/VaultClawback.cpp | 4 +- .../tx/transactors/Vault}/VaultCreate.cpp | 7 +- .../tx/transactors/Vault}/VaultDelete.cpp | 3 +- .../tx/transactors/Vault}/VaultDeposit.cpp | 5 +- .../tx/transactors/Vault}/VaultSet.cpp | 3 +- .../tx/transactors/Vault}/VaultWithdraw.cpp | 3 +- .../tx/transactors}/XChainBridge.cpp | 9 +- src/test/app/AMMCalc_test.cpp | 3 +- src/test/app/AMMClawback_test.cpp | 3 +- src/test/app/AMMExtended_test.cpp | 8 +- src/test/app/AMM_test.cpp | 9 +- src/test/app/AmendmentTable_test.cpp | 2 +- src/test/app/Batch_test.cpp | 4 +- src/test/app/EscrowToken_test.cpp | 3 +- src/test/app/Escrow_test.cpp | 3 +- src/test/app/FeeVote_test.cpp | 2 +- src/test/app/FixNFTokenPageLinks_test.cpp | 5 +- src/test/app/Flow_test.cpp | 4 +- src/test/app/Invariants_test.cpp | 5 +- src/test/app/LedgerHistory_test.cpp | 2 +- src/test/app/LendingHelpers_test.cpp | 9 +- src/test/app/LoadFeeTrack_test.cpp | 2 +- src/test/app/LoanBroker_test.cpp | 3 +- src/test/app/Loan_test.cpp | 9 +- src/test/app/NFTokenAuth_test.cpp | 2 +- src/test/app/NFTokenBurn_test.cpp | 3 +- src/test/app/NFTokenDir_test.cpp | 3 +- src/test/app/NFToken_test.cpp | 3 +- src/test/app/OfferStream_test.cpp | 3 +- src/test/app/PayStrand_test.cpp | 6 +- src/test/app/PermissionedDEX_test.cpp | 3 +- src/test/app/PermissionedDomains_test.cpp | 3 +- src/test/app/PseudoTx_test.cpp | 3 +- src/test/app/Regression_test.cpp | 2 +- src/test/app/TheoreticalQuality_test.cpp | 9 +- src/test/app/TxQ_test.cpp | 4 +- src/test/app/tx/apply_test.cpp | 3 +- src/test/consensus/NegativeUNL_test.cpp | 2 +- src/test/jtx/impl/AMM.cpp | 5 +- src/test/jtx/impl/ledgerStateFixes.cpp | 3 +- src/test/jtx/impl/token.cpp | 3 +- src/test/rpc/AccountObjects_test.cpp | 3 +- src/test/rpc/AccountSet_test.cpp | 3 +- src/test/rpc/Feature_test.cpp | 3 +- src/test/rpc/JSONRPC_test.cpp | 2 +- src/test/rpc/Subscribe_test.cpp | 2 +- src/test/server/ServerStatus_test.cpp | 2 +- src/xrpld/app/consensus/RCLConsensus.cpp | 4 +- src/xrpld/app/ledger/Ledger.cpp | 10 +- src/xrpld/app/ledger/Ledger.h | 5 - src/xrpld/app/ledger/OrderBookDBImpl.cpp | 2 +- src/xrpld/app/ledger/detail/BuildLedger.cpp | 2 +- src/xrpld/app/ledger/detail/LedgerCleaner.cpp | 2 +- src/xrpld/app/ledger/detail/LedgerMaster.cpp | 4 +- src/xrpld/app/ledger/detail/OpenLedger.cpp | 2 +- src/xrpld/app/main/Application.cpp | 7 +- src/xrpld/app/main/LoadManager.cpp | 2 +- src/xrpld/app/misc/AmendmentTableImpl.h | 21 +++ src/xrpld/app/misc/NetworkOPs.cpp | 6 +- src/xrpld/app/misc/TxQ.h | 3 +- src/xrpld/app/misc/detail/AmendmentTable.cpp | 4 +- src/xrpld/app/misc/detail/Transaction.cpp | 2 +- src/xrpld/app/misc/detail/TxQ.cpp | 2 +- src/xrpld/app/paths/AMMLiquidity.h | 7 +- src/xrpld/app/paths/PathRequest.cpp | 4 +- src/xrpld/app/paths/Pathfinder.cpp | 2 +- src/xrpld/app/paths/detail/BookStep.cpp | 8 +- src/xrpld/app/paths/detail/DirectStep.cpp | 2 +- src/xrpld/app/paths/detail/PaySteps.cpp | 3 +- .../app/paths/detail/XRPEndpointStep.cpp | 4 +- src/xrpld/overlay/detail/PeerImp.cpp | 4 +- src/xrpld/rpc/detail/LegacyPathFind.cpp | 2 +- src/xrpld/rpc/detail/RPCHelpers.cpp | 2 +- src/xrpld/rpc/detail/TransactionSign.cpp | 4 +- src/xrpld/rpc/detail/TransactionSign.h | 2 +- src/xrpld/rpc/handlers/AMMInfo.cpp | 2 +- src/xrpld/rpc/handlers/AccountObjects.cpp | 2 +- src/xrpld/rpc/handlers/Feature1.cpp | 2 +- src/xrpld/rpc/handlers/LedgerHandler.cpp | 2 +- src/xrpld/rpc/handlers/NoRippleCheck.cpp | 2 +- src/xrpld/rpc/handlers/Peers.cpp | 2 +- src/xrpld/rpc/handlers/Simulate.cpp | 2 +- src/xrpld/rpc/handlers/Submit.cpp | 2 +- 242 files changed, 473 insertions(+), 552 deletions(-) rename {src/xrpld/app/misc => include/xrpl/ledger}/AmendmentTable.h (98%) rename {src/xrpld/app/misc => include/xrpl/server}/LoadFeeTrack.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx}/ApplyContext.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx}/InvariantCheck.h (99%) rename {src/xrpld/app/tx/detail => include/xrpl/tx}/SignerEntries.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx}/Transactor.h (98%) rename {src/xrpld/app => include/xrpl}/tx/apply.h (98%) rename {src/xrpld/app => include/xrpl}/tx/applySteps.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/paths}/BookTip.h (93%) rename {src/xrpld/app => include/xrpl/tx}/paths/Flow.h (95%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/paths}/Offer.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/paths}/OfferStream.h (96%) rename {src/xrpld/app => include/xrpl/tx}/paths/RippleCalc.h (100%) rename {src/xrpld/app => include/xrpl/tx}/paths/detail/AmountSpec.h (100%) rename {src/xrpld/app => include/xrpl/tx}/paths/detail/FlatSets.h (100%) rename {src/xrpld/app => include/xrpl/tx}/paths/detail/FlowDebugInfo.h (99%) rename {src/xrpld/app => include/xrpl/tx}/paths/detail/Steps.h (99%) rename {src/xrpld/app => include/xrpl/tx}/paths/detail/StrandFlow.h (98%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/AMM}/AMMBid.h (98%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/AMM}/AMMClawback.h (97%) rename {src/xrpld/app/paths => include/xrpl/tx/transactors/AMM}/AMMContext.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/AMM}/AMMCreate.h (98%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/AMM}/AMMDelete.h (95%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/AMM}/AMMDeposit.h (99%) rename {src/xrpld/app/misc => include/xrpl/tx/transactors/AMM}/AMMHelpers.h (100%) rename {src/xrpld/app/misc => include/xrpl/tx/transactors/AMM}/AMMUtils.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/AMM}/AMMVote.h (97%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/AMM}/AMMWithdraw.h (99%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/Batch.h (96%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/Change.h (94%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Check}/CancelCheck.h (92%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Check}/CashCheck.h (91%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Check}/CreateCheck.h (92%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/Clawback.h (92%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/CreateTicket.h (98%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/Credentials.h (97%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/DID.h (95%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Delegate}/DelegateSet.h (93%) rename {src/xrpld/app/misc => include/xrpl/tx/transactors/Delegate}/DelegateUtils.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/DeleteAccount.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/DeleteOracle.h (96%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/DepositPreauth.h (94%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/Escrow.h (97%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/LedgerStateFix.h (93%) rename {src/xrpld/app/misc => include/xrpl/tx/transactors/Lending}/LendingHelpers.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanBrokerCoverClawback.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanBrokerCoverDeposit.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanBrokerCoverWithdraw.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanBrokerDelete.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanBrokerSet.h (94%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanDelete.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanManage.h (97%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanPay.h (94%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Lending}/LoanSet.h (94%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/MPT}/MPTokenAuthorize.h (95%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/MPT}/MPTokenIssuanceCreate.h (96%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/MPT}/MPTokenIssuanceDestroy.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/MPT}/MPTokenIssuanceSet.h (94%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/NFT}/NFTokenAcceptOffer.h (95%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/NFT}/NFTokenBurn.h (91%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/NFT}/NFTokenCancelOffer.h (92%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/NFT}/NFTokenCreateOffer.h (92%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/NFT}/NFTokenMint.h (90%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/NFT}/NFTokenModify.h (91%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/NFT}/NFTokenUtils.h (98%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Offer}/CancelOffer.h (92%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Offer}/CreateOffer.h (97%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/PayChan.h (97%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/Payment.h (95%) rename {src/xrpld/app/misc => include/xrpl/tx/transactors}/PermissionedDEXHelpers.h (100%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/PermissionedDomain}/PermissionedDomainDelete.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/PermissionedDomain}/PermissionedDomainSet.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/SetAccount.h (94%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/SetOracle.h (95%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/SetRegularKey.h (92%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/SetSignerList.h (95%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/SetTrust.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Vault}/VaultClawback.h (94%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Vault}/VaultCreate.h (93%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Vault}/VaultDelete.h (91%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Vault}/VaultDeposit.h (91%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Vault}/VaultSet.h (92%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors/Vault}/VaultWithdraw.h (91%) rename {src/xrpld/app/tx/detail => include/xrpl/tx/transactors}/XChainBridge.h (99%) create mode 100644 src/libxrpl/protocol/Protocol.cpp rename src/{xrpld/app/misc/detail => libxrpl/server}/LoadFeeTrack.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx}/ApplyContext.cpp (97%) rename src/{xrpld/app/tx/detail => libxrpl/tx}/InvariantCheck.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx}/SignerEntries.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx}/Transactor.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx}/apply.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx}/applySteps.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/paths}/BookTip.cpp (97%) rename src/{xrpld/app => libxrpl/tx}/paths/Flow.cpp (95%) rename src/{xrpld/app/tx/detail => libxrpl/tx/paths}/OfferStream.cpp (99%) rename src/{xrpld/app => libxrpl/tx}/paths/RippleCalc.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/AMM}/AMMBid.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/AMM}/AMMClawback.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/AMM}/AMMCreate.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/AMM}/AMMDelete.cpp (92%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/AMM}/AMMDeposit.cpp (99%) rename src/{xrpld/app/misc/detail => libxrpl/tx/transactors/AMM}/AMMHelpers.cpp (99%) rename src/{xrpld/app/misc/detail => libxrpl/tx/transactors/AMM}/AMMUtils.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/AMM}/AMMVote.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/AMM}/AMMWithdraw.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/Batch.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/Change.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Check}/CancelCheck.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Check}/CashCheck.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Check}/CreateCheck.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/Clawback.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/CreateTicket.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/Credentials.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/DID.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Delegate}/DelegateSet.cpp (98%) rename src/{xrpld/app/misc/detail => libxrpl/tx/transactors/Delegate}/DelegateUtils.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/DeleteAccount.cpp (97%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/DeleteOracle.cpp (97%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/DepositPreauth.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/Escrow.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/LedgerStateFix.cpp (94%) rename src/{xrpld/app/misc/detail => libxrpl/tx/transactors/Lending}/LendingHelpers.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanBrokerCoverClawback.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanBrokerCoverDeposit.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanBrokerCoverWithdraw.cpp (97%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanBrokerDelete.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanBrokerSet.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanDelete.cpp (97%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanManage.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanPay.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Lending}/LoanSet.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/MPT}/MPTokenAuthorize.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/MPT}/MPTokenIssuanceCreate.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/MPT}/MPTokenIssuanceDestroy.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/MPT}/MPTokenIssuanceSet.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/NFT}/NFTokenAcceptOffer.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/NFT}/NFTokenBurn.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/NFT}/NFTokenCancelOffer.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/NFT}/NFTokenCreateOffer.cpp (95%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/NFT}/NFTokenMint.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/NFT}/NFTokenModify.cpp (93%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/NFT}/NFTokenUtils.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Offer}/CancelOffer.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Offer}/CreateOffer.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/PayChan.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/Payment.cpp (99%) rename src/{xrpld/app/misc => libxrpl/tx/transactors/PermissionedDomain}/PermissionedDEXHelpers.cpp (97%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/PermissionedDomain}/PermissionedDomainDelete.cpp (96%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/PermissionedDomain}/PermissionedDomainSet.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/SetAccount.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/SetOracle.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/SetRegularKey.cpp (97%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/SetSignerList.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/SetTrust.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Vault}/VaultClawback.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Vault}/VaultCreate.cpp (97%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Vault}/VaultDelete.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Vault}/VaultDeposit.cpp (98%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Vault}/VaultSet.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors/Vault}/VaultWithdraw.cpp (99%) rename src/{xrpld/app/tx/detail => libxrpl/tx/transactors}/XChainBridge.cpp (99%) create mode 100644 src/xrpld/app/misc/AmendmentTableImpl.h diff --git a/cmake/XrplCore.cmake b/cmake/XrplCore.cmake index f94656b307..6ba30bed5f 100644 --- a/cmake/XrplCore.cmake +++ b/cmake/XrplCore.cmake @@ -154,10 +154,16 @@ target_link_libraries(xrpl.libxrpl.ledger PUBLIC xrpl.libxrpl.json xrpl.libxrpl.protocol xrpl.libxrpl.rdb + xrpl.libxrpl.shamap xrpl.libxrpl.server xrpl.libxrpl.conditions ) +add_module(xrpl tx) +target_link_libraries(xrpl.libxrpl.tx PUBLIC + xrpl.libxrpl.ledger +) + add_library(xrpl.libxrpl) set_target_properties(xrpl.libxrpl PROPERTIES OUTPUT_NAME xrpl) @@ -183,6 +189,7 @@ target_link_modules(xrpl PUBLIC server conditions ledger + tx ) # All headers in libxrpl are in modules. diff --git a/cmake/XrplInstall.cmake b/cmake/XrplInstall.cmake index 61a579bf7f..2562d69467 100644 --- a/cmake/XrplInstall.cmake +++ b/cmake/XrplInstall.cmake @@ -22,6 +22,7 @@ install ( xrpl.libxrpl.rdb xrpl.libxrpl.nodestore xrpl.libxrpl.ledger + xrpl.libxrpl.tx xrpl.libxrpl.conditions xrpl.libxrpl.net xrpl.libxrpl.protocol diff --git a/src/xrpld/app/misc/AmendmentTable.h b/include/xrpl/ledger/AmendmentTable.h similarity index 98% rename from src/xrpld/app/misc/AmendmentTable.h rename to include/xrpl/ledger/AmendmentTable.h index accfcd2e2e..fbbba5d8ce 100644 --- a/src/xrpld/app/misc/AmendmentTable.h +++ b/include/xrpl/ledger/AmendmentTable.h @@ -1,13 +1,12 @@ #ifndef XRPL_APP_MISC_AMENDMENTTABLE_H_INCLUDED #define XRPL_APP_MISC_AMENDMENTTABLE_H_INCLUDED -#include -#include - -#include +#include +#include #include #include #include +#include #include diff --git a/include/xrpl/protocol/Protocol.h b/include/xrpl/protocol/Protocol.h index 43be9d3b45..6a89e31fbd 100644 --- a/include/xrpl/protocol/Protocol.h +++ b/include/xrpl/protocol/Protocol.h @@ -255,6 +255,14 @@ std::uint8_t constexpr maxAssetCheckDepth = 5; /** A ledger index. */ using LedgerIndex = std::uint32_t; +std::uint32_t constexpr FLAG_LEDGER_INTERVAL = 256; +/** Returns true if the given ledgerIndex is a voting ledgerIndex */ +bool +isVotingLedger(LedgerIndex seq); +/** Returns true if the given ledgerIndex is a flag ledgerIndex */ +bool +isFlagLedger(LedgerIndex seq); + /** A transaction identifier. The value is computed as the hash of the canonicalized, serialized transaction object. diff --git a/include/xrpl/protocol/detail/transactions.macro b/include/xrpl/protocol/detail/transactions.macro index bc7eefedb5..b696a1d1c2 100644 --- a/include/xrpl/protocol/detail/transactions.macro +++ b/include/xrpl/protocol/detail/transactions.macro @@ -8,11 +8,11 @@ * To ease maintenance, you may replace any unneeded values with "..." * e.g. #define TRANSACTION(tag, value, name, ...) * - * You must define a transactor class in the `ripple` namespace named `name`, + * You must define a transactor class in the `xrpl` namespace named `name`, * and include its header alongside the TRANSACTOR definition using this * format: * #if TRANSACTION_INCLUDE - * # include + * # include * #endif * * The `privileges` parameter of the TRANSACTION macro is a bitfield @@ -22,7 +22,7 @@ /** This transaction type executes a payment. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttPAYMENT, 0, Payment, Delegation::delegable, @@ -42,7 +42,7 @@ TRANSACTION(ttPAYMENT, 0, Payment, /** This transaction type creates an escrow object. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, Delegation::delegable, @@ -73,7 +73,7 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish, /** This transaction type adjusts various account settings. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttACCOUNT_SET, 3, AccountSet, Delegation::notDelegable, @@ -94,7 +94,7 @@ TRANSACTION(ttACCOUNT_SET, 3, AccountSet, /** This transaction type cancels an existing escrow. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel, Delegation::delegable, @@ -107,7 +107,7 @@ TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel, /** This transaction type sets or clears an account's "regular key". */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey, Delegation::notDelegable, @@ -121,7 +121,7 @@ TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey, /** This transaction type creates an offer to trade one asset for another. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttOFFER_CREATE, 7, OfferCreate, Delegation::delegable, @@ -137,7 +137,7 @@ TRANSACTION(ttOFFER_CREATE, 7, OfferCreate, /** This transaction type cancels existing offers to trade one asset for another. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel, Delegation::delegable, @@ -151,7 +151,7 @@ TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel, /** This transaction type creates a new set of tickets. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttTICKET_CREATE, 10, TicketCreate, Delegation::delegable, @@ -167,7 +167,7 @@ TRANSACTION(ttTICKET_CREATE, 10, TicketCreate, // The SignerEntries are optional because a SignerList is deleted by // setting the SignerQuorum to zero and omitting SignerEntries. #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet, Delegation::notDelegable, @@ -180,7 +180,7 @@ TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet, /** This transaction type creates a new unidirectional XRP payment channel. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate, Delegation::delegable, @@ -222,7 +222,7 @@ TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim, /** This transaction type creates a new check. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCHECK_CREATE, 16, CheckCreate, Delegation::delegable, @@ -238,7 +238,7 @@ TRANSACTION(ttCHECK_CREATE, 16, CheckCreate, /** This transaction type cashes an existing check. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCHECK_CASH, 17, CheckCash, Delegation::delegable, @@ -252,7 +252,7 @@ TRANSACTION(ttCHECK_CASH, 17, CheckCash, /** This transaction type cancels an existing check. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel, Delegation::delegable, @@ -264,7 +264,7 @@ TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel, /** This transaction type grants or revokes authorization to transfer funds. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth, Delegation::delegable, @@ -279,7 +279,7 @@ TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth, /** This transaction type modifies a trustline between two accounts. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttTRUST_SET, 20, TrustSet, Delegation::delegable, @@ -293,7 +293,7 @@ TRANSACTION(ttTRUST_SET, 20, TrustSet, /** This transaction type deletes an existing account. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete, Delegation::notDelegable, @@ -309,7 +309,7 @@ TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete, /** This transaction mints a new NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint, Delegation::delegable, @@ -327,7 +327,7 @@ TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint, /** This transaction burns (i.e. destroys) an existing NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn, Delegation::delegable, @@ -340,7 +340,7 @@ TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn, /** This transaction creates a new offer to buy or sell an NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer, Delegation::delegable, @@ -356,7 +356,7 @@ TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer, /** This transaction cancels an existing offer to buy or sell an existing NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer, Delegation::delegable, @@ -368,7 +368,7 @@ TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer, /** This transaction accepts an existing offer to buy or sell an existing NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer, Delegation::delegable, @@ -382,7 +382,7 @@ TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer, /** This transaction claws back issued tokens. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCLAWBACK, 30, Clawback, Delegation::delegable, @@ -395,7 +395,7 @@ TRANSACTION(ttCLAWBACK, 30, Clawback, /** This transaction claws back tokens from an AMM pool. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback, Delegation::delegable, @@ -410,7 +410,7 @@ TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback, /** This transaction type creates an AMM instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_CREATE, 35, AMMCreate, Delegation::delegable, @@ -424,7 +424,7 @@ TRANSACTION(ttAMM_CREATE, 35, AMMCreate, /** This transaction type deposits into an AMM instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit, Delegation::delegable, @@ -442,7 +442,7 @@ TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit, /** This transaction type withdraws from an AMM instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw, Delegation::delegable, @@ -459,7 +459,7 @@ TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw, /** This transaction type votes for the trading fee */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_VOTE, 38, AMMVote, Delegation::delegable, @@ -473,7 +473,7 @@ TRANSACTION(ttAMM_VOTE, 38, AMMVote, /** This transaction type bids for the auction slot */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_BID, 39, AMMBid, Delegation::delegable, @@ -489,7 +489,7 @@ TRANSACTION(ttAMM_BID, 39, AMMBid, /** This transaction type deletes AMM in the empty state */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_DELETE, 40, AMMDelete, Delegation::delegable, @@ -502,7 +502,7 @@ TRANSACTION(ttAMM_DELETE, 40, AMMDelete, /** This transactions creates a crosschain sequence number */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID, Delegation::delegable, @@ -617,7 +617,7 @@ TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge, /** This transaction type creates or updates a DID */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttDID_SET, 49, DIDSet, Delegation::delegable, @@ -638,7 +638,7 @@ TRANSACTION(ttDID_DELETE, 50, DIDDelete, /** This transaction type creates an Oracle instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttORACLE_SET, 51, OracleSet, Delegation::delegable, @@ -655,7 +655,7 @@ TRANSACTION(ttORACLE_SET, 51, OracleSet, /** This transaction type deletes an Oracle instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttORACLE_DELETE, 52, OracleDelete, Delegation::delegable, @@ -667,7 +667,7 @@ TRANSACTION(ttORACLE_DELETE, 52, OracleDelete, /** This transaction type fixes a problem in the ledger state */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix, Delegation::delegable, @@ -680,7 +680,7 @@ TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix, /** This transaction type creates a MPTokensIssuance instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate, Delegation::delegable, @@ -697,7 +697,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate, /** This transaction type destroys a MPTokensIssuance instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy, Delegation::delegable, @@ -709,7 +709,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy, /** This transaction type sets flags on a MPTokensIssuance or MPToken instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet, Delegation::delegable, @@ -726,7 +726,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet, /** This transaction type authorizes a MPToken instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize, Delegation::delegable, @@ -739,7 +739,7 @@ TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize, /** This transaction type create an Credential instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate, Delegation::delegable, @@ -775,7 +775,7 @@ TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete, /** This transaction type modify a NFToken */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify, Delegation::delegable, @@ -789,7 +789,7 @@ TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify, /** This transaction type creates or modifies a Permissioned Domain */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet, Delegation::delegable, @@ -802,7 +802,7 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet, /** This transaction type deletes a Permissioned Domain */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete, Delegation::delegable, @@ -814,7 +814,7 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete, /** This transaction type delegates authorized account specified permissions */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttDELEGATE_SET, 64, DelegateSet, Delegation::notDelegable, @@ -827,7 +827,7 @@ TRANSACTION(ttDELEGATE_SET, 64, DelegateSet, /** This transaction creates a single asset vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_CREATE, 65, VaultCreate, Delegation::delegable, @@ -845,7 +845,7 @@ TRANSACTION(ttVAULT_CREATE, 65, VaultCreate, /** This transaction updates a single asset vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_SET, 66, VaultSet, Delegation::delegable, @@ -860,7 +860,7 @@ TRANSACTION(ttVAULT_SET, 66, VaultSet, /** This transaction deletes a single asset vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_DELETE, 67, VaultDelete, Delegation::delegable, @@ -872,7 +872,7 @@ TRANSACTION(ttVAULT_DELETE, 67, VaultDelete, /** This transaction trades assets for shares with a vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit, Delegation::delegable, @@ -885,7 +885,7 @@ TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit, /** This transaction trades shares for assets with a vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw, Delegation::delegable, @@ -900,7 +900,7 @@ TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw, /** This transaction claws back tokens from a vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback, Delegation::delegable, @@ -914,7 +914,7 @@ TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback, /** This transaction type batches together transactions. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttBATCH, 71, Batch, Delegation::notDelegable, @@ -929,7 +929,7 @@ TRANSACTION(ttBATCH, 71, Batch, /** This transaction creates and updates a Loan Broker */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet, Delegation::delegable, @@ -946,7 +946,7 @@ TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet, /** This transaction deletes a Loan Broker */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete, Delegation::delegable, @@ -957,7 +957,7 @@ TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete, /** This transaction deposits First Loss Capital into a Loan Broker */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit, Delegation::delegable, @@ -969,7 +969,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit, /** This transaction withdraws First Loss Capital from a Loan Broker */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw, Delegation::delegable, @@ -984,7 +984,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw, /** This transaction claws back First Loss Capital from a Loan Broker to the issuer of the capital */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback, Delegation::delegable, @@ -996,7 +996,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback, /** This transaction creates a Loan */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_SET, 80, LoanSet, Delegation::delegable, @@ -1023,7 +1023,7 @@ TRANSACTION(ttLOAN_SET, 80, LoanSet, /** This transaction deletes an existing Loan */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_DELETE, 81, LoanDelete, Delegation::delegable, @@ -1034,7 +1034,7 @@ TRANSACTION(ttLOAN_DELETE, 81, LoanDelete, /** This transaction is used to change the delinquency status of an existing Loan */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_MANAGE, 82, LoanManage, Delegation::delegable, @@ -1048,7 +1048,7 @@ TRANSACTION(ttLOAN_MANAGE, 82, LoanManage, /** The Borrower uses this transaction to make a Payment on the Loan. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_PAY, 84, LoanPay, Delegation::delegable, @@ -1063,7 +1063,7 @@ TRANSACTION(ttLOAN_PAY, 84, LoanPay, For details, see: https://xrpl.org/amendments.html */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMENDMENT, 100, EnableAmendment, Delegation::notDelegable, diff --git a/include/xrpl/rdb/RelationalDatabase.h b/include/xrpl/rdb/RelationalDatabase.h index 2c8e17ba31..e85056042e 100644 --- a/include/xrpl/rdb/RelationalDatabase.h +++ b/include/xrpl/rdb/RelationalDatabase.h @@ -4,11 +4,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/src/xrpld/app/misc/LoadFeeTrack.h b/include/xrpl/server/LoadFeeTrack.h similarity index 100% rename from src/xrpld/app/misc/LoadFeeTrack.h rename to include/xrpl/server/LoadFeeTrack.h diff --git a/src/xrpld/app/tx/detail/ApplyContext.h b/include/xrpl/tx/ApplyContext.h similarity index 100% rename from src/xrpld/app/tx/detail/ApplyContext.h rename to include/xrpl/tx/ApplyContext.h diff --git a/src/xrpld/app/tx/detail/InvariantCheck.h b/include/xrpl/tx/InvariantCheck.h similarity index 99% rename from src/xrpld/app/tx/detail/InvariantCheck.h rename to include/xrpl/tx/InvariantCheck.h index 87a1afb623..82d7bc6397 100644 --- a/src/xrpld/app/tx/detail/InvariantCheck.h +++ b/include/xrpl/tx/InvariantCheck.h @@ -1,5 +1,5 @@ -#ifndef XRPL_APP_TX_INVARIANTCHECK_H_INCLUDED -#define XRPL_APP_TX_INVARIANTCHECK_H_INCLUDED +#ifndef XRPL_TX_INVARIANTCHECK_H_INCLUDED +#define XRPL_TX_INVARIANTCHECK_H_INCLUDED #include #include diff --git a/src/xrpld/app/tx/detail/SignerEntries.h b/include/xrpl/tx/SignerEntries.h similarity index 93% rename from src/xrpld/app/tx/detail/SignerEntries.h rename to include/xrpl/tx/SignerEntries.h index 0a66fd33f5..c1a8d254f1 100644 --- a/src/xrpld/app/tx/detail/SignerEntries.h +++ b/include/xrpl/tx/SignerEntries.h @@ -1,7 +1,5 @@ -#ifndef XRPL_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED -#define XRPL_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED - -#include // NotTEC +#ifndef XRPL_TX_SIGNERENTRIES_H_INCLUDED +#define XRPL_TX_SIGNERENTRIES_H_INCLUDED #include // #include // beast::Journal diff --git a/src/xrpld/app/tx/detail/Transactor.h b/include/xrpl/tx/Transactor.h similarity index 98% rename from src/xrpld/app/tx/detail/Transactor.h rename to include/xrpl/tx/Transactor.h index 5a82f62c0e..c02009516c 100644 --- a/src/xrpld/app/tx/detail/Transactor.h +++ b/include/xrpl/tx/Transactor.h @@ -1,13 +1,12 @@ -#ifndef XRPL_APP_TX_TRANSACTOR_H_INCLUDED -#define XRPL_APP_TX_TRANSACTOR_H_INCLUDED - -#include -#include +#ifndef XRPL_TX_TRANSACTOR_H_INCLUDED +#define XRPL_TX_TRANSACTOR_H_INCLUDED #include #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/apply.h b/include/xrpl/tx/apply.h similarity index 98% rename from src/xrpld/app/tx/apply.h rename to include/xrpl/tx/apply.h index 64d44441d9..516aaaa912 100644 --- a/src/xrpld/app/tx/apply.h +++ b/include/xrpl/tx/apply.h @@ -1,11 +1,10 @@ #ifndef XRPL_TX_APPLY_H_INCLUDED #define XRPL_TX_APPLY_H_INCLUDED -#include - #include #include #include +#include #include diff --git a/src/xrpld/app/tx/applySteps.h b/include/xrpl/tx/applySteps.h similarity index 100% rename from src/xrpld/app/tx/applySteps.h rename to include/xrpl/tx/applySteps.h diff --git a/src/xrpld/app/tx/detail/BookTip.h b/include/xrpl/tx/paths/BookTip.h similarity index 93% rename from src/xrpld/app/tx/detail/BookTip.h rename to include/xrpl/tx/paths/BookTip.h index 51dc252835..fd8d267028 100644 --- a/src/xrpld/app/tx/detail/BookTip.h +++ b/include/xrpl/tx/paths/BookTip.h @@ -1,5 +1,5 @@ -#ifndef XRPL_APP_BOOK_BOOKTIP_H_INCLUDED -#define XRPL_APP_BOOK_BOOKTIP_H_INCLUDED +#ifndef XRPL_TX_PATHS_BOOKTIP_H_INCLUDED +#define XRPL_TX_PATHS_BOOKTIP_H_INCLUDED #include #include diff --git a/src/xrpld/app/paths/Flow.h b/include/xrpl/tx/paths/Flow.h similarity index 95% rename from src/xrpld/app/paths/Flow.h rename to include/xrpl/tx/paths/Flow.h index 5fafe294db..b94d126929 100644 --- a/src/xrpld/app/paths/Flow.h +++ b/include/xrpl/tx/paths/Flow.h @@ -1,10 +1,9 @@ #ifndef XRPL_APP_PATHS_FLOW_H_INCLUDED #define XRPL_APP_PATHS_FLOW_H_INCLUDED -#include -#include - #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Offer.h b/include/xrpl/tx/paths/Offer.h similarity index 100% rename from src/xrpld/app/tx/detail/Offer.h rename to include/xrpl/tx/paths/Offer.h diff --git a/src/xrpld/app/tx/detail/OfferStream.h b/include/xrpl/tx/paths/OfferStream.h similarity index 96% rename from src/xrpld/app/tx/detail/OfferStream.h rename to include/xrpl/tx/paths/OfferStream.h index cab5f1384d..5482f6cacb 100644 --- a/src/xrpld/app/tx/detail/OfferStream.h +++ b/include/xrpl/tx/paths/OfferStream.h @@ -1,13 +1,12 @@ -#ifndef XRPL_APP_BOOK_OFFERSTREAM_H_INCLUDED -#define XRPL_APP_BOOK_OFFERSTREAM_H_INCLUDED - -#include -#include +#ifndef XRPL_TX_PATHS_OFFERSTREAM_H_INCLUDED +#define XRPL_TX_PATHS_OFFERSTREAM_H_INCLUDED #include #include #include #include +#include +#include #include diff --git a/src/xrpld/app/paths/RippleCalc.h b/include/xrpl/tx/paths/RippleCalc.h similarity index 100% rename from src/xrpld/app/paths/RippleCalc.h rename to include/xrpl/tx/paths/RippleCalc.h diff --git a/src/xrpld/app/paths/detail/AmountSpec.h b/include/xrpl/tx/paths/detail/AmountSpec.h similarity index 100% rename from src/xrpld/app/paths/detail/AmountSpec.h rename to include/xrpl/tx/paths/detail/AmountSpec.h diff --git a/src/xrpld/app/paths/detail/FlatSets.h b/include/xrpl/tx/paths/detail/FlatSets.h similarity index 100% rename from src/xrpld/app/paths/detail/FlatSets.h rename to include/xrpl/tx/paths/detail/FlatSets.h diff --git a/src/xrpld/app/paths/detail/FlowDebugInfo.h b/include/xrpl/tx/paths/detail/FlowDebugInfo.h similarity index 99% rename from src/xrpld/app/paths/detail/FlowDebugInfo.h rename to include/xrpl/tx/paths/detail/FlowDebugInfo.h index 6c0f0e8e00..4ebf18a0ea 100644 --- a/src/xrpld/app/paths/detail/FlowDebugInfo.h +++ b/include/xrpl/tx/paths/detail/FlowDebugInfo.h @@ -1,11 +1,10 @@ #ifndef XRPL_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED #define XRPL_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED -#include - #include #include #include +#include #include diff --git a/src/xrpld/app/paths/detail/Steps.h b/include/xrpl/tx/paths/detail/Steps.h similarity index 99% rename from src/xrpld/app/paths/detail/Steps.h rename to include/xrpl/tx/paths/detail/Steps.h index 63254c228e..0e07facb10 100644 --- a/src/xrpld/app/paths/detail/Steps.h +++ b/include/xrpl/tx/paths/detail/Steps.h @@ -1,14 +1,13 @@ #ifndef XRPL_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED #define XRPL_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED -#include - #include #include #include #include #include #include +#include #include diff --git a/src/xrpld/app/paths/detail/StrandFlow.h b/include/xrpl/tx/paths/detail/StrandFlow.h similarity index 98% rename from src/xrpld/app/paths/detail/StrandFlow.h rename to include/xrpl/tx/paths/detail/StrandFlow.h index ca4b18f0a3..8de7f30fdf 100644 --- a/src/xrpld/app/paths/detail/StrandFlow.h +++ b/include/xrpl/tx/paths/detail/StrandFlow.h @@ -1,19 +1,18 @@ #ifndef XRPL_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED #define XRPL_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/xrpld/app/tx/detail/AMMBid.h b/include/xrpl/tx/transactors/AMM/AMMBid.h similarity index 98% rename from src/xrpld/app/tx/detail/AMMBid.h rename to include/xrpl/tx/transactors/AMM/AMMBid.h index b402e82f9d..fdde7c839f 100644 --- a/src/xrpld/app/tx/detail/AMMBid.h +++ b/include/xrpl/tx/transactors/AMM/AMMBid.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_AMMBID_H_INCLUDED #define XRPL_TX_AMMBID_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMClawback.h b/include/xrpl/tx/transactors/AMM/AMMClawback.h similarity index 97% rename from src/xrpld/app/tx/detail/AMMClawback.h rename to include/xrpl/tx/transactors/AMM/AMMClawback.h index 0615234ffa..39184f2207 100644 --- a/src/xrpld/app/tx/detail/AMMClawback.h +++ b/include/xrpl/tx/transactors/AMM/AMMClawback.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_AMMCLAWBACK_H_INCLUDED #define XRPL_TX_AMMCLAWBACK_H_INCLUDED -#include +#include namespace xrpl { class Sandbox; diff --git a/src/xrpld/app/paths/AMMContext.h b/include/xrpl/tx/transactors/AMM/AMMContext.h similarity index 100% rename from src/xrpld/app/paths/AMMContext.h rename to include/xrpl/tx/transactors/AMM/AMMContext.h diff --git a/src/xrpld/app/tx/detail/AMMCreate.h b/include/xrpl/tx/transactors/AMM/AMMCreate.h similarity index 98% rename from src/xrpld/app/tx/detail/AMMCreate.h rename to include/xrpl/tx/transactors/AMM/AMMCreate.h index da77f79c5e..972e478f12 100644 --- a/src/xrpld/app/tx/detail/AMMCreate.h +++ b/include/xrpl/tx/transactors/AMM/AMMCreate.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_AMMCREATE_H_INCLUDED #define XRPL_TX_AMMCREATE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMDelete.h b/include/xrpl/tx/transactors/AMM/AMMDelete.h similarity index 95% rename from src/xrpld/app/tx/detail/AMMDelete.h rename to include/xrpl/tx/transactors/AMM/AMMDelete.h index a09b855c7c..2352519b67 100644 --- a/src/xrpld/app/tx/detail/AMMDelete.h +++ b/include/xrpl/tx/transactors/AMM/AMMDelete.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_AMMDELETE_H_INCLUDED #define XRPL_TX_AMMDELETE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMDeposit.h b/include/xrpl/tx/transactors/AMM/AMMDeposit.h similarity index 99% rename from src/xrpld/app/tx/detail/AMMDeposit.h rename to include/xrpl/tx/transactors/AMM/AMMDeposit.h index 7fd50c4c4d..ad4299073d 100644 --- a/src/xrpld/app/tx/detail/AMMDeposit.h +++ b/include/xrpl/tx/transactors/AMM/AMMDeposit.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_AMMDEPOSIT_H_INCLUDED #define XRPL_TX_AMMDEPOSIT_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/AMMHelpers.h b/include/xrpl/tx/transactors/AMM/AMMHelpers.h similarity index 100% rename from src/xrpld/app/misc/AMMHelpers.h rename to include/xrpl/tx/transactors/AMM/AMMHelpers.h diff --git a/src/xrpld/app/misc/AMMUtils.h b/include/xrpl/tx/transactors/AMM/AMMUtils.h similarity index 100% rename from src/xrpld/app/misc/AMMUtils.h rename to include/xrpl/tx/transactors/AMM/AMMUtils.h diff --git a/src/xrpld/app/tx/detail/AMMVote.h b/include/xrpl/tx/transactors/AMM/AMMVote.h similarity index 97% rename from src/xrpld/app/tx/detail/AMMVote.h rename to include/xrpl/tx/transactors/AMM/AMMVote.h index 1dec046c29..462b0637ef 100644 --- a/src/xrpld/app/tx/detail/AMMVote.h +++ b/include/xrpl/tx/transactors/AMM/AMMVote.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_AMMVOTE_H_INCLUDED #define XRPL_TX_AMMVOTE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.h b/include/xrpl/tx/transactors/AMM/AMMWithdraw.h similarity index 99% rename from src/xrpld/app/tx/detail/AMMWithdraw.h rename to include/xrpl/tx/transactors/AMM/AMMWithdraw.h index 916621a5d0..1cdc2b1aa8 100644 --- a/src/xrpld/app/tx/detail/AMMWithdraw.h +++ b/include/xrpl/tx/transactors/AMM/AMMWithdraw.h @@ -1,9 +1,8 @@ #ifndef XRPL_TX_AMMWITHDRAW_H_INCLUDED #define XRPL_TX_AMMWITHDRAW_H_INCLUDED -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Batch.h b/include/xrpl/tx/transactors/Batch.h similarity index 96% rename from src/xrpld/app/tx/detail/Batch.h rename to include/xrpl/tx/transactors/Batch.h index eaa0e933ac..e6df06182c 100644 --- a/src/xrpld/app/tx/detail/Batch.h +++ b/include/xrpl/tx/transactors/Batch.h @@ -1,10 +1,9 @@ #ifndef XRPL_TX_BATCH_H_INCLUDED #define XRPL_TX_BATCH_H_INCLUDED -#include - #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Change.h b/include/xrpl/tx/transactors/Change.h similarity index 94% rename from src/xrpld/app/tx/detail/Change.h rename to include/xrpl/tx/transactors/Change.h index 4d7b76ed78..3a1b0c822e 100644 --- a/src/xrpld/app/tx/detail/Change.h +++ b/include/xrpl/tx/transactors/Change.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_CHANGE_H_INCLUDED #define XRPL_TX_CHANGE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CancelCheck.h b/include/xrpl/tx/transactors/Check/CancelCheck.h similarity index 92% rename from src/xrpld/app/tx/detail/CancelCheck.h rename to include/xrpl/tx/transactors/Check/CancelCheck.h index 4be696520d..62ee280ea7 100644 --- a/src/xrpld/app/tx/detail/CancelCheck.h +++ b/include/xrpl/tx/transactors/Check/CancelCheck.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_CANCELCHECK_H_INCLUDED #define XRPL_TX_CANCELCHECK_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CashCheck.h b/include/xrpl/tx/transactors/Check/CashCheck.h similarity index 91% rename from src/xrpld/app/tx/detail/CashCheck.h rename to include/xrpl/tx/transactors/Check/CashCheck.h index f27a45a0c4..515256fbf4 100644 --- a/src/xrpld/app/tx/detail/CashCheck.h +++ b/include/xrpl/tx/transactors/Check/CashCheck.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_CASHCHECK_H_INCLUDED #define XRPL_TX_CASHCHECK_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CreateCheck.h b/include/xrpl/tx/transactors/Check/CreateCheck.h similarity index 92% rename from src/xrpld/app/tx/detail/CreateCheck.h rename to include/xrpl/tx/transactors/Check/CreateCheck.h index ac735eecb0..71729ee559 100644 --- a/src/xrpld/app/tx/detail/CreateCheck.h +++ b/include/xrpl/tx/transactors/Check/CreateCheck.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_CREATECHECK_H_INCLUDED #define XRPL_TX_CREATECHECK_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Clawback.h b/include/xrpl/tx/transactors/Clawback.h similarity index 92% rename from src/xrpld/app/tx/detail/Clawback.h rename to include/xrpl/tx/transactors/Clawback.h index 8db93fcc01..f60d7784d7 100644 --- a/src/xrpld/app/tx/detail/Clawback.h +++ b/include/xrpl/tx/transactors/Clawback.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_CLAWBACK_H_INCLUDED #define XRPL_TX_CLAWBACK_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CreateTicket.h b/include/xrpl/tx/transactors/CreateTicket.h similarity index 98% rename from src/xrpld/app/tx/detail/CreateTicket.h rename to include/xrpl/tx/transactors/CreateTicket.h index dc547065cd..c86400e677 100644 --- a/src/xrpld/app/tx/detail/CreateTicket.h +++ b/include/xrpl/tx/transactors/CreateTicket.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_CREATETICKET_H_INCLUDED #define XRPL_TX_CREATETICKET_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Credentials.h b/include/xrpl/tx/transactors/Credentials.h similarity index 97% rename from src/xrpld/app/tx/detail/Credentials.h rename to include/xrpl/tx/transactors/Credentials.h index 6723a2f0e4..601d1efbf1 100644 --- a/src/xrpld/app/tx/detail/Credentials.h +++ b/include/xrpl/tx/transactors/Credentials.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_CREDENTIALS_H_INCLUDED #define XRPL_TX_CREDENTIALS_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/DID.h b/include/xrpl/tx/transactors/DID.h similarity index 95% rename from src/xrpld/app/tx/detail/DID.h rename to include/xrpl/tx/transactors/DID.h index 934a9c9e6f..2ff1b07527 100644 --- a/src/xrpld/app/tx/detail/DID.h +++ b/include/xrpl/tx/transactors/DID.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_DID_H_INCLUDED #define XRPL_TX_DID_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/DelegateSet.h b/include/xrpl/tx/transactors/Delegate/DelegateSet.h similarity index 93% rename from src/xrpld/app/tx/detail/DelegateSet.h rename to include/xrpl/tx/transactors/Delegate/DelegateSet.h index 1f9bc02944..638bec8ef5 100644 --- a/src/xrpld/app/tx/detail/DelegateSet.h +++ b/include/xrpl/tx/transactors/Delegate/DelegateSet.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_DELEGATESET_H_INCLUDED #define XRPL_TX_DELEGATESET_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/DelegateUtils.h b/include/xrpl/tx/transactors/Delegate/DelegateUtils.h similarity index 100% rename from src/xrpld/app/misc/DelegateUtils.h rename to include/xrpl/tx/transactors/Delegate/DelegateUtils.h diff --git a/src/xrpld/app/tx/detail/DeleteAccount.h b/include/xrpl/tx/transactors/DeleteAccount.h similarity index 93% rename from src/xrpld/app/tx/detail/DeleteAccount.h rename to include/xrpl/tx/transactors/DeleteAccount.h index 357f87d566..48c98393f5 100644 --- a/src/xrpld/app/tx/detail/DeleteAccount.h +++ b/include/xrpl/tx/transactors/DeleteAccount.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_DELETEACCOUNT_H_INCLUDED #define XRPL_TX_DELETEACCOUNT_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/DeleteOracle.h b/include/xrpl/tx/transactors/DeleteOracle.h similarity index 96% rename from src/xrpld/app/tx/detail/DeleteOracle.h rename to include/xrpl/tx/transactors/DeleteOracle.h index 48950cfad9..046bdaa9c6 100644 --- a/src/xrpld/app/tx/detail/DeleteOracle.h +++ b/include/xrpl/tx/transactors/DeleteOracle.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_DELETEORACLE_H_INCLUDED #define XRPL_TX_DELETEORACLE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/DepositPreauth.h b/include/xrpl/tx/transactors/DepositPreauth.h similarity index 94% rename from src/xrpld/app/tx/detail/DepositPreauth.h rename to include/xrpl/tx/transactors/DepositPreauth.h index 003d444bf3..a90fdbf907 100644 --- a/src/xrpld/app/tx/detail/DepositPreauth.h +++ b/include/xrpl/tx/transactors/DepositPreauth.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_DEPOSIT_PREAUTH_H_INCLUDED #define XRPL_TX_DEPOSIT_PREAUTH_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Escrow.h b/include/xrpl/tx/transactors/Escrow.h similarity index 97% rename from src/xrpld/app/tx/detail/Escrow.h rename to include/xrpl/tx/transactors/Escrow.h index 935fb27cd0..d835631fb8 100644 --- a/src/xrpld/app/tx/detail/Escrow.h +++ b/include/xrpl/tx/transactors/Escrow.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_ESCROW_H_INCLUDED #define XRPL_TX_ESCROW_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LedgerStateFix.h b/include/xrpl/tx/transactors/LedgerStateFix.h similarity index 93% rename from src/xrpld/app/tx/detail/LedgerStateFix.h rename to include/xrpl/tx/transactors/LedgerStateFix.h index e1a7f85ecc..32d42b19cf 100644 --- a/src/xrpld/app/tx/detail/LedgerStateFix.h +++ b/include/xrpl/tx/transactors/LedgerStateFix.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LEDGER_STATE_FIX_H_INCLUDED #define XRPL_TX_LEDGER_STATE_FIX_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/LendingHelpers.h b/include/xrpl/tx/transactors/Lending/LendingHelpers.h similarity index 100% rename from src/xrpld/app/misc/LendingHelpers.h rename to include/xrpl/tx/transactors/Lending/LendingHelpers.h diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverClawback.h b/include/xrpl/tx/transactors/Lending/LoanBrokerCoverClawback.h similarity index 93% rename from src/xrpld/app/tx/detail/LoanBrokerCoverClawback.h rename to include/xrpl/tx/transactors/Lending/LoanBrokerCoverClawback.h index 3c4f997d95..ac9590b44b 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverClawback.h +++ b/include/xrpl/tx/transactors/Lending/LoanBrokerCoverClawback.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LOANBROKERCOVERCLAWBACK_H_INCLUDED #define XRPL_TX_LOANBROKERCOVERCLAWBACK_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.h b/include/xrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.h similarity index 93% rename from src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.h rename to include/xrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.h index d2f17b1f1c..9095bad6ff 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.h +++ b/include/xrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LOANBROKERCOVERDEPOSIT_H_INCLUDED #define XRPL_TX_LOANBROKERCOVERDEPOSIT_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.h b/include/xrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.h similarity index 93% rename from src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.h rename to include/xrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.h index e0a9a2e51b..0d542c4ed2 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.h +++ b/include/xrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LOANBROKERCOVERWITHDRAW_H_INCLUDED #define XRPL_TX_LOANBROKERCOVERWITHDRAW_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerDelete.h b/include/xrpl/tx/transactors/Lending/LoanBrokerDelete.h similarity index 93% rename from src/xrpld/app/tx/detail/LoanBrokerDelete.h rename to include/xrpl/tx/transactors/Lending/LoanBrokerDelete.h index aaea2af81a..024068d199 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerDelete.h +++ b/include/xrpl/tx/transactors/Lending/LoanBrokerDelete.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LOANBROKERDELETE_H_INCLUDED #define XRPL_TX_LOANBROKERDELETE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerSet.h b/include/xrpl/tx/transactors/Lending/LoanBrokerSet.h similarity index 94% rename from src/xrpld/app/tx/detail/LoanBrokerSet.h rename to include/xrpl/tx/transactors/Lending/LoanBrokerSet.h index 57170b9cb9..2b1b965608 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerSet.h +++ b/include/xrpl/tx/transactors/Lending/LoanBrokerSet.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LOANBROKERSET_H_INCLUDED #define XRPL_TX_LOANBROKERSET_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanDelete.h b/include/xrpl/tx/transactors/Lending/LoanDelete.h similarity index 93% rename from src/xrpld/app/tx/detail/LoanDelete.h rename to include/xrpl/tx/transactors/Lending/LoanDelete.h index a1ebad340c..446f454639 100644 --- a/src/xrpld/app/tx/detail/LoanDelete.h +++ b/include/xrpl/tx/transactors/Lending/LoanDelete.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LOANDELETE_H_INCLUDED #define XRPL_TX_LOANDELETE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanManage.h b/include/xrpl/tx/transactors/Lending/LoanManage.h similarity index 97% rename from src/xrpld/app/tx/detail/LoanManage.h rename to include/xrpl/tx/transactors/Lending/LoanManage.h index 155611580f..ac261ae08b 100644 --- a/src/xrpld/app/tx/detail/LoanManage.h +++ b/include/xrpl/tx/transactors/Lending/LoanManage.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LOANMANAGE_H_INCLUDED #define XRPL_TX_LOANMANAGE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanPay.h b/include/xrpl/tx/transactors/Lending/LoanPay.h similarity index 94% rename from src/xrpld/app/tx/detail/LoanPay.h rename to include/xrpl/tx/transactors/Lending/LoanPay.h index f951fdad5f..3aa2887460 100644 --- a/src/xrpld/app/tx/detail/LoanPay.h +++ b/include/xrpl/tx/transactors/Lending/LoanPay.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_LOANPAY_H_INCLUDED #define XRPL_TX_LOANPAY_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanSet.h b/include/xrpl/tx/transactors/Lending/LoanSet.h similarity index 94% rename from src/xrpld/app/tx/detail/LoanSet.h rename to include/xrpl/tx/transactors/Lending/LoanSet.h index d3853fbbdd..a0dc51dc35 100644 --- a/src/xrpld/app/tx/detail/LoanSet.h +++ b/include/xrpl/tx/transactors/Lending/LoanSet.h @@ -1,8 +1,8 @@ #ifndef XRPL_TX_LOANSET_H_INCLUDED #define XRPL_TX_LOANSET_H_INCLUDED -#include -#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/MPTokenAuthorize.h b/include/xrpl/tx/transactors/MPT/MPTokenAuthorize.h similarity index 95% rename from src/xrpld/app/tx/detail/MPTokenAuthorize.h rename to include/xrpl/tx/transactors/MPT/MPTokenAuthorize.h index 6c0ade324c..479d22f3ce 100644 --- a/src/xrpld/app/tx/detail/MPTokenAuthorize.h +++ b/include/xrpl/tx/transactors/MPT/MPTokenAuthorize.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_MPTOKENAUTHORIZE_H_INCLUDED #define XRPL_TX_MPTOKENAUTHORIZE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h b/include/xrpl/tx/transactors/MPT/MPTokenIssuanceCreate.h similarity index 96% rename from src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h rename to include/xrpl/tx/transactors/MPT/MPTokenIssuanceCreate.h index 5b5268265c..3405c86b4c 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h +++ b/include/xrpl/tx/transactors/MPT/MPTokenIssuanceCreate.h @@ -1,10 +1,9 @@ #ifndef XRPL_TX_MPTOKENISSUANCECREATE_H_INCLUDED #define XRPL_TX_MPTOKENISSUANCECREATE_H_INCLUDED -#include - #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h b/include/xrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.h similarity index 93% rename from src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h rename to include/xrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.h index 5f59c9b1bd..da7a3bbbe5 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h +++ b/include/xrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_MPTOKENISSUANCEDESTROY_H_INCLUDED #define XRPL_TX_MPTOKENISSUANCEDESTROY_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h b/include/xrpl/tx/transactors/MPT/MPTokenIssuanceSet.h similarity index 94% rename from src/xrpld/app/tx/detail/MPTokenIssuanceSet.h rename to include/xrpl/tx/transactors/MPT/MPTokenIssuanceSet.h index a687a37b47..596da64cf1 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h +++ b/include/xrpl/tx/transactors/MPT/MPTokenIssuanceSet.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_MPTOKENISSUANCESET_H_INCLUDED #define XRPL_TX_MPTOKENISSUANCESET_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h b/include/xrpl/tx/transactors/NFT/NFTokenAcceptOffer.h similarity index 95% rename from src/xrpld/app/tx/detail/NFTokenAcceptOffer.h rename to include/xrpl/tx/transactors/NFT/NFTokenAcceptOffer.h index 83cd71b734..30bf323107 100644 --- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h +++ b/include/xrpl/tx/transactors/NFT/NFTokenAcceptOffer.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_NFTOKENACCEPTOFFER_H_INCLUDED #define XRPL_TX_NFTOKENACCEPTOFFER_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.h b/include/xrpl/tx/transactors/NFT/NFTokenBurn.h similarity index 91% rename from src/xrpld/app/tx/detail/NFTokenBurn.h rename to include/xrpl/tx/transactors/NFT/NFTokenBurn.h index 5425f0902d..2d8974186d 100644 --- a/src/xrpld/app/tx/detail/NFTokenBurn.h +++ b/include/xrpl/tx/transactors/NFT/NFTokenBurn.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_BURNNFT_H_INCLUDED #define XRPL_TX_BURNNFT_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.h b/include/xrpl/tx/transactors/NFT/NFTokenCancelOffer.h similarity index 92% rename from src/xrpld/app/tx/detail/NFTokenCancelOffer.h rename to include/xrpl/tx/transactors/NFT/NFTokenCancelOffer.h index 13a6ecc065..fa168afed3 100644 --- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.h +++ b/include/xrpl/tx/transactors/NFT/NFTokenCancelOffer.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_NFTOKENCANCELOFFER_H_INCLUDED #define XRPL_TX_NFTOKENCANCELOFFER_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.h b/include/xrpl/tx/transactors/NFT/NFTokenCreateOffer.h similarity index 92% rename from src/xrpld/app/tx/detail/NFTokenCreateOffer.h rename to include/xrpl/tx/transactors/NFT/NFTokenCreateOffer.h index 704b253924..853a4c2c62 100644 --- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.h +++ b/include/xrpl/tx/transactors/NFT/NFTokenCreateOffer.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_NFTOKENOFFERCREATE_H_INCLUDED #define XRPL_TX_NFTOKENOFFERCREATE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenMint.h b/include/xrpl/tx/transactors/NFT/NFTokenMint.h similarity index 90% rename from src/xrpld/app/tx/detail/NFTokenMint.h rename to include/xrpl/tx/transactors/NFT/NFTokenMint.h index a3b43b8269..a183b75da8 100644 --- a/src/xrpld/app/tx/detail/NFTokenMint.h +++ b/include/xrpl/tx/transactors/NFT/NFTokenMint.h @@ -1,10 +1,9 @@ #ifndef XRPL_TX_NFTTOKENMINT_H_INCLUDED #define XRPL_TX_NFTTOKENMINT_H_INCLUDED -#include -#include - #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenModify.h b/include/xrpl/tx/transactors/NFT/NFTokenModify.h similarity index 91% rename from src/xrpld/app/tx/detail/NFTokenModify.h rename to include/xrpl/tx/transactors/NFT/NFTokenModify.h index 4353c3d58b..3bb2a9a844 100644 --- a/src/xrpld/app/tx/detail/NFTokenModify.h +++ b/include/xrpl/tx/transactors/NFT/NFTokenModify.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_NFTOKENMODIFY_H_INCLUDED #define XRPL_TX_NFTOKENMODIFY_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenUtils.h b/include/xrpl/tx/transactors/NFT/NFTokenUtils.h similarity index 98% rename from src/xrpld/app/tx/detail/NFTokenUtils.h rename to include/xrpl/tx/transactors/NFT/NFTokenUtils.h index 640f12f9d2..c5ecac1bb0 100644 --- a/src/xrpld/app/tx/detail/NFTokenUtils.h +++ b/include/xrpl/tx/transactors/NFT/NFTokenUtils.h @@ -1,13 +1,12 @@ #ifndef XRPL_TX_IMPL_DETAILS_NFTOKENUTILS_H_INCLUDED #define XRPL_TX_IMPL_DETAILS_NFTOKENUTILS_H_INCLUDED -#include - #include #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CancelOffer.h b/include/xrpl/tx/transactors/Offer/CancelOffer.h similarity index 92% rename from src/xrpld/app/tx/detail/CancelOffer.h rename to include/xrpl/tx/transactors/Offer/CancelOffer.h index 33af365c4d..514c664e59 100644 --- a/src/xrpld/app/tx/detail/CancelOffer.h +++ b/include/xrpl/tx/transactors/Offer/CancelOffer.h @@ -1,9 +1,8 @@ #ifndef XRPL_TX_CANCELOFFER_H_INCLUDED #define XRPL_TX_CANCELOFFER_H_INCLUDED -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CreateOffer.h b/include/xrpl/tx/transactors/Offer/CreateOffer.h similarity index 97% rename from src/xrpld/app/tx/detail/CreateOffer.h rename to include/xrpl/tx/transactors/Offer/CreateOffer.h index 5aaa60c20e..efd33896d8 100644 --- a/src/xrpld/app/tx/detail/CreateOffer.h +++ b/include/xrpl/tx/transactors/Offer/CreateOffer.h @@ -1,9 +1,8 @@ #ifndef XRPL_TX_CREATEOFFER_H_INCLUDED #define XRPL_TX_CREATEOFFER_H_INCLUDED -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/PayChan.h b/include/xrpl/tx/transactors/PayChan.h similarity index 97% rename from src/xrpld/app/tx/detail/PayChan.h rename to include/xrpl/tx/transactors/PayChan.h index f42e9549b3..cb25083cfc 100644 --- a/src/xrpld/app/tx/detail/PayChan.h +++ b/include/xrpl/tx/transactors/PayChan.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_PAYCHAN_H_INCLUDED #define XRPL_TX_PAYCHAN_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Payment.h b/include/xrpl/tx/transactors/Payment.h similarity index 95% rename from src/xrpld/app/tx/detail/Payment.h rename to include/xrpl/tx/transactors/Payment.h index 30c9a9e326..6399a07559 100644 --- a/src/xrpld/app/tx/detail/Payment.h +++ b/include/xrpl/tx/transactors/Payment.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_PAYMENT_H_INCLUDED #define XRPL_TX_PAYMENT_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/PermissionedDEXHelpers.h b/include/xrpl/tx/transactors/PermissionedDEXHelpers.h similarity index 100% rename from src/xrpld/app/misc/PermissionedDEXHelpers.h rename to include/xrpl/tx/transactors/PermissionedDEXHelpers.h diff --git a/src/xrpld/app/tx/detail/PermissionedDomainDelete.h b/include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.h similarity index 93% rename from src/xrpld/app/tx/detail/PermissionedDomainDelete.h rename to include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.h index 3ae10a739f..12859924da 100644 --- a/src/xrpld/app/tx/detail/PermissionedDomainDelete.h +++ b/include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_PERMISSIONEDDOMAINDELETE_H_INCLUDED #define XRPL_TX_PERMISSIONEDDOMAINDELETE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.h b/include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.h similarity index 93% rename from src/xrpld/app/tx/detail/PermissionedDomainSet.h rename to include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.h index fde06232a5..77652464a7 100644 --- a/src/xrpld/app/tx/detail/PermissionedDomainSet.h +++ b/include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_PERMISSIONEDDOMAINSET_H_INCLUDED #define XRPL_TX_PERMISSIONEDDOMAINSET_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/SetAccount.h b/include/xrpl/tx/transactors/SetAccount.h similarity index 94% rename from src/xrpld/app/tx/detail/SetAccount.h rename to include/xrpl/tx/transactors/SetAccount.h index fb8b4a0ccd..ea066aaf0b 100644 --- a/src/xrpld/app/tx/detail/SetAccount.h +++ b/include/xrpl/tx/transactors/SetAccount.h @@ -1,9 +1,8 @@ #ifndef XRPL_TX_SETACCOUNT_H_INCLUDED #define XRPL_TX_SETACCOUNT_H_INCLUDED -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/SetOracle.h b/include/xrpl/tx/transactors/SetOracle.h similarity index 95% rename from src/xrpld/app/tx/detail/SetOracle.h rename to include/xrpl/tx/transactors/SetOracle.h index c1c9a3d3fb..abb9ce54bd 100644 --- a/src/xrpld/app/tx/detail/SetOracle.h +++ b/include/xrpl/tx/transactors/SetOracle.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_SETORACLE_H_INCLUDED #define XRPL_TX_SETORACLE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/SetRegularKey.h b/include/xrpl/tx/transactors/SetRegularKey.h similarity index 92% rename from src/xrpld/app/tx/detail/SetRegularKey.h rename to include/xrpl/tx/transactors/SetRegularKey.h index 735ac522fd..6b4b160194 100644 --- a/src/xrpld/app/tx/detail/SetRegularKey.h +++ b/include/xrpl/tx/transactors/SetRegularKey.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_SETREGULARKEY_H_INCLUDED #define XRPL_TX_SETREGULARKEY_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/SetSignerList.h b/include/xrpl/tx/transactors/SetSignerList.h similarity index 95% rename from src/xrpld/app/tx/detail/SetSignerList.h rename to include/xrpl/tx/transactors/SetSignerList.h index 971565e987..d9b7985423 100644 --- a/src/xrpld/app/tx/detail/SetSignerList.h +++ b/include/xrpl/tx/transactors/SetSignerList.h @@ -1,11 +1,10 @@ #ifndef XRPL_TX_SETSIGNERLIST_H_INCLUDED #define XRPL_TX_SETSIGNERLIST_H_INCLUDED -#include -#include - #include #include +#include +#include #include #include diff --git a/src/xrpld/app/tx/detail/SetTrust.h b/include/xrpl/tx/transactors/SetTrust.h similarity index 93% rename from src/xrpld/app/tx/detail/SetTrust.h rename to include/xrpl/tx/transactors/SetTrust.h index b5776c6d33..2bbf1b471e 100644 --- a/src/xrpld/app/tx/detail/SetTrust.h +++ b/include/xrpl/tx/transactors/SetTrust.h @@ -1,9 +1,8 @@ #ifndef XRPL_TX_SETTRUST_H_INCLUDED #define XRPL_TX_SETTRUST_H_INCLUDED -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultClawback.h b/include/xrpl/tx/transactors/Vault/VaultClawback.h similarity index 94% rename from src/xrpld/app/tx/detail/VaultClawback.h rename to include/xrpl/tx/transactors/Vault/VaultClawback.h index d05f280e75..d43be671d8 100644 --- a/src/xrpld/app/tx/detail/VaultClawback.h +++ b/include/xrpl/tx/transactors/Vault/VaultClawback.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_VAULTCLAWBACK_H_INCLUDED #define XRPL_TX_VAULTCLAWBACK_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultCreate.h b/include/xrpl/tx/transactors/Vault/VaultCreate.h similarity index 93% rename from src/xrpld/app/tx/detail/VaultCreate.h rename to include/xrpl/tx/transactors/Vault/VaultCreate.h index 78593eb491..c40512f3d3 100644 --- a/src/xrpld/app/tx/detail/VaultCreate.h +++ b/include/xrpl/tx/transactors/Vault/VaultCreate.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_VAULTCREATE_H_INCLUDED #define XRPL_TX_VAULTCREATE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultDelete.h b/include/xrpl/tx/transactors/Vault/VaultDelete.h similarity index 91% rename from src/xrpld/app/tx/detail/VaultDelete.h rename to include/xrpl/tx/transactors/Vault/VaultDelete.h index e7c71b408c..c2dec47966 100644 --- a/src/xrpld/app/tx/detail/VaultDelete.h +++ b/include/xrpl/tx/transactors/Vault/VaultDelete.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_VAULTDELETE_H_INCLUDED #define XRPL_TX_VAULTDELETE_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultDeposit.h b/include/xrpl/tx/transactors/Vault/VaultDeposit.h similarity index 91% rename from src/xrpld/app/tx/detail/VaultDeposit.h rename to include/xrpl/tx/transactors/Vault/VaultDeposit.h index 1fd62b95ff..198cf64790 100644 --- a/src/xrpld/app/tx/detail/VaultDeposit.h +++ b/include/xrpl/tx/transactors/Vault/VaultDeposit.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_VAULTDEPOSIT_H_INCLUDED #define XRPL_TX_VAULTDEPOSIT_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultSet.h b/include/xrpl/tx/transactors/Vault/VaultSet.h similarity index 92% rename from src/xrpld/app/tx/detail/VaultSet.h rename to include/xrpl/tx/transactors/Vault/VaultSet.h index bfa38e5284..0d47eda60f 100644 --- a/src/xrpld/app/tx/detail/VaultSet.h +++ b/include/xrpl/tx/transactors/Vault/VaultSet.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_VAULTSET_H_INCLUDED #define XRPL_TX_VAULTSET_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultWithdraw.h b/include/xrpl/tx/transactors/Vault/VaultWithdraw.h similarity index 91% rename from src/xrpld/app/tx/detail/VaultWithdraw.h rename to include/xrpl/tx/transactors/Vault/VaultWithdraw.h index 33463831e5..ddd9c34408 100644 --- a/src/xrpld/app/tx/detail/VaultWithdraw.h +++ b/include/xrpl/tx/transactors/Vault/VaultWithdraw.h @@ -1,7 +1,7 @@ #ifndef XRPL_TX_VAULTWITHDRAW_H_INCLUDED #define XRPL_TX_VAULTWITHDRAW_H_INCLUDED -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/XChainBridge.h b/include/xrpl/tx/transactors/XChainBridge.h similarity index 99% rename from src/xrpld/app/tx/detail/XChainBridge.h rename to include/xrpl/tx/transactors/XChainBridge.h index db1026ebb4..b0507f2f50 100644 --- a/src/xrpld/app/tx/detail/XChainBridge.h +++ b/include/xrpl/tx/transactors/XChainBridge.h @@ -1,9 +1,8 @@ #ifndef XRPL_TX_XCHAINBRIDGE_H_INCLUDED #define XRPL_TX_XCHAINBRIDGE_H_INCLUDED -#include - #include +#include namespace xrpl { diff --git a/src/libxrpl/protocol/Protocol.cpp b/src/libxrpl/protocol/Protocol.cpp new file mode 100644 index 0000000000..6f86f49fc6 --- /dev/null +++ b/src/libxrpl/protocol/Protocol.cpp @@ -0,0 +1,15 @@ +#include + +namespace xrpl { +bool +isVotingLedger(LedgerIndex seq) +{ + return seq % FLAG_LEDGER_INTERVAL == 0; +} + +bool +isFlagLedger(LedgerIndex seq) +{ + return seq % FLAG_LEDGER_INTERVAL == 0; +} +} // namespace xrpl diff --git a/src/xrpld/app/misc/detail/LoadFeeTrack.cpp b/src/libxrpl/server/LoadFeeTrack.cpp similarity index 98% rename from src/xrpld/app/misc/detail/LoadFeeTrack.cpp rename to src/libxrpl/server/LoadFeeTrack.cpp index 6166656aee..41d26dd6c6 100644 --- a/src/xrpld/app/misc/detail/LoadFeeTrack.cpp +++ b/src/libxrpl/server/LoadFeeTrack.cpp @@ -1,9 +1,8 @@ -#include - #include #include #include #include +#include #include diff --git a/src/xrpld/app/tx/detail/ApplyContext.cpp b/src/libxrpl/tx/ApplyContext.cpp similarity index 97% rename from src/xrpld/app/tx/detail/ApplyContext.cpp rename to src/libxrpl/tx/ApplyContext.cpp index 46398c3d10..f50866e67a 100644 --- a/src/xrpld/app/tx/detail/ApplyContext.cpp +++ b/src/libxrpl/tx/ApplyContext.cpp @@ -1,9 +1,8 @@ -#include -#include - #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/InvariantCheck.cpp b/src/libxrpl/tx/InvariantCheck.cpp similarity index 99% rename from src/xrpld/app/tx/detail/InvariantCheck.cpp rename to src/libxrpl/tx/InvariantCheck.cpp index 2e0b3cbfab..9040065bef 100644 --- a/src/xrpld/app/tx/detail/InvariantCheck.cpp +++ b/src/libxrpl/tx/InvariantCheck.cpp @@ -1,9 +1,3 @@ -#include -#include -#include -#include -#include - #include #include #include @@ -21,6 +15,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include diff --git a/src/xrpld/app/tx/detail/SignerEntries.cpp b/src/libxrpl/tx/SignerEntries.cpp similarity index 96% rename from src/xrpld/app/tx/detail/SignerEntries.cpp rename to src/libxrpl/tx/SignerEntries.cpp index 128cc984e4..e999b9c78c 100644 --- a/src/xrpld/app/tx/detail/SignerEntries.cpp +++ b/src/libxrpl/tx/SignerEntries.cpp @@ -1,8 +1,7 @@ -#include - #include #include #include +#include #include #include diff --git a/src/xrpld/app/tx/detail/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp similarity index 99% rename from src/xrpld/app/tx/detail/Transactor.cpp rename to src/libxrpl/tx/Transactor.cpp index a1f75344cc..3829a9bf54 100644 --- a/src/xrpld/app/tx/detail/Transactor.cpp +++ b/src/libxrpl/tx/Transactor.cpp @@ -1,10 +1,3 @@ -#include -#include -#include -#include -#include -#include - #include #include #include @@ -17,6 +10,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/apply.cpp b/src/libxrpl/tx/apply.cpp similarity index 99% rename from src/xrpld/app/tx/detail/apply.cpp rename to src/libxrpl/tx/apply.cpp index 1dfbc92a09..15778c836f 100644 --- a/src/xrpld/app/tx/detail/apply.cpp +++ b/src/libxrpl/tx/apply.cpp @@ -1,11 +1,10 @@ -#include -#include - #include #include #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/applySteps.cpp b/src/libxrpl/tx/applySteps.cpp similarity index 99% rename from src/xrpld/app/tx/detail/applySteps.cpp rename to src/libxrpl/tx/applySteps.cpp index 5a831a2eb2..875cb45efc 100644 --- a/src/xrpld/app/tx/detail/applySteps.cpp +++ b/src/libxrpl/tx/applySteps.cpp @@ -1,4 +1,4 @@ -#include +#include #pragma push_macro("TRANSACTION") #undef TRANSACTION diff --git a/src/xrpld/app/tx/detail/BookTip.cpp b/src/libxrpl/tx/paths/BookTip.cpp similarity index 97% rename from src/xrpld/app/tx/detail/BookTip.cpp rename to src/libxrpl/tx/paths/BookTip.cpp index d3c8e69e01..ae6e358749 100644 --- a/src/xrpld/app/tx/detail/BookTip.cpp +++ b/src/libxrpl/tx/paths/BookTip.cpp @@ -1,4 +1,4 @@ -#include +#include namespace xrpl { diff --git a/src/xrpld/app/paths/Flow.cpp b/src/libxrpl/tx/paths/Flow.cpp similarity index 95% rename from src/xrpld/app/paths/Flow.cpp rename to src/libxrpl/tx/paths/Flow.cpp index b5088d15b3..f04aaef6c9 100644 --- a/src/xrpld/app/paths/Flow.cpp +++ b/src/libxrpl/tx/paths/Flow.cpp @@ -1,13 +1,12 @@ -#include -#include -#include -#include -#include - #include #include #include #include +#include +#include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/OfferStream.cpp b/src/libxrpl/tx/paths/OfferStream.cpp similarity index 99% rename from src/xrpld/app/tx/detail/OfferStream.cpp rename to src/libxrpl/tx/paths/OfferStream.cpp index 587badf31a..5977d4b753 100644 --- a/src/xrpld/app/tx/detail/OfferStream.cpp +++ b/src/libxrpl/tx/paths/OfferStream.cpp @@ -1,10 +1,9 @@ -#include -#include - #include #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/paths/RippleCalc.cpp b/src/libxrpl/tx/paths/RippleCalc.cpp similarity index 96% rename from src/xrpld/app/paths/RippleCalc.cpp rename to src/libxrpl/tx/paths/RippleCalc.cpp index 2b48a6ba5c..9bbba3f015 100644 --- a/src/xrpld/app/paths/RippleCalc.cpp +++ b/src/libxrpl/tx/paths/RippleCalc.cpp @@ -1,10 +1,9 @@ -#include -#include -#include - #include #include #include +#include +#include +#include namespace xrpl { namespace path { diff --git a/src/xrpld/app/tx/detail/AMMBid.cpp b/src/libxrpl/tx/transactors/AMM/AMMBid.cpp similarity index 98% rename from src/xrpld/app/tx/detail/AMMBid.cpp rename to src/libxrpl/tx/transactors/AMM/AMMBid.cpp index 34b2c811c2..bffe36d3a5 100644 --- a/src/xrpld/app/tx/detail/AMMBid.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMBid.cpp @@ -1,13 +1,12 @@ -#include -#include -#include - #include #include #include #include #include #include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMClawback.cpp b/src/libxrpl/tx/transactors/AMM/AMMClawback.cpp similarity index 98% rename from src/xrpld/app/tx/detail/AMMClawback.cpp rename to src/libxrpl/tx/transactors/AMM/AMMClawback.cpp index 5eaed55f23..f7a6aebe75 100644 --- a/src/xrpld/app/tx/detail/AMMClawback.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMClawback.cpp @@ -1,14 +1,13 @@ -#include -#include -#include -#include - #include #include #include #include #include #include +#include +#include +#include +#include #include diff --git a/src/xrpld/app/tx/detail/AMMCreate.cpp b/src/libxrpl/tx/transactors/AMM/AMMCreate.cpp similarity index 98% rename from src/xrpld/app/tx/detail/AMMCreate.cpp rename to src/libxrpl/tx/transactors/AMM/AMMCreate.cpp index b72caf6281..e326c0099b 100644 --- a/src/xrpld/app/tx/detail/AMMCreate.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMCreate.cpp @@ -1,7 +1,3 @@ -#include -#include -#include - #include #include #include @@ -9,6 +5,9 @@ #include #include #include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMDelete.cpp b/src/libxrpl/tx/transactors/AMM/AMMDelete.cpp similarity index 92% rename from src/xrpld/app/tx/detail/AMMDelete.cpp rename to src/libxrpl/tx/transactors/AMM/AMMDelete.cpp index a6cfaac586..040854fa15 100644 --- a/src/xrpld/app/tx/detail/AMMDelete.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMDelete.cpp @@ -1,10 +1,9 @@ -#include -#include - #include #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMDeposit.cpp b/src/libxrpl/tx/transactors/AMM/AMMDeposit.cpp similarity index 99% rename from src/xrpld/app/tx/detail/AMMDeposit.cpp rename to src/libxrpl/tx/transactors/AMM/AMMDeposit.cpp index 36399d4e1c..2b2df4b87b 100644 --- a/src/xrpld/app/tx/detail/AMMDeposit.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMDeposit.cpp @@ -1,12 +1,11 @@ -#include -#include -#include - #include #include #include #include #include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/detail/AMMHelpers.cpp b/src/libxrpl/tx/transactors/AMM/AMMHelpers.cpp similarity index 99% rename from src/xrpld/app/misc/detail/AMMHelpers.cpp rename to src/libxrpl/tx/transactors/AMM/AMMHelpers.cpp index 0b741c8d36..35263e5744 100644 --- a/src/xrpld/app/misc/detail/AMMHelpers.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMHelpers.cpp @@ -1,4 +1,4 @@ -#include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/detail/AMMUtils.cpp b/src/libxrpl/tx/transactors/AMM/AMMUtils.cpp similarity index 99% rename from src/xrpld/app/misc/detail/AMMUtils.cpp rename to src/libxrpl/tx/transactors/AMM/AMMUtils.cpp index c0cda2bd73..50ae84269d 100644 --- a/src/xrpld/app/misc/detail/AMMUtils.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMUtils.cpp @@ -1,10 +1,9 @@ -#include -#include - #include #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMVote.cpp b/src/libxrpl/tx/transactors/AMM/AMMVote.cpp similarity index 98% rename from src/xrpld/app/tx/detail/AMMVote.cpp rename to src/libxrpl/tx/transactors/AMM/AMMVote.cpp index ca57ce1f8c..01fde5f1f1 100644 --- a/src/xrpld/app/tx/detail/AMMVote.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMVote.cpp @@ -1,10 +1,9 @@ -#include -#include - #include #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/libxrpl/tx/transactors/AMM/AMMWithdraw.cpp similarity index 99% rename from src/xrpld/app/tx/detail/AMMWithdraw.cpp rename to src/libxrpl/tx/transactors/AMM/AMMWithdraw.cpp index 78da481b95..73fb1bdc04 100644 --- a/src/xrpld/app/tx/detail/AMMWithdraw.cpp +++ b/src/libxrpl/tx/transactors/AMM/AMMWithdraw.cpp @@ -1,11 +1,10 @@ -#include -#include -#include - #include #include #include #include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Batch.cpp b/src/libxrpl/tx/transactors/Batch.cpp similarity index 99% rename from src/xrpld/app/tx/detail/Batch.cpp rename to src/libxrpl/tx/transactors/Batch.cpp index 8cbab6cfd3..c6dff8c966 100644 --- a/src/xrpld/app/tx/detail/Batch.cpp +++ b/src/libxrpl/tx/transactors/Batch.cpp @@ -1,6 +1,3 @@ -#include -#include - #include #include #include @@ -9,6 +6,8 @@ #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Change.cpp b/src/libxrpl/tx/transactors/Change.cpp similarity index 99% rename from src/xrpld/app/tx/detail/Change.cpp rename to src/libxrpl/tx/transactors/Change.cpp index b0bcc1a870..8532d29b5a 100644 --- a/src/xrpld/app/tx/detail/Change.cpp +++ b/src/libxrpl/tx/transactors/Change.cpp @@ -1,12 +1,11 @@ -#include -#include - #include +#include #include #include #include #include #include +#include #include diff --git a/src/xrpld/app/tx/detail/CancelCheck.cpp b/src/libxrpl/tx/transactors/Check/CancelCheck.cpp similarity index 98% rename from src/xrpld/app/tx/detail/CancelCheck.cpp rename to src/libxrpl/tx/transactors/Check/CancelCheck.cpp index 4a987ace5f..bc57925961 100644 --- a/src/xrpld/app/tx/detail/CancelCheck.cpp +++ b/src/libxrpl/tx/transactors/Check/CancelCheck.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -7,6 +5,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CashCheck.cpp b/src/libxrpl/tx/transactors/Check/CashCheck.cpp similarity index 99% rename from src/xrpld/app/tx/detail/CashCheck.cpp rename to src/libxrpl/tx/transactors/Check/CashCheck.cpp index f03a96e102..7f3db2570c 100644 --- a/src/xrpld/app/tx/detail/CashCheck.cpp +++ b/src/libxrpl/tx/transactors/Check/CashCheck.cpp @@ -1,6 +1,3 @@ -#include -#include - #include #include #include @@ -8,6 +5,8 @@ #include #include #include +#include +#include #include diff --git a/src/xrpld/app/tx/detail/CreateCheck.cpp b/src/libxrpl/tx/transactors/Check/CreateCheck.cpp similarity index 99% rename from src/xrpld/app/tx/detail/CreateCheck.cpp rename to src/libxrpl/tx/transactors/Check/CreateCheck.cpp index a9d7cb950b..82cc5ab35c 100644 --- a/src/xrpld/app/tx/detail/CreateCheck.cpp +++ b/src/libxrpl/tx/transactors/Check/CreateCheck.cpp @@ -1,11 +1,10 @@ -#include - #include #include #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Clawback.cpp b/src/libxrpl/tx/transactors/Clawback.cpp similarity index 99% rename from src/xrpld/app/tx/detail/Clawback.cpp rename to src/libxrpl/tx/transactors/Clawback.cpp index 24b1603aab..8b54696fd0 100644 --- a/src/xrpld/app/tx/detail/Clawback.cpp +++ b/src/libxrpl/tx/transactors/Clawback.cpp @@ -1,11 +1,10 @@ -#include - #include #include #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CreateTicket.cpp b/src/libxrpl/tx/transactors/CreateTicket.cpp similarity index 98% rename from src/xrpld/app/tx/detail/CreateTicket.cpp rename to src/libxrpl/tx/transactors/CreateTicket.cpp index aa01d22f7c..5a4d803238 100644 --- a/src/xrpld/app/tx/detail/CreateTicket.cpp +++ b/src/libxrpl/tx/transactors/CreateTicket.cpp @@ -1,9 +1,9 @@ -#include - #include +#include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Credentials.cpp b/src/libxrpl/tx/transactors/Credentials.cpp similarity index 99% rename from src/xrpld/app/tx/detail/Credentials.cpp rename to src/libxrpl/tx/transactors/Credentials.cpp index 6d106535a2..c36eb21948 100644 --- a/src/xrpld/app/tx/detail/Credentials.cpp +++ b/src/libxrpl/tx/transactors/Credentials.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -7,6 +5,7 @@ #include #include #include +#include #include diff --git a/src/xrpld/app/tx/detail/DID.cpp b/src/libxrpl/tx/transactors/DID.cpp similarity index 99% rename from src/xrpld/app/tx/detail/DID.cpp rename to src/libxrpl/tx/transactors/DID.cpp index e9b23a15eb..c04ec8d428 100644 --- a/src/xrpld/app/tx/detail/DID.cpp +++ b/src/libxrpl/tx/transactors/DID.cpp @@ -1,11 +1,10 @@ -#include - #include #include #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/DelegateSet.cpp b/src/libxrpl/tx/transactors/Delegate/DelegateSet.cpp similarity index 98% rename from src/xrpld/app/tx/detail/DelegateSet.cpp rename to src/libxrpl/tx/transactors/Delegate/DelegateSet.cpp index 96d02bf2bc..6a06fd2221 100644 --- a/src/xrpld/app/tx/detail/DelegateSet.cpp +++ b/src/libxrpl/tx/transactors/Delegate/DelegateSet.cpp @@ -1,10 +1,9 @@ -#include - #include #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/detail/DelegateUtils.cpp b/src/libxrpl/tx/transactors/Delegate/DelegateUtils.cpp similarity index 96% rename from src/xrpld/app/misc/detail/DelegateUtils.cpp rename to src/libxrpl/tx/transactors/Delegate/DelegateUtils.cpp index 027f2f1cc6..9c93d48f82 100644 --- a/src/xrpld/app/misc/detail/DelegateUtils.cpp +++ b/src/libxrpl/tx/transactors/Delegate/DelegateUtils.cpp @@ -1,6 +1,5 @@ -#include - #include +#include namespace xrpl { NotTEC diff --git a/src/xrpld/app/tx/detail/DeleteAccount.cpp b/src/libxrpl/tx/transactors/DeleteAccount.cpp similarity index 97% rename from src/xrpld/app/tx/detail/DeleteAccount.cpp rename to src/libxrpl/tx/transactors/DeleteAccount.cpp index 37c7785cf5..76f92664f3 100644 --- a/src/xrpld/app/tx/detail/DeleteAccount.cpp +++ b/src/libxrpl/tx/transactors/DeleteAccount.cpp @@ -1,11 +1,3 @@ -#include -#include -#include -#include -#include -#include -#include - #include #include #include @@ -16,6 +8,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/DeleteOracle.cpp b/src/libxrpl/tx/transactors/DeleteOracle.cpp similarity index 97% rename from src/xrpld/app/tx/detail/DeleteOracle.cpp rename to src/libxrpl/tx/transactors/DeleteOracle.cpp index df7b737eed..ba919c4cce 100644 --- a/src/xrpld/app/tx/detail/DeleteOracle.cpp +++ b/src/libxrpl/tx/transactors/DeleteOracle.cpp @@ -1,9 +1,8 @@ -#include - #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/DepositPreauth.cpp b/src/libxrpl/tx/transactors/DepositPreauth.cpp similarity index 99% rename from src/xrpld/app/tx/detail/DepositPreauth.cpp rename to src/libxrpl/tx/transactors/DepositPreauth.cpp index 057e240fff..d87d3f5ea0 100644 --- a/src/xrpld/app/tx/detail/DepositPreauth.cpp +++ b/src/libxrpl/tx/transactors/DepositPreauth.cpp @@ -1,11 +1,10 @@ -#include - #include #include #include #include #include #include +#include #include diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/libxrpl/tx/transactors/Escrow.cpp similarity index 99% rename from src/xrpld/app/tx/detail/Escrow.cpp rename to src/libxrpl/tx/transactors/Escrow.cpp index 1d000d1be3..39dc3653d0 100644 --- a/src/xrpld/app/tx/detail/Escrow.cpp +++ b/src/libxrpl/tx/transactors/Escrow.cpp @@ -1,6 +1,3 @@ -#include -#include - #include #include #include @@ -14,6 +11,8 @@ #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LedgerStateFix.cpp b/src/libxrpl/tx/transactors/LedgerStateFix.cpp similarity index 94% rename from src/xrpld/app/tx/detail/LedgerStateFix.cpp rename to src/libxrpl/tx/transactors/LedgerStateFix.cpp index 43001e2fbf..28028b6f2b 100644 --- a/src/xrpld/app/tx/detail/LedgerStateFix.cpp +++ b/src/libxrpl/tx/transactors/LedgerStateFix.cpp @@ -1,10 +1,9 @@ -#include -#include - #include #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/detail/LendingHelpers.cpp b/src/libxrpl/tx/transactors/Lending/LendingHelpers.cpp similarity index 99% rename from src/xrpld/app/misc/detail/LendingHelpers.cpp rename to src/libxrpl/tx/transactors/Lending/LendingHelpers.cpp index a8354ff049..3101c78a92 100644 --- a/src/xrpld/app/misc/detail/LendingHelpers.cpp +++ b/src/libxrpl/tx/transactors/Lending/LendingHelpers.cpp @@ -1,6 +1,6 @@ -#include +#include // DO NOT REMOVE forces header file include to sort first -#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverClawback.cpp b/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverClawback.cpp similarity index 98% rename from src/xrpld/app/tx/detail/LoanBrokerCoverClawback.cpp rename to src/libxrpl/tx/transactors/Lending/LoanBrokerCoverClawback.cpp index c61145dda1..6de6c4f75a 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverClawback.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverClawback.cpp @@ -1,8 +1,7 @@ -#include +#include // -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp b/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.cpp similarity index 96% rename from src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp rename to src/libxrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.cpp index ed47d40631..98ebcc0b12 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.cpp @@ -1,8 +1,7 @@ -#include +#include // -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.cpp b/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.cpp similarity index 97% rename from src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.cpp rename to src/libxrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.cpp index 5d4d2053ed..76081bdacc 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.cpp @@ -1,10 +1,9 @@ -#include +#include // -#include -#include - #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp b/src/libxrpl/tx/transactors/Lending/LoanBrokerDelete.cpp similarity index 98% rename from src/xrpld/app/tx/detail/LoanBrokerDelete.cpp rename to src/libxrpl/tx/transactors/Lending/LoanBrokerDelete.cpp index f3f57f8659..5d8fa23fa6 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanBrokerDelete.cpp @@ -1,8 +1,7 @@ -#include +#include // -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanBrokerSet.cpp b/src/libxrpl/tx/transactors/Lending/LoanBrokerSet.cpp similarity index 98% rename from src/xrpld/app/tx/detail/LoanBrokerSet.cpp rename to src/libxrpl/tx/transactors/Lending/LoanBrokerSet.cpp index b7e9e4c79f..fda47d544e 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerSet.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanBrokerSet.cpp @@ -1,8 +1,7 @@ -#include +#include // -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanDelete.cpp b/src/libxrpl/tx/transactors/Lending/LoanDelete.cpp similarity index 97% rename from src/xrpld/app/tx/detail/LoanDelete.cpp rename to src/libxrpl/tx/transactors/Lending/LoanDelete.cpp index ddb286db12..01a4643fe7 100644 --- a/src/xrpld/app/tx/detail/LoanDelete.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanDelete.cpp @@ -1,8 +1,7 @@ -#include +#include // -#include - #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanManage.cpp b/src/libxrpl/tx/transactors/Lending/LoanManage.cpp similarity index 99% rename from src/xrpld/app/tx/detail/LoanManage.cpp rename to src/libxrpl/tx/transactors/Lending/LoanManage.cpp index 17dee8ffe8..a6ed966d0a 100644 --- a/src/xrpld/app/tx/detail/LoanManage.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanManage.cpp @@ -1,9 +1,8 @@ -#include +#include // -#include - #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/LoanPay.cpp b/src/libxrpl/tx/transactors/Lending/LoanPay.cpp similarity index 99% rename from src/xrpld/app/tx/detail/LoanPay.cpp rename to src/libxrpl/tx/transactors/Lending/LoanPay.cpp index 13f62d4c0d..df519266ed 100644 --- a/src/xrpld/app/tx/detail/LoanPay.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanPay.cpp @@ -1,12 +1,11 @@ -#include +#include // -#include -#include - #include #include #include #include +#include +#include #include diff --git a/src/xrpld/app/tx/detail/LoanSet.cpp b/src/libxrpl/tx/transactors/Lending/LoanSet.cpp similarity index 99% rename from src/xrpld/app/tx/detail/LoanSet.cpp rename to src/libxrpl/tx/transactors/Lending/LoanSet.cpp index 0b83d3009f..585c95ca03 100644 --- a/src/xrpld/app/tx/detail/LoanSet.cpp +++ b/src/libxrpl/tx/transactors/Lending/LoanSet.cpp @@ -1,9 +1,8 @@ -#include +#include // -#include - #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp b/src/libxrpl/tx/transactors/MPT/MPTokenAuthorize.cpp similarity index 98% rename from src/xrpld/app/tx/detail/MPTokenAuthorize.cpp rename to src/libxrpl/tx/transactors/MPT/MPTokenAuthorize.cpp index a563849a0b..b63fb82b4b 100644 --- a/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp +++ b/src/libxrpl/tx/transactors/MPT/MPTokenAuthorize.cpp @@ -1,9 +1,8 @@ -#include - #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceCreate.cpp similarity index 98% rename from src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp rename to src/libxrpl/tx/transactors/MPT/MPTokenIssuanceCreate.cpp index 913c7cf53c..745e79ae0a 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp +++ b/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceCreate.cpp @@ -1,8 +1,7 @@ -#include - #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp b/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.cpp similarity index 96% rename from src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp rename to src/libxrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.cpp index 58b3cbea4f..6a0ba3d017 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp +++ b/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.cpp @@ -1,8 +1,7 @@ -#include - #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp b/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceSet.cpp similarity index 98% rename from src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp rename to src/libxrpl/tx/transactors/MPT/MPTokenIssuanceSet.cpp index 578e5f6564..3942d0e17d 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp +++ b/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceSet.cpp @@ -1,9 +1,8 @@ -#include -#include - #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/NFT/NFTokenAcceptOffer.cpp similarity index 99% rename from src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp rename to src/libxrpl/tx/transactors/NFT/NFTokenAcceptOffer.cpp index f3205f6df3..7c7905a23a 100644 --- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp +++ b/src/libxrpl/tx/transactors/NFT/NFTokenAcceptOffer.cpp @@ -1,10 +1,9 @@ -#include -#include - #include #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.cpp b/src/libxrpl/tx/transactors/NFT/NFTokenBurn.cpp similarity index 96% rename from src/xrpld/app/tx/detail/NFTokenBurn.cpp rename to src/libxrpl/tx/transactors/NFT/NFTokenBurn.cpp index 755e9e52c5..67f29a4f02 100644 --- a/src/xrpld/app/tx/detail/NFTokenBurn.cpp +++ b/src/libxrpl/tx/transactors/NFT/NFTokenBurn.cpp @@ -1,9 +1,8 @@ -#include -#include - #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp b/src/libxrpl/tx/transactors/NFT/NFTokenCancelOffer.cpp similarity index 96% rename from src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp rename to src/libxrpl/tx/transactors/NFT/NFTokenCancelOffer.cpp index 94512b5e66..6ee02febec 100644 --- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp +++ b/src/libxrpl/tx/transactors/NFT/NFTokenCancelOffer.cpp @@ -1,9 +1,8 @@ -#include -#include - #include #include #include +#include +#include #include diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp b/src/libxrpl/tx/transactors/NFT/NFTokenCreateOffer.cpp similarity index 95% rename from src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp rename to src/libxrpl/tx/transactors/NFT/NFTokenCreateOffer.cpp index 00e69ccc9f..e8f0a491b0 100644 --- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp +++ b/src/libxrpl/tx/transactors/NFT/NFTokenCreateOffer.cpp @@ -1,9 +1,8 @@ -#include -#include - #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenMint.cpp b/src/libxrpl/tx/transactors/NFT/NFTokenMint.cpp similarity index 99% rename from src/xrpld/app/tx/detail/NFTokenMint.cpp rename to src/libxrpl/tx/transactors/NFT/NFTokenMint.cpp index fbba92b264..e716979772 100644 --- a/src/xrpld/app/tx/detail/NFTokenMint.cpp +++ b/src/libxrpl/tx/transactors/NFT/NFTokenMint.cpp @@ -1,11 +1,10 @@ -#include - #include #include #include #include #include #include +#include #include diff --git a/src/xrpld/app/tx/detail/NFTokenModify.cpp b/src/libxrpl/tx/transactors/NFT/NFTokenModify.cpp similarity index 93% rename from src/xrpld/app/tx/detail/NFTokenModify.cpp rename to src/libxrpl/tx/transactors/NFT/NFTokenModify.cpp index 8ecf8de676..b14e384fa6 100644 --- a/src/xrpld/app/tx/detail/NFTokenModify.cpp +++ b/src/libxrpl/tx/transactors/NFT/NFTokenModify.cpp @@ -1,8 +1,7 @@ -#include -#include - #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/NFTokenUtils.cpp b/src/libxrpl/tx/transactors/NFT/NFTokenUtils.cpp similarity index 99% rename from src/xrpld/app/tx/detail/NFTokenUtils.cpp rename to src/libxrpl/tx/transactors/NFT/NFTokenUtils.cpp index 3a43cda6f0..32ce30f57a 100644 --- a/src/xrpld/app/tx/detail/NFTokenUtils.cpp +++ b/src/libxrpl/tx/transactors/NFT/NFTokenUtils.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -7,6 +5,7 @@ #include #include #include +#include #include #include diff --git a/src/xrpld/app/tx/detail/CancelOffer.cpp b/src/libxrpl/tx/transactors/Offer/CancelOffer.cpp similarity index 96% rename from src/xrpld/app/tx/detail/CancelOffer.cpp rename to src/libxrpl/tx/transactors/Offer/CancelOffer.cpp index 3b690cb730..3e5d2441e1 100644 --- a/src/xrpld/app/tx/detail/CancelOffer.cpp +++ b/src/libxrpl/tx/transactors/Offer/CancelOffer.cpp @@ -1,8 +1,7 @@ -#include - #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/CreateOffer.cpp b/src/libxrpl/tx/transactors/Offer/CreateOffer.cpp similarity index 99% rename from src/xrpld/app/tx/detail/CreateOffer.cpp rename to src/libxrpl/tx/transactors/Offer/CreateOffer.cpp index 5fdb889abd..aca6986789 100644 --- a/src/xrpld/app/tx/detail/CreateOffer.cpp +++ b/src/libxrpl/tx/transactors/Offer/CreateOffer.cpp @@ -1,7 +1,3 @@ -#include -#include -#include - #include #include #include @@ -11,6 +7,9 @@ #include #include #include +#include +#include +#include namespace xrpl { TxConsequences diff --git a/src/xrpld/app/tx/detail/PayChan.cpp b/src/libxrpl/tx/transactors/PayChan.cpp similarity index 99% rename from src/xrpld/app/tx/detail/PayChan.cpp rename to src/libxrpl/tx/transactors/PayChan.cpp index 3356f5d4f2..009ab9398e 100644 --- a/src/xrpld/app/tx/detail/PayChan.cpp +++ b/src/libxrpl/tx/transactors/PayChan.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -12,6 +10,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/Payment.cpp b/src/libxrpl/tx/transactors/Payment.cpp similarity index 99% rename from src/xrpld/app/tx/detail/Payment.cpp rename to src/libxrpl/tx/transactors/Payment.cpp index 9f985c631b..4bb64322b3 100644 --- a/src/xrpld/app/tx/detail/Payment.cpp +++ b/src/libxrpl/tx/transactors/Payment.cpp @@ -1,8 +1,3 @@ -#include -#include -#include -#include - #include #include #include @@ -10,6 +5,10 @@ #include #include #include +#include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/PermissionedDEXHelpers.cpp b/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDEXHelpers.cpp similarity index 97% rename from src/xrpld/app/misc/PermissionedDEXHelpers.cpp rename to src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDEXHelpers.cpp index 0cf41ac6f0..38cd524dab 100644 --- a/src/xrpld/app/misc/PermissionedDEXHelpers.cpp +++ b/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDEXHelpers.cpp @@ -1,6 +1,5 @@ -#include - #include +#include namespace xrpl { namespace permissioned_dex { diff --git a/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp b/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.cpp similarity index 96% rename from src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp rename to src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.cpp index 6301d6f892..8875132b30 100644 --- a/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp +++ b/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.cpp @@ -1,7 +1,6 @@ -#include - #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp b/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.cpp similarity index 98% rename from src/xrpld/app/tx/detail/PermissionedDomainSet.cpp rename to src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.cpp index 3417f1fb0a..4d87890af8 100644 --- a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp +++ b/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.cpp @@ -1,9 +1,8 @@ -#include - #include #include #include #include +#include #include diff --git a/src/xrpld/app/tx/detail/SetAccount.cpp b/src/libxrpl/tx/transactors/SetAccount.cpp similarity index 99% rename from src/xrpld/app/tx/detail/SetAccount.cpp rename to src/libxrpl/tx/transactors/SetAccount.cpp index 62487fd89d..ad2d433696 100644 --- a/src/xrpld/app/tx/detail/SetAccount.cpp +++ b/src/libxrpl/tx/transactors/SetAccount.cpp @@ -1,6 +1,3 @@ -#include -#include - #include #include #include @@ -8,6 +5,8 @@ #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/SetOracle.cpp b/src/libxrpl/tx/transactors/SetOracle.cpp similarity index 99% rename from src/xrpld/app/tx/detail/SetOracle.cpp rename to src/libxrpl/tx/transactors/SetOracle.cpp index 10d40b7859..24b8ed7f90 100644 --- a/src/xrpld/app/tx/detail/SetOracle.cpp +++ b/src/libxrpl/tx/transactors/SetOracle.cpp @@ -1,11 +1,10 @@ -#include - #include #include #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/SetRegularKey.cpp b/src/libxrpl/tx/transactors/SetRegularKey.cpp similarity index 97% rename from src/xrpld/app/tx/detail/SetRegularKey.cpp rename to src/libxrpl/tx/transactors/SetRegularKey.cpp index c349ee8ec3..3f6cbf1289 100644 --- a/src/xrpld/app/tx/detail/SetRegularKey.cpp +++ b/src/libxrpl/tx/transactors/SetRegularKey.cpp @@ -1,8 +1,7 @@ -#include - #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/SetSignerList.cpp b/src/libxrpl/tx/transactors/SetSignerList.cpp similarity index 99% rename from src/xrpld/app/tx/detail/SetSignerList.cpp rename to src/libxrpl/tx/transactors/SetSignerList.cpp index 17d81baf43..e1973e2bfa 100644 --- a/src/xrpld/app/tx/detail/SetSignerList.cpp +++ b/src/libxrpl/tx/transactors/SetSignerList.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -9,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/src/xrpld/app/tx/detail/SetTrust.cpp b/src/libxrpl/tx/transactors/SetTrust.cpp similarity index 99% rename from src/xrpld/app/tx/detail/SetTrust.cpp rename to src/libxrpl/tx/transactors/SetTrust.cpp index be0c5cc3d0..b8ff40d54b 100644 --- a/src/xrpld/app/tx/detail/SetTrust.cpp +++ b/src/libxrpl/tx/transactors/SetTrust.cpp @@ -1,6 +1,3 @@ -#include -#include - #include #include #include @@ -9,6 +6,8 @@ #include #include #include +#include +#include namespace { diff --git a/src/xrpld/app/tx/detail/VaultClawback.cpp b/src/libxrpl/tx/transactors/Vault/VaultClawback.cpp similarity index 99% rename from src/xrpld/app/tx/detail/VaultClawback.cpp rename to src/libxrpl/tx/transactors/Vault/VaultClawback.cpp index dbdf4440ec..c8c245dfb1 100644 --- a/src/xrpld/app/tx/detail/VaultClawback.cpp +++ b/src/libxrpl/tx/transactors/Vault/VaultClawback.cpp @@ -1,5 +1,3 @@ -#include -// #include #include #include @@ -9,6 +7,8 @@ #include #include #include +#include +#include #include diff --git a/src/xrpld/app/tx/detail/VaultCreate.cpp b/src/libxrpl/tx/transactors/Vault/VaultCreate.cpp similarity index 97% rename from src/xrpld/app/tx/detail/VaultCreate.cpp rename to src/libxrpl/tx/transactors/Vault/VaultCreate.cpp index 402d877a00..0203523807 100644 --- a/src/xrpld/app/tx/detail/VaultCreate.cpp +++ b/src/libxrpl/tx/transactors/Vault/VaultCreate.cpp @@ -1,7 +1,3 @@ -#include -#include -#include - #include #include #include @@ -14,6 +10,9 @@ #include #include #include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultDelete.cpp b/src/libxrpl/tx/transactors/Vault/VaultDelete.cpp similarity index 99% rename from src/xrpld/app/tx/detail/VaultDelete.cpp rename to src/libxrpl/tx/transactors/Vault/VaultDelete.cpp index 9b63c7766b..25a9791d7f 100644 --- a/src/xrpld/app/tx/detail/VaultDelete.cpp +++ b/src/libxrpl/tx/transactors/Vault/VaultDelete.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -7,6 +5,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultDeposit.cpp b/src/libxrpl/tx/transactors/Vault/VaultDeposit.cpp similarity index 98% rename from src/xrpld/app/tx/detail/VaultDeposit.cpp rename to src/libxrpl/tx/transactors/Vault/VaultDeposit.cpp index 02ef4afad1..2a15429633 100644 --- a/src/xrpld/app/tx/detail/VaultDeposit.cpp +++ b/src/libxrpl/tx/transactors/Vault/VaultDeposit.cpp @@ -1,6 +1,3 @@ -#include -#include - #include #include #include @@ -12,6 +9,8 @@ #include #include #include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultSet.cpp b/src/libxrpl/tx/transactors/Vault/VaultSet.cpp similarity index 99% rename from src/xrpld/app/tx/detail/VaultSet.cpp rename to src/libxrpl/tx/transactors/Vault/VaultSet.cpp index 13c8ad5db8..f5831e8c4e 100644 --- a/src/xrpld/app/tx/detail/VaultSet.cpp +++ b/src/libxrpl/tx/transactors/Vault/VaultSet.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -9,6 +7,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/VaultWithdraw.cpp b/src/libxrpl/tx/transactors/Vault/VaultWithdraw.cpp similarity index 99% rename from src/xrpld/app/tx/detail/VaultWithdraw.cpp rename to src/libxrpl/tx/transactors/Vault/VaultWithdraw.cpp index 9a4334e435..fbf05cb579 100644 --- a/src/xrpld/app/tx/detail/VaultWithdraw.cpp +++ b/src/libxrpl/tx/transactors/Vault/VaultWithdraw.cpp @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -9,6 +7,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/tx/detail/XChainBridge.cpp b/src/libxrpl/tx/transactors/XChainBridge.cpp similarity index 99% rename from src/xrpld/app/tx/detail/XChainBridge.cpp rename to src/libxrpl/tx/transactors/XChainBridge.cpp index ebfcc8a769..72c43bbfd2 100644 --- a/src/xrpld/app/tx/detail/XChainBridge.cpp +++ b/src/libxrpl/tx/transactors/XChainBridge.cpp @@ -1,8 +1,3 @@ -#include -#include -#include -#include - #include #include #include @@ -23,6 +18,10 @@ #include #include #include +#include +#include +#include +#include #include #include diff --git a/src/test/app/AMMCalc_test.cpp b/src/test/app/AMMCalc_test.cpp index abfb548b64..6fe67c2bbe 100644 --- a/src/test/app/AMMCalc_test.cpp +++ b/src/test/app/AMMCalc_test.cpp @@ -1,8 +1,7 @@ #include -#include - #include +#include #include diff --git a/src/test/app/AMMClawback_test.cpp b/src/test/app/AMMClawback_test.cpp index 52f05f9ed5..938ec6bcd9 100644 --- a/src/test/app/AMMClawback_test.cpp +++ b/src/test/app/AMMClawback_test.cpp @@ -2,9 +2,8 @@ #include #include -#include - #include +#include namespace xrpl { namespace test { diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp index d1816df51b..231d1da770 100644 --- a/src/test/app/AMMExtended_test.cpp +++ b/src/test/app/AMMExtended_test.cpp @@ -5,15 +5,15 @@ #include #include -#include -#include #include -#include -#include #include #include #include +#include +#include +#include +#include #include #include diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp index 3e7487600d..cca0213b43 100644 --- a/src/test/app/AMM_test.cpp +++ b/src/test/app/AMM_test.cpp @@ -6,15 +6,14 @@ #include #include -#include -#include -#include -#include - #include #include #include #include +#include +#include +#include +#include #include diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp index 8b068d35b0..3e6cc5f7b8 100644 --- a/src/test/app/AmendmentTable_test.cpp +++ b/src/test/app/AmendmentTable_test.cpp @@ -1,13 +1,13 @@ #include #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/src/test/app/Batch_test.cpp b/src/test/app/Batch_test.cpp index f7b252c470..a214ffd322 100644 --- a/src/test/app/Batch_test.cpp +++ b/src/test/app/Batch_test.cpp @@ -3,8 +3,6 @@ #include #include -#include -#include #include #include @@ -14,6 +12,8 @@ #include #include #include +#include +#include namespace xrpl { namespace test { diff --git a/src/test/app/EscrowToken_test.cpp b/src/test/app/EscrowToken_test.cpp index 589a8b474e..1b05643606 100644 --- a/src/test/app/EscrowToken_test.cpp +++ b/src/test/app/EscrowToken_test.cpp @@ -1,7 +1,5 @@ #include -#include - #include #include #include @@ -9,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp index 11f8d1f051..50de149d8c 100644 --- a/src/test/app/Escrow_test.cpp +++ b/src/test/app/Escrow_test.cpp @@ -1,12 +1,11 @@ #include -#include - #include #include #include #include #include +#include #include #include diff --git a/src/test/app/FeeVote_test.cpp b/src/test/app/FeeVote_test.cpp index 6ce34119da..d693a1eb8c 100644 --- a/src/test/app/FeeVote_test.cpp +++ b/src/test/app/FeeVote_test.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include @@ -11,6 +10,7 @@ #include #include #include +#include namespace xrpl { namespace test { diff --git a/src/test/app/FixNFTokenPageLinks_test.cpp b/src/test/app/FixNFTokenPageLinks_test.cpp index ad457cc58b..3a6020e0ef 100644 --- a/src/test/app/FixNFTokenPageLinks_test.cpp +++ b/src/test/app/FixNFTokenPageLinks_test.cpp @@ -1,10 +1,9 @@ #include -#include -#include - #include #include +#include +#include namespace xrpl { diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp index 8c5a9615fa..fedb02ef98 100644 --- a/src/test/app/Flow_test.cpp +++ b/src/test/app/Flow_test.cpp @@ -1,14 +1,14 @@ #include #include -#include -#include #include #include #include #include #include +#include +#include namespace xrpl { namespace test { diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp index 589674ecf7..db13f2f185 100644 --- a/src/test/app/Invariants_test.cpp +++ b/src/test/app/Invariants_test.cpp @@ -2,9 +2,6 @@ #include #include -#include -#include - #include #include #include @@ -17,6 +14,8 @@ #include #include #include +#include +#include #include diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp index 5d21f8bada..955de72bbb 100644 --- a/src/test/app/LedgerHistory_test.cpp +++ b/src/test/app/LedgerHistory_test.cpp @@ -3,11 +3,11 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/src/test/app/LendingHelpers_test.cpp b/src/test/app/LendingHelpers_test.cpp index 55fffad6b0..93b7d91777 100644 --- a/src/test/app/LendingHelpers_test.cpp +++ b/src/test/app/LendingHelpers_test.cpp @@ -5,13 +5,12 @@ #include #include -#include -#include -#include -#include - #include #include +#include +#include +#include +#include #include #include diff --git a/src/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp index e0638b64bc..3fe20d3d1f 100644 --- a/src/test/app/LoadFeeTrack_test.cpp +++ b/src/test/app/LoadFeeTrack_test.cpp @@ -1,8 +1,8 @@ -#include #include #include #include +#include namespace xrpl { diff --git a/src/test/app/LoanBroker_test.cpp b/src/test/app/LoanBroker_test.cpp index 4c3a9f3043..42d2adcae0 100644 --- a/src/test/app/LoanBroker_test.cpp +++ b/src/test/app/LoanBroker_test.cpp @@ -1,8 +1,7 @@ #include -#include - #include +#include namespace xrpl { namespace test { diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp index e9780211de..49fbd3babc 100644 --- a/src/test/app/Loan_test.cpp +++ b/src/test/app/Loan_test.cpp @@ -3,13 +3,12 @@ #include #include -#include -#include -#include -#include - #include #include +#include +#include +#include +#include #include diff --git a/src/test/app/NFTokenAuth_test.cpp b/src/test/app/NFTokenAuth_test.cpp index dce8da0042..a9056619f2 100644 --- a/src/test/app/NFTokenAuth_test.cpp +++ b/src/test/app/NFTokenAuth_test.cpp @@ -1,6 +1,6 @@ #include -#include +#include namespace xrpl { diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp index d004fa9ae8..b72a29b0d2 100644 --- a/src/test/app/NFTokenBurn_test.cpp +++ b/src/test/app/NFTokenBurn_test.cpp @@ -1,9 +1,8 @@ #include -#include - #include #include +#include #include diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp index 9718a5d073..111c4c8fcf 100644 --- a/src/test/app/NFTokenDir_test.cpp +++ b/src/test/app/NFTokenDir_test.cpp @@ -1,10 +1,9 @@ #include -#include - #include #include #include +#include #include diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp index 59995a4078..f17ee650c1 100644 --- a/src/test/app/NFToken_test.cpp +++ b/src/test/app/NFToken_test.cpp @@ -1,10 +1,9 @@ #include -#include - #include #include #include +#include #include diff --git a/src/test/app/OfferStream_test.cpp b/src/test/app/OfferStream_test.cpp index 218653a5d4..becb190513 100644 --- a/src/test/app/OfferStream_test.cpp +++ b/src/test/app/OfferStream_test.cpp @@ -1,6 +1,5 @@ -#include - #include +#include namespace xrpl { diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp index 8e0ff337b4..150e37031f 100644 --- a/src/test/app/PayStrand_test.cpp +++ b/src/test/app/PayStrand_test.cpp @@ -1,9 +1,6 @@ #include #include -#include -#include -#include #include #include @@ -11,6 +8,9 @@ #include #include #include +#include +#include +#include #include diff --git a/src/test/app/PermissionedDEX_test.cpp b/src/test/app/PermissionedDEX_test.cpp index c29b5344e2..a9eae2a0fa 100644 --- a/src/test/app/PermissionedDEX_test.cpp +++ b/src/test/app/PermissionedDEX_test.cpp @@ -2,8 +2,6 @@ #include #include -#include - #include #include #include @@ -18,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/src/test/app/PermissionedDomains_test.cpp b/src/test/app/PermissionedDomains_test.cpp index a7dff84cff..b3b256e419 100644 --- a/src/test/app/PermissionedDomains_test.cpp +++ b/src/test/app/PermissionedDomains_test.cpp @@ -1,9 +1,8 @@ #include -#include - #include #include +#include #include #include diff --git a/src/test/app/PseudoTx_test.cpp b/src/test/app/PseudoTx_test.cpp index 1435c493a2..eda9e369b5 100644 --- a/src/test/app/PseudoTx_test.cpp +++ b/src/test/app/PseudoTx_test.cpp @@ -1,8 +1,7 @@ #include -#include - #include +#include #include #include diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp index 2806d351a2..8d5f5aa166 100644 --- a/src/test/app/Regression_test.cpp +++ b/src/test/app/Regression_test.cpp @@ -3,13 +3,13 @@ #include #include -#include #include #include #include #include #include +#include namespace xrpl { namespace test { diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp index ed4a62c4b0..b4ad2a3e80 100644 --- a/src/test/app/TheoreticalQuality_test.cpp +++ b/src/test/app/TheoreticalQuality_test.cpp @@ -1,16 +1,15 @@ #include #include -#include -#include -#include -#include - #include #include #include #include #include +#include +#include +#include +#include namespace xrpl { namespace test { diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp index 652a7d6a46..ecf8661686 100644 --- a/src/test/app/TxQ_test.cpp +++ b/src/test/app/TxQ_test.cpp @@ -6,13 +6,13 @@ #include #include -#include #include -#include #include #include #include +#include +#include namespace xrpl { diff --git a/src/test/app/tx/apply_test.cpp b/src/test/app/tx/apply_test.cpp index eaa1924542..fd9b265a57 100644 --- a/src/test/app/tx/apply_test.cpp +++ b/src/test/app/tx/apply_test.cpp @@ -2,10 +2,9 @@ #include -#include - #include #include +#include namespace xrpl { diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp index 644536071d..e721c4df97 100644 --- a/src/test/consensus/NegativeUNL_test.cpp +++ b/src/test/consensus/NegativeUNL_test.cpp @@ -4,10 +4,10 @@ #include #include #include -#include #include #include +#include namespace xrpl { namespace test { diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp index b620126b0f..4d70f5e7f8 100644 --- a/src/test/jtx/impl/AMM.cpp +++ b/src/test/jtx/impl/AMM.cpp @@ -1,13 +1,12 @@ #include #include -#include -#include - #include #include #include #include +#include +#include namespace xrpl { namespace test { diff --git a/src/test/jtx/impl/ledgerStateFixes.cpp b/src/test/jtx/impl/ledgerStateFixes.cpp index f1e6b6eda1..04860a5e3a 100644 --- a/src/test/jtx/impl/ledgerStateFixes.cpp +++ b/src/test/jtx/impl/ledgerStateFixes.cpp @@ -1,9 +1,8 @@ #include -#include - #include #include +#include namespace xrpl { namespace test { diff --git a/src/test/jtx/impl/token.cpp b/src/test/jtx/impl/token.cpp index f74b66f9ae..3e65b656bd 100644 --- a/src/test/jtx/impl/token.cpp +++ b/src/test/jtx/impl/token.cpp @@ -1,10 +1,9 @@ #include #include -#include - #include #include +#include namespace xrpl { namespace test { diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp index 4f3e1817e1..57aff923c4 100644 --- a/src/test/rpc/AccountObjects_test.cpp +++ b/src/test/rpc/AccountObjects_test.cpp @@ -2,13 +2,12 @@ #include #include -#include - #include #include #include #include #include +#include #include diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp index 9bcf5ded7b..474efa8272 100644 --- a/src/test/rpc/AccountSet_test.cpp +++ b/src/test/rpc/AccountSet_test.cpp @@ -1,12 +1,11 @@ #include -#include - #include #include #include #include #include +#include namespace xrpl { diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp index 6b66da072e..3c74ae3137 100644 --- a/src/test/rpc/Feature_test.cpp +++ b/src/test/rpc/Feature_test.cpp @@ -1,7 +1,6 @@ #include -#include - +#include #include #include diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp index 6a9fae74a5..bf5d408c1b 100644 --- a/src/test/rpc/JSONRPC_test.cpp +++ b/src/test/rpc/JSONRPC_test.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #include #include @@ -10,6 +9,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp index 2a177d85a3..ba2eec0359 100644 --- a/src/test/rpc/Subscribe_test.cpp +++ b/src/test/rpc/Subscribe_test.cpp @@ -3,13 +3,13 @@ #include #include -#include #include #include #include #include #include +#include #include #include diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp index c4e85a4f4e..88bce111cb 100644 --- a/src/test/server/ServerStatus_test.cpp +++ b/src/test/server/ServerStatus_test.cpp @@ -4,12 +4,12 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp index 2b0de8300f..4ac3d68c1f 100644 --- a/src/xrpld/app/consensus/RCLConsensus.cpp +++ b/src/xrpld/app/consensus/RCLConsensus.cpp @@ -7,8 +7,6 @@ #include #include #include -#include -#include #include #include #include @@ -21,9 +19,11 @@ #include #include #include +#include #include #include #include +#include #include #include diff --git a/src/xrpld/app/ledger/Ledger.cpp b/src/xrpld/app/ledger/Ledger.cpp index 1ddc90d853..b63f6e1068 100644 --- a/src/xrpld/app/ledger/Ledger.cpp +++ b/src/xrpld/app/ledger/Ledger.cpp @@ -931,18 +931,12 @@ Ledger::updateSkipList() bool Ledger::isFlagLedger() const { - return header_.seq % FLAG_LEDGER_INTERVAL == 0; + return ::xrpl::isFlagLedger(header_.seq); } bool Ledger::isVotingLedger() const { - return (header_.seq + 1) % FLAG_LEDGER_INTERVAL == 0; -} - -bool -isFlagLedger(LedgerIndex seq) -{ - return seq % FLAG_LEDGER_INTERVAL == 0; + return ::xrpl::isVotingLedger(header_.seq + 1); } static bool diff --git a/src/xrpld/app/ledger/Ledger.h b/src/xrpld/app/ledger/Ledger.h index a17281f2c7..ba7d71b15c 100644 --- a/src/xrpld/app/ledger/Ledger.h +++ b/src/xrpld/app/ledger/Ledger.h @@ -404,11 +404,6 @@ private: /** A ledger wrapped in a CachedView. */ using CachedLedger = CachedView; -std::uint32_t constexpr FLAG_LEDGER_INTERVAL = 256; -/** Returns true if the given ledgerIndex is a flag ledgerIndex */ -bool -isFlagLedger(LedgerIndex seq); - //------------------------------------------------------------------------------ // // API diff --git a/src/xrpld/app/ledger/OrderBookDBImpl.cpp b/src/xrpld/app/ledger/OrderBookDBImpl.cpp index f6d08a8e1f..8120b851c3 100644 --- a/src/xrpld/app/ledger/OrderBookDBImpl.cpp +++ b/src/xrpld/app/ledger/OrderBookDBImpl.cpp @@ -1,11 +1,11 @@ #include #include -#include #include #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/ledger/detail/BuildLedger.cpp b/src/xrpld/app/ledger/detail/BuildLedger.cpp index 172c2c2b4c..cc5ab2defe 100644 --- a/src/xrpld/app/ledger/detail/BuildLedger.cpp +++ b/src/xrpld/app/ledger/detail/BuildLedger.cpp @@ -3,9 +3,9 @@ #include #include #include -#include #include +#include namespace xrpl { diff --git a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp index 1eec2efc80..a12f2d84a4 100644 --- a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp +++ b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp @@ -1,10 +1,10 @@ #include #include #include -#include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/ledger/detail/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp index 3658ca6b95..0ddb8c2c71 100644 --- a/src/xrpld/app/ledger/detail/LedgerMaster.cpp +++ b/src/xrpld/app/ledger/detail/LedgerMaster.cpp @@ -5,8 +5,6 @@ #include #include #include -#include -#include #include #include #include @@ -23,12 +21,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include diff --git a/src/xrpld/app/ledger/detail/OpenLedger.cpp b/src/xrpld/app/ledger/detail/OpenLedger.cpp index c7d820c003..4b825e5ddf 100644 --- a/src/xrpld/app/ledger/detail/OpenLedger.cpp +++ b/src/xrpld/app/ledger/detail/OpenLedger.cpp @@ -1,13 +1,13 @@ #include #include #include -#include #include #include #include #include #include +#include #include diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp index dbd941bc9a..afbbad86b5 100644 --- a/src/xrpld/app/main/Application.cpp +++ b/src/xrpld/app/main/Application.cpp @@ -15,8 +15,6 @@ #include #include #include -#include -#include #include #include #include @@ -25,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -43,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +50,9 @@ #include #include #include +#include #include +#include #include #include diff --git a/src/xrpld/app/main/LoadManager.cpp b/src/xrpld/app/main/LoadManager.cpp index 783ab9163f..fbace20636 100644 --- a/src/xrpld/app/main/LoadManager.cpp +++ b/src/xrpld/app/main/LoadManager.cpp @@ -1,9 +1,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/xrpld/app/misc/AmendmentTableImpl.h b/src/xrpld/app/misc/AmendmentTableImpl.h new file mode 100644 index 0000000000..758a61bcca --- /dev/null +++ b/src/xrpld/app/misc/AmendmentTableImpl.h @@ -0,0 +1,21 @@ +#ifndef XRPL_APP_MISC_AMENDMENTTABLE_H_INCLUDED +#define XRPL_APP_MISC_AMENDMENTTABLE_H_INCLUDED + +#include + +#include + +namespace xrpl { + +std::unique_ptr +make_AmendmentTable( + ServiceRegistry& registry, + std::chrono::seconds majorityTime, + std::vector const& supported, + Section const& enabled, + Section const& vetoed, + beast::Journal journal); + +} // namespace xrpl + +#endif diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp index 643d554d8a..32fbaae9d7 100644 --- a/src/xrpld/app/misc/NetworkOPs.cpp +++ b/src/xrpld/app/misc/NetworkOPs.cpp @@ -10,9 +10,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -20,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -41,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +49,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/xrpld/app/misc/TxQ.h b/src/xrpld/app/misc/TxQ.h index 10ed4adeea..642281895c 100644 --- a/src/xrpld/app/misc/TxQ.h +++ b/src/xrpld/app/misc/TxQ.h @@ -1,14 +1,13 @@ #ifndef XRPL_TXQ_H_INCLUDED #define XRPL_TXQ_H_INCLUDED -#include - #include #include #include #include #include #include +#include #include #include diff --git a/src/xrpld/app/misc/detail/AmendmentTable.cpp b/src/xrpld/app/misc/detail/AmendmentTable.cpp index b12d1e1b7e..a9d105222d 100644 --- a/src/xrpld/app/misc/detail/AmendmentTable.cpp +++ b/src/xrpld/app/misc/detail/AmendmentTable.cpp @@ -1,7 +1,5 @@ -#include -#include - #include +#include #include #include #include diff --git a/src/xrpld/app/misc/detail/Transaction.cpp b/src/xrpld/app/misc/detail/Transaction.cpp index 4f624c749d..050c0ba6f2 100644 --- a/src/xrpld/app/misc/detail/Transaction.cpp +++ b/src/xrpld/app/misc/detail/Transaction.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include @@ -9,6 +8,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp index eac92ed2cb..207ed88a51 100644 --- a/src/xrpld/app/misc/detail/TxQ.cpp +++ b/src/xrpld/app/misc/detail/TxQ.cpp @@ -1,12 +1,12 @@ #include #include #include -#include #include #include #include #include +#include #include #include diff --git a/src/xrpld/app/paths/AMMLiquidity.h b/src/xrpld/app/paths/AMMLiquidity.h index b5b865d80e..af874ada06 100644 --- a/src/xrpld/app/paths/AMMLiquidity.h +++ b/src/xrpld/app/paths/AMMLiquidity.h @@ -1,14 +1,13 @@ #ifndef XRPL_APP_TX_AMMLIQUIDITY_H_INCLUDED #define XRPL_APP_TX_AMMLIQUIDITY_H_INCLUDED -#include -#include -#include - #include #include #include #include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/paths/PathRequest.cpp b/src/xrpld/app/paths/PathRequest.cpp index 9c2278f2ee..aa41c3876e 100644 --- a/src/xrpld/app/paths/PathRequest.cpp +++ b/src/xrpld/app/paths/PathRequest.cpp @@ -1,9 +1,7 @@ #include -#include #include #include #include -#include #include #include #include @@ -13,7 +11,9 @@ #include #include #include +#include #include +#include #include #include diff --git a/src/xrpld/app/paths/Pathfinder.cpp b/src/xrpld/app/paths/Pathfinder.cpp index bb264f814c..19d495b902 100644 --- a/src/xrpld/app/paths/Pathfinder.cpp +++ b/src/xrpld/app/paths/Pathfinder.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include @@ -10,6 +9,7 @@ #include #include #include +#include #include diff --git a/src/xrpld/app/paths/detail/BookStep.cpp b/src/xrpld/app/paths/detail/BookStep.cpp index baef42a492..c4c25fcd33 100644 --- a/src/xrpld/app/paths/detail/BookStep.cpp +++ b/src/xrpld/app/paths/detail/BookStep.cpp @@ -1,9 +1,5 @@ -#include #include #include -#include -#include -#include #include #include @@ -14,6 +10,10 @@ #include #include #include +#include +#include +#include +#include #include diff --git a/src/xrpld/app/paths/detail/DirectStep.cpp b/src/xrpld/app/paths/detail/DirectStep.cpp index 3d3a76f42d..cd01b514bc 100644 --- a/src/xrpld/app/paths/detail/DirectStep.cpp +++ b/src/xrpld/app/paths/detail/DirectStep.cpp @@ -1,5 +1,4 @@ #include -#include #include #include @@ -7,6 +6,7 @@ #include #include #include +#include #include diff --git a/src/xrpld/app/paths/detail/PaySteps.cpp b/src/xrpld/app/paths/detail/PaySteps.cpp index 97d1dad4fa..d445b419d4 100644 --- a/src/xrpld/app/paths/detail/PaySteps.cpp +++ b/src/xrpld/app/paths/detail/PaySteps.cpp @@ -1,10 +1,9 @@ -#include - #include #include #include #include #include +#include #include diff --git a/src/xrpld/app/paths/detail/XRPEndpointStep.cpp b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp index ed1866bf24..94070d1d6c 100644 --- a/src/xrpld/app/paths/detail/XRPEndpointStep.cpp +++ b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp @@ -1,6 +1,4 @@ -#include #include -#include #include #include @@ -9,6 +7,8 @@ #include #include #include +#include +#include #include diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp index 183b95d053..7b4764b414 100644 --- a/src/xrpld/overlay/detail/PeerImp.cpp +++ b/src/xrpld/overlay/detail/PeerImp.cpp @@ -3,10 +3,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -19,7 +17,9 @@ #include #include #include +#include #include +#include #include #include diff --git a/src/xrpld/rpc/detail/LegacyPathFind.cpp b/src/xrpld/rpc/detail/LegacyPathFind.cpp index e06ae4062d..44f136232f 100644 --- a/src/xrpld/rpc/detail/LegacyPathFind.cpp +++ b/src/xrpld/rpc/detail/LegacyPathFind.cpp @@ -1,10 +1,10 @@ #include -#include #include #include #include #include +#include namespace xrpl { namespace RPC { diff --git a/src/xrpld/rpc/detail/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp index 2169b016db..c0a9ea5c75 100644 --- a/src/xrpld/rpc/detail/RPCHelpers.cpp +++ b/src/xrpld/rpc/detail/RPCHelpers.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -11,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/src/xrpld/rpc/detail/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp index ff95017aa3..82c7e025b0 100644 --- a/src/xrpld/rpc/detail/TransactionSign.cpp +++ b/src/xrpld/rpc/detail/TransactionSign.cpp @@ -4,8 +4,6 @@ #include #include #include -#include // Validity::Valid -#include #include #include #include @@ -19,6 +17,8 @@ #include #include #include +#include // Validity::Valid +#include #include #include diff --git a/src/xrpld/rpc/detail/TransactionSign.h b/src/xrpld/rpc/detail/TransactionSign.h index aa5b706858..d2620b7d12 100644 --- a/src/xrpld/rpc/detail/TransactionSign.h +++ b/src/xrpld/rpc/detail/TransactionSign.h @@ -1,10 +1,10 @@ #ifndef XRPL_RPC_TRANSACTIONSIGN_H_INCLUDED #define XRPL_RPC_TRANSACTIONSIGN_H_INCLUDED -#include #include #include +#include #include namespace xrpl { diff --git a/src/xrpld/rpc/handlers/AMMInfo.cpp b/src/xrpld/rpc/handlers/AMMInfo.cpp index 7bf2dd7eae..b23ea7cfbf 100644 --- a/src/xrpld/rpc/handlers/AMMInfo.cpp +++ b/src/xrpld/rpc/handlers/AMMInfo.cpp @@ -1,5 +1,4 @@ #include -#include #include #include @@ -7,6 +6,7 @@ #include #include #include +#include #include diff --git a/src/xrpld/rpc/handlers/AccountObjects.cpp b/src/xrpld/rpc/handlers/AccountObjects.cpp index 6440c78e58..69bc09fd06 100644 --- a/src/xrpld/rpc/handlers/AccountObjects.cpp +++ b/src/xrpld/rpc/handlers/AccountObjects.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -12,6 +11,7 @@ #include #include #include +#include #include diff --git a/src/xrpld/rpc/handlers/Feature1.cpp b/src/xrpld/rpc/handlers/Feature1.cpp index dc1ccaee6c..e2debb96ab 100644 --- a/src/xrpld/rpc/handlers/Feature1.cpp +++ b/src/xrpld/rpc/handlers/Feature1.cpp @@ -1,8 +1,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/rpc/handlers/LedgerHandler.cpp b/src/xrpld/rpc/handlers/LedgerHandler.cpp index f8e8111aad..7fee9b487c 100644 --- a/src/xrpld/rpc/handlers/LedgerHandler.cpp +++ b/src/xrpld/rpc/handlers/LedgerHandler.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -9,6 +8,7 @@ #include #include #include +#include namespace xrpl { namespace RPC { diff --git a/src/xrpld/rpc/handlers/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/NoRippleCheck.cpp index b42c86ee01..f5b7f646be 100644 --- a/src/xrpld/rpc/handlers/NoRippleCheck.cpp +++ b/src/xrpld/rpc/handlers/NoRippleCheck.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -11,6 +10,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/rpc/handlers/Peers.cpp b/src/xrpld/rpc/handlers/Peers.cpp index 5a34f4b557..155a43e22b 100644 --- a/src/xrpld/rpc/handlers/Peers.cpp +++ b/src/xrpld/rpc/handlers/Peers.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -7,6 +6,7 @@ #include #include +#include namespace xrpl { diff --git a/src/xrpld/rpc/handlers/Simulate.cpp b/src/xrpld/rpc/handlers/Simulate.cpp index ed3068a613..c0d6d2a10e 100644 --- a/src/xrpld/rpc/handlers/Simulate.cpp +++ b/src/xrpld/rpc/handlers/Simulate.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -15,6 +14,7 @@ #include #include #include +#include namespace xrpl { diff --git a/src/xrpld/rpc/handlers/Submit.cpp b/src/xrpld/rpc/handlers/Submit.cpp index 025461af43..e54a43a8a0 100644 --- a/src/xrpld/rpc/handlers/Submit.cpp +++ b/src/xrpld/rpc/handlers/Submit.cpp @@ -1,12 +1,12 @@ #include #include -#include #include #include #include #include #include +#include namespace xrpl {