Skip to content

Avoid Simplicity header dependency propogation #1518

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

Open
roconnor-blockstream wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −7
Open

Avoid Simplicity header dependency propogation #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/script/interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <script/script.h>
#include <uint256.h>
extern "C" {
#include <simplicity/elements/env.h>
#include <simplicity/elements/exec.h>
#include <simplicity/errorCodes.h>
}
Expand Down Expand Up @@ -2675,6 +2676,10 @@ void PrecomputedTransactionData::Init(const T& txTo, std::vector<CTxOut>&& spent
}
}

void SimplicityTransactionDeleter::operator()(elementsTransaction* ptr) const {
simplicity_elements_freeTransaction(ptr);
}

template <class T>
PrecomputedTransactionData::PrecomputedTransactionData(const T& txTo)
: PrecomputedTransactionData(uint256{})
Expand Down
12 changes: 5 additions & 7 deletions src/script/interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
#include <script/script_error.h>
#include <span.h>
#include <primitives/transaction.h>
extern "C" {
#include <simplicity/elements/env.h>
}

#include <optional>
#include <vector>
Expand Down Expand Up @@ -169,12 +166,13 @@ enum : uint32_t {

bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);

// Forward declarations of Simplicity structures.
struct elementsTransaction;
struct rawElementsTapEnv;

struct SimplicityTransactionDeleter
{
void operator()(elementsTransaction* ptr)
{
simplicity_elements_freeTransaction(ptr);
}
void operator()(elementsTransaction* ptr) const;
};
using SimplicityTransactionUniquePtr = std::unique_ptr<elementsTransaction, SimplicityTransactionDeleter>;

Expand Down