Commit Graph

23688 Commits

Author SHA1 Message Date
miketout
05247588a2 Merge pull request #14 from miketout/dev
Latest Komodo changes, spending time locked coinbases, some cleanup
2018-05-09 00:55:45 -07:00
miketout
fb99540b9d Merge pull request #6 from jl777/dev
Merge jl777 changes
2018-05-09 00:53:49 -07:00
miketout
204cf3fcba Enable seamless spending of timelocked coinbases through z_shieldcoinbase 2018-05-09 00:49:09 -07:00
jl777
629ff5a287 Merge pull request #660 from jl777/jl777
Jl777
2018-05-09 10:05:25 +03:00
jl777
c1ec8014fa Test 2018-05-09 09:58:52 +03:00
jl777
1d03bae255 Display vin address in tx son 2018-05-09 09:55:43 +03:00
jl777
b9b415654f Restore possibility of negative timestamps for PoS 2018-05-09 09:36:27 +03:00
miketout
32d8c6d015 Merge latest from Komodo, including POS 2018-05-08 17:57:03 -07:00
Homu
f0daf3915f Auto merge of #3233 - str4d:3164-sapling-sighash, r=str4d
ZIP 243: Sapling SignatureHash

Closes #3164.
2018-05-08 16:59:33 -07:00
Jack Grigg
93bd00a0d5 Add key_io includes to Zcash-specific code 2018-05-08 21:39:56 +01:00
Pieter Wuille
3d31e09cbb Split key_io (address/key encodings) off from base58 2018-05-08 21:39:56 +01:00
Pieter Wuille
3e60c9fabd Stop using CBase58Data for ext keys 2018-05-08 21:39:55 +01:00
Jack Grigg
aa333ee8f2 Implement {Encode,Decode}PaymentAddress etc. without CZCEncoding 2018-05-08 21:39:55 +01:00
Jack Grigg
8bf3a3d700 Introduce wrappers around CZCViewingKey 2018-05-08 21:39:55 +01:00
Jack Grigg
472f75bc2d Introduce wrappers around CZCSpendingKey 2018-05-08 21:39:55 +01:00
Jack Grigg
80ed13d545 Introduce wrappers around CZCPaymentAddress
This patch removes the need for the intermediary Base58 type
CZCPaymentAddress, by providing {Encode,Decode}PaymentAddress
functions that directly operate on the conversion between strings
and libzcash::PaymentAddress.
2018-05-08 21:39:55 +01:00
Pieter Wuille
f146029b0a Replace CBitcoinSecret with {Encode,Decode}Secret 2018-05-08 21:39:54 +01:00
miketout
18c72b619a Merge pull request #13 from miketout/dev
Recognizing CLTV transactions more broadly
2018-05-08 13:35:23 -07:00
miketout
ea340a1443 Recognizing CLTV transactions more broadly 2018-05-08 13:33:14 -07:00
Sean Bowe
b4db32f53c Check Sapling Spend/Output proofs and signatures. 2018-05-08 14:30:26 -06:00
Sean Bowe
531fcc88da Update to latest librustzcash 2018-05-08 14:30:26 -06:00
Sean Bowe
55fabd8272 Refactor so that dataToBeSigned can be used later in the function for other purposes. 2018-05-08 14:28:01 -06:00
Sean Bowe
6eea48bf96 Remove unnecessary IsCoinbase() check. Coinbases are guaranteed to have empty vjoinsplit. 2018-05-08 14:23:09 -06:00
jl777
2e12bbce39 Test 2018-05-08 23:08:00 +03:00
jl777
751df7814f Test 2018-05-08 22:51:57 +03:00
jl777
f4dfe27442 Test 2018-05-08 22:44:52 +03:00
jl777
ccb805c993 Merge pull request #659 from jl777/jl777
Jl777
2018-05-08 21:05:15 +03:00
jl777
58d3618754 Test 2018-05-08 20:18:34 +03:00
jl777
0afe191c04 Test 2018-05-08 19:11:58 +03:00
jl777
1448ebba2b Merge pull request #658 from himu007/patch-10
delete vote2018
2018-05-08 19:09:09 +03:00
jl777
30fd48c34c Merge pull request #657 from himu007/patch-9
removed VOTE2018
2018-05-08 19:08:52 +03:00
Homu
b1d2a69908 Auto merge of #3202 - str4d:3058-sapling-bech32, r=str4d
Bech32 encoding support

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#8578
- bitcoin/bitcoin#11167
  - Only the second and third commits (first is in #3228, fourth depends on #2390, later ones are SegWit-specific).
- bitcoin/bitcoin#12757
  - Only the change to `src/bech32.h`

Part of #3058.
2018-05-08 09:08:37 -07:00
jl777
bed479837b Merge pull request #656 from himu007/patch-8
removed VOTE2018
2018-05-08 19:08:34 +03:00
jl777
864067ba3b Merge pull request #655 from himu007/patch-7
removed VOTE2018
2018-05-08 19:08:14 +03:00
jl777
de230f5e75 Test 2018-05-08 19:05:38 +03:00
jl777
e37664a90f Test 2018-05-08 19:00:21 +03:00
jl777
ba1587fd37 Test 2018-05-08 18:55:16 +03:00
jl777
9703f8a03d Test 2018-05-08 18:43:08 +03:00
jl777
bed8cd1f49 Test 2018-05-08 18:38:51 +03:00
jl777
596b05baf2 Test 2018-05-08 18:05:21 +03:00
jl777
26810a265b Test 2018-05-08 18:03:43 +03:00
jl777
99e3046307 Test 2018-05-08 18:02:57 +03:00
Homu
0c1adf8281 Auto merge of #3201 - Eirik0:3190-dumpprivkey-help-text, r=str4d
Clarify help text of dumpprivkey

Closes #3190
2018-05-08 06:02:17 -07:00
Jack Grigg
50284985e9 Update sighash tests 2018-05-08 11:45:41 +01:00
Jack Grigg
b391b70736 Implement Sapling signature hash (ZIP 243) 2018-05-08 11:45:38 +01:00
Homu
0a98b97524 Auto merge of #3236 - str4d:3192-jsoutpoint-constructor, r=str4d
Change JSOutPoint constructor to have js argument be uint64_t

Closes #3192.
2018-05-08 02:50:04 -07:00
jl777
9c72a5cbb7 Test 2018-05-08 12:23:58 +03:00
jl777
51f0e5008d Test 2018-05-08 12:17:48 +03:00
jl777
0c03fd07bd Test 2018-05-08 12:07:29 +03:00
jl777
dd24966431 Test 2018-05-08 12:07:05 +03:00