mirror of
https://github.com/XRPLF/rippled.git
synced 2026-07-29 01:50:43 +00:00
Merge branch 'tapanito/lending-fix-amendment' into tapanito/vault-block-deposit
# Conflicts: # src/libxrpl/ledger/helpers/VaultHelpers.cpp # src/libxrpl/tx/transactors/vault/VaultClawback.cpp # src/libxrpl/tx/transactors/vault/VaultCreate.cpp # src/libxrpl/tx/transactors/vault/VaultDelete.cpp # src/libxrpl/tx/transactors/vault/VaultDeposit.cpp # src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp # src/test/app/Vault_test.cpp
This commit is contained in:
@@ -1,33 +1,38 @@
|
||||
#include <test/jtx/Env.h>
|
||||
#include <test/jtx/vault.h>
|
||||
|
||||
#include <test/jtx/Env.h>
|
||||
|
||||
#include <xrpl/basics/base_uint.h>
|
||||
#include <xrpl/json/json_value.h>
|
||||
#include <xrpl/protocol/STAmount.h>
|
||||
#include <xrpl/protocol/Asset.h>
|
||||
#include <xrpl/protocol/Indexes.h>
|
||||
#include <xrpl/protocol/Keylet.h>
|
||||
#include <xrpl/protocol/SField.h>
|
||||
#include <xrpl/protocol/STBase.h>
|
||||
#include <xrpl/protocol/jss.h>
|
||||
|
||||
#include <optional>
|
||||
#include <tuple>
|
||||
|
||||
namespace xrpl {
|
||||
namespace test {
|
||||
namespace jtx {
|
||||
namespace xrpl::test::jtx {
|
||||
|
||||
std::tuple<Json::Value, Keylet>
|
||||
std::tuple<json::Value, Keylet>
|
||||
Vault::create(CreateArgs const& args) const
|
||||
{
|
||||
auto keylet = keylet::vault(args.owner.id(), env.seq(args.owner));
|
||||
Json::Value jv;
|
||||
json::Value jv;
|
||||
jv[jss::TransactionType] = jss::VaultCreate;
|
||||
jv[jss::Account] = args.owner.human();
|
||||
jv[jss::Asset] = to_json(args.asset);
|
||||
jv[jss::Asset] = toJson(args.asset);
|
||||
if (args.flags)
|
||||
jv[jss::Flags] = *args.flags;
|
||||
return {jv, keylet};
|
||||
}
|
||||
|
||||
Json::Value
|
||||
json::Value
|
||||
Vault::set(SetArgs const& args)
|
||||
{
|
||||
Json::Value jv;
|
||||
json::Value jv;
|
||||
jv[jss::TransactionType] = jss::VaultSet;
|
||||
jv[jss::Account] = args.owner.human();
|
||||
jv[sfVaultID] = to_string(args.id);
|
||||
@@ -36,51 +41,49 @@ Vault::set(SetArgs const& args)
|
||||
return jv;
|
||||
}
|
||||
|
||||
Json::Value
|
||||
json::Value
|
||||
Vault::del(DeleteArgs const& args)
|
||||
{
|
||||
Json::Value jv;
|
||||
json::Value jv;
|
||||
jv[jss::TransactionType] = jss::VaultDelete;
|
||||
jv[jss::Account] = args.owner.human();
|
||||
jv[sfVaultID] = to_string(args.id);
|
||||
return jv;
|
||||
}
|
||||
|
||||
Json::Value
|
||||
json::Value
|
||||
Vault::deposit(DepositArgs const& args)
|
||||
{
|
||||
Json::Value jv;
|
||||
json::Value jv;
|
||||
jv[jss::TransactionType] = jss::VaultDeposit;
|
||||
jv[jss::Account] = args.depositor.human();
|
||||
jv[sfVaultID] = to_string(args.id);
|
||||
jv[jss::Amount] = to_json(args.amount);
|
||||
jv[jss::Amount] = toJson(args.amount);
|
||||
return jv;
|
||||
}
|
||||
|
||||
Json::Value
|
||||
json::Value
|
||||
Vault::withdraw(WithdrawArgs const& args)
|
||||
{
|
||||
Json::Value jv;
|
||||
json::Value jv;
|
||||
jv[jss::TransactionType] = jss::VaultWithdraw;
|
||||
jv[jss::Account] = args.depositor.human();
|
||||
jv[sfVaultID] = to_string(args.id);
|
||||
jv[jss::Amount] = to_json(args.amount);
|
||||
jv[jss::Amount] = toJson(args.amount);
|
||||
return jv;
|
||||
}
|
||||
|
||||
Json::Value
|
||||
json::Value
|
||||
Vault::clawback(ClawbackArgs const& args)
|
||||
{
|
||||
Json::Value jv;
|
||||
json::Value jv;
|
||||
jv[jss::TransactionType] = jss::VaultClawback;
|
||||
jv[jss::Account] = args.issuer.human();
|
||||
jv[sfVaultID] = to_string(args.id);
|
||||
jv[jss::Holder] = args.holder.human();
|
||||
if (args.amount)
|
||||
jv[jss::Amount] = to_json(*args.amount);
|
||||
jv[jss::Amount] = toJson(*args.amount);
|
||||
return jv;
|
||||
}
|
||||
|
||||
} // namespace jtx
|
||||
} // namespace test
|
||||
} // namespace xrpl
|
||||
} // namespace xrpl::test::jtx
|
||||
|
||||
Reference in New Issue
Block a user