Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Break up script/standard.{h/cpp} #28244

Merged
merged 9 commits into from
Aug 17, 2023
Merged

Break up script/standard.{h/cpp} #28244

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cba69dd
Move MANDATORY_SCRIPT_VERIFY_FLAGS from script/standard.h to policy/p…
ajtowns Oct 11, 2022
b81ebff
Remove ScriptHash from CScriptID constructor
achow101 Aug 8, 2023
86ea8be
Move CScriptID to script.{h/cpp}
achow101 Aug 8, 2023
145f36e
Move Taproot{SpendData/Builder} to signingprovider.{h/cpp}
achow101 Aug 8, 2023
7a172c7
Move CTxDestination to its own file
achow101 Aug 8, 2023
8bbe257
MOVEONLY: Move datacarrier defaults to policy.h
achow101 Aug 9, 2023
f3c9078
Clean up things that include script/standard.h
achow101 Aug 9, 2023
bacdb2e
Clean up script/standard.{h/cpp} includes
achow101 Aug 9, 2023
91d924e
Rename script/standard.{cpp/h} to script/solver.{cpp/h}
achow101 Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/key_io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <base58.h>
#include <bech32.h>
#include <script/interpreter.h>
#include <script/standard.h>
#include <util/strencodings.h>

Expand Down
6 changes: 2 additions & 4 deletions src/script/standard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include <script/standard.h>

#include <crypto/sha256.h>
#include <hash.h>
#include <pubkey.h>
#include <script/interpreter.h>
#include <script/script.h>
#include <util/strencodings.h>
#include <span.h>

#include <string>
#include <algorithm>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bacdb2e: nit:

script/solver.cpp should add these lines:
#include <cassert>              // for assert
#include "prevector.h"           // for operator-, prevector

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in #28284


typedef std::vector<unsigned char> valtype;

Expand Down
13 changes: 6 additions & 7 deletions src/script/standard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@
#define BITCOIN_SCRIPT_STANDARD_H

#include <attributes.h>
#include <pubkey.h>
#include <script/interpreter.h>
#include <uint256.h>
#include <util/hash_type.h>
#include <script/script.h>

#include <map>
#include <string>
#include <variant>
#include <optional>
#include <utility>
#include <vector>

class CScript;
class CPubKey;
template <typename C> class Span;

enum class TxoutType {
NONSTANDARD,
Expand Down
1 change: 1 addition & 0 deletions src/test/sigopcount_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <consensus/tx_verify.h>
#include <key.h>
#include <pubkey.h>
#include <script/interpreter.h>
#include <script/script.h>
#include <script/standard.h>
#include <test/util/setup_common.h>
Expand Down