ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-21 03:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch sfAssetTotal sfAssetAvailable and sfLossUnrealized to required

Browse Source
This commit is contained in:
Bronek Kozicki
2025-03-25 12:07:24 +00:00
parent ae68a09b06
commit fbe28f6536
3 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/xrpl/protocol/detail/ledger_entries.macro
View File

@@ -475,10 +475,10 @@ LEDGER_ENTRY(ltVAULT, 0x0083, Vault, vault, ({
{sfAccount, soeREQUIRED},
{sfData, soeOPTIONAL},
{sfAsset, soeREQUIRED},
{sfAssetTotal, soeDEFAULT},
{sfAssetAvailable, soeDEFAULT},
{sfAssetTotal, soeREQUIRED},
{sfAssetAvailable, soeREQUIRED},
{sfAssetMaximum, soeDEFAULT},
{sfLossUnrealized, soeDEFAULT},
{sfLossUnrealized, soeREQUIRED},
{sfMPTokenIssuanceID, soeREQUIRED}, // sfShare
{sfWithdrawalPolicy, soeREQUIRED},
// no ShareTotal ever (use MPTIssuance.sfOutstandingAmount)

42
src/test/app/Vault_test.cpp
View File

@@ -31,6 +31,7 @@
#include <xrpl/json/json_forwards.h>
#include <xrpl/protocol/Asset.h>
#include <xrpl/protocol/Feature.h>
#include <xrpl/protocol/Indexes.h>
#include <xrpl/protocol/STAmount.h>
#include <xrpl/protocol/STNumber.h>
#include <xrpl/protocol/TER.h>
@@ -780,7 +781,7 @@ class Vault_test : public beast::unit_test::suite
}
void
testTransactionFees()
testWithIOU()
{
testcase("IOU fees");
Env env{*this};
@@ -802,16 +803,41 @@ class Vault_test : public beast::unit_test::suite
env(tx);
env.close();
AccountID const vaultAccount = [&env, key = keylet.key]() {
auto const [vaultAccount, ownerAccount, mptID] = //
[&env, &owner, key = keylet.key, this]() //
-> std::tuple<AccountID, AccountID, uint192> {
Json::Value jvParams;
jvParams[jss::ledger_index] = jss::validated;
jvParams[jss::vault] = strHex(key);
auto const jvVault =
env.rpc("json", "ledger_entry", to_string(jvParams));
return parseBase58<AccountID>(
jvVault[jss::result][jss::node][jss::Account].asString())
.value();
auto jvVault = env.rpc("json", "ledger_entry", to_string(jvParams));
// Vault pseudo-account
auto const vAcct =
parseBase58<AccountID>(
jvVault[jss::result][jss::node][jss::Account].asString())
.value();
// Owner account
auto const oAcct =
parseBase58<AccountID>(
jvVault[jss::result][jss::node][jss::Owner].asString())
.value();
BEAST_EXPECT(oAcct == owner.id());
// MPTID of the vault shares
auto const strMpt = jvVault[jss::result][jss::node][jss::Share]
[jss::mpt_issuance_id]
.asString();
uint192 mpt;
BEAST_EXPECT(mpt.parseHex(strMpt));
return {vAcct, oAcct, mpt};
}();
BEAST_EXPECT(makeMptID(1, vaultAccount) == mptID);
BEAST_EXPECT(
keylet::vault(ownerAccount, env.seq(owner) - 1).key == keylet.key);
auto const vaultBalance = [&]() -> PrettyAmount {
auto const sle = env.le(keylet::line(vaultAccount, issue));
BEAST_EXPECT(sle != nullptr);
@@ -866,8 +892,8 @@ public:
testCreateFailIOU();
testCreateFailMPT();
testWithMPT();
testWithIOU();
testWithDomainCheck();
testTransactionFees();
}
};

3
src/xrpld/app/tx/detail/VaultCreate.cpp
View File

@@ -187,6 +187,9 @@ VaultCreate::doApply()
vault->at(sfOwner) = ownerId;
vault->at(sfAccount) = pseudoId;
vault->at(sfAsset) = tx[sfAsset];
vault->at(sfAssetTotal) = Number(0);
vault->at(sfAssetAvailable) = Number(0);
vault->at(sfLossUnrealized) = Number(0);
// Leave default values for AssetTotal and AssetAvailable, both zero.
if (auto value = tx[~sfAssetMaximum])
vault->at(sfAssetMaximum) = *value;