DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
23,279 Commits 7 Branches 3 Tags
82cf345e94de801e4dcec919932ff4d6ec33ad83
Commit Graph

23279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pbca26
848b6c8434 Merge branch 'beta' of https://github.com/jl777/komodo into beta 2018-05-12 12:41:57 +03:00
Jack Grigg
e5eab182b5 Use boost::variant to represent shielded addresses and keys 
libzcash::PaymentAddress has been renamed to libzcash::SproutPaymentAddress,
and a new typedef boost::variant is now libzcash::PaymentAddress. Similarly
for ViewingKey and SpendingKey.

A new class InvalidEncoding is introduced as the default boost::variant
option for each address and key type; it is used during decoding instead
of boost::optional.

All address and key storage functions in the wallet have been modified to
refer specifically to the Sprout types, as they are used very precisely.
In most other cases, the more general type is leveraged as much as possible,
and we convert to the Sprout type when necessary. This will be subsequently
wrapped in, or replaced with, context-specific functions once Sapling
types are implemented.
 2018-05-11 17:14:49 -04:00
Homu
1942f7a42b Auto merge of #3242 - str4d:3058-key-encoding-refactor, r=str4d 
Key encoding refactor

Includes code cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#11372
  - Only the first three commits (the fourth commit depends on #2390)

Part of #3058.
 2018-05-11 12:21:29 -07:00
jl777
09511571af Test 2018-05-11 16:36:21 +03:00
jl777
316a563c50 Test 2018-05-11 16:34:25 +03:00
jl777
ae3f3fea6c +GAME sanitize listunspent interest calc 2018-05-11 16:28:52 +03:00
jl777
581d2c416e Merge pull request #663 from lukechilds/patch-4 
Remove VOTE2018 from `dpowassets`
 2018-05-11 09:51:49 +03:00
jl777
63f5ad95cf Merge pull request #662 from lukechilds/patch-3 
Remove VOTE2018 from `fiat-cli`
 2018-05-11 09:50:59 +03:00
Luke Childs
7be54a7fa3 Remove VOTE2018 from dpowassets 2018-05-11 11:59:49 +07:00
Luke Childs
87ae917277 Remove vote2018 from fiat-cli 2018-05-11 11:38:31 +07:00
Jonathan "Duke" Leto
30bf78ca23 Clarify help that signmessage only works on taddrs 2018-05-10 17:25:13 -07:00
Homu
ae6c2587d3 Auto merge of #3232 - ebfull:3207-sapling-validation, r=str4d 
Sapling validation

**Also review https://github.com/zcash/librustzcash/pull/7**

This is an attempt to tackle much of https://github.com/zcash/zcash/issues/3065
 2018-05-10 10:21:15 -07:00
Homu
73f5cb1213 Auto merge of #3257 - bitcartel:3250_fix_segfault_memo, r=ebfull 
Closes #3250. Memo getter should return by reference, not by value.
 2018-05-10 08:47:06 -07:00
jl777
cfc16d5ca4 KOMODO_MAXMEMPOOLTIME 2018-05-10 17:52:55 +03:00
jl777
afd62a9688 KOMODO_MAXMEMPOOLTIME 2018-05-10 17:51:45 +03:00
Homu
677b5b3b8b Auto merge of #3247 - str4d:3207-valuebalance, r=str4d 
Add valueBalance to value balances

Part of #3065 and #3207.
 2018-05-10 07:12:00 -07:00
Jack Grigg
0fe0ca7948 Add contextual comment for GetValueOut() and GetShieldedValueIn() 2018-05-10 09:34:19 -04:00
jl777
4f9e2254e2 Update libgmp url 2018-05-10 13:15:18 +03:00
jl777
d014b5bd1c Change url for gmplib 2018-05-10 13:14:42 +03:00
jl777
4017d7c4f5 Change libgmp path to supernetorg 2018-05-10 13:13:49 +03:00
jl777
bc39b264cb Merge pull request #661 from ca333/patch-6 
update libgmp
 2018-05-10 13:09:46 +03:00
jl777
e390692576 Display invalidateblock, reconsiderblock, resendwallettransactions 2018-05-10 13:08:25 +03:00
jl777
2b322c794a Prevent relaying expired tx 2018-05-10 13:01:26 +03:00
jl777
be5f41cd90 Prevent rebroadcast of expired tx 2018-05-10 13:00:24 +03:00
ca333
0d66440990 update libgmp 
using our own CDN
 2018-05-10 11:58:13 +02:00
jl777
a5b7fef44b Test 2018-05-10 12:56:52 +03:00
jl777
bd070d8bce Prevent relaying expired tx 2018-05-10 12:55:14 +03:00
Simon
67f3577239 Closes #3250. Memo getter should return by reference, not by value. 2018-05-09 21:52:33 -07:00
miketout
6939648e84 Merge pull request #17 from miketout/dev 
Integrate proof of stake
 2018-05-09 21:43:42 -07:00
miketout
135fa24e0f Integrate new proof of stake support 2018-05-09 21:40:17 -07:00
David L. Dawes
8ed47707a4 Get a working URL for libgmp. 2018-05-09 16:03:36 -07:00
Homu
08f74ed026 Auto merge of #3240 - str4d:remove-obsolete-binaries, r=str4d 
Remove obsolete CreateJoinSplit and GenerateParams binaries
 2018-05-09 13:50:25 -07:00
miketout
4cd2cd4dd1 Improve and complete getinfo output, cleanup unused reference 2018-05-09 13:13:12 -07:00
Jack Grigg
ae97177c86 Track net value entering and exiting the Sapling circuit 2018-05-09 16:02:23 -04:00
Scott Sadler
20c3ac51c2 wip 2018-05-09 16:17:28 -03:00
Jack Grigg
97b46f00cc Add valueBalance to value balances, and enforce its consensus rules 2018-05-09 11:34:41 +01:00
miketout
4fa65bc3ed Merge pull request #16 from miketout/dev 
Only zero sequence for timelocked coinbases to enable shielding all t…
 2018-05-09 03:33:39 -07:00
miketout
8af1971bf3 Only zero sequence for timelocked coinbases to enable shielding all types 2018-05-09 03:32:28 -07:00
miketout
328f7a125f Merge pull request #15 from miketout/dev 
Added blockstomaturity output for immature coinbase transactions on rpc:listtransactions
 2018-05-09 02:10:33 -07:00
miketout
c2f6623fdf Add blocks to maturity in transaction JSON for listtransactions RPC API 2018-05-09 02:06:55 -07:00
miketout
3b03d0670c Merge pull request #7 from VerusCoin/dev 
Pull Dave's changes back
 2018-05-09 00:58:21 -07:00
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