Commit Graph
100 Commits
Author SHA1 Message Date
jl777 ff66ecc576 Merge pull request #780 from jl777/example0
code complete core AE
2018-07-19 22:14:17 -11:00
jl777 f8ea73704a Merge pull request #779 from CHMEX/jl777
add Burnaddress to excluding list?
2018-07-19 21:28:45 -11:00
jl777 e0ca925153 Merge pull request #778 from letolabs/snapshot
More snapshot tweaks
2018-07-19 18:05:28 -11:00
jl777 d3eb070474 Merge pull request #777 from letolabs/snapshot
Snapshot III
2018-07-19 17:10:00 -11:00
jl777 c2e6edb7ca Merge pull request #776 from jl777/example0
Example0
2018-07-19 16:09:12 -11:00
jl777 afca7f1e12 Merge pull request #775 from letolabs/snapshot
Snapshot II
2018-07-18 09:35:54 -11:00
jl777 564399152b Merge pull request #774 from jl777/example0
initial core support for assets
2018-07-18 06:21:42 -11:00
jl777 79f49ac49f Merge pull request #772 from letolabs/snapshot
getsnapshot RPC
2018-07-17 21:43:14 -11:00
jl777 ce2083e49d Merge pull request #769 from letolabs/ac_progress
Fix progress estimate for asset chains in UpdateTip
2018-07-15 21:29:24 -11:00
jl777 8af1877ebd Merge pull request #754 from l0rb/blocks_warning
remove a bad alert
2018-07-11 03:31:47 -11:00
jl777 531dbbe344 Merge pull request #755 from jl777/jl777
Jl777
2018-07-11 03:28:58 -11:00
jl777 75b6ed6988 Merge pull request #753 from jl777/jl777
Jl777
2018-07-10 07:31:43 -11:00
jl777 a85084dc35 Merge pull request #752 from jl777/jl777
new PoS algo
2018-07-10 06:59:50 -11:00
jl777 6ca4a999ca Merge pull request #751 from jl777/jl777
new PoS methods
2018-07-10 05:27:46 -11:00
jl777 fcbd7025af Merge pull request #750 from jl777/jl777new
Jl777new
2018-07-10 05:04:24 -11:00
jl777 fdd3e2009b Merge branch 'jl777' into jl777new 2018-07-10 05:04:15 -11:00
jl777 8ec04eb820 Merge pull request #749 from jl777/jl777
Syntax
2018-07-10 03:25:40 -11:00
jl777 34ddd5b2df Merge pull request #748 from jl777/jl777
Fix exceptions
2018-07-10 03:24:03 -11:00
jl777 fe327d1a9e Merge pull request #747 from jl777/jl777
7500 activation
2018-07-10 03:09:50 -11:00
jl777 162eced012 Merge pull request #746 from jl777/jl777
Syntax
2018-07-10 00:42:37 -11:00
jl777 01b0bc34fc Merge pull request #745 from jl777/jl777
7250 diff cap.16 hardfork for PoS
2018-07-09 22:16:45 -11:00
jl777 1e852bc9a4 Merge pull request #744 from jl777/jl777
Fix timestamps
2018-07-09 08:41:15 -11:00
jl777 f4f9b723d3 Merge pull request #743 from jl777/jl777
Jl777
2018-07-09 08:28:01 -11:00
jl777 6ba7cd4484 Merge pull request #742 from jl777/jl777
Jl777
2018-07-08 16:53:37 -11:00
jl777 aac4f8e5a1 Merge pull request #741 from jl777/jl777
Height 6000 disable 60 sec delay
2018-07-08 16:31:27 -11:00
jl777 6384be4101 Merge pull request #740 from jl777/jl777
Update URL to white paper
2018-07-08 04:06:11 -11:00
jl777 9c99c0d5d4 Merge pull request #739 from jl777/jl777
-print
2018-07-08 04:02:32 -11:00
jl777 c67868af66 Merge pull request #738 from jl777/jl777
Jl777
2018-07-08 03:03:56 -11:00
jl777 8758aaacac Merge pull request #737 from jl777/jl777
Jl777
2018-07-08 02:06:54 -11:00
jl777 ef3d08254d Merge pull request #736 from jl777/jl777
Jl777
2018-07-08 00:14:49 -11:00
jl777 769b70c007 Merge pull request #735 from jl777/jl777
Decker's fix for watch only addresses
2018-07-07 20:32:01 -11:00
jl777 86de663fff Merge pull request #734 from jl777/jl777
Simplify
2018-07-07 07:00:47 -11:00
jl777 346af15b07 Merge pull request #733 from jl777/jl777
Skip fractional utxo for staking
2018-07-07 06:58:54 -11:00
jl777 39e35ec01a Merge pull request #732 from jl777/jl777
newstake algo at 4000 for PoS
2018-07-07 02:48:38 -11:00
jl777 2613ec5232 Merge pull request #731 from jl777/jl777
Jl777
2018-07-06 04:08:44 -11:00
jl777 b93e63a9af Merge pull request #730 from jl777/jl777
Remove mindiff cap for 100% PoS
2018-07-05 21:48:39 -11:00
jl777 bb2d9e7b07 Merge pull request #729 from jl777/jl777
Ht.200 exemption
2018-07-05 08:10:37 -11:00
jl777 666d66fde8 Merge pull request #728 from jl777/jl777
skip check <130
2018-07-05 07:21:33 -11:00
jl777 b595d20ddc Merge pull request #727 from jl777/jl777
Prevent PoW in 100% PoS
2018-07-05 07:09:58 -11:00
jl777 e701463cda Merge pull request #726 from jl777/jl777
No exemption for isPoS
2018-07-05 06:33:16 -11:00
jl777 193367cb54 Merge pull request #725 from jl777/jl777
fix isPoS detection
2018-07-05 06:20:27 -11:00
jl777 a271bcc842 Merge pull request #724 from jl777/jl777
Vins == 1 check for staking utxo
2018-07-05 05:53:45 -11:00
jl777 355c554c17 Merge pull request #723 from jl777/jl777
stricter tests for 100% PoS chains
2018-07-05 05:50:15 -11:00
jl777 98145b02ae Merge pull request #722 from jl777/jl777
Fix ac_private help
2018-07-05 01:50:38 -11:00
jl777 0cf44f9d67 Merge pull request #720 from jl777/jl777
Jl777
2018-07-04 01:35:52 -11:00
jl777 452c82921e Merge pull request #716 from chainmakers/dev
Dev
2018-07-01 23:07:41 -11:00
jl777 9ff34b15db Merge pull request #717 from jl777/jl777
fixes for 100% PoS assetchains
2018-07-01 00:47:26 -11:00
jl777 9017c55676 Merge pull request #715 from jl777/jl777
Jl777
2018-06-29 03:07:09 -11:00
jl777 9fe465ebec Merge pull request #713 from jl777/jl777
Jl777
2018-06-28 05:31:10 -11:00
jl777 3092580a77 Merge pull request #712 from libscott/jl777-evalhfixes
two fixes for eval.h so it compiles on older gcc and prevent an overflow
2018-06-28 05:25:57 -11:00
jl777 4c4f1807ad Merge pull request #711 from jl777/jl777
Syntax
2018-06-27 09:19:51 -11:00
jl777 2fa9f175a9 Merge pull request #710 from jl777/jl777
Jl777
2018-06-27 09:00:47 -11:00
jl777 c8e54f8472 Merge pull request #709 from jl777/jl777
handle case of no checkpoints at all
2018-06-27 07:11:03 -11:00
jl777 67faba8d91 Merge pull request #707 from jl777/jl777
Jl777
2018-06-27 06:57:13 -11:00
jl777 6e6a953072 Merge pull request #706 from himu007/patch-12
VRSC fix
2018-06-27 06:56:45 -11:00
jl777 0e666a4149 Merge pull request #703 from jl777/kolo-is-awesome
asset chains
2018-06-27 03:23:59 -11:00
jl777 d80ba77666 Merge pull request #702 from jl777/jl777
Fix -addressindex mode for paytopubkey

