Merge branch 'develop' into ripple/wasmi

* Use conan repo for wasmi lib
* Generate lockfile

CMakeLists.txt

@@ -93,6 +93,7 @@ find_package(OpenSSL REQUIRED)
 find_package(secp256k1 REQUIRED)
 find_package(SOCI REQUIRED)
 find_package(SQLite3 REQUIRED)
+find_package(wasmi REQUIRED)
 find_package(xxHash REQUIRED)
 
 target_link_libraries(

cmake/XrplCore.cmake

@@ -67,6 +67,7 @@ target_link_libraries(
         Xrpl::opts
         Xrpl::syslibs
         secp256k1::secp256k1
+        wasmi::wasmi
         xrpl.libpb
         xxHash::xxhash
         $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>

conan.lock

@@ -3,6 +3,7 @@
     "requires": [
         "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1765850150.075",
         "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1765850149.987",
+        "wasmi/1.0.6#407c9db14601a8af1c7dd3b388f3e4cd%1768164779.349",
         "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1765850149.926",
         "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1765850149.46",
         "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1765850147.878",

conanfile.py

@@ -35,6 +35,7 @@ class Xrpl(ConanFile):
         "openssl/3.5.5",
         "secp256k1/0.7.1",
         "soci/4.0.3",
+        "wasmi/1.0.6",
         "zlib/1.3.1",
     ]
 
@@ -215,6 +216,7 @@ class Xrpl(ConanFile):
             "soci::soci",
             "secp256k1::secp256k1",
             "sqlite3::sqlite",
+            "wasmi::wasmi",
             "xxhash::xxhash",
             "zlib::zlib",
         ]

cspell.config.yaml

@@ -214,6 +214,7 @@ words:
   - ripdtop
   - rippleci
   - rippled
+  - ripplerpc
   - rippletest
   - RLUSD
   - rngfill
@@ -292,6 +293,7 @@ words:
   - venv
   - vfalco
   - vinnie
+  - wasmi
   - wextra
   - wptr
   - writeme

include/xrpl/protocol/jss.h

@@ -531,6 +531,7 @@ JSS(response);                // websocket
 JSS(result);                  // RPC
 JSS(ripple_lines);            // out: NetworkOPs
 JSS(ripple_state);            // in: LedgerEntr
+JSS(ripplerpc);               // ripple RPC version
 JSS(role);                    // out: Ping.cpp
 JSS(rpc);
 JSS(rt_accounts);             // in: Subscribe, Unsubscribe

src/test/app/Offer_test.cpp

@@ -2105,6 +2105,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jrr.isMember(jss::jsonrpc) && jrr[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jrr.isMember(jss::ripplerpc) && jrr[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jrr.isMember(jss::id) && jrr[jss::id] == 5);
         }
 

src/test/jtx/impl/JSONRPCClient.cpp

@@ -107,6 +107,7 @@ public:
             if (rpc_version_ == 2)
             {
                 jr[jss::jsonrpc] = "2.0";
+                jr[jss::ripplerpc] = "2.0";
                 jr[jss::id] = 5;
             }
             if (params)

src/test/jtx/impl/WSClient.cpp

@@ -174,6 +174,7 @@ public:
             {
                 jp[jss::method] = cmd;
                 jp[jss::jsonrpc] = "2.0";
+                jp[jss::ripplerpc] = "2.0";
                 jp[jss::id] = 5;
             }
             else

src/test/jtx/impl/utility.cpp

@@ -82,6 +82,8 @@ cmdToJSONRPC(std::vector<std::string> const& args, beast::Journal j, unsigned in
     }
     if (paramsObj.isMember(jss::jsonrpc))
         jv[jss::jsonrpc] = paramsObj[jss::jsonrpc];
+    if (paramsObj.isMember(jss::ripplerpc))
+        jv[jss::ripplerpc] = paramsObj[jss::ripplerpc];
     if (paramsObj.isMember(jss::id))
         jv[jss::id] = paramsObj[jss::id];
     return jv;

src/test/rpc/AccountInfo_test.cpp

@@ -335,6 +335,7 @@ public:
 
         auto const withoutSigners = std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
+            "\"ripplerpc\": \"2.0\", "
             "\"id\": 5, "
             "\"method\": \"account_info\", "
             "\"params\": { "
@@ -343,6 +344,7 @@ public:
 
         auto const withSigners = std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
+            "\"ripplerpc\": \"2.0\", "
             "\"id\": 6, "
             "\"method\": \"account_info\", "
             "\"params\": { "
@@ -356,6 +358,7 @@ public:
                 info.isMember(jss::result) && info[jss::result].isMember(jss::account_data));
             BEAST_EXPECT(!info[jss::result][jss::account_data].isMember(jss::signer_lists));
             BEAST_EXPECT(info.isMember(jss::jsonrpc) && info[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(info.isMember(jss::ripplerpc) && info[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(info.isMember(jss::id) && info[jss::id] == 5);
         }
         {
@@ -369,6 +372,7 @@ public:
             BEAST_EXPECT(signerLists.isArray());
             BEAST_EXPECT(signerLists.size() == 0);
             BEAST_EXPECT(info.isMember(jss::jsonrpc) && info[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(info.isMember(jss::ripplerpc) && info[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(info.isMember(jss::id) && info[jss::id] == 6);
         }
         {
@@ -379,6 +383,7 @@ public:
                 info[0u][jss::result].isMember(jss::account_data));
             BEAST_EXPECT(!info[0u][jss::result][jss::account_data].isMember(jss::signer_lists));
             BEAST_EXPECT(info[0u].isMember(jss::jsonrpc) && info[0u][jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(info[0u].isMember(jss::ripplerpc) && info[0u][jss::ripplerpc] == "2.0");
             BEAST_EXPECT(info[0u].isMember(jss::id) && info[0u][jss::id] == 5);
 
             BEAST_EXPECT(
@@ -390,6 +395,7 @@ public:
             BEAST_EXPECT(signerLists.isArray());
             BEAST_EXPECT(signerLists.size() == 0);
             BEAST_EXPECT(info[1u].isMember(jss::jsonrpc) && info[1u][jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(info[1u].isMember(jss::ripplerpc) && info[1u][jss::ripplerpc] == "2.0");
             BEAST_EXPECT(info[1u].isMember(jss::id) && info[1u][jss::id] == 6);
         }
 
@@ -405,6 +411,7 @@ public:
                 info.isMember(jss::result) && info[jss::result].isMember(jss::account_data));
             BEAST_EXPECT(!info[jss::result][jss::account_data].isMember(jss::signer_lists));
             BEAST_EXPECT(info.isMember(jss::jsonrpc) && info[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(info.isMember(jss::ripplerpc) && info[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(info.isMember(jss::id) && info[jss::id] == 5);
         }
         {
@@ -425,6 +432,7 @@ public:
             auto const& entry0 = signerEntries[0u][sfSignerEntry.jsonName];
             BEAST_EXPECT(entry0[sfSignerWeight.jsonName] == 3);
             BEAST_EXPECT(info.isMember(jss::jsonrpc) && info[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(info.isMember(jss::ripplerpc) && info[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(info.isMember(jss::id) && info[jss::id] == 6);
         }
 
@@ -474,6 +482,7 @@ public:
                 BEAST_EXPECT(entry[sfSignerWeight.jsonName] == 1);
             }
             BEAST_EXPECT(info.isMember(jss::jsonrpc) && info[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(info.isMember(jss::ripplerpc) && info[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(info.isMember(jss::id) && info[jss::id] == 6);
         }
     }

src/test/rpc/AccountLines_test.cpp

@@ -685,20 +685,24 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
         }
         {
             // account_lines with no account.
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(
                 lines[jss::error][jss::message] ==
                 RPC::missing_field_error(jss::account)[jss::error_message]);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -708,6 +712,7 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
@@ -715,6 +720,7 @@ public:
                 lines[jss::error][jss::message] ==
                 RPC::make_error(rpcACT_MALFORMED)[jss::error_message]);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         Account const alice{"alice"};
@@ -725,6 +731,7 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
@@ -732,6 +739,7 @@ public:
                 lines[jss::error][jss::message] ==
                 RPC::make_error(rpcACT_NOT_FOUND)[jss::error_message]);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         env.fund(XRP(10000), alice);
@@ -746,12 +754,14 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(lines[jss::result][jss::lines].isArray());
             BEAST_EXPECT(lines[jss::result][jss::lines].size() == 0);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -762,6 +772,7 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
@@ -769,6 +780,7 @@ public:
                 lines[jss::error][jss::message] ==
                 "Invalid field 'ledger_index', not string or number.");
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -779,11 +791,13 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(lines[jss::error][jss::message] == "ledgerNotFound");
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         // Create trust lines to share with alice.
@@ -836,38 +850,44 @@ public:
         BEAST_EXPECT(ledger58Info.seq == 58);
 
         // A re-usable test for historic ledgers.
-        auto testAccountLinesHistory =
-            [this, &env](Account const& account, LedgerHeader const& info, int count) {
-                // Get account_lines by ledger index.
-                Json::Value paramsSeq;
-                paramsSeq[jss::account] = account.human();
-                paramsSeq[jss::ledger_index] = info.seq;
-                Json::Value requestSeq;
-                requestSeq[jss::method] = "account_lines";
-                requestSeq[jss::jsonrpc] = "2.0";
-                requestSeq[jss::id] = 5;
-                requestSeq[jss::params] = paramsSeq;
-                auto const linesSeq = env.rpc("json2", to_string(requestSeq));
-                BEAST_EXPECT(linesSeq[jss::result][jss::lines].isArray());
-                BEAST_EXPECT(linesSeq[jss::result][jss::lines].size() == count);
-                BEAST_EXPECT(linesSeq.isMember(jss::jsonrpc) && linesSeq[jss::jsonrpc] == "2.0");
-                BEAST_EXPECT(linesSeq.isMember(jss::id) && linesSeq[jss::id] == 5);
+        auto testAccountLinesHistory = [this, &env](
+                                           Account const& account,
+                                           LedgerHeader const& info,
+                                           int count) {
+            // Get account_lines by ledger index.
+            Json::Value paramsSeq;
+            paramsSeq[jss::account] = account.human();
+            paramsSeq[jss::ledger_index] = info.seq;
+            Json::Value requestSeq;
+            requestSeq[jss::method] = "account_lines";
+            requestSeq[jss::jsonrpc] = "2.0";
+            requestSeq[jss::ripplerpc] = "2.0";
+            requestSeq[jss::id] = 5;
+            requestSeq[jss::params] = paramsSeq;
+            auto const linesSeq = env.rpc("json2", to_string(requestSeq));
+            BEAST_EXPECT(linesSeq[jss::result][jss::lines].isArray());
+            BEAST_EXPECT(linesSeq[jss::result][jss::lines].size() == count);
+            BEAST_EXPECT(linesSeq.isMember(jss::jsonrpc) && linesSeq[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(linesSeq.isMember(jss::ripplerpc) && linesSeq[jss::ripplerpc] == "2.0");
+            BEAST_EXPECT(linesSeq.isMember(jss::id) && linesSeq[jss::id] == 5);
 
-                // Get account_lines by ledger hash.
-                Json::Value paramsHash;
-                paramsHash[jss::account] = account.human();
-                paramsHash[jss::ledger_hash] = to_string(info.hash);
-                Json::Value requestHash;
-                requestHash[jss::method] = "account_lines";
-                requestHash[jss::jsonrpc] = "2.0";
-                requestHash[jss::id] = 5;
-                requestHash[jss::params] = paramsHash;
-                auto const linesHash = env.rpc("json2", to_string(requestHash));
-                BEAST_EXPECT(linesHash[jss::result][jss::lines].isArray());
-                BEAST_EXPECT(linesHash[jss::result][jss::lines].size() == count);
-                BEAST_EXPECT(linesHash.isMember(jss::jsonrpc) && linesHash[jss::jsonrpc] == "2.0");
-                BEAST_EXPECT(linesHash.isMember(jss::id) && linesHash[jss::id] == 5);
-            };
+            // Get account_lines by ledger hash.
+            Json::Value paramsHash;
+            paramsHash[jss::account] = account.human();
+            paramsHash[jss::ledger_hash] = to_string(info.hash);
+            Json::Value requestHash;
+            requestHash[jss::method] = "account_lines";
+            requestHash[jss::jsonrpc] = "2.0";
+            requestHash[jss::ripplerpc] = "2.0";
+            requestHash[jss::id] = 5;
+            requestHash[jss::params] = paramsHash;
+            auto const linesHash = env.rpc("json2", to_string(requestHash));
+            BEAST_EXPECT(linesHash[jss::result][jss::lines].isArray());
+            BEAST_EXPECT(linesHash[jss::result][jss::lines].size() == count);
+            BEAST_EXPECT(linesHash.isMember(jss::jsonrpc) && linesHash[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(linesHash.isMember(jss::ripplerpc) && linesHash[jss::ripplerpc] == "2.0");
+            BEAST_EXPECT(linesHash.isMember(jss::id) && linesHash[jss::id] == 5);
+        };
 
         // Alice should have no trust lines in ledger 3.
         testAccountLinesHistory(alice, ledger3Info, 0);
@@ -888,6 +908,7 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
@@ -897,6 +918,7 @@ public:
                 "Exactly one of 'ledger_hash' or 'ledger_index' can be "
                 "specified.");
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -906,12 +928,14 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(lines[jss::result][jss::lines].isArray());
             BEAST_EXPECT(lines[jss::result][jss::lines].size() == 52);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -922,12 +946,14 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(lines[jss::result][jss::lines].isArray());
             BEAST_EXPECT(lines[jss::result][jss::lines].size() == 26);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -938,6 +964,7 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
@@ -945,6 +972,7 @@ public:
                 lines[jss::error][jss::message] ==
                 RPC::make_error(rpcACT_MALFORMED)[jss::error_message]);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -955,6 +983,7 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
@@ -962,6 +991,7 @@ public:
                 lines[jss::error][jss::message] ==
                 RPC::expected_field_message(jss::limit, "unsigned integer"));
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -972,12 +1002,14 @@ public:
             Json::Value requestA;
             requestA[jss::method] = "account_lines";
             requestA[jss::jsonrpc] = "2.0";
+            requestA[jss::ripplerpc] = "2.0";
             requestA[jss::id] = 5;
             requestA[jss::params] = paramsA;
             auto const linesA = env.rpc("json2", to_string(requestA));
             BEAST_EXPECT(linesA[jss::result][jss::lines].isArray());
             BEAST_EXPECT(linesA[jss::result][jss::lines].size() == 1);
             BEAST_EXPECT(linesA.isMember(jss::jsonrpc) && linesA[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(linesA.isMember(jss::ripplerpc) && linesA[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(linesA.isMember(jss::id) && linesA[jss::id] == 5);
 
             // Pick up from where the marker left off.  We should get 51.
@@ -988,12 +1020,14 @@ public:
             Json::Value requestB;
             requestB[jss::method] = "account_lines";
             requestB[jss::jsonrpc] = "2.0";
+            requestB[jss::ripplerpc] = "2.0";
             requestB[jss::id] = 5;
             requestB[jss::params] = paramsB;
             auto const linesB = env.rpc("json2", to_string(requestB));
             BEAST_EXPECT(linesB[jss::result][jss::lines].isArray());
             BEAST_EXPECT(linesB[jss::result][jss::lines].size() == 51);
             BEAST_EXPECT(linesB.isMember(jss::jsonrpc) && linesB[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(linesB.isMember(jss::ripplerpc) && linesB[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(linesB.isMember(jss::id) && linesB[jss::id] == 5);
 
             // Go again from where the marker left off, but set a limit of 3.
@@ -1004,12 +1038,14 @@ public:
             Json::Value requestC;
             requestC[jss::method] = "account_lines";
             requestC[jss::jsonrpc] = "2.0";
+            requestC[jss::ripplerpc] = "2.0";
             requestC[jss::id] = 5;
             requestC[jss::params] = paramsC;
             auto const linesC = env.rpc("json2", to_string(requestC));
             BEAST_EXPECT(linesC[jss::result][jss::lines].isArray());
             BEAST_EXPECT(linesC[jss::result][jss::lines].size() == 3);
             BEAST_EXPECT(linesC.isMember(jss::jsonrpc) && linesC[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(linesC.isMember(jss::ripplerpc) && linesC[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(linesC.isMember(jss::id) && linesC[jss::id] == 5);
 
             // Mess with the marker so it becomes bad and check for the error.
@@ -1020,6 +1056,7 @@ public:
             Json::Value requestD;
             requestD[jss::method] = "account_lines";
             requestD[jss::jsonrpc] = "2.0";
+            requestD[jss::ripplerpc] = "2.0";
             requestD[jss::id] = 5;
             requestD[jss::params] = paramsD;
             auto const linesD = env.rpc("json2", to_string(requestD));
@@ -1027,6 +1064,7 @@ public:
                 linesD[jss::error][jss::message] ==
                 RPC::make_error(rpcINVALID_PARAMS)[jss::error_message]);
             BEAST_EXPECT(linesD.isMember(jss::jsonrpc) && linesD[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(linesD.isMember(jss::ripplerpc) && linesD[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(linesD.isMember(jss::id) && linesD[jss::id] == 5);
         }
         {
@@ -1037,6 +1075,7 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
@@ -1044,6 +1083,7 @@ public:
                 lines[jss::error][jss::message] ==
                 RPC::expected_field_message(jss::marker, "string"));
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -1055,6 +1095,7 @@ public:
             Json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
+            request[jss::ripplerpc] = "2.0";
             request[jss::id] = 5;
             request[jss::params] = params;
             auto const lines = env.rpc("json2", to_string(request));
@@ -1064,6 +1105,7 @@ public:
             BEAST_EXPECT(line[jss::no_ripple].asBool() == true);
             BEAST_EXPECT(line[jss::peer_authorized].asBool() == true);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
@@ -1075,6 +1117,7 @@ public:
             Json::Value requestA;
             requestA[jss::method] = "account_lines";
             requestA[jss::jsonrpc] = "2.0";
+            requestA[jss::ripplerpc] = "2.0";
             requestA[jss::id] = 5;
             requestA[jss::params] = paramsA;
             auto const linesA = env.rpc("json2", to_string(requestA));
@@ -1084,6 +1127,7 @@ public:
             BEAST_EXPECT(lineA[jss::no_ripple_peer].asBool() == true);
             BEAST_EXPECT(lineA[jss::authorized].asBool() == true);
             BEAST_EXPECT(linesA.isMember(jss::jsonrpc) && linesA[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(linesA.isMember(jss::ripplerpc) && linesA[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(linesA.isMember(jss::id) && linesA[jss::id] == 5);
 
             // Continue from the returned marker to make sure that works.
@@ -1097,6 +1141,7 @@ public:
             Json::Value requestB;
             requestB[jss::method] = "account_lines";
             requestB[jss::jsonrpc] = "2.0";
+            requestB[jss::ripplerpc] = "2.0";
             requestB[jss::id] = 5;
             requestB[jss::params] = paramsB;
             auto const linesB = env.rpc("json2", to_string(requestB));
@@ -1104,6 +1149,7 @@ public:
             BEAST_EXPECT(linesB[jss::result][jss::lines].size() == 25);
             BEAST_EXPECT(!linesB[jss::result].isMember(jss::marker));
             BEAST_EXPECT(linesB.isMember(jss::jsonrpc) && linesB[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(linesB.isMember(jss::ripplerpc) && linesB[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(linesB.isMember(jss::id) && linesB[jss::id] == 5);
         }
     }
@@ -1164,12 +1210,14 @@ public:
         Json::Value linesBegRequest;
         linesBegRequest[jss::method] = "account_lines";
         linesBegRequest[jss::jsonrpc] = "2.0";
+        linesBegRequest[jss::ripplerpc] = "2.0";
         linesBegRequest[jss::id] = 5;
         linesBegRequest[jss::params] = linesBegParams;
         auto const linesBeg = env.rpc("json2", to_string(linesBegRequest));
         BEAST_EXPECT(linesBeg[jss::result][jss::lines][0u][jss::currency] == "USD");
         BEAST_EXPECT(linesBeg[jss::result].isMember(jss::marker));
         BEAST_EXPECT(linesBeg.isMember(jss::jsonrpc) && linesBeg[jss::jsonrpc] == "2.0");
+        BEAST_EXPECT(linesBeg.isMember(jss::ripplerpc) && linesBeg[jss::ripplerpc] == "2.0");
         BEAST_EXPECT(linesBeg.isMember(jss::id) && linesBeg[jss::id] == 5);
 
         // alice pays 100 USD to cheri.
@@ -1184,6 +1232,7 @@ public:
         Json::Value linesEndRequest;
         linesEndRequest[jss::method] = "account_lines";
         linesEndRequest[jss::jsonrpc] = "2.0";
+        linesEndRequest[jss::ripplerpc] = "2.0";
         linesEndRequest[jss::id] = 5;
         linesEndRequest[jss::params] = linesEndParams;
         auto const linesEnd = env.rpc("json2", to_string(linesEndRequest));
@@ -1191,6 +1240,7 @@ public:
             linesEnd[jss::error][jss::message] ==
             RPC::make_error(rpcINVALID_PARAMS)[jss::error_message]);
         BEAST_EXPECT(linesEnd.isMember(jss::jsonrpc) && linesEnd[jss::jsonrpc] == "2.0");
+        BEAST_EXPECT(linesEnd.isMember(jss::ripplerpc) && linesEnd[jss::ripplerpc] == "2.0");
         BEAST_EXPECT(linesEnd.isMember(jss::id) && linesEnd[jss::id] == 5);
     }
 

src/test/rpc/Book_test.cpp

@@ -66,6 +66,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -103,6 +104,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
     }
@@ -141,6 +143,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -184,6 +187,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
     }
@@ -216,6 +220,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -261,6 +266,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
     }
@@ -300,6 +306,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -357,6 +364,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
     }
@@ -398,6 +406,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -456,6 +465,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
     }
@@ -510,6 +520,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -580,6 +591,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
     }
@@ -623,6 +635,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -696,6 +709,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
     }
@@ -753,6 +767,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -850,6 +865,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
     }
@@ -883,6 +899,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             if (!BEAST_EXPECT(jv[jss::status] == "success"))
@@ -913,6 +930,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
         auto jrr = jv[jss::result];
@@ -956,6 +974,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
         jrr = jv[jss::result];
@@ -979,6 +998,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
         BEAST_EXPECT(jv[jss::status] == "success");

src/test/rpc/DeliveredAmount_test.cpp

@@ -218,6 +218,7 @@ class DeliveredAmount_test : public beast::unit_test::suite
                 if (wsc->version() == 2)
                 {
                     BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                    BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                     BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
                 }
                 BEAST_EXPECT(jv[jss::result][jss::ledger_index] == 3);

src/test/rpc/GatewayBalances_test.cpp

@@ -77,6 +77,7 @@ public:
             if (wsc->version() == 2)
             {
                 expect(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                expect(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 expect(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
 

src/test/rpc/RPCCall_test.cpp

@@ -3006,7 +3006,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      __LINE__,
      {
          "json2",
-         R"({"jsonrpc":"2.0","id":"A1","method":"call_1"})",
+         R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
      RPCCallTestData::no_exception,
      R"({
@@ -3019,8 +3019,10 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "id" : "A1",
          "jsonrpc" : "2.0",
          "method" : "call_1",
+         "ripplerpc" : "2.0"
       }
     ],
+    "ripplerpc" : "2.0"
     })"},
     {"json2: object with nested params.",
      __LINE__,
@@ -3028,6 +3030,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({
         "jsonrpc" : "2.0",
+        "ripplerpc" : "2.0",
         "id" : "A1",
         "method" : "call_1",
         "params" : [{"inner_arg" : "yup"}]
@@ -3047,14 +3050,16 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "id" : "A1",
          "jsonrpc" : "2.0",
          "method" : "call_1",
+         "ripplerpc" : "2.0"
       }
     ],
+    "ripplerpc" : "2.0"
     })"},
     {"json2: minimal array.",
      __LINE__,
      {
          "json2",
-         R"([{"jsonrpc":"2.0","id":"A1","method":"call_1"}])",
+         R"([{"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1"}])",
      },
      RPCCallTestData::no_exception,
      R"({
@@ -3066,7 +3071,8 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "id" : "A1",
             "jsonrpc" : "2.0",
             "method" : "call_1",
-            }
+            "ripplerpc" : "2.0"
+         }
       ]
     ]
     })"},
@@ -3076,6 +3082,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([
         {"jsonrpc":"2.0",
+        "ripplerpc":"2.0",
         "id":"A1",
         "method":"call_1",
         "params" : [{"inner_arg" : "yup"}]}
@@ -3094,7 +3101,8 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "id" : "A1",
             "jsonrpc" : "2.0",
             "method" : "call_1",
-            }
+            "ripplerpc" : "2.0"
+         }
       ]
     ]})"},
     {"json2: too few arguments.",
@@ -3115,7 +3123,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     })"},
     {"json2: too many arguments.",
      __LINE__,
-     {"json2", R"({"jsonrpc":"2.0","id":"A1","method":"call_this"})", "extra"},
+     {"json2", R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_this"})", "extra"},
      RPCCallTestData::no_exception,
      R"({
     "method" : "json2",
@@ -3131,7 +3139,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      __LINE__,
      {
          "json2",
-         R"({"jsonrpc":"2.0","id":"A1","method":"call_1",})",
+         R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1",})",
      },
      RPCCallTestData::no_exception,
      R"({
@@ -3145,14 +3153,16 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "error_message" : "Invalid parameters.",
          "id" : "A1",
          "jsonrpc" : "2.0",
+         "ripplerpc" : "2.0"
       }
     ],
+    "ripplerpc" : "2.0"
     })"},
     {"json2: omit jsonrpc.",
      __LINE__,
      {
          "json2",
-         R"({"id":"A1","method":"call_1"})",
+         R"({"ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
      RPCCallTestData::no_exception,
      R"({
@@ -3164,14 +3174,16 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "error_code" : 31,
          "error_message" : "Invalid parameters.",
          "id" : "A1",
+         "ripplerpc" : "2.0"
       }
     ],
+    "ripplerpc" : "2.0"
     })"},
     {"json2: wrong jsonrpc version.",
      __LINE__,
      {
          "json2",
-         R"({"jsonrpc":"2.1","id":"A1","method":"call_1"})",
+         R"({"jsonrpc":"2.1","ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
      RPCCallTestData::no_exception,
      R"({
@@ -3185,17 +3197,20 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "error_message" : "Invalid parameters.",
          "id" : "A1",
          "jsonrpc" : "2.1",
+         "ripplerpc" : "2.0"
       }
     ],
+    "ripplerpc" : "2.0"
     })"},
-    {"json2: omit id.",
+    {"json2: omit ripplerpc.",
      __LINE__,
      {
          "json2",
-         R"({"jsonrpc":"2.0","method":"call_1"})",
+         R"({"jsonrpc":"2.0","id":"A1","method":"call_1"})",
      },
      RPCCallTestData::no_exception,
      R"({
+    "id" : "A1",
     "jsonrpc" : "2.0",
     "method" : "json2",
     "params" : [
@@ -3203,15 +3218,16 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "error" : "invalidParams",
          "error_code" : 31,
          "error_message" : "Invalid parameters.",
-         "jsonrpc" : "2.0",
+         "id" : "A1",
+         "jsonrpc" : "2.0"
       }
-    ],
+    ]
     })"},
-    {"json2: omit method.",
+    {"json2: wrong ripplerpc version.",
      __LINE__,
      {
          "json2",
-         R"({"jsonrpc":"2.0","id":"A1"})",
+         R"({"jsonrpc":"2.0","ripplerpc":"2.00","id":"A1","method":"call_1"})",
      },
      RPCCallTestData::no_exception,
      R"({
@@ -3225,8 +3241,54 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "error_message" : "Invalid parameters.",
          "id" : "A1",
          "jsonrpc" : "2.0",
+         "ripplerpc" : "2.00"
       }
     ],
+    "ripplerpc" : "2.00"
+    })"},
+    {"json2: omit id.",
+     __LINE__,
+     {
+         "json2",
+         R"({"jsonrpc":"2.0","ripplerpc":"2.0","method":"call_1"})",
+     },
+     RPCCallTestData::no_exception,
+     R"({
+    "jsonrpc" : "2.0",
+    "method" : "json2",
+    "params" : [
+      {
+         "error" : "invalidParams",
+         "error_code" : 31,
+         "error_message" : "Invalid parameters.",
+         "jsonrpc" : "2.0",
+         "ripplerpc" : "2.0"
+      }
+    ],
+   "ripplerpc" : "2.0"
+    })"},
+    {"json2: omit method.",
+     __LINE__,
+     {
+         "json2",
+         R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1"})",
+     },
+     RPCCallTestData::no_exception,
+     R"({
+    "id" : "A1",
+    "jsonrpc" : "2.0",
+    "method" : "json2",
+    "params" : [
+      {
+         "error" : "invalidParams",
+         "error_code" : 31,
+         "error_message" : "Invalid parameters.",
+         "id" : "A1",
+         "jsonrpc" : "2.0",
+         "ripplerpc" : "2.0"
+      }
+    ],
+   "ripplerpc" : "2.0"
     })"},
     {"json2: empty outer array.",
      __LINE__,
@@ -3249,7 +3311,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      __LINE__,
      {
          "json2",
-         R"([{"jsonrpc":"2.0","id":"A1","method":"call_1",[]}])",
+         R"([{"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1",[]}])",
      },
      RPCCallTestData::no_exception,
      R"({
@@ -3268,6 +3330,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([
             {"jsonrpc" : "2.1",
+            "ripplerpc" : "2.0",
             "id" : "A1",
             "method" : "call_1"
             }
@@ -3290,6 +3353,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({
         "jsonrpc" : "2.0",
+        "ripplerpc" : "2.0",
         "id" : "A1",
         "method" : "call_1",
         "params" : true
@@ -3307,8 +3371,10 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "error_message" : "Invalid parameters.",
          "id" : "A1",
          "jsonrpc" : "2.0",
+         "ripplerpc" : "2.0"
       }
    ],
+   "ripplerpc" : "2.0"
     })"},
 
     // ledger

src/test/rpc/RobustTransaction_test.cpp

@@ -31,6 +31,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
         }
@@ -45,6 +46,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::engine_result] == "tefMAX_LEDGER");
@@ -56,6 +58,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::engine_result] == "tefPAST_SEQ");
@@ -66,6 +69,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::engine_result] == "terPRE_SEQ");
@@ -76,6 +80,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::engine_result] == "tesSUCCESS");
@@ -88,6 +93,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result].isMember(jss::ledger_current_index));
@@ -115,6 +121,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -150,6 +157,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::engine_result] == "tesSUCCESS");
@@ -172,6 +180,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
 
