highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

script: match multisigs with up to MAX_PUBKEYS_PER_MULTISIG keys

Browse Source 
We were previously ruling out 17-20 pubkeys multisig, while they are
only invalid under P2SH context.
This makes multisigs with up to 20 keys be detected as valid by the
solver. This is however *not* a policy change as it would only apply
to bare multisigs, which are already limited to 3 pubkeys.

Note that this does not change the sigOpCount calculation (as it would
break consensus). Therefore 1-16 keys multisigs are counted as 1-16 sigops
and 17-20 keys multisigs are counted as 20 sigops.

Signed-off-by: Antoine Poinsot <darosior@protonmail.com>
This commit is contained in:
Antoine Poinsot
2021-01-05 13:32:41 +01:00
parent ac219dcbcc
commit 9fc68faf35
4 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/descriptor_tests.cpp
View File

@@ -2,6 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <pubkey.h>
#include <script/descriptor.h>
#include <script/sign.h>
#include <script/standard.h>
@@ -27,6 +28,14 @@ void CheckUnparsable(const std::string& prv, const std::string& pub, const std::
BOOST_CHECK_EQUAL(error, expected_error);
}
/** Check that the script is inferred as non-standard */
void CheckInferRaw(const CScript& script)
{
FlatSigningProvider dummy_provider;
std::unique_ptr<Descriptor> desc = InferDescriptor(script, dummy_provider);
BOOST_CHECK(desc->ToString().rfind("raw(", 0) == 0);
}
constexpr int DEFAULT = 0;
constexpr int RANGE = 1; // Expected to be ranged descriptor
constexpr int HARDENED = 2; // Derivation needs access to private keys
@@ -376,6 +385,27 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
CheckUnparsable("", "addr(asdf)", "Address is not valid"); // Invalid address
CheckUnparsable("", "raw(asdf)", "Raw script is not hex"); // Invalid script
CheckUnparsable("", "raw(Ü)#00000000", "Invalid characters in payload"); // Invalid chars
// A 2of4 but using a direct push rather than OP_2
CScript nonminimalmultisig;
CKey keys[4];
nonminimalmultisig << std::vector<unsigned char>{2};
for (int i = 0; i < 4; i++) {
keys[i].MakeNewKey(true);
nonminimalmultisig << ToByteVector(keys[i].GetPubKey());
}
nonminimalmultisig << 4 << OP_CHECKMULTISIG;
CheckInferRaw(nonminimalmultisig);
// A 2of4 but using a direct push rather than OP_4
nonminimalmultisig.clear();
nonminimalmultisig << 2;
for (int i = 0; i < 4; i++) {
keys[i].MakeNewKey(true);
nonminimalmultisig << ToByteVector(keys[i].GetPubKey());
}
nonminimalmultisig << std::vector<unsigned char>{4} << OP_CHECKMULTISIG;
CheckInferRaw(nonminimalmultisig);
}
BOOST_AUTO_TEST_SUITE_END()