MoMoM support
2018-06-26 06:54:52 -11:00
jl777 098dad7df7 Merge pull request #701 from Alrighttt/dev
add KV help docs
2018-06-25 08:58:14 -11:00
jl777 c5ba245408 Merge pull request #700 from libscott/momo
Cross chain fungibility
2018-06-20 01:22:29 -11:00
jl777 2321eb9875 Merge pull request #699 from lukechilds/dev
Make src/fiat/zilla executable
2018-06-18 03:59:55 -11:00
jl777 b683c29bd7 Merge pull request #697 from jl777/jl777
Jl777
2018-06-13 21:05:02 -11:00
jl777 4c7e1060f6 Merge pull request #696 from ChainZilla/dev
I fixed missing dpow configurations
2018-06-13 10:10:28 -11:00
jl777 fa83088529 Merge pull request #694 from jl777/jl777
make notarizations complete by preventing skipping old ones
2018-06-13 08:50:33 -11:00
jl777 da03076d6f Merge pull request #695 from ChainZilla/dev
Added Zilla Chain
2018-06-13 08:32:45 -11:00
jl777 ada22ead25 Merge pull request #693 from l0rb/patch-2
remove unused variable
2018-06-08 09:09:02 -11:00
jl777 f6cf227a30 Merge pull request #691 from jl777/jl777
reduce notary mining initial delay from 65 to 60 seconds
2018-06-08 05:18:55 -11:00
jl777 f19b324032 Merge pull request #690 from jl777/jl777
prevent long delay between blocks
2018-06-07 21:15:05 -11:00
jl777 b268860f81 Merge pull request #689 from jl777/jl777
-genjson option for komodo_port.c
much faster convergence for PoS/Pow ratio, but it will break any existing test chains
2018-06-06 03:01:17 -11:00
jl777 5891a4215a Merge pull request #688 from letolabs/viewingkeys
Fix the importing and exporting of viewing keys on mainnet + testnet
2018-06-02 20:13:18 -11:00
jl777 5251910566 Merge pull request #686 from jl777/jl777
fix KV chain detection of MoM so prevMoMheight is non-zero
changes to PoS/PoW diff and staking algo: breaking change for testchains AC using -ac_staked
2018-06-01 07:42:33 -11:00
jl777 5e193eea72 Merge pull request #685 from jl777/jl777
Truncate MoMdepth
2018-05-30 12:58:03 -11:00
jl777 20d63ae8b9 Merge pull request #684 from jl777/jl777
Encode Ccid into upper MoMdepth
2018-05-30 12:31:16 -11:00
jl777 51c7d99169 Merge pull request #683 from jl777/jl777
Add VRSC to assetchains.old
2018-05-30 11:09:10 -11:00
jl777 57b7e06242 Merge pull request #682 from jl777/jl777
Height 1 exclusion -ac_pubkey
2018-05-30 09:18:16 -11:00
jl777 d56e039dba Merge pull request #681 from jl777/jl777
various bug fixes
2018-05-30 05:36:39 -11:00
jl777 05ee667701 Merge pull request #680 from jl777/2coins-kolo
2 new coins
2018-05-28 00:26:37 -11:00
jl777 de8834fb9b Merge branch 'beta' into dev 2018-05-23 15:18:21 +03:00
jl777 371c496499 Merge pull request #678 from jl777/jl777
+print
2018-05-23 14:41:20 +03:00
jl777 80b0a73a34 Merge pull request #677 from igorvoltaic/dev
lets get rid of this message: 'section __textcoal_nt is deprecated'
2018-05-23 13:18:17 +03:00
jl777 53e8e2401c Merge pull request #676 from jl777/jl777
Jl777
2018-05-23 10:06:53 +03:00
jl777 0b72f2e5f5 Merge pull request #675 from Alrighttt/dev
Changed help docs to reflect KMD/assetchains
2018-05-22 10:49:38 +03:00
jl777 c9832b3a35 Merge pull request #670 from letolabs/regtest
Regtest mode for Komodo
2018-05-19 22:36:56 +03:00
jl777 c669b8bd8c Merge pull request #669 from jl777/jl777
enable GAME
2018-05-19 18:49:50 +03:00
jl777 8d926f6ece Merge pull request #668 from jl777/jl777
Enable zmergetoaddress by default
2018-05-19 08:49:11 +03:00
jl777 b9e8849a6a Merge pull request #667 from KomodoPlatform/dev
add DSEC
2018-05-19 08:29:57 +03:00
jl777 90416cc3b3 Merge pull request #666 from jl777/jl777
Change notary sig to CRYPTO output
2018-05-16 09:58:42 +03:00
jl777 163c740bf9 Merge pull request #665 from jl777/jl777
Jl777
2018-05-14 16:54:48 +03:00
jl777 8dcf818ee9 Merge pull request #664 from pbca26/beta
rename zcash to komodo in cli examples
2018-05-12 16:09:01 +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
jl777 bc39b264cb Merge pull request #661 from ca333/patch-6
update libgmp
2018-05-10 13:09:46 +03:00
jl777 629ff5a287 Merge pull request #660 from jl777/jl777
Jl777
2018-05-09 10:05:25 +03:00
jl777 ccb805c993 Merge pull request #659 from jl777/jl777
Jl777
2018-05-08 21:05:15 +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
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 2a1a6c5cb3 Merge pull request #653 from jl777/jl777
Monthly cap
2018-05-04 17:41:05 +03:00
jl777 08f17e01d3 Merge pull request #651 from jl777/jl777
65 seconds to slow down diff
2018-05-03 16:18:32 +03:00
jl777 e3a9e5fe72 Merge pull request #650 from jl777/jl777
Jl777
2018-05-03 14:21:28 +03:00