Added Error messages on Gateway_Balance and Channel_Authorize

src/ripple/rpc/handlers/GatewayBalances.cpp

@@ -78,6 +78,12 @@ doGatewayBalances(RPC::JsonContext& context)
 
     result[jss::account] = toBase58(accountID);
 
+    if (!ledger->exists(keylet::account(accountID)) && context.apiVersion > 1)
+    {
+        RPC::inject_error(rpcACT_NOT_FOUND, result);
+        return result;
+    }
+
     // Parse the specified hotwallet(s), if any
     std::set<AccountID> hotWallets;
 

src/ripple/rpc/handlers/PayChanClaim.cpp

@@ -55,7 +55,7 @@ doChannelAuthorize(RPC::JsonContext& context)
         return RPC::missing_field_error(jss::secret);
 
     Json::Value result;
-    auto const [pk, sk] = RPC::keypairForSignature(params, result);
+    auto const [pk, sk] = RPC::keypairForSignature(params, result, context);
     if (RPC::contains_error(result))
         return result;
 

src/ripple/rpc/impl/RPCHelpers.cpp

@@ -846,7 +846,10 @@ getSeedFromRPC(Json::Value const& params, Json::Value& error)
 }
 
 std::pair<PublicKey, SecretKey>
-keypairForSignature(Json::Value const& params, Json::Value& error)
+keypairForSignature(
+    Json::Value const& params,
+    Json::Value& error,
+    std::optional<std::reference_wrapper<JsonContext>> context)
 {
     bool const has_key_type = params.isMember(jss::key_type);
 
@@ -900,7 +903,14 @@ keypairForSignature(Json::Value const& params, Json::Value& error)
 
         if (!keyType)
         {
-            error = RPC::invalid_field_error(jss::key_type);
+            if (context.has_value() && context.value().get().apiVersion > 1)
+            {
+                error = RPC::make_error(rpcBAD_KEY_TYPE);
+            }
+            else
+            {
+                error = RPC::invalid_field_error(jss::key_type);
+            }
             return {};
         }
 

src/ripple/rpc/impl/RPCHelpers.h

@@ -207,7 +207,10 @@ std::optional<Seed>
 parseRippleLibSeed(Json::Value const& params);
 
 std::pair<PublicKey, SecretKey>
-keypairForSignature(Json::Value const& params, Json::Value& error);
+keypairForSignature(
+    Json::Value const& params,
+    Json::Value& error,
+    std::optional<std::reference_wrapper<JsonContext>> context = std::nullopt);
 
 /**
  * API version numbers used in API version 1

src/test/app/PayChan_test.cpp

@@ -1160,6 +1160,47 @@ struct PayChan_test : public beast::unit_test::suite
             bob.human());
     }
 
+    void
+    testAccountChannelAuthorizeApiV2(FeatureBitset features)
+    {
+        testcase("PayChan Channel_Auth RPC Api V2");
+        using namespace jtx;
+        using namespace std::literals::chrono_literals;
+
+        Env env{
+            *this,
+            envconfig([](std::unique_ptr<Config> c) {
+                c->loadFromString("\n[beta_rpc_api]\n1\n");
+                return c;
+            }),
+            features};
+        auto const alice = Account("alice");
+        auto const bob = Account("bob");
+        auto const charlie = Account("charlie", KeyType::ed25519);
+        env.fund(XRP(10000), alice, bob, charlie);
+        auto const pk = alice.pk();
+        auto const settleDelay = 3600s;
+        auto const channelFunds = XRP(1000);
+        auto const chan1Str = to_string(channel(alice, bob, env.seq(alice)));
+        env(create(alice, bob, channelFunds, settleDelay, pk));
+        env.close();
+
+        // test for api_version 2
+        Json::Value args{Json::objectValue};
+        args[jss::api_version] = 2;
+        {
+            args[jss::channel_id] = chan1Str;
+            args[jss::key_type] = "ed255191";
+            args[jss::seed] = "snHq1rzQoN2qiUkC3XF5RyxBzUtN";
+            args[jss::amount] = 51110000;
+            auto const rs = env.rpc(
+                "json",
+                "channel_authorize",
+                args.toStyledString())[jss::result];
+            BEAST_EXPECT(rs[jss::error] == "badKeyType");
+        }
+    }
+
     void
     testAuthVerifyRPC(FeatureBitset features)
     {
@@ -2139,6 +2180,7 @@ struct PayChan_test : public beast::unit_test::suite
         testAccountChannelsRPC(features);
         testAccountChannelsRPCMarkers(features);
         testAccountChannelsRPCSenderOnly(features);
+        testAccountChannelAuthorizeApiV2(features);
         testAuthVerifyRPC(features);
         testOptionalFields(features);
         testMalformedPK(features);

src/test/rpc/GatewayBalances_test.cpp

@@ -148,6 +148,30 @@ class GatewayBalances_test : public beast::unit_test::suite
         }
     }
 
+    void
+    testGWBApiV2(FeatureBitset features)
+    {
+        using namespace std::chrono_literals;
+        using namespace jtx;
+        Env env{*this, features};
+        env.close();
+
+        // Gateway account and assets
+        Account const alice{"alice"};
+        Account const hw{"hw"};
+        auto wsc = makeWSClient(env.app().config());
+
+        Json::Value qry2;
+        qry2[jss::api_version] = 2;
+        qry2[jss::account] = "rNGQLojaFxTYphuQUJ24QUhyGBUMMbqBMx";
+        qry2[jss::hotwallet] = hw.human();
+        auto jv = wsc->invoke("gateway_balances", qry2);
+        expect(jv[jss::status] == "error");
+
+        auto response = jv[jss::result];
+        expect(response[jss::error] == "actNotFound");
+    }
+
     void
     testGWBOverflow()
     {
@@ -209,6 +233,7 @@ class GatewayBalances_test : public beast::unit_test::suite
         auto const sa = supported_amendments();
         testGWB(sa - featureFlowCross);
         testGWB(sa);
+        testGWBApiV2(sa);
 
         testGWBOverflow();
     }