@@ -202,6 +211,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::engine_result] == "tesSUCCESS");
@@ -211,6 +221,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result].isMember(jss::ledger_current_index));
@@ -229,6 +240,7 @@ public:
                 if (wsc->version() == 2)
                 {
                     BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                    BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                     BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
                 }
                 BEAST_EXPECT(jv[jss::status] == "success");
@@ -241,6 +253,7 @@ public:
                 if (wsc->version() == 2)
                 {
                     BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                    BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                     BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
                 }
                 BEAST_EXPECT(jv[jss::result].isMember(jss::ledger_current_index));
@@ -261,6 +274,7 @@ public:
                 if (wsc->version() == 2)
                 {
                     BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                    BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                     BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
                 }
                 BEAST_EXPECT(jv[jss::status] == "success");
@@ -279,6 +293,7 @@ public:
                 if (wsc->version() == 2)
                 {
                     BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                    BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                     BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
                 }
                 BEAST_EXPECT(jv[jss::status] == "success");
@@ -291,6 +306,7 @@ public:
                 if (wsc->version() == 2)
                 {
                     BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                    BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                     BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
                 }
                 BEAST_EXPECT(jv[jss::result].isMember(jss::ledger_current_index));
@@ -311,6 +327,7 @@ public:
                 if (wsc->version() == 2)
                 {
                     BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                    BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                     BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
                 }
                 BEAST_EXPECT(jv[jss::status] == "success");
