v29.4-roots.3 · Commit 3: [PATCH 03/30] policy: restore conservative relay and network controls
src/script/script.h
Before: src/script/script.h · After: src/script/script.h
File metadata
index f4579849803beda9230965b2768a38d33b494ccd..3a26dfc9eb5b7045721cd15136d285cb980e4cac 100644
Download original patch · Release notes
Diff rows 1–18 of 18. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. The two line-number columns refer to before and after.
src/script/script.h
CHANGED
|
@@ -410,6 +410,8 @@ typedef prevector<28, unsigned char> CScriptBase;
|
|
|
410
410
|
|
|
411
411
|
bool GetScriptOp(CScriptBase::const_iterator& pc, CScriptBase::const_iterator end, opcodetype& opcodeRet, std::vector<unsigned char>* pvchRet);
|
|
412
412
|
|
|
413
|
+
struct CScriptWitness;
|
|
414
|
+
|
|
413
415
|
/** Serialized script, used inside transaction inputs and outputs */
|
|
414
416
|
class CScript : public CScriptBase
|
|
415
417
|
{
|
|
@@ -573,6 +575,10 @@ public:
|
|
|
573
575
|
return (size() > 0 && *begin() == OP_RETURN) || (size() > MAX_SCRIPT_SIZE);
|
|
574
576
|
}
|
|
575
577
|
|
|
578
|
+
size_t OPNetWitnessSize(const CScriptWitness& witness) const;
|
|
579
|
+
size_t IsOLGA(size_t remaining_outputs) const;
|
|
580
|
+
std::pair<size_t, size_t> DatacarrierBytes(size_t remaining_outputs, const CScriptWitness* witness = nullptr) const;
|
|
581
|
+
|
|
576
582
|
void clear()
|
|
577
583
|
{
|
|
578
584
|
// The default prevector::clear() does not release memory
|