Check amendment block status and update with ledgers: #2137
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| //------------------------------------------------------------------------------ | ||
| /* | ||
| This file is part of rippled: https://github.com/ripple/rippled | ||
| Copyright (c) 2017 Ripple Labs Inc. | ||
|
|
||
| Permission to use, copy, modify, and/or distribute this software for any | ||
| purpose with or without fee is hereby granted, provided that the above | ||
| copyright notice and this permission notice appear in all copies. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| */ | ||
| //============================================================================== | ||
|
|
||
| #include <test/jtx.h> | ||
| #include <ripple/protocol/JsonFields.h> | ||
| #include <ripple/app/misc/NetworkOPs.h> | ||
| #include <test/jtx/WSClient.h> | ||
|
|
||
| namespace ripple { | ||
|
|
||
| class AmendmentBlocked_test : public beast::unit_test::suite | ||
| { | ||
| void testBlockedMethods() | ||
| { | ||
| using namespace test::jtx; | ||
| Env env {*this}; | ||
| auto const gw = Account {"gateway"}; | ||
| auto const USD = gw["USD"]; | ||
| auto const alice = Account {"alice"}; | ||
| auto const bob = Account {"bob"}; | ||
| env.fund (XRP(10000), alice, bob, gw); | ||
| env.trust (USD(600), alice); | ||
| env.trust (USD(700), bob); | ||
| env(pay (gw, alice, USD(70))); | ||
| env(pay (gw, bob, USD(50))); | ||
| env.close(); | ||
|
|
||
| auto wsc = test::makeWSClient(env.app().config()); | ||
|
|
||
| auto current = env.current (); | ||
| // ledger_accept | ||
| auto jr = env.rpc ("ledger_accept") [jss::result]; | ||
| BEAST_EXPECT (jr[jss::ledger_current_index] == current->seq ()+1); | ||
|
|
||
| // ledger_current | ||
| jr = env.rpc ("ledger_current") [jss::result]; | ||
| BEAST_EXPECT (jr[jss::ledger_current_index] == current->seq ()+1); | ||
|
|
||
| // owner_info | ||
| jr = env.rpc ("owner_info", alice.human()) [jss::result]; | ||
| BEAST_EXPECT (jr.isMember (jss::accepted) && jr.isMember (jss::current)); | ||
|
|
||
| // path_find | ||
| Json::Value pf_req; | ||
| pf_req[jss::subcommand] = "create"; | ||
| pf_req[jss::source_account] = alice.human(); | ||
| pf_req[jss::destination_account] = bob.human(); | ||
| pf_req[jss::destination_amount] = bob["USD"](20).value ().getJson (0); | ||
| jr = wsc->invoke("path_find", pf_req) [jss::result]; | ||
| BEAST_EXPECT (jr.isMember (jss::alternatives) && | ||
| jr[jss::alternatives].isArray () && | ||
| jr[jss::alternatives].size () == 1); | ||
|
|
||
| // submit | ||
| auto jt = env.jt (noop (alice)); | ||
| Serializer s; | ||
| jt.stx->add (s); | ||
| jr = env.rpc ("submit", strHex (s.slice ())) [jss::result]; | ||
| BEAST_EXPECT (jr.isMember (jss::engine_result) && | ||
| jr[jss::engine_result] == "tesSUCCESS"); | ||
|
|
||
| // submit_multisigned | ||
| env(signers(bob, 1, {{alice, 1}}), sig (bob)); | ||
| Account const ali {"ali", KeyType::secp256k1}; | ||
| env(regkey (alice, ali)); | ||
| env.close(); | ||
|
|
||
| Json::Value set_tx; | ||
| set_tx[jss::Account] = bob.human(); | ||
| set_tx[jss::TransactionType] = "AccountSet"; | ||
| set_tx[jss::Fee] = | ||
| static_cast<uint32_t>(8 * env.current()->fees().base); | ||
| set_tx[jss::Sequence] = env.seq(bob); | ||
| set_tx[jss::SigningPubKey] = ""; | ||
|
|
||
| Json::Value sign_for; | ||
| sign_for[jss::tx_json] = set_tx; | ||
| sign_for[jss::account] = alice.human(); | ||
| sign_for[jss::secret] = ali.name(); | ||
| jr = env.rpc("json", "sign_for", to_string(sign_for)) [jss::result]; | ||
| BEAST_EXPECT(jr[jss::status] == "success"); | ||
|
|
||
| Json::Value ms_req; | ||
| ms_req[jss::tx_json] = jr[jss::tx_json]; | ||
| jr = env.rpc("json", "submit_multisigned", to_string(ms_req)) | ||
| [jss::result]; | ||
| BEAST_EXPECT (jr.isMember (jss::engine_result) && | ||
| jr[jss::engine_result] == "tesSUCCESS"); | ||
|
|
||
| // make the network amendment blocked...now all the same | ||
| // requests should fail | ||
|
|
||
| env.app ().getOPs ().setAmendmentBlocked (); | ||
|
|
||
| // ledger_accept | ||
| jr = env.rpc ("ledger_accept") [jss::result]; | ||
| BEAST_EXPECT( | ||
| jr.isMember (jss::error) && | ||
| jr[jss::error] == "amendmentBlocked"); | ||
| BEAST_EXPECT(jr[jss::status] == "error"); | ||
|
|
||
| // ledger_current | ||
| jr = env.rpc ("ledger_current") [jss::result]; | ||
| BEAST_EXPECT( | ||
| jr.isMember (jss::error) && | ||
| jr[jss::error] == "amendmentBlocked"); | ||
| BEAST_EXPECT(jr[jss::status] == "error"); | ||
|
|
||
| // owner_info | ||
| jr = env.rpc ("owner_info", alice.human()) [jss::result]; | ||
| BEAST_EXPECT( | ||
| jr.isMember (jss::error) && | ||
| jr[jss::error] == "amendmentBlocked"); | ||
| BEAST_EXPECT(jr[jss::status] == "error"); | ||
|
|
||
| // path_find | ||
| jr = wsc->invoke("path_find", pf_req) [jss::result]; | ||
| BEAST_EXPECT( | ||
| jr.isMember (jss::error) && | ||
| jr[jss::error] == "amendmentBlocked"); | ||
| BEAST_EXPECT(jr[jss::status] == "error"); | ||
|
|
||
| // submit | ||
| jr = env.rpc("submit", strHex(s.slice())) [jss::result]; | ||
| BEAST_EXPECT( | ||
| jr.isMember (jss::error) && | ||
| jr[jss::error] == "amendmentBlocked"); | ||
| BEAST_EXPECT(jr[jss::status] == "error"); | ||
|
|
||
| // submit_multisigned | ||
| set_tx[jss::Sequence] = env.seq(bob); | ||
| sign_for[jss::tx_json] = set_tx; | ||
| jr = env.rpc("json", "sign_for", to_string(sign_for)) [jss::result]; | ||
| BEAST_EXPECT(jr[jss::status] == "success"); | ||
| ms_req[jss::tx_json] = jr[jss::tx_json]; | ||
| jr = env.rpc("json", "submit_multisigned", to_string(ms_req)) | ||
| [jss::result]; | ||
| BEAST_EXPECT( | ||
| jr.isMember (jss::error) && | ||
| jr[jss::error] == "amendmentBlocked"); | ||
| } | ||
|
|
||
| public: | ||
| void run() | ||
| { | ||
| testBlockedMethods(); | ||
| } | ||
| }; | ||
|
|
||
| BEAST_DEFINE_TESTSUITE(AmendmentBlocked,app,ripple); | ||
|
|
||
| } | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should the
NEEDS_CLOSED_LEDGERalso only work if not amendment blocked? Note that I don't see any RPCs actually using that condition.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, I wondered that too and had a hard time deciding since, as you point out, there aren't any methods currently using it. I think I'll add it to the check as you suggest.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like the idea of using these conditions to determine what commands to reject when an amendment blocked.
At first, I was concerned about
NO_CONDITIONcommands such asaccount_channels,account_objects,channel_authorize,channel_verify, andledger_entrythat are affected by amendments. But commands specific to an amendment would simply return anunknownCmderror, and when I reverted the commit that addedPayChan, rippled crashed before I could even try looking up account objects/channels or ledger entriesAll that to say, I think this change is a good addition to the existing limitations in rippled's ability to serve RPC requests while amendment blocked.