Merge remote-tracking branch 'ripple/develop' into develop

This commit is contained in:
Richard Holland
2022-05-20 08:05:08 +00:00
304 changed files with 21096 additions and 7004 deletions

View File

@@ -29,6 +29,11 @@
#include <ripple/app/tx/impl/DeleteAccount.h>
#include <ripple/app/tx/impl/DepositPreauth.h>
#include <ripple/app/tx/impl/Escrow.h>
#include <ripple/app/tx/impl/NFTokenAcceptOffer.h>
#include <ripple/app/tx/impl/NFTokenBurn.h>
#include <ripple/app/tx/impl/NFTokenCancelOffer.h>
#include <ripple/app/tx/impl/NFTokenCreateOffer.h>
#include <ripple/app/tx/impl/NFTokenMint.h>
#include <ripple/app/tx/impl/PayChan.h>
#include <ripple/app/tx/impl/Payment.h>
#include <ripple/app/tx/impl/SetAccount.h>
@@ -136,6 +141,16 @@ invoke_preflight(PreflightContext const& ctx)
return invoke_preflight_helper<Change>(ctx);
case ttHOOK_SET:
return invoke_preflight_helper<SetHook>(ctx);
case ttNFTOKEN_MINT:
return invoke_preflight_helper<NFTokenMint>(ctx);
case ttNFTOKEN_BURN:
return invoke_preflight_helper<NFTokenBurn>(ctx);
case ttNFTOKEN_CREATE_OFFER:
return invoke_preflight_helper<NFTokenCreateOffer>(ctx);
case ttNFTOKEN_CANCEL_OFFER:
return invoke_preflight_helper<NFTokenCancelOffer>(ctx);
case ttNFTOKEN_ACCEPT_OFFER:
return invoke_preflight_helper<NFTokenAcceptOffer>(ctx);
default:
assert(false);
return {temUNKNOWN, TxConsequences{temUNKNOWN}};
@@ -231,6 +246,16 @@ invoke_preclaim(PreclaimContext const& ctx)
case ttUNL_MODIFY:
case ttEMIT_FAILURE:
return invoke_preclaim<Change>(ctx);
case ttNFTOKEN_MINT:
return invoke_preclaim<NFTokenMint>(ctx);
case ttNFTOKEN_BURN:
return invoke_preclaim<NFTokenBurn>(ctx);
case ttNFTOKEN_CREATE_OFFER:
return invoke_preclaim<NFTokenCreateOffer>(ctx);
case ttNFTOKEN_CANCEL_OFFER:
return invoke_preclaim<NFTokenCancelOffer>(ctx);
case ttNFTOKEN_ACCEPT_OFFER:
return invoke_preclaim<NFTokenAcceptOffer>(ctx);
default:
assert(false);
return temUNKNOWN;
@@ -287,6 +312,16 @@ invoke_calculateBaseFee(ReadView const& view, STTx const& tx)
case ttUNL_MODIFY:
case ttEMIT_FAILURE:
return Change::calculateBaseFee(view, tx);
case ttNFTOKEN_MINT:
return NFTokenMint::calculateBaseFee(view, tx);
case ttNFTOKEN_BURN:
return NFTokenBurn::calculateBaseFee(view, tx);
case ttNFTOKEN_CREATE_OFFER:
return NFTokenCreateOffer::calculateBaseFee(view, tx);
case ttNFTOKEN_CANCEL_OFFER:
return NFTokenCancelOffer::calculateBaseFee(view, tx);
case ttNFTOKEN_ACCEPT_OFFER:
return NFTokenAcceptOffer::calculateBaseFee(view, tx);
default:
assert(false);
return FeeUnit64{0};
@@ -425,6 +460,26 @@ invoke_apply(ApplyContext& ctx)
Change p(ctx);
return p();
}
case ttNFTOKEN_MINT: {
NFTokenMint p(ctx);
return p();
}
case ttNFTOKEN_BURN: {
NFTokenBurn p(ctx);
return p();
}
case ttNFTOKEN_CREATE_OFFER: {
NFTokenCreateOffer p(ctx);
return p();
}
case ttNFTOKEN_CANCEL_OFFER: {
NFTokenCancelOffer p(ctx);
return p();
}
case ttNFTOKEN_ACCEPT_OFFER: {
NFTokenAcceptOffer p(ctx);
return p();
}
default:
assert(false);
return {temUNKNOWN, false};