mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-23 20:45:51 +00:00
Miscellaneous refactors and updates (#5590)
- 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.
This commit is contained in:
Ed Hennis
@@ -97,8 +97,8 @@ private:
|
||||
AMM ammAlice(env, alice, USD(20'000), BTC(0.5));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(20'000), BTC(0.5), IOUAmount{100, 0}));
|
||||
BEAST_EXPECT(expectLine(env, alice, USD(0)));
|
||||
BEAST_EXPECT(expectLine(env, alice, BTC(0)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, USD(0)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, BTC(0)));
|
||||
}
|
||||
|
||||
// Require authorization is set, account is authorized
|
||||
@@ -1394,7 +1394,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(11'000), USD(11'000), IOUAmount{11'000'000, 0}));
|
||||
// 30,000 less deposited 1,000
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(29'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(29'000)));
|
||||
// 30,000 less deposited 1,000 and 10 drops tx fee
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env, carol, XRPAmount{29'000'000'000 - baseFee}));
|
||||
@@ -1449,7 +1449,8 @@ private:
|
||||
IOUAmount{1, 7} + newLPTokens));
|
||||
|
||||
// 30,000 less deposited depositUSD
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'000) - depositUSD));
|
||||
BEAST_EXPECT(
|
||||
expectHolding(env, carol, USD(30'000) - depositUSD));
|
||||
// 30,000 less deposited depositXRP and 10 drops tx fee
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env, carol, XRP(30'000) - depositXRP - txfee(env, 1)));
|
||||
@@ -1553,15 +1554,15 @@ private:
|
||||
AMM ammAlice(env, alice, USD(20'000), BTC(0.5));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(20'000), BTC(0.5), IOUAmount{100, 0}));
|
||||
BEAST_EXPECT(expectLine(env, alice, USD(0)));
|
||||
BEAST_EXPECT(expectLine(env, alice, BTC(0)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, USD(0)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, BTC(0)));
|
||||
fund(env, gw, {carol}, {USD(2'000), BTC(0.05)}, Fund::Acct);
|
||||
// no transfer fee on deposit
|
||||
ammAlice.deposit(carol, 10);
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(22'000), BTC(0.55), IOUAmount{110, 0}));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(0)));
|
||||
BEAST_EXPECT(expectLine(env, carol, BTC(0)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(0)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, BTC(0)));
|
||||
}
|
||||
|
||||
// Tiny deposits
|
||||
@@ -2281,7 +2282,7 @@ private:
|
||||
BEAST_EXPECT(
|
||||
ammAlice.expectLPTokens(carol, IOUAmount{1'000'000, 0}));
|
||||
// 30,000 less deposited 1,000
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(29'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(29'000)));
|
||||
// 30,000 less deposited 1,000 and 10 drops tx fee
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env, carol, XRPAmount{29'000'000'000 - baseFee}));
|
||||
@@ -2290,7 +2291,7 @@ private:
|
||||
ammAlice.withdraw(carol, 1'000'000);
|
||||
BEAST_EXPECT(
|
||||
ammAlice.expectLPTokens(carol, IOUAmount(beast::Zero())));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env, carol, XRPAmount{30'000'000'000 - 2 * baseFee}));
|
||||
});
|
||||
@@ -2525,22 +2526,22 @@ private:
|
||||
AMM ammAlice(env, alice, USD(20'000), BTC(0.5));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(20'000), BTC(0.5), IOUAmount{100, 0}));
|
||||
BEAST_EXPECT(expectLine(env, alice, USD(0)));
|
||||
BEAST_EXPECT(expectLine(env, alice, BTC(0)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, USD(0)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, BTC(0)));
|
||||
fund(env, gw, {carol}, {USD(2'000), BTC(0.05)}, Fund::Acct);
|
||||
// no transfer fee on deposit
|
||||
ammAlice.deposit(carol, 10);
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(22'000), BTC(0.55), IOUAmount{110, 0}));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(0)));
|
||||
BEAST_EXPECT(expectLine(env, carol, BTC(0)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(0)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, BTC(0)));
|
||||
// no transfer fee on withdraw
|
||||
ammAlice.withdraw(carol, 10);
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(20'000), BTC(0.5), IOUAmount{100, 0}));
|
||||
BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0, 0}));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(2'000)));
|
||||
BEAST_EXPECT(expectLine(env, carol, BTC(0.05)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(2'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, BTC(0.05)));
|
||||
}
|
||||
|
||||
// Tiny withdraw
|
||||
@@ -3527,7 +3528,7 @@ private:
|
||||
// Alice doesn't have anymore lp tokens
|
||||
env(amm.bid({.account = alice, .bidMin = 500}));
|
||||
BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{500}));
|
||||
BEAST_EXPECT(expectLine(env, alice, STAmount{lpIssue, 0}));
|
||||
BEAST_EXPECT(expectHolding(env, alice, STAmount{lpIssue, 0}));
|
||||
// But trades with the discounted fee since she still owns the slot.
|
||||
// Alice pays 10011 drops in fees
|
||||
env(pay(alice, bob, USD(10)), path(~USD), sendmax(XRP(11)));
|
||||
@@ -3790,7 +3791,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(10'100), USD(10'000), ammAlice.tokens()));
|
||||
// Initial balance 30,000 + 100
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'100)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
|
||||
// Initial balance 30,000 - 100(sendmax) - 10(tx fee)
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
|
||||
@@ -3810,7 +3811,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(10'100), USD(10'000), ammAlice.tokens()));
|
||||
// Initial balance 30,000 + 100
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'100)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
|
||||
// Initial balance 30,000 - 100(sendmax) - 10(tx fee)
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
|
||||
@@ -3831,7 +3832,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(10'100), USD(10'000), ammAlice.tokens()));
|
||||
// Initial balance 30,000 + 100
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'100)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
|
||||
// Initial balance 30,000 - 100(sendmax) - 10(tx fee)
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
|
||||
@@ -3857,7 +3858,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(10'010), USD(10'000), ammAlice.tokens()));
|
||||
// Initial balance 30,000 + 10(limited by limitQuality)
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'010)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'010)));
|
||||
// Initial balance 30,000 - 10(limited by limitQuality) - 10(tx
|
||||
// fee)
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
@@ -3897,7 +3898,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(10'010), USD(10'000), ammAlice.tokens()));
|
||||
// 10USD - 10% transfer fee
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(30'009'09090909091), -11}));
|
||||
@@ -3984,7 +3985,7 @@ private:
|
||||
BEAST_EXPECT(expectOffers(env, alice, 1, {{expectedAmounts}}));
|
||||
}
|
||||
// Initial 30,000 + 100
|
||||
BEAST_EXPECT(expectLine(env, carol, STAmount{USD, 30'100}));
|
||||
BEAST_EXPECT(expectHolding(env, carol, STAmount{USD, 30'100}));
|
||||
// Initial 1,000 - 30082730(AMM pool) - 70798251(offer) - 10(tx fee)
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env,
|
||||
@@ -4027,7 +4028,7 @@ private:
|
||||
STAmount(EUR, UINT64_C(49'98750312422), -11),
|
||||
STAmount(USD, UINT64_C(49'98750312422), -11)}}}));
|
||||
// Initial 30,000 + 99.99999999999
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(30'099'99999999999), -11}));
|
||||
@@ -4061,7 +4062,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(10'100), USD(10'000), ammAlice.tokens()));
|
||||
// Initial 30,000 + 200
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'200)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'200)));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -4069,7 +4070,7 @@ private:
|
||||
XRP(10'100),
|
||||
STAmount(USD, UINT64_C(10'000'00000000001), -11),
|
||||
ammAlice.tokens()));
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount(USD, UINT64_C(30'199'99999999999), -11)));
|
||||
@@ -4104,7 +4105,7 @@ private:
|
||||
env.close();
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(1'050), USD(1'000), ammAlice.tokens()));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(2'200)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(2'200)));
|
||||
BEAST_EXPECT(expectOffers(env, bob, 0));
|
||||
}
|
||||
|
||||
@@ -4118,7 +4119,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(10'100), USD(10'000), ammAlice.tokens()));
|
||||
// Initial 1,000 + 100
|
||||
BEAST_EXPECT(expectLine(env, bob, USD(1'100)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, USD(1'100)));
|
||||
// Initial 30,000 - 100(offer) - 10(tx fee)
|
||||
BEAST_EXPECT(expectLedgerEntryRoot(
|
||||
env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
|
||||
@@ -4145,9 +4146,9 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
GBP(1'100), EUR(1'000), ammAlice.tokens()));
|
||||
// Initial 30,000 - 100(offer) - 25% transfer fee
|
||||
BEAST_EXPECT(expectLine(env, carol, GBP(29'875)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, GBP(29'875)));
|
||||
// Initial 30,000 + 100(offer)
|
||||
BEAST_EXPECT(expectLine(env, carol, EUR(30'100)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, EUR(30'100)));
|
||||
BEAST_EXPECT(expectOffers(env, bob, 0));
|
||||
},
|
||||
{{GBP(1'000), EUR(1'100)}},
|
||||
@@ -4285,12 +4286,12 @@ private:
|
||||
// = 58.825 = ~29941.17
|
||||
// carol bought ~72.93EUR at the cost of ~70.68GBP
|
||||
// the offer is partially consumed
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{GBP, UINT64_C(29'941'16770347333), -11}));
|
||||
// Initial 30,000 + ~49.3(offers = 39.3(AMM) + 10(LOB))
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{EUR, UINT64_C(30'049'31517120716), -11}));
|
||||
@@ -4324,20 +4325,20 @@ private:
|
||||
// = 88.35 = ~29911.64
|
||||
// carol bought ~72.93EUR at the cost of ~70.68GBP
|
||||
// the offer is partially consumed
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{GBP, UINT64_C(29'911'64396400896), -11}));
|
||||
// Initial 30,000 + ~72.93(offers = 62.93(AMM) + 10(LOB))
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{EUR, UINT64_C(30'072'93416277865), -11}));
|
||||
}
|
||||
// Initial 2000 + 10 = 2010
|
||||
BEAST_EXPECT(expectLine(env, bob, GBP(2'010)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, GBP(2'010)));
|
||||
// Initial 2000 - 10 * 1.25 = 1987.5
|
||||
BEAST_EXPECT(expectLine(env, ed, EUR(1'987.5)));
|
||||
BEAST_EXPECT(expectHolding(env, ed, EUR(1'987.5)));
|
||||
},
|
||||
{{GBP(1'000), EUR(1'100)}},
|
||||
0,
|
||||
@@ -4363,8 +4364,8 @@ private:
|
||||
env.close();
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
GBP(1'100), EUR(1'000), ammAlice.tokens()));
|
||||
BEAST_EXPECT(expectLine(env, bob, GBP(75)));
|
||||
BEAST_EXPECT(expectLine(env, carol, EUR(30'080)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, GBP(75)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, EUR(30'080)));
|
||||
},
|
||||
{{GBP(1'000), EUR(1'100)}},
|
||||
0,
|
||||
@@ -4401,12 +4402,12 @@ private:
|
||||
sendmax(CAN(195.3125)),
|
||||
txflags(tfPartialPayment));
|
||||
env.close();
|
||||
BEAST_EXPECT(expectLine(env, bob, CAN(0)));
|
||||
BEAST_EXPECT(expectLine(env, dan, CAN(356.25), GBP(43.75)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, CAN(0)));
|
||||
BEAST_EXPECT(expectHolding(env, dan, CAN(356.25), GBP(43.75)));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
GBP(10'125), EUR(10'000), ammAlice.tokens()));
|
||||
BEAST_EXPECT(expectLine(env, ed, EUR(300), USD(100)));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(80)));
|
||||
BEAST_EXPECT(expectHolding(env, ed, EUR(300), USD(100)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(80)));
|
||||
},
|
||||
{{GBP(10'000), EUR(10'125)}},
|
||||
0,
|
||||
@@ -4523,7 +4524,7 @@ private:
|
||||
BEAST_EXPECT(btc_usd.expectBalances(
|
||||
BTC(10'100), USD(10'000), btc_usd.tokens()));
|
||||
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(300)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(300)));
|
||||
}
|
||||
|
||||
// Dependent AMM
|
||||
@@ -4594,7 +4595,7 @@ private:
|
||||
STAmount{EUR, UINT64_C(10'917'2945958102), -10},
|
||||
eth_eur.tokens()));
|
||||
}
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(300)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(300)));
|
||||
}
|
||||
|
||||
// AMM offers limit
|
||||
@@ -4620,7 +4621,7 @@ private:
|
||||
XRP(10'030),
|
||||
STAmount{USD, UINT64_C(9'970'089730807577), -12},
|
||||
ammAlice.tokens()));
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(30'029'91026919241), -11}));
|
||||
@@ -4631,7 +4632,7 @@ private:
|
||||
XRP(10'030),
|
||||
STAmount{USD, UINT64_C(9'970'089730807827), -12},
|
||||
ammAlice.tokens()));
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(30'029'91026919217), -11}));
|
||||
@@ -4663,14 +4664,14 @@ private:
|
||||
if (!features[fixAMMv1_1])
|
||||
{
|
||||
// Carol gets ~100USD
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(30'099'99999999999), -11}));
|
||||
}
|
||||
else
|
||||
{
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'100)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
|
||||
}
|
||||
BEAST_EXPECT(expectOffers(
|
||||
env,
|
||||
@@ -4717,7 +4718,7 @@ private:
|
||||
1,
|
||||
{{{XRPAmount{50'074'628},
|
||||
STAmount{USD, UINT64_C(50'07512950697), -11}}}}));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'100)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4809,11 +4810,11 @@ private:
|
||||
env(offer(carol, STAmount{token2, 100}, STAmount{token1, 100}));
|
||||
env.close();
|
||||
BEAST_EXPECT(
|
||||
expectLine(env, alice, STAmount{token1, 10'000'100}) &&
|
||||
expectLine(env, alice, STAmount{token2, 9'999'900}));
|
||||
expectHolding(env, alice, STAmount{token1, 10'000'100}) &&
|
||||
expectHolding(env, alice, STAmount{token2, 9'999'900}));
|
||||
BEAST_EXPECT(
|
||||
expectLine(env, carol, STAmount{token2, 1'000'100}) &&
|
||||
expectLine(env, carol, STAmount{token1, 999'900}));
|
||||
expectHolding(env, carol, STAmount{token2, 1'000'100}) &&
|
||||
expectHolding(env, carol, STAmount{token1, 999'900}));
|
||||
BEAST_EXPECT(
|
||||
expectOffers(env, alice, 0) && expectOffers(env, carol, 0));
|
||||
});
|
||||
@@ -5034,7 +5035,7 @@ private:
|
||||
BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1'000}));
|
||||
ammAlice.withdrawAll(carol, USD(3'000));
|
||||
BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
|
||||
// Set fee to 1%
|
||||
ammAlice.vote(alice, 1'000);
|
||||
BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
|
||||
@@ -5043,12 +5044,12 @@ private:
|
||||
ammAlice.deposit(carol, USD(3'000));
|
||||
BEAST_EXPECT(ammAlice.expectLPTokens(
|
||||
carol, IOUAmount{994'981155689671, -12}));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(27'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(27'000)));
|
||||
// Set fee to 0
|
||||
ammAlice.vote(alice, 0);
|
||||
ammAlice.withdrawAll(carol, USD(0));
|
||||
// Carol gets back less than the original deposit
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(29'994'96220068281), -11}));
|
||||
@@ -5109,13 +5110,13 @@ private:
|
||||
ammAlice.deposit(carol, USD(3'000));
|
||||
|
||||
BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1'000}));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(27'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(27'000)));
|
||||
// Set fee to 1%
|
||||
ammAlice.vote(alice, 1'000);
|
||||
BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
|
||||
// Single withdrawal. Carol gets ~5USD less than deposited.
|
||||
ammAlice.withdrawAll(carol, USD(0));
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(29'994'97487437186), -11}));
|
||||
@@ -5189,9 +5190,9 @@ private:
|
||||
{USD(1'000), EUR(1'000)},
|
||||
Fund::Acct);
|
||||
// Alice contributed 1010EUR and 1000USD to the pool
|
||||
BEAST_EXPECT(expectLine(env, alice, EUR(28'990)));
|
||||
BEAST_EXPECT(expectLine(env, alice, USD(29'000)));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, EUR(28'990)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, USD(29'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
|
||||
// Carol pays to Alice with no fee
|
||||
env(pay(carol, alice, EUR(10)),
|
||||
path(~EUR),
|
||||
@@ -5199,9 +5200,9 @@ private:
|
||||
txflags(tfNoRippleDirect));
|
||||
env.close();
|
||||
// Alice has 10EUR more and Carol has 10USD less
|
||||
BEAST_EXPECT(expectLine(env, alice, EUR(29'000)));
|
||||
BEAST_EXPECT(expectLine(env, alice, USD(29'000)));
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(29'990)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, EUR(29'000)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, USD(29'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(29'990)));
|
||||
|
||||
// Set fee to 1%
|
||||
ammAlice.vote(alice, 1'000);
|
||||
@@ -5213,10 +5214,10 @@ private:
|
||||
txflags(tfNoRippleDirect));
|
||||
env.close();
|
||||
// Bob sends 10.1~EUR to pay 10USD
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env, bob, STAmount{EUR, UINT64_C(989'8989898989899), -13}));
|
||||
// Carol got 10USD
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(1'000),
|
||||
STAmount{EUR, UINT64_C(1'010'10101010101), -11},
|
||||
@@ -5233,8 +5234,8 @@ private:
|
||||
// No fee
|
||||
env(offer(carol, EUR(10), USD(10)));
|
||||
env.close();
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(29'990)));
|
||||
BEAST_EXPECT(expectLine(env, carol, EUR(30'010)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(29'990)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, EUR(30'010)));
|
||||
// Change pool composition back
|
||||
env(offer(carol, USD(10), EUR(10)));
|
||||
env.close();
|
||||
@@ -5245,11 +5246,11 @@ private:
|
||||
env.close();
|
||||
// Alice gets fewer ~4.97EUR for ~5.02USD, the difference goes
|
||||
// to the pool
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(29'995'02512562814), -11}));
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{EUR, UINT64_C(30'004'97487437186), -11}));
|
||||
@@ -5299,16 +5300,16 @@ private:
|
||||
path(~USD),
|
||||
sendmax(EUR(15)),
|
||||
txflags(tfNoRippleDirect));
|
||||
BEAST_EXPECT(expectLine(env, ed, USD(2'010)));
|
||||
BEAST_EXPECT(expectHolding(env, ed, USD(2'010)));
|
||||
if (!features[fixAMMv1_1])
|
||||
{
|
||||
BEAST_EXPECT(expectLine(env, bob, EUR(1'990)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, EUR(1'990)));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(1'000), EUR(1'005), ammAlice.tokens()));
|
||||
}
|
||||
else
|
||||
{
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env, bob, STAmount(EUR, UINT64_C(1989'999999999999), -12)));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(1'000),
|
||||
@@ -5336,10 +5337,10 @@ private:
|
||||
path(~USD),
|
||||
sendmax(EUR(15)),
|
||||
txflags(tfNoRippleDirect));
|
||||
BEAST_EXPECT(expectLine(env, ed, USD(2'010)));
|
||||
BEAST_EXPECT(expectHolding(env, ed, USD(2'010)));
|
||||
if (!features[fixAMMv1_1])
|
||||
{
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
bob,
|
||||
STAmount{EUR, UINT64_C(1'989'987453007618), -12}));
|
||||
@@ -5350,7 +5351,7 @@ private:
|
||||
}
|
||||
else
|
||||
{
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
bob,
|
||||
STAmount{EUR, UINT64_C(1'989'987453007628), -12}));
|
||||
@@ -5381,8 +5382,8 @@ private:
|
||||
path(~USD),
|
||||
sendmax(EUR(15)),
|
||||
txflags(tfNoRippleDirect));
|
||||
BEAST_EXPECT(expectLine(env, ed, USD(2'010)));
|
||||
BEAST_EXPECT(expectLine(env, bob, EUR(1'990)));
|
||||
BEAST_EXPECT(expectHolding(env, ed, USD(2'010)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, EUR(1'990)));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(1'005), EUR(1'000), ammAlice.tokens()));
|
||||
BEAST_EXPECT(expectOffers(env, carol, 0));
|
||||
@@ -5408,8 +5409,8 @@ private:
|
||||
path(~USD),
|
||||
sendmax(EUR(15)),
|
||||
txflags(tfNoRippleDirect));
|
||||
BEAST_EXPECT(expectLine(env, ed, USD(2'010)));
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(env, ed, USD(2'010)));
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env, bob, STAmount{EUR, UINT64_C(1'989'993923296712), -12}));
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
USD(1'004),
|
||||
@@ -5480,47 +5481,47 @@ private:
|
||||
else
|
||||
BEAST_EXPECT(ammAlice.expectBalances(
|
||||
XRP(10'000), USD(10'000), IOUAmount{10'000'000}));
|
||||
BEAST_EXPECT(expectLine(env, ben, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectLine(env, simon, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectLine(env, chris, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectLine(env, dan, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectHolding(env, ben, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectHolding(env, simon, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectHolding(env, chris, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectHolding(env, dan, USD(1'500'000)));
|
||||
if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
carol,
|
||||
STAmount{USD, UINT64_C(30'000'00000000001), -11}));
|
||||
else if (features[fixAMMv1_1] && !features[fixAMMv1_3])
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
|
||||
else
|
||||
BEAST_EXPECT(expectLine(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(expectLine(env, ed, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectLine(env, paul, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
|
||||
BEAST_EXPECT(expectHolding(env, ed, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectHolding(env, paul, USD(1'500'000)));
|
||||
if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
nataly,
|
||||
STAmount{USD, UINT64_C(1'500'000'000000002), -9}));
|
||||
else if (features[fixAMMv1_1] && !features[fixAMMv1_3])
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
nataly,
|
||||
STAmount{USD, UINT64_C(1'500'000'000000005), -9}));
|
||||
else
|
||||
BEAST_EXPECT(expectLine(env, nataly, USD(1'500'000)));
|
||||
BEAST_EXPECT(expectHolding(env, nataly, USD(1'500'000)));
|
||||
ammAlice.withdrawAll(alice);
|
||||
BEAST_EXPECT(!ammAlice.ammExists());
|
||||
if (!features[fixAMMv1_1])
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
alice,
|
||||
STAmount{USD, UINT64_C(30'000'0000000013), -10}));
|
||||
else if (features[fixAMMv1_3])
|
||||
BEAST_EXPECT(expectLine(
|
||||
BEAST_EXPECT(expectHolding(
|
||||
env,
|
||||
alice,
|
||||
STAmount{USD, UINT64_C(30'000'0000000003), -10}));
|
||||
else
|
||||
BEAST_EXPECT(expectLine(env, alice, USD(30'000)));
|
||||
BEAST_EXPECT(expectHolding(env, alice, USD(30'000)));
|
||||
// alice XRP balance is 30,000initial - 50 ammcreate fee -
|
||||
// 10drops fee
|
||||
BEAST_EXPECT(
|
||||
@@ -5883,7 +5884,7 @@ private:
|
||||
BEAST_EXPECT(amm->expectBalances(
|
||||
USD(1'000), ETH(1'000), amm->tokens()));
|
||||
}
|
||||
BEAST_EXPECT(expectLine(env, bob, USD(2'100)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, USD(2'100)));
|
||||
q[i] = Quality(Amounts{
|
||||
ETH(2'000) - env.balance(carol, ETH),
|
||||
env.balance(bob, USD) - USD(2'000)});
|
||||
@@ -6056,7 +6057,7 @@ private:
|
||||
-13}}}}));
|
||||
}
|
||||
}
|
||||
BEAST_EXPECT(expectLine(env, bob, USD(2'100)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, USD(2'100)));
|
||||
q[i] = Quality(Amounts{
|
||||
ETH(2'000) - env.balance(carol, ETH),
|
||||
env.balance(bob, USD) - USD(2'000)});
|
||||
@@ -6203,7 +6204,7 @@ private:
|
||||
sendmax(ETH(600)));
|
||||
env.close();
|
||||
|
||||
BEAST_EXPECT(expectLine(env, bob, USD(2'100)));
|
||||
BEAST_EXPECT(expectHolding(env, bob, USD(2'100)));
|
||||
|
||||
if (i == 2 && !features[fixAMMv1_1])
|
||||
{
|
||||
@@ -7484,7 +7485,7 @@ private:
|
||||
using namespace test::jtx;
|
||||
|
||||
auto const testCase = [&](std::string suffix, FeatureBitset features) {
|
||||
testcase("Failed pseudo-account allocation " + suffix);
|
||||
testcase("Fail pseudo-account allocation " + suffix);
|
||||
std::string logs;
|
||||
Env env{*this, features, std::make_unique<CaptureLogs>(&logs)};
|
||||
env.fund(XRP(30'000), gw, alice);
|
||||
|
||||
Reference in New Issue
Block a user