mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
36bb302f80
619bb05 Squashed 'src/univalue/' changes from 16a1f7f6e..fe805ea74 (MarcoFalke)
Pull request description:
The subtree-merge commit also fixes the whitespace for failing tests, such that bisect doesn't break.
Finally, the bump also includes the changes that accidentally modified our subtree, such that the subtree check should work fine now:
```sh
./contrib/devtools/git-subtree-check.sh src/univalue
Tree-SHA512: 3009d1e52b6f41ef89ecc8a000649f08e44395538703f294995a6e913e3fbfb7813d6bd31fdb4acb6127fd4af99c095bf980a12f1f026bb27cacc66e1487cd1e
29 lines
1.3 KiB
JSON
29 lines
1.3 KiB
JSON
{
|
|
"txid": "0d1d4edfc217d9db3ab6a9298f26a52eae3c52f55a6cb8ccbc14f7c727572894",
|
|
"version": 1,
|
|
"type": 0,
|
|
"size": 124,
|
|
"locktime": 0,
|
|
"vin": [
|
|
],
|
|
"vout": [
|
|
{
|
|
"value": 1.00000000,
|
|
"valueSat": 100000000,
|
|
"n": 0,
|
|
"scriptPubKey": {
|
|
"asm": "2 02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d 02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485 3 OP_CHECKMULTISIG",
|
|
"hex": "522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae",
|
|
"reqSigs": 2,
|
|
"type": "multisig",
|
|
"addresses": [
|
|
"XqV6rHmzCyFUKF2jSVg8ZkZ7oRhGLVxifK",
|
|
"XqDjpPyN61bMZAZsVbYyvouVzgV59oSmWp",
|
|
"Xe2kRBG5ZEn8T34TqvvPKwQwHEzVL9WvxH"
|
|
]
|
|
}
|
|
}
|
|
],
|
|
"hex": "01000000000100e1f5050000000069522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae00000000"
|
|
}
|