GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648)

Browse source
This commit is contained in:
Byron Hambly 2024-10-24 17:14:16 +02:00
commit 12dbf6cb9d
40 changed files with 289 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/script/standard.cpp
View file

@ -17,9 +17,6 @@
typedef std::vector<unsigned char> valtype;
bool fAcceptDatacarrier = DEFAULT_ACCEPT_DATACARRIER;
unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY;
CScriptID::CScriptID(const CScript& in) : BaseHash(Hash160(in)) {}
CScriptID::CScriptID(const ScriptHash& in) : BaseHash(static_cast<uint160>(in)) {}