mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-04 19:25:51 +00:00
3cbdf818a7
- Added a new Invariant: `ValidPseudoAccounts` which checks that all pseudo-accounts behave consistently through creation and updates, and that no "real" accounts look like pseudo-accounts (which means they don't have a 0 sequence).
- `to_short_string(base_uint)`. Like `to_string`, but only returns the first 8 characters. (Similar to how a git commit ID can be abbreviated.) Used as a wrapped sink to prefix most transaction-related messages. More can be added later.
- `XRPL_ASSERT_PARTS`. Convenience wrapper for `XRPL_ASSERT`, which takes the `function` and `description` as separate parameters.
- `SField::sMD_PseudoAccount`. Metadata option for `SField` definitions to indicate that the field, if set in an `AccountRoot` indicates that account is a pseudo-account. Removes the need for hard-coded field lists all over the place. Added the flag to `AMMID` and `VaultID`.
- Added functionality to `SField` ctor to detect both code and name collisions using asserts. And require all SFields to have a name
- Convenience type aliases `STLedgerEntry::const_pointer` and `STLedgerEntry::const_ref`. (`SLE` is an alias to `STLedgerEntry`.)
- Generalized `feeunit.h` (`TaggedFee`) into `unit.h` (`ValueUnit`) and added new "BIPS"-related tags for future use. Also refactored the type restrictions to use Concepts.
- Restructured `transactions.macro` to do two big things
1. Include the `#include` directives for transactor header files directly in the macro file. Removes the need to update `applySteps.cpp` and the resulting conflicts.
2. Added a `privileges` parameter to the `TRANSACTION` macro, which specifies some of the operations a transaction is allowed to do. These `privileges` are enforced by invariant checks. Again, removed the need to update scattered lists of transaction types in various checks.
- Unit tests:
1. Moved more helper functions into `TestHelpers.h` and `.cpp`.
2. Cleaned up the namespaces to prevent / mitigate random collisions and ambiguous symbols, particularly in unity builds.
3. Generalized `Env::balance` to add support for `MPTIssue` and `Asset`.
4. Added a set of helper classes to simplify `Env` transaction parameter classes: `JTxField`, `JTxFieldWrapper`, and a bunch of classes derived or aliased from it. For an example of how awesome it is, check the changes `src/test/jtx/escrow.h` for how much simpler the definitions are for `finish_time`, `cancel_time`, `condition`, and `fulfillment`.
5. Generalized several of the amount-related helper classes to understand `Asset`s.
6. `env.balance` for an MPT issuer will return a negative number (or 0) for consistency with IOUs.
133 lines
3.6 KiB
C++
133 lines
3.6 KiB
C++
//------------------------------------------------------------------------------
|
|
/*
|
|
This file is part of rippled: https://github.com/ripple/rippled
|
|
Copyright (c) 2012, 2013 Ripple Labs Inc.
|
|
|
|
Permission to use, copy, modify, and/or distribute this software for any
|
|
purpose with or without fee is hereby granted, provided that the above
|
|
copyright notice and this permission notice appear in all copies.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
//==============================================================================
|
|
|
|
#ifndef RIPPLE_PROTOCOL_STLEDGERENTRY_H_INCLUDED
|
|
#define RIPPLE_PROTOCOL_STLEDGERENTRY_H_INCLUDED
|
|
|
|
#include <xrpl/protocol/Indexes.h>
|
|
#include <xrpl/protocol/STObject.h>
|
|
|
|
namespace ripple {
|
|
|
|
class Rules;
|
|
namespace test {
|
|
class Invariants_test;
|
|
}
|
|
|
|
class STLedgerEntry final : public STObject, public CountedObject<STLedgerEntry>
|
|
{
|
|
uint256 key_;
|
|
LedgerEntryType type_;
|
|
|
|
public:
|
|
using pointer = std::shared_ptr<STLedgerEntry>;
|
|
using ref = std::shared_ptr<STLedgerEntry> const&;
|
|
using const_pointer = std::shared_ptr<STLedgerEntry const>;
|
|
using const_ref = std::shared_ptr<STLedgerEntry const> const&;
|
|
|
|
/** Create an empty object with the given key and type. */
|
|
explicit STLedgerEntry(Keylet const& k);
|
|
STLedgerEntry(LedgerEntryType type, uint256 const& key);
|
|
STLedgerEntry(SerialIter& sit, uint256 const& index);
|
|
STLedgerEntry(SerialIter&& sit, uint256 const& index);
|
|
STLedgerEntry(STObject const& object, uint256 const& index);
|
|
|
|
SerializedTypeID
|
|
getSType() const override;
|
|
|
|
std::string
|
|
getFullText() const override;
|
|
|
|
std::string
|
|
getText() const override;
|
|
|
|
Json::Value
|
|
getJson(JsonOptions options = JsonOptions::none) const override;
|
|
|
|
/** Returns the 'key' (or 'index') of this item.
|
|
The key identifies this entry's position in
|
|
the SHAMap associative container.
|
|
*/
|
|
uint256 const&
|
|
key() const;
|
|
|
|
LedgerEntryType
|
|
getType() const;
|
|
|
|
// is this a ledger entry that can be threaded
|
|
bool
|
|
isThreadedType(Rules const& rules) const;
|
|
|
|
bool
|
|
thread(
|
|
uint256 const& txID,
|
|
std::uint32_t ledgerSeq,
|
|
uint256& prevTxID,
|
|
std::uint32_t& prevLedgerID);
|
|
|
|
private:
|
|
/* Make STObject comply with the template for this SLE type
|
|
Can throw
|
|
*/
|
|
void
|
|
setSLEType();
|
|
|
|
friend test::Invariants_test; // this test wants access to the private
|
|
// type_
|
|
|
|
STBase*
|
|
copy(std::size_t n, void* buf) const override;
|
|
STBase*
|
|
move(std::size_t n, void* buf) override;
|
|
|
|
friend class detail::STVar;
|
|
};
|
|
|
|
using SLE = STLedgerEntry;
|
|
|
|
inline STLedgerEntry::STLedgerEntry(LedgerEntryType type, uint256 const& key)
|
|
: STLedgerEntry(Keylet(type, key))
|
|
{
|
|
}
|
|
|
|
inline STLedgerEntry::STLedgerEntry(SerialIter&& sit, uint256 const& index)
|
|
: STLedgerEntry(sit, index)
|
|
{
|
|
}
|
|
|
|
/** Returns the 'key' (or 'index') of this item.
|
|
The key identifies this entry's position in
|
|
the SHAMap associative container.
|
|
*/
|
|
inline uint256 const&
|
|
STLedgerEntry::key() const
|
|
{
|
|
return key_;
|
|
}
|
|
|
|
inline LedgerEntryType
|
|
STLedgerEntry::getType() const
|
|
{
|
|
return type_;
|
|
}
|
|
|
|
} // namespace ripple
|
|
|
|
#endif
|