sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4909

Browse Source
This commit is contained in:
Jeff Garzik 2014-09-14 19:27:22 -04:00
commit a0a8700bc8
Failed to extract signature
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.test.include
View File

@ -13,7 +13,8 @@ EXTRA_DIST += \
test/data/tt-delout1-out.hex \ test/data/tt-delout1-out.hex \
test/data/tt-locktime317000-out.hex \ test/data/tt-locktime317000-out.hex \
test/data/tx394b54bb.hex \ test/data/tx394b54bb.hex \
test/data/txcreate1.hex test/data/txcreate1.hex \
test/data/txcreate2.hex
JSON_TEST_FILES = \ JSON_TEST_FILES = \
test/data/script_valid.json \ test/data/script_valid.json \

3
src/bitcoin-tx.cpp
View File

@ -237,8 +237,7 @@ static void MutateTxAddOutScript(CMutableTransaction& tx, const string& strInput
// separate VALUE:SCRIPT in string // separate VALUE:SCRIPT in string
size_t pos = strInput.find(':'); size_t pos = strInput.find(':');
if ((pos == string::npos) || if ((pos == string::npos) ||
(pos == 0) || (pos == 0))
(pos == (strInput.size() - 1)))
throw runtime_error("TX output missing separator"); throw runtime_error("TX output missing separator");
// extract and validate VALUE // extract and validate VALUE

3
src/test/data/bitcoin-util-test.json
View File

@ -34,5 +34,8 @@
"outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o", "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
"outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"], "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
"output_cmp": "txcreate1.hex" "output_cmp": "txcreate1.hex"
},
{ "exec": ["./bitcoin-tx", "-create", "outscript=0:"],
"output_cmp": "txcreate2.hex"
} }
] ]

1
src/test/data/txcreate2.hex Normal file
View File

@ -0,0 +1 @@
01000000000100000000000000000000000000