mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244)
This commit is contained in:
commit
6c55760a2d
88 changed files with 1205 additions and 1153 deletions
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
#include <script/script.h>
|
||||
|
||||
#include <hash.h>
|
||||
#include <util/strencodings.h>
|
||||
|
||||
#include <string>
|
||||
|
|
@ -12,6 +13,8 @@
|
|||
// ELEMENTS
|
||||
bool g_con_elementsmode = false;
|
||||
|
||||
CScriptID::CScriptID(const CScript& in) : BaseHash(Hash160(in)) {}
|
||||
|
||||
std::string GetOpName(opcodetype opcode)
|
||||
{
|
||||
switch (opcode)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue