-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Write proper forAllApiVersions
used in NetworkOPs.cpp
#4833
Conversation
4f95d0f
to
aaa843f
Compare
021bcfc
to
577c160
Compare
e0a1331
to
c4f4981
Compare
Before I dive into the code, can you please share in an English comment (a) what problem this is meant to solve and (b) the general design / intuition of this solution? |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #4833 +/- ##
===========================================
+ Coverage 76.96% 76.97% +0.01%
===========================================
Files 1127 1129 +2
Lines 131768 131858 +90
Branches 39699 39662 -37
===========================================
+ Hits 101417 101503 +86
+ Misses 24494 24475 -19
- Partials 5857 5880 +23 ☔ View full report in Codecov by Sentry. |
@Bronek - any preference on whether this goes in 2.1 or 2.2? Given it is a refactor, I'm not sure if there is some urgency to getting it merged/released. |
@intelliot After 2.1 release is fine. |
from the coverage report:
so basically these gaps are either unavoidable, or old. |
* Price Oracle (XLS-47d): (XRPLF#4789) (XRPLF#4789) Implement native support for Price Oracles. A Price Oracle is used to bring real-world data, such as market prices, onto the blockchain, enabling dApps to access and utilize information that resides outside the blockchain. Add Price Oracle functionality: - OracleSet: create or update the Oracle object - OracleDelete: delete the Oracle object To support this functionality add: - New RPC method, `get_aggregate_price`, to calculate aggregate price for a token pair of the specified oracles - `ltOracle` object The `ltOracle` object maintains: - Oracle Owner's account - Oracle's metadata - Up to ten token pairs with the scaled price - The last update time the token pairs were updated Add Oracle unit-tests * fix compile error on gcc 13: (XRPLF#4932) The compilation fails due to an issue in the initializer list of an optional argument, which holds a vector of pairs. The code compiles correctly on earlier gcc versions, but fails on gcc 13. * Set version to 2.2.0-b1 * Remove default ctors from SecretKey and PublicKey: (XRPLF#4607) * It is now an invariant that all constructed Public Keys are valid, non-empty and contain 33 bytes of data. * Additionally, the memory footprint of the PublicKey class is reduced. The size_ data member is declared as static. * Distinguish and identify the PublisherList retrieved from the local config file, versus the ones obtained from other validators. * Fixes XRPLF#2942 * Fast base58 codec: (XRPLF#4327) This algorithm is about an order of magnitude faster than the existing algorithm (about 10x faster for encoding and about 15x faster for decoding - including the double hash for the checksum). The algorithms use gcc's int128 (fast MS version will have to wait, in the meantime MS falls back to the slow code). * feat: add user version of `feature` RPC (XRPLF#4781) * uses same formatting as admin RPC * hides potentially sensitive data * build: add STCurrency.h to xrpl_core to fix clio build (XRPLF#4939) * Embed patched recipe for RocksDB 6.29.5 (XRPLF#4947) * fix: order book update variable swap: (XRPLF#4890) This is likely the result of a typo when the code was simplified. * Fix workflows (XRPLF#4948) The problem was `CONAN_USERNAME` environment variable, which Conan 1.x uses as the default user in package references. * Upgrade to xxhash 0.8.2 as a Conan requirement, enable SIMD hashing (XRPLF#4893) We are currently using old version 0.6.2 of `xxhash`, as a verbatim copy and paste of its header file `xxhash.h`. Switch to the more recent version 0.8.2. Since this version is in Conan Center (and properly protects its ABI by keeping the state object incomplete), add it as a Conan requirement. Switch to the SIMD instructions (in the new `XXH3` family) supported by the new version. * Update remaining actions (XRPLF#4949) Downgrade {upload,download}-artifact action to v3 because of unreliability with v4. * Install more public headers (XRPLF#4940) Fixes some mistakes in XRPLF#4885 * test: Env unit test RPC errors return a unique result: (XRPLF#4877) * telENV_RPC_FAILED is a new code, reserved exclusively for unit tests when RPC fails. This will make those types of errors distinct and easier to test for when expected and/or diagnose when not. * Output RPC command result when result is not expected. * Fix workflows (XRPLF#4951) - Update container for Doxygen workflow. Matches Linux workflow, with newer GLIBC version required by newer actions. - Fixes macOS workflow to install and configure Conan correctly. Still fails on tests, but that does not seem attributable to the workflow. * perf: improve `account_tx` SQL query: (XRPLF#4955) The witness server makes heavily use of the `account_tx` RPC command. Perf testing showed that the SQL query used by `account_tx` became unacceptably slow when the DB was large and there was a `marker` parameter. The plan for the query showed only indexed reads. This appears to be an issue with the internal SQLite optimizer. This patch rewrote the query to use `UNION` instead of `OR` and significantly improves performance. See RXI-896 and RIPD-1847 for more details. * `fixEmptyDID`: fix amendment to handle empty DID edge case: (XRPLF#4950) This amendment fixes an edge case where an empty DID object can be created. It adds an additional check to ensure that DIDs are non-empty when created, and returns a `tecEMPTY_DID` error if the DID would be empty. * Enforce no duplicate slots from incoming connections: (XRPLF#4944) We do not currently enforce that incoming peer connection does not have remote_endpoint which is already used (either by incoming or outgoing connection), hence already stored in slots_. If we happen to receive a connection from such a duplicate remote_endpoint, it will eventually result in a crash (when disconnecting) or weird behavior (when updating slot state), as a result of an apparently matching remote_endpoint in slots_ being used by a different connection. * Remove zaphod.alloy.ee hub from default server list: (XRPLF#4903) Remove the zaphod.alloy.ee hubs from the bootstrap and default configuration after 5 years. It has been an honor to run these servers, but it is now time for another entity to step into this role. The zaphod servers will be taken offline in a phased manner keeping all those who have peering arrangements informed. These would be the preferred attributes of a boostrap set of hubs: 1. Commitment to run the hubs for a minimum of 2 years 2. Highly available 3. Geographically dispersed 4. Secure and up to date 5. Committed to ensure that peering information is kept private * Write improved `forAllApiVersions` used in NetworkOPs (XRPLF#4833) * Don't reach consensus as quickly if no other proposals seen: (XRPLF#4763) This fixes a case where a peer can desync under a certain timing circumstance--if it reaches a certain point in consensus before it receives proposals. This was noticed under high transaction volumes. Namely, when we arrive at the point of deciding whether consensus is reached after minimum establish phase duration but before having received any proposals. This could be caused by finishing the previous round slightly faster and/or having some delay in receiving proposals. Existing behavior arrives at consensus immediately after the minimum establish duration with no proposals. This causes us to desync because we then close a non-validated ledger. The change in this PR causes us to wait for a configured threshold before making the decision to arrive at consensus with no proposals. This allows validators to catch up and for brief delays in receiving proposals to be absorbed. There should be no drawback since, with no proposals coming in, we needn't be in a huge rush to jump ahead. * fixXChainRewardRounding: round reward shares down: (XRPLF#4933) When calculating reward shares, the amount should always be rounded down. If the `fixUniversalNumber` amendment is not active, this works correctly. If it is not active, then the amount is incorrectly rounded up. This patch introduces an amendment so it will be rounded down. * Remove unused files * Remove packaging scripts * Consolidate external libraries * Simplify protobuf generation * Rename .hpp to .h * Format formerly .hpp files * Rewrite includes $ find src/ripple/ src/test/ -type f -exec sed -i 's:include\s*["<]ripple/\(.*\)\.h\(pp\)\?[">]:include <ripple/\1.h>:' {} + * Fix source lists * Add markers around source lists * fix: improper handling of large synthetic AMM offers: A large synthetic offer was not handled correctly in the payment engine. This patch fixes that issue and introduces a new invariant check while processing synthetic offers. * Set version to 2.1.1 * chore: change Github Action triggers for build/test jobs (XRPLF#4956) Github Actions for the build/test jobs (nix.yml, mac.yml, windows.yml) will only run on branches that build packages (develop, release, master), and branches with names starting with "ci/". This is intended as a compromise between disabling CI jobs on personal forks entirely, and having the jobs run as a free-for-all. Note that it will not affect PR jobs at all. * Address compiler warnings * Fix search for protoc * chore: Default validator-keys-tool to master branch: (XRPLF#4943) * master is the default branch for that project. There's no point in using develop. * Remove unused lambdas from MultiApiJson_test * fix Conan component reference typo * Set version to 2.2.0-b2 * bump version * 2.2.3 * 2.2.4 * 2.2.5 --------- Co-authored-by: Gregory Tsipenyuk <[email protected]> Co-authored-by: seelabs <[email protected]> Co-authored-by: Chenna Keshava B S <[email protected]> Co-authored-by: Mayukha Vadari <[email protected]> Co-authored-by: John Freeman <[email protected]> Co-authored-by: Bronek Kozicki <[email protected]> Co-authored-by: Ed Hennis <[email protected]> Co-authored-by: Olek <[email protected]> Co-authored-by: Alloy Networks <[email protected]> Co-authored-by: Mark Travis <[email protected]> Co-authored-by: Gregory Tsipenyuk <[email protected]>
High Level Overview of Change
We have
forAllApiVersions
in tests, but since #4820 we also need something similar inNetworkOPs.cpp
. Write it properly so we can use it both in prod code and in testsContext of Change
What's
MultiApiJson
and why do we need it (not this PR)Class
MultiApiJson
was added in version 2.0, to enable us to publish JSON data fromNetworkOPs.cpp
(where we handle data subscriptions) to clients supporting different API version - that is, slightly different JSON objects, because of differences between API versions. A lazy (and very wasteful) solution would have been to build new JSON object for each subscription on each update, however that would cause a serious performance degradation. So instead, when sending publications to subscribed clients, I chose to expand on the existing (faster) solution, which is to build JSON once and then publish it to all clients. The trouble is, we need to send subtly different JSON depending on the API version supported by the client - the good news is that there are not that many supported API versions, and hopefully that number will stay low. This is whereMultiApiJson
comes in (technically, it is a specialization ofMultivarJson
). It is a very small (size equals to the number of valid API versions, 3 at this moment) array of distinct JSON objects, which are indexed by API version. All these JSON objects are created as a copy of a single JSON received in the class constructor - which should be the object that's closest to what we want to publish. After construction, each individual copy can be altered to accommodate variations between versions (this is best seen in the body ofNetworkOPsImp::transJson
), or all can be altered at the same time (there's aset
method for this, which is not affected by this PR). The ownership and functions allowing for inspection and alteration of the individual JSON objects is the responsibility ofMultiApiJson
. This PR changes how we can inspect and alter these individual JSON objects.Back to this PR
The purpose of this change is to enable the user of the
MultiApiJson
class to "visit" (that is, execute a piece of code, typically a lambda) a JSON object selected by API version. If the user wants to "visit" all API versions, theMultiApiJson
in this PR is smart enough to know what specific versions that means. The best example is in theNetworkOPsImp::transJson
function, where the following:has changed to:
This came about because a very similar code was also needed in #4820 , inside function
NetworkOPsImp::pubValidation
, and of course, many instances offorAllApiVersions
inside tests. Such uses are likely to increase as we add new API versions. Hence it is important to establish good practice which minimises potential for bugs.The approach adopted in this PR is to:
ripple/rpc/impl/RPCHelpers.h
to a new fileripple/protocol/ApiVersion.h
MultivarJson
for conversion from version to index in the array of JSON objectsMultiApiJson
fromripple/json/MultivarJson.h
toApiVersion.h
; this is where "policy"ApiVersionHelper
(used to specializeMultivarJson
) is definedstd::integral_constant<unsigned, ...>
insideApiVersion.h
forAllApiVersions
(removing equivalent from tests) andforApiVersions
(similar to the previously definedvisit
template) insideApiVersion.h
MultivarJson::select
with a more powerfulMultivarJson::visit
and a helper nested classvisitor_t
The type change of API version from unsigned to
std::integral_constant<unsigned, ...>
has several consequences:NetworkOPsImp::pubValidation
:if constexpr
(instead of branching instruction), as seen inNetworkOPsImp::transJson
unsigned
(inServerHandler.cpp
andRPCHelpers.h
)unsigned
(this could in time change, but the cost in terms of code churn is not worth it, at this time).MultivarJson::visitor_t
has to support both variants of API version selection:std::integral_constant<unsigned, ...>
(which enforces version correctness viastatic_assert
)unsigned
(which enforces version correctness via normalassert
)Additionally, the switch from
select
tovisit
reverses the calling convention used to publish JSON insideNetworkOPs.cpp
, from:to:
As for the complexity of change, the implementation of
MultivarJson::visitor_t
is probably the most challenging, mostly due to the number of defined overloads. The class itself is a stateless niebloid which should make the reasoning about it slightly easier. The number of overloads inside this class also explains the size of unit tests, bothMultivarJson_test.cpp
andApiVersion_test.cpp
.Additionally, the newly added
visit
function insideMultivarJson
has two slightly different meanings depending on the parameters:visitor
object for the lazy execution (wrapped in a tiny lambda to provide the*this
object); this object is next called byforAllApiVersions
etc.visitor
directly, forwarding both*this
and all the provided parameters, for the eager executionI realise that this approach might be foreign to some readers, but I feel it is consistent with the paradigms of functional programming, where function evaluation is lazy when possible and eager when needed.
There is also a small drive-by fix in
LedgerToJson.cpp
where I removed the superfluous(fill.context->apiVersion > 1)
conditional inside the scope ofelse if (fill.context->apiVersion > 1)
section (starting at the line 140).Type of Change
.gitignore
, formatting, dropping support for older tooling)Perf impact not expected
: This does not change any algorithms. The binary will be little different forNetworkOPs
compared to before the change, but not in a way that would change anything perceptible. It gives the compiler slightly more space to apply optimisations when building JSON and when publishing but this is very minor.