@@ -328,6 +345,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
 
@@ -358,6 +376,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -373,6 +392,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::engine_result] == "tesSUCCESS");
@@ -394,6 +414,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");

src/test/rpc/Subscribe_test.cpp

@@ -38,6 +38,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -67,6 +68,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -102,6 +104,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::result][jss::ledger_index] == 2);
@@ -136,6 +139,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
         BEAST_EXPECT(jv[jss::status] == "success");
@@ -159,6 +163,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -220,6 +225,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -234,6 +240,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -266,6 +273,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
         BEAST_EXPECT(jv[jss::status] == "success");
@@ -295,6 +303,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -341,6 +350,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -363,6 +373,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -373,6 +384,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
         BEAST_EXPECT(jv[jss::status] == "success");
@@ -407,6 +419,7 @@ public:
             if (wsc->version() == 2)
             {
                 BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+                BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
                 BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
             }
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -482,6 +495,7 @@ public:
         if (wsc->version() == 2)
         {
             BEAST_EXPECT(jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0");
+            BEAST_EXPECT(jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(jv.isMember(jss::id) && jv[jss::id] == 5);
         }
         BEAST_EXPECT(jv[jss::status] == "success");

src/test/rpc/Version_test.cpp

@@ -120,11 +120,13 @@ class Version_test : public beast::unit_test::suite
 
         auto const without_api_verion = std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
+            "\"ripplerpc\": \"2.0\", "
             "\"id\": 5, "
             "\"method\": \"version\", "
             "\"params\": {}}";
         auto const with_api_verion = std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
+            "\"ripplerpc\": \"2.0\", "
             "\"id\": 6, "
             "\"method\": \"version\", "
             "\"params\": { "
@@ -151,12 +153,14 @@ class Version_test : public beast::unit_test::suite
         BEAST_EXPECT(env.app().config().BETA_RPC_API);
         auto const without_api_verion = std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
+            "\"ripplerpc\": \"2.0\", "
             "\"id\": 5, "
             "\"method\": \"version\", "
             "\"params\": {}}";
         auto const with_wrong_api_verion =
             std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
+            "\"ripplerpc\": \"2.0\", "
             "\"id\": 6, "
             "\"method\": \"version\", "
             "\"params\": { "

src/xrpld/rpc/detail/RPCCall.cpp

@@ -537,8 +537,9 @@ private:
         }
         if (jv.isObject())
         {
-            if (jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0" && jv.isMember(jss::id) &&
-                jv.isMember(jss::method))
+            if (jv.isMember(jss::jsonrpc) && jv[jss::jsonrpc] == "2.0" &&
+                jv.isMember(jss::ripplerpc) && jv[jss::ripplerpc] == "2.0" &&
+                jv.isMember(jss::id) && jv.isMember(jss::method))
             {
                 if (jv.isMember(jss::params) &&
                     !(jv[jss::params].isNull() || jv[jss::params].isArray() ||
@@ -568,6 +569,7 @@ private:
                         jv1[i.key().asString()] = *i;
                 }
                 jv1[jss::jsonrpc] = jv[jss::jsonrpc];
+                jv1[jss::ripplerpc] = jv[jss::ripplerpc];
                 jv1[jss::id] = jv[jss::id];
                 jv1[jss::method] = jv[jss::method];
                 return jv1;
@@ -583,6 +585,7 @@ private:
                         jv1[j][i.key().asString()] = *i;
                 }
                 jv1[j][jss::jsonrpc] = jv[j][jss::jsonrpc];
+                jv1[j][jss::ripplerpc] = jv[j][jss::ripplerpc];
                 jv1[j][jss::id] = jv[j][jss::id];
                 jv1[j][jss::method] = jv[j][jss::method];
             }
@@ -591,6 +594,8 @@ private:
         auto jv_error = rpcError(rpcINVALID_PARAMS);
         if (jv.isMember(jss::jsonrpc))
             jv_error[jss::jsonrpc] = jv[jss::jsonrpc];
+        if (jv.isMember(jss::ripplerpc))
+            jv_error[jss::ripplerpc] = jv[jss::ripplerpc];
         if (jv.isMember(jss::id))
             jv_error[jss::id] = jv[jss::id];
         return jv_error;

src/xrpld/rpc/detail/ServerHandler.cpp

@@ -409,6 +409,8 @@ ServerHandler::processSession(
                 jr[jss::id] = jv[jss::id];
             if (jv.isMember(jss::jsonrpc))
                 jr[jss::jsonrpc] = jv[jss::jsonrpc];
+            if (jv.isMember(jss::ripplerpc))
+                jr[jss::ripplerpc] = jv[jss::ripplerpc];
             if (jv.isMember(jss::api_version))
                 jr[jss::api_version] = jv[jss::api_version];
 
@@ -503,6 +505,8 @@ ServerHandler::processSession(
         jr[jss::id] = jv[jss::id];
     if (jv.isMember(jss::jsonrpc))
         jr[jss::jsonrpc] = jv[jss::jsonrpc];
+    if (jv.isMember(jss::ripplerpc))
+        jr[jss::ripplerpc] = jv[jss::ripplerpc];
     if (jv.isMember(jss::api_version))
         jr[jss::api_version] = jv[jss::api_version];
 
@@ -769,6 +773,26 @@ ServerHandler::processRequest(
             params = jsonRPC;
         }
 
+        std::string ripplerpc = "1.0";
+        if (params.isMember(jss::ripplerpc))
+        {
+            if (!params[jss::ripplerpc].isString())
+            {
+                usage.charge(Resource::feeMalformedRPC);
+                if (!batch)
+                {
+                    HTTPReply(400, "ripplerpc is not a string", output, rpcJ);
+                    return;
+                }
+
+                Json::Value r = jsonRPC;
+                r[jss::error] = make_json_error(method_not_found, "ripplerpc is not a string");
+                reply.append(r);
+                continue;
+            }
+            ripplerpc = params[jss::ripplerpc].asString();
+        }
+
         /**
          * Clear header-assigned values if not positively identified from a
          * secure_gateway.
@@ -827,24 +851,61 @@ ServerHandler::processRequest(
             result[jss::warning] = jss::load;
 
         Json::Value r(Json::objectValue);
-        if (result.isMember(jss::error))
+        if (ripplerpc >= "2.0")
         {
-            result[jss::status] = jss::error;
-            result["code"] = result[jss::error_code];
-            result["message"] = result[jss::error_message];
-            JLOG(m_journal.debug())
-                << "rpcError: " << result[jss::error] << ": " << result["message"];
-            result.removeMember(jss::error_message);
-            r[jss::error] = std::move(result);
+            if (result.isMember(jss::error))
+            {
+                result[jss::status] = jss::error;
+                result["code"] = result[jss::error_code];
+                result["message"] = result[jss::error_message];
+                result.removeMember(jss::error_message);
+                JLOG(m_journal.debug())
+                    << "rpcError: " << result[jss::error] << ": " << result[jss::error_message];
+                r[jss::error] = std::move(result);
+            }
+            else
+            {
+                result[jss::status] = jss::success;
+                r[jss::result] = std::move(result);
+            }
         }
         else
         {
-            result[jss::status] = jss::success;
+            // Always report "status".  On an error report the request as
+            // received.
+            if (result.isMember(jss::error))
+            {
+                auto rq = params;
+
+                if (rq.isObject())
+                {  // But mask potentially sensitive information.
+                    if (rq.isMember(jss::passphrase.c_str()))
+                        rq[jss::passphrase.c_str()] = "<masked>";
+                    if (rq.isMember(jss::secret.c_str()))
+                        rq[jss::secret.c_str()] = "<masked>";
+                    if (rq.isMember(jss::seed.c_str()))
+                        rq[jss::seed.c_str()] = "<masked>";
+                    if (rq.isMember(jss::seed_hex.c_str()))
+                        rq[jss::seed_hex.c_str()] = "<masked>";
+                }
+
+                result[jss::status] = jss::error;
+                result[jss::request] = rq;
+
+                JLOG(m_journal.debug())
+                    << "rpcError: " << result[jss::error] << ": " << result[jss::error_message];
+            }
+            else
+            {
+                result[jss::status] = jss::success;
+            }
             r[jss::result] = std::move(result);
         }
 
         if (params.isMember(jss::jsonrpc))
             r[jss::jsonrpc] = params[jss::jsonrpc];
+        if (params.isMember(jss::ripplerpc))
+            r[jss::ripplerpc] = params[jss::ripplerpc];
         if (params.isMember(jss::id))
             r[jss::id] = params[jss::id];
         if (batch)
@@ -865,11 +926,18 @@ ServerHandler::processRequest(
 
     // If we're returning an error_code, use that to determine the HTTP status.
     int const httpStatus = [&reply]() {
-        if (reply.isMember(jss::error) && reply[jss::error].isMember(jss::error_code) &&
-            reply[jss::error][jss::error_code].isInt())
+        // This feature is enabled with ripplerpc version 3.0 and above.
+        // Before ripplerpc version 3.0 always return 200.
+        if (reply.isMember(jss::ripplerpc) && reply[jss::ripplerpc].isString() &&
+            reply[jss::ripplerpc].asString() >= "3.0")
         {
-            int const errCode = reply[jss::error][jss::error_code].asInt();
-            return RPC::error_code_http_status(static_cast<error_code_i>(errCode));
+            // If there's an error_code, use that to determine the HTTP Status.
+            if (reply.isMember(jss::error) && reply[jss::error].isMember(jss::error_code) &&
+                reply[jss::error][jss::error_code].isInt())
+            {
+                int const errCode = reply[jss::error][jss::error_code].asInt();
+                return RPC::error_code_http_status(static_cast<error_code_i>(errCode));
+            }
         }
         // Return OK.
         return 200;