update script section

This commit is contained in:
Michel van Kessel
2020-12-21 20:03:10 +01:00
parent 6f65c8722d
commit 30961ed2d5
15 changed files with 84 additions and 81 deletions

View File

@@ -3,16 +3,14 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "script/sign.h"
#include <script/sign.h>
#include "key.h"
#include "keystore.h"
#include "policy/policy.h"
#include "primitives/transaction.h"
#include "script/standard.h"
#include "uint256.h"
#include <boost/foreach.hpp>
#include <key.h>
#include <keystore.h>
#include <policy/policy.h>
#include <primitives/transaction.h>
#include <script/standard.h>
#include <uint256.h>
using namespace std;
@@ -112,7 +110,7 @@ static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptP
static CScript PushAll(const vector<valtype>& values)
{
CScript result;
BOOST_FOREACH(const valtype& v, values) {
for(const valtype& v: values) {
if (v.size() == 0) {
result << OP_0;
} else if (v.size() == 1 && v[0] >= 1 && v[0] <= 16) {
@@ -192,12 +190,12 @@ static vector<valtype> CombineMultisig(const CScript& scriptPubKey, const BaseSi
{
// Combine all the signatures we've got:
set<valtype> allsigs;
BOOST_FOREACH(const valtype& v, sigs1)
for(const valtype& v: sigs1)
{
if (!v.empty())
allsigs.insert(v);
}
BOOST_FOREACH(const valtype& v, sigs2)
for(const valtype& v: sigs2)
{
if (!v.empty())
allsigs.insert(v);
@@ -208,7 +206,7 @@ static vector<valtype> CombineMultisig(const CScript& scriptPubKey, const BaseSi
unsigned int nSigsRequired = vSolutions.front()[0];
unsigned int nPubKeys = vSolutions.size()-2;
map<valtype, valtype> sigs;
BOOST_FOREACH(const valtype& sig, allsigs)
for(const valtype& sig: allsigs)
{
for (unsigned int i = 0; i < nPubKeys; i++)
{