Skip to content

Commit c26f1bf

Browse files
committed
Clean up script outputing
1 parent d7d6086 commit c26f1bf

File tree

1 file changed

+32
-14
lines changed

1 file changed

+32
-14
lines changed

src/transaction.cpp

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,30 @@ int main (int argc, char** argv) {
9292

9393
if(input.scriptStack.size()) {
9494

95-
std::cout << "\tScript: ";
96-
outputScript = streamScript(std::cout, input.scriptStack.back().begin(), input.scriptStack.back().size());
97-
std::cout << "\n";
98-
99-
if(outputScript && input.scriptStack.size() > 1) {
95+
if(input.scriptStack.size() == 1) {
96+
97+
std::cout << "\tScript input: [";
98+
streamHex(std::cout, input.scriptStack[0].begin(), input.scriptStack[0].size());
99+
std::cout << "]\n";
100+
101+
outputScript = true;
102+
}
103+
else {
100104

101-
std::cout << "\tScript inputs:\n";
105+
std::cout << "\tScript: ";
106+
outputScript = streamScript(std::cout, input.scriptStack.back().begin(), input.scriptStack.back().size());
107+
std::cout << "\n";
102108

103-
for(size_t i = 0; i < input.scriptStack.size() - 1; i++) {
109+
if(outputScript && input.scriptStack.size() > 1) {
104110

105-
std::cout << "\t[";
106-
streamHex(std::cout, input.scriptStack[i].begin(), input.scriptStack[i].size());
107-
std::cout << "]\n";
111+
std::cout << "\tScript inputs:\n";
112+
113+
for(size_t i = 0; i < input.scriptStack.size() - 1; i++) {
114+
115+
std::cout << "\t[";
116+
streamHex(std::cout, input.scriptStack[i].begin(), input.scriptStack[i].size());
117+
std::cout << "]\n";
118+
}
108119
}
109120
}
110121
}
@@ -191,10 +202,17 @@ int main (int argc, char** argv) {
191202

192203
std::cout << "[Output " << ++counter << "]\n";
193204

194-
std::cout << "\tScript: ";
195-
streamScript(std::cout, output.script.data(), output.script.size());
196-
std::cout << "\n";
197-
205+
if(!output.script.size()) {
206+
207+
std::cout << "\tScript: EMPTY SCRIPT\n";
208+
}
209+
else {
210+
211+
std::cout << "\tScript: ";
212+
streamScript(std::cout, output.script.data(), output.script.size());
213+
std::cout << "\n";
214+
}
215+
198216
std::cout << "\tValue: " << output.value / 100000000 << ".";
199217

200218
printf("%08llu\n", output.value % 100000000);

0 commit comments

Comments
 (0)