mirror of
https://github.com/XRPLF/rippled.git
synced 2026-01-09 17:25:35 +00:00
With this changeset two-level multisigning is removed from the
codebase and replaced with single-level multisigning.
Additionally, SignerLists in the ledger are prepared for the
possibility of multiple SignerLists per account. This was done
by adding a defaulted 32-bit SignerListID to each SignerList.
The SignerListIndex calculation incorporates the SignerListID.
There are three known missing elements:
1. Multisigned transactions should require higher fees than
regular (single-signed) transaction. That's not yet
implemented.
2. It should be possible to disable the master key on an account
if that account is multisign enabled (has a signer list).
That's not yet implemented.
3. Documentation about multisigning needs to be improved.
Multisigning is still compiled out of the code base. To enable
multisigning for a stand-alone rippled, change the
RIPPLE_ENABLE_MULTI_SIGN macro (in BeastConfig.h) to "1" and
rebuild.
This commit also addresses:
o RIPD-912: Remove multisign APIs from STObject, and
o RIPD-944: Replace common_transactor with jtx at call sites.
206 lines
7.4 KiB
C++
206 lines
7.4 KiB
C++
//------------------------------------------------------------------------------
|
|
/*
|
|
This file is part of rippled: https://github.com/ripple/rippled
|
|
Copyright (c) 2012, 2013 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 <BeastConfig.h>
|
|
#include <ripple/protocol/Sign.h>
|
|
#include <ripple/protocol/STTx.h>
|
|
#include <ripple/protocol/STParsedJSON.h>
|
|
#include <ripple/protocol/types.h>
|
|
#include <ripple/json/to_string.h>
|
|
#include <beast/unit_test/suite.h>
|
|
|
|
namespace ripple {
|
|
|
|
class STTx_test : public beast::unit_test::suite
|
|
{
|
|
public:
|
|
void run()
|
|
{
|
|
RippleAddress seed;
|
|
seed.setSeedRandom ();
|
|
RippleAddress generator = RippleAddress::createGeneratorPublic (seed);
|
|
RippleAddress publicAcct = RippleAddress::createAccountPublic (generator, 1);
|
|
RippleAddress privateAcct = RippleAddress::createAccountPrivate (generator, seed, 1);
|
|
|
|
STTx j (ttACCOUNT_SET);
|
|
j.setAccountID (sfAccount, calcAccountID(publicAcct));
|
|
j.setSigningPubKey (publicAcct);
|
|
j.setFieldVL (sfMessageKey, publicAcct.getAccountPublic ());
|
|
j.sign (privateAcct);
|
|
|
|
unexpected (!j.checkSign (), "Transaction fails signature test");
|
|
|
|
Serializer rawTxn;
|
|
j.add (rawTxn);
|
|
SerialIter sit (rawTxn.slice());
|
|
STTx copy (sit);
|
|
|
|
if (copy != j)
|
|
{
|
|
log << j.getJson (0);
|
|
log << copy.getJson (0);
|
|
fail ("Transaction fails serialize/deserialize test");
|
|
}
|
|
else
|
|
{
|
|
pass ();
|
|
}
|
|
|
|
STParsedJSONObject parsed ("test", j.getJson (0));
|
|
if (!parsed.object)
|
|
fail ("Unable to build object from json");
|
|
|
|
if (STObject (j) != parsed.object)
|
|
{
|
|
log << "ORIG: " << j.getJson (0);
|
|
log << "BUILT " << parsed.object->getJson (0);
|
|
fail ("Built a different transaction");
|
|
}
|
|
else
|
|
{
|
|
pass ();
|
|
}
|
|
}
|
|
};
|
|
|
|
class InnerObjectFormatsSerializer_test : public beast::unit_test::suite
|
|
{
|
|
public:
|
|
void run()
|
|
{
|
|
// Create a transaction
|
|
RippleAddress txnSeed;
|
|
txnSeed.setSeedRandom ();
|
|
// VFALCO Generators are no longer supported
|
|
RippleAddress txnGenerator = txnSeed.createGeneratorPublic (txnSeed);
|
|
// VFALCO Use PublicKey here
|
|
RippleAddress txnPublicAcct = txnSeed.createAccountPublic (txnGenerator, 1);
|
|
|
|
STTx txn (ttACCOUNT_SET);
|
|
txn.setAccountID (sfAccount, calcAccountID(txnPublicAcct));
|
|
txn.setSigningPubKey (txnPublicAcct);
|
|
txn.setFieldVL (sfMessageKey, txnPublicAcct.getAccountPublic ());
|
|
Blob const emptyBlob; // Make empty signature for multi-signing
|
|
txn.setFieldVL (sfSigningPubKey, emptyBlob);
|
|
|
|
// Create fields for a SigningAccount
|
|
RippleAddress saSeed;
|
|
saSeed.setSeedGeneric ("masterpassphrase");
|
|
RippleAddress const saGenerator = saSeed.createGeneratorPublic (saSeed);
|
|
RippleAddress const saPublicAcct =
|
|
saSeed.createAccountPublic (saGenerator, 1);
|
|
AccountID const saID = calcAccountID(saPublicAcct);
|
|
|
|
// Create a field for SigningFor
|
|
AccountID const signingForID = calcAccountID(txnPublicAcct);
|
|
|
|
RippleAddress saPrivateAcct =
|
|
saSeed.createAccountPrivate(saGenerator, saSeed, 0);
|
|
|
|
// Get the stream of the transaction for use in multi-signing.
|
|
Serializer s = buildMultiSigningData (txn, saID);
|
|
|
|
Blob saMultiSignature =
|
|
saPrivateAcct.accountPrivateSign (s.getData());
|
|
|
|
// The InnerObjectFormats say a Signer is supposed to look
|
|
// like this:
|
|
// Signer {
|
|
// Account: "...",
|
|
// TxnSignature: "...",
|
|
// PublicKey: "...""
|
|
// }
|
|
// Make one well formed Signer and several mal-formed ones. See
|
|
// whether the serializer lets the good one through and catches
|
|
// the bad ones.
|
|
|
|
// This lambda contains the bulk of the test code.
|
|
auto testMalformedSigningAccount =
|
|
[this, &txn, &signingForID]
|
|
(STObject const& signer, bool expectPass)
|
|
{
|
|
// Create SigningAccounts array.
|
|
STArray signers (sfSigners, 1);
|
|
signers.push_back (signer);
|
|
|
|
// Insert signers into transaction.
|
|
STTx tempTxn (txn);
|
|
tempTxn.setFieldArray (sfSigners, signers);
|
|
|
|
Serializer rawTxn;
|
|
tempTxn.add (rawTxn);
|
|
SerialIter sit (rawTxn.slice());
|
|
bool serialized = false;
|
|
try
|
|
{
|
|
STTx copy (sit);
|
|
serialized = true;
|
|
}
|
|
catch (...)
|
|
{
|
|
; // If it threw then serialization failed.
|
|
}
|
|
expect (serialized == expectPass,
|
|
"Unexpected serialized = " + std::to_string (serialized) +
|
|
". Object:\n" + signer.getFullText () + "\n");
|
|
};
|
|
|
|
{
|
|
// Test case 1. Make a valid Signer object.
|
|
STObject soTest1 (sfSigner);
|
|
soTest1.setAccountID (sfAccount, saID);
|
|
soTest1.setFieldVL (sfSigningPubKey,
|
|
txnPublicAcct.getAccountPublic ());
|
|
soTest1.setFieldVL (sfTxnSignature, saMultiSignature);
|
|
testMalformedSigningAccount (soTest1, true);
|
|
}
|
|
{
|
|
// Test case 2. Omit sfSigningPubKey from SigningAccount.
|
|
STObject soTest2 (sfSigner);
|
|
soTest2.setAccountID (sfAccount, saID);
|
|
soTest2.setFieldVL (sfTxnSignature, saMultiSignature);
|
|
testMalformedSigningAccount (soTest2, false);
|
|
}
|
|
{
|
|
// Test case 3. Extra sfAmount in SigningAccount.
|
|
STObject soTest3 (sfSigner);
|
|
soTest3.setAccountID (sfAccount, saID);
|
|
soTest3.setFieldVL (sfSigningPubKey,
|
|
txnPublicAcct.getAccountPublic ());
|
|
soTest3.setFieldVL (sfTxnSignature, saMultiSignature);
|
|
soTest3.setFieldAmount (sfAmount, STAmount (10000));
|
|
testMalformedSigningAccount (soTest3, false);
|
|
}
|
|
{
|
|
// Test case 4. Right number of fields, but wrong ones.
|
|
STObject soTest4 (sfSigner);
|
|
soTest4.setFieldVL (sfSigningPubKey,
|
|
txnPublicAcct.getAccountPublic ());
|
|
soTest4.setFieldVL (sfTxnSignature, saMultiSignature);
|
|
soTest4.setFieldAmount (sfAmount, STAmount (10000));
|
|
testMalformedSigningAccount (soTest4, false);
|
|
}
|
|
}
|
|
};
|
|
|
|
BEAST_DEFINE_TESTSUITE(STTx,ripple_app,ripple);
|
|
BEAST_DEFINE_TESTSUITE(InnerObjectFormatsSerializer,ripple_app,ripple);
|
|
|
|
} // ripple
|