 jl777
|
ae11e32574
|
Merge pull request #1018 from himu007/patch-12
Update README.md
|
2018-12-03 07:13:38 -11:00 |
|
|
jl777
|
4b984eb540
|
Merge pull request #1016 from tonymorony/FSM
separated tests for different CCs to different files
|
2018-12-03 04:32:36 -11:00 |
|
|
jl777
|
a6597a8f83
|
Merge pull request #1013 from jl777/dev
sync DEV -> FSM
|
2018-12-01 23:30:21 -11:00 |
|
|
jl777
|
b09f1c193a
|
Merge pull request #1011 from jl777/FSM
FSM
|
2018-12-01 08:43:25 -11:00 |
|
|
jl777
|
181dcaa02c
|
Merge pull request #1010 from jl777/jl777
dealer0 fixes to create entropytx reliably
|
2018-12-01 04:00:15 -11:00 |
|
|
jl777
|
706208ecf9
|
Merge pull request #1009 from jl777/jl777
fix staking edge case
|
2018-11-30 23:38:28 -11:00 |
|
|
jl777
|
bf5705da1e
|
Merge pull request #1008 from blackjok3rtt/FSM
fix getblocktemplate
|
2018-11-30 21:51:28 -11:00 |
|
|
jl777
|
35a0d86d64
|
Merge pull request #1007 from jl777/jl777
Jl777
|
2018-11-30 13:59:36 -11:00 |
|
|
jl777
|
e0ee681019
|
Merge pull request #1006 from jl777/jl777
Jl777
|
2018-11-30 12:23:20 -11:00 |
|
|
jl777
|
6b5dbcf41c
|
Merge pull request #1005 from dimxy/dimxy-val
Dimxy val (asset validation and tx creation check against bad tx's in the ancestors)
|
2018-11-30 12:15:25 -11:00 |
|
|
jl777
|
7cbd6557c3
|
Merge pull request #1004 from blackjok3rtt/fix_cli
Fix cli includes
|
2018-11-29 06:58:25 -11:00 |
|
|
jl777
|
cc77288f5a
|
Merge pull request #1003 from jl777/jl777
Jl777
|
2018-11-29 03:03:38 -11:00 |
|
|
jl777
|
4e781776e2
|
Merge pull request #1001 from jl777/FSM
FSM
|
2018-11-28 21:55:08 -11:00 |
|
|
jl777
|
256c0b799c
|
Merge pull request #1000 from jl777/jl777
Mempool fixes in the CC path
|
2018-11-28 21:53:58 -11:00 |
|
|
jl777
|
2e1f49dfa6
|
Merge pull request #999 from jl777/jl777
Jl777
|
2018-11-28 04:07:23 -11:00 |
|
|
jl777
|
b1c4e5eaae
|
Merge pull request #998 from jl777/jl777
Prevent sapling activation until ac_sapling set
|
2018-11-28 00:35:56 -11:00 |
|
|
jl777
|
03383b18b6
|
Merge pull request #997 from jl777/jl777
Jl777
|
2018-11-27 23:03:50 -11:00 |
|
|
jl777
|
5d5da38a6f
|
Merge pull request #996 from himu007/patch-8
Update assetchains.json
|
2018-11-27 08:45:17 -11:00 |
|
|
jl777
|
4e44fe01a4
|
Merge pull request #994 from chainmakers/dev
EQL activate CC
|
2018-11-27 06:17:39 -11:00 |
|
|
jl777
|
e68ece5cd1
|
Merge pull request #993 from jl777/FSM
FSM
|
2018-11-27 05:30:57 -11:00 |
|
|
jl777
|
98fc53819a
|
Merge pull request #992 from jl777/jl777
Jl777
|
2018-11-27 05:05:33 -11:00 |
|
|
jl777
|
4d7df9f590
|
Merge pull request #991 from miketout/dev-komodo
Updated db calls in CBlockTree::Snapshot
|
2018-11-26 22:04:32 -11:00 |
|
|
jl777
|
ffa22dc5c0
|
Merge pull request #990 from Mixa84/FSM
Fix tx_notarizedconfirmed
|
2018-11-26 10:23:50 -11:00 |
|
|
jl777
|
19930a5f65
|
Merge pull request #989 from jl777/jl777
MIN_NON_NOTARIZED_CONFIRMS -> 101
|
2018-11-26 09:18:33 -11:00 |
|
|
jl777
|
b001c75108
|
Merge pull request #988 from jl777/jl777
init notarized
|
2018-11-26 09:02:21 -11:00 |
|
|
jl777
|
ab109df2b7
|
Merge pull request #987 from jl777/jl777
Fix case
|
2018-11-26 08:59:14 -11:00 |
|
|
jl777
|
cb718dce12
|
Merge pull request #986 from jl777/jl777
Jl777
|
2018-11-26 08:52:12 -11:00 |
|
|
jl777
|
fe274bf254
|
Merge pull request #985 from Mixa84/FSM
Gateways withdraw update
|
2018-11-26 08:39:10 -11:00 |
|
|
jl777
|
fbb3490bfb
|
Merge pull request #984 from letolabs/FSM
Fsm
|
2018-11-26 06:18:12 -11:00 |
|
|
jl777
|
0ca564da8c
|
Merge pull request #983 from jl777/jl777
Delay
|
2018-11-25 06:32:55 -11:00 |
|
|
jl777
|
a6ec35d8cb
|
Merge pull request #982 from jl777/jl777
Jl777
|
2018-11-25 06:28:46 -11:00 |
|
|
jl777
|
4709d72570
|
Merge pull request #981 from jl777/jl777
+debug
|
2018-11-25 06:25:00 -11:00 |
|
|
jl777
|
8f47dce303
|
Merge pull request #980 from jl777/jl777
Slow down migrate
|
2018-11-25 06:17:37 -11:00 |
|
|
jl777
|
50fbc59590
|
Merge pull request #979 from jl777/jl777
Test
|
2018-11-25 06:03:36 -11:00 |
|
|
jl777
|
ed9147a5f1
|
Merge pull request #978 from jl777/jl777
Jl777
|
2018-11-25 06:02:09 -11:00 |
|
|
jl777
|
9dfb4184f0
|
Merge pull request #977 from ca333/patch-2
fix makeRelease.sh
|
2018-11-25 05:10:25 -11:00 |
|
|
jl777
|
5fc3f58e76
|
Merge pull request #976 from ca333/patch-1
update gitlab CI conf
|
2018-11-25 05:10:00 -11:00 |
|
|
jl777
|
d80ef46e94
|
Merge pull request #974 from jl777/jl777
sapling release candidate
|
2018-11-25 04:25:08 -11:00 |
|
|
jl777
|
8b05586dc5
|
Merge pull request #973 from jl777/FSM
FSM
|
2018-11-25 04:19:55 -11:00 |
|
|
jl777
|
1276d4b72d
|
Merge pull request #972 from jl777/jl777
maxinputs+1
|
2018-11-25 04:13:49 -11:00 |
|
|
jl777
|
db8e9dde5c
|
Merge pull request #971 from letolabs/ac_private_tests
Tests for ac_private=1
|
2018-11-23 20:22:37 -11:00 |
|
|
jl777
|
e4d6a53cd0
|
Merge pull request #970 from letolabs/verushash
Tests for -ac_algo=verushash
|
2018-11-23 10:51:59 -11:00 |
|
|
jl777
|
4458e675a2
|
Merge pull request #969 from tonymorony/FSM
CC auto-tests changes
|
2018-11-22 23:01:56 -11:00 |
|
|
jl777
|
9b80571a2d
|
Merge pull request #967 from miketout/dev-komodo
Fix index db iterators
|
2018-11-21 21:22:41 -11:00 |
|
|
jl777
|
ab3ae964e1
|
Merge pull request #966 from letolabs/ccerrors
Add various error checking to gateway + oracle RPCs
|
2018-11-20 21:48:24 -11:00 |
|
|
jl777
|
f5c0b2039e
|
Merge pull request #965 from letolabs/fsm-fix
Get dice CC compiling again
|
2018-11-20 21:40:42 -11:00 |
|
|
jl777
|
7dfae3293b
|
Merge pull request #964 from miketout/dev-komodo
Fix bug in oracles for KMDICE and others
|
2018-11-18 22:31:18 -11:00 |
|
|
jl777
|
065756bdc2
|
Merge pull request #963 from miketout/dev-komodo
Latest fixes from testing
|
2018-11-18 21:13:28 -11:00 |
|
|
jl777
|
a187da04b3
|
Merge pull request #962 from miketout/dev-komodo
Fix for chains with coinbase_maturity under 100
|
2018-11-18 05:43:20 -11:00 |
|
|
jl777
|
2a5fc9cd81
|
Merge pull request #958 from miketout/dev-komodo
Support for all Verus parameters, VerusHash, Coinbase Timelocks, Sapling, and 50/50 VerusPoS/PoW, not VerusPoP
|
2018-11-17 22:01:47 -11:00 |
|
|
jl777
|
13165b0d10
|
Merge pull request #960 from jl777/jl777
pre-sapling
|
2018-11-17 22:00:01 -11:00 |
|
|
jl777
|
8173c75652
|
Merge pull request #959 from jl777/FSM
FSM
|
2018-11-17 21:59:12 -11:00 |
|
|
jl777
|
c41f80392b
|
Merge pull request #956 from jl777/jl777
Extra satoshi for KMDICE
|
2018-11-15 00:12:36 -11:00 |
|
|
jl777
|
6ca0bd1c3a
|
Merge pull request #955 from jl777/FSM
Extra satoshi for KMDICE
|
2018-11-15 00:11:53 -11:00 |
|
|
jl777
|
168b59604e
|
Merge pull request #953 from jl777/jl777
sync with FSM
|
2018-11-15 00:08:31 -11:00 |
|
|
jl777
|
0a0e74f740
|
Merge pull request #952 from jl777/FSM
synchronize to FSM
|
2018-11-15 00:07:41 -11:00 |
|
|
jl777
|
a46640a43e
|
Merge pull request #950 from blackjok3rtt/disable_coinbase_option
use external pubkey fix
|
2018-11-14 10:05:01 -11:00 |
|
|
jl777
|
45ac89ca0f
|
Merge pull request #949 from blackjok3rtt/disable_coinbase_option
Disable coinbase option
|
2018-11-14 08:49:03 -11:00 |
|
|
jl777
|
4652afb57a
|
Merge pull request #948 from Mixa84/FSM
Oracle Fix
|
2018-11-14 05:15:23 -11:00 |
|
|
jl777
|
f96d22f663
|
Merge pull request #947 from Alrighttt/dev
Fix ZEX seed node
|
2018-11-14 05:07:59 -11:00 |
|
|
jl777
|
ad56eb54d2
|
Merge pull request #945 from jl777/jl777
Jl777
|
2018-11-13 09:42:07 -11:00 |
|
|
jl777
|
39dcafb0f1
|
Merge pull request #944 from jl777/FSM
FSM
|
2018-11-13 09:41:24 -11:00 |
|
|
jl777
|
7f5ed6ec45
|
Merge pull request #943 from Alrighttt/dev
Dev
|
2018-11-13 01:19:02 -11:00 |
|
|
jl777
|
5c391082dd
|
Merge pull request #941 from jl777/jl777
Jl777
|
2018-11-11 21:44:59 -11:00 |
|
|
jl777
|
8edff10be2
|
Merge pull request #940 from jl777/FSM
FSM
|
2018-11-11 21:44:30 -11:00 |
|
|
jl777
|
4d711ae4aa
|
Merge pull request #938 from jl777/jl777
Jl777
|
2018-11-11 10:15:07 -11:00 |
|
|
jl777
|
44b992f744
|
Merge pull request #937 from jl777/FSM
FSM
|
2018-11-11 10:14:33 -11:00 |
|
|
jl777
|
c5d2a7f105
|
Merge pull request #935 from jl777/jl777
release candidate for KMDICE
|
2018-11-11 03:48:34 -11:00 |
|
|
jl777
|
d662e63bcd
|
Merge pull request #934 from jl777/FSM
release candidate for KMDICE
|
2018-11-11 03:47:59 -11:00 |
|
|
jl777
|
ed38af203d
|
Merge branch 'beta' into dev
|
2018-11-11 00:28:12 -11:00 |
|
|
jl777
|
8a28f91601
|
Merge pull request #932 from jl777/jl777
Jl777
|
2018-11-11 00:26:44 -11:00 |
|
|
jl777
|
f1d395f5bd
|
Merge pull request #931 from jl777/FSM
FSM
|
2018-11-11 00:21:06 -11:00 |
|
|
jl777
|
bd17261194
|
Merge branch 'jl777' into FSM
|
2018-11-11 00:20:48 -11:00 |
|
|
jl777
|
8453af1c13
|
Merge pull request #930 from jl777/kolo
Removed KMDICE
|
2018-11-09 23:04:06 -11:00 |
|
|
jl777
|
e68fb20926
|
Merge pull request #929 from letolabs/CCerror
Clean up dicebet/dicestatus error handling
|
2018-11-07 10:42:24 -11:00 |
|
|
jl777
|
612bfb3500
|
Merge pull request #927 from letolabs/jsindex
Add jsindex to z_listreceivedbyaddress to uniquely identify
|
2018-11-01 07:13:46 -11:00 |
|
|
jl777
|
dde9e773ce
|
Merge pull request #926 from blackjok3rtt/FSM
Dice mempool fix to ignore Z-txs
|
2018-11-01 04:32:25 -11:00 |
|
|
jl777
|
19d614c834
|
Merge pull request #924 from Mixa84/gatewaysCC
Multi signature gateways fix
|
2018-10-31 05:23:46 -11:00 |
|
|
jl777
|
17919f0887
|
Merge pull request #923 from blackjok3rtt/DICE_mempoolfix
Dice mempoolfix, needs more testing to be sure.
|
2018-10-29 06:48:55 -11:00 |
|
|
jl777
|
7c3e764a6a
|
Merge pull request #922 from blackjok3rtt/DICE_fix
Dice fix - this seems to work ok.
|
2018-10-29 01:45:54 -11:00 |
|
|
jl777
|
1ed9e2c8b8
|
Merge pull request #921 from letolabs/size_on_disk
Add size_on_disk to getblockchaininfo from BTC master
|
2018-10-28 22:38:20 -11:00 |
|
|
jl777
|
43aba7ea8f
|
Merge pull request #920 from blackjok3rtt/FSM
random utxo
|
2018-10-28 05:24:43 -11:00 |
|
|
jl777
|
b3ff3d6370
|
Merge pull request #919 from blackjok3rtt/FSM
fix for dice
|
2018-10-28 04:03:19 -11:00 |
|
|
jl777
|
d79f9f650a
|
Merge pull request #918 from blackjok3rtt/FSM
Dice bet/status error messages, and possible fix for fork issue.
|
2018-10-27 21:14:34 -11:00 |
|
|
jl777
|
de490a4695
|
Merge pull request #917 from blackjok3rtt/FSM
Add entropy txs to dice info
|
2018-10-27 10:52:49 -11:00 |
|
|
jl777
|
22c41c6d95
|
Merge pull request #916 from Alrighttt/FSM
FSM
|
2018-10-27 10:08:09 -11:00 |
|
|
jl777
|
27ca539872
|
Merge pull request #915 from blackjok3rtt/setpubkey_RPC
Setpubkey rpc
|
2018-10-23 22:36:05 -11:00 |
|
|
jl777
|
c6cec39e8d
|
Merge pull request #914 from tonymorony/FSM
Oracles creation RPC checks and tests
|
2018-10-19 06:30:15 -11:00 |
|
|
jl777
|
07abafda25
|
Merge pull request #912 from DION-PAY/dev
fix dion perms and assetchains.old
|
2018-10-18 05:29:03 -11:00 |
|
|
jl777
|
80d71f2c9c
|
Merge pull request #911 from tonymorony/FSM
this space made tests failing
|
2018-10-17 22:49:25 -11:00 |
|
|
jl777
|
6afed391f3
|
Merge pull request #910 from DION-PAY/dev
add dion
|
2018-10-17 20:14:11 -11:00 |
|
|
jl777
|
d5107f6415
|
Merge pull request #909 from chainmakers/dev
add KMDICE
|
2018-10-17 08:43:17 -11:00 |
|
|
jl777
|
7d9588e07a
|
Merge pull request #908 from Mixa84/gatewaysCC
Fix oraclesinfo
|
2018-10-16 22:00:34 -11:00 |
|
|
jl777
|
01ba6d10d3
|
Merge pull request #907 from jl777/kolo
PGT
|
2018-10-11 23:54:35 -11:00 |
|
|
jl777
|
68fd571656
|
Merge pull request #906 from Mixa84/channelCCFSM
Channel CC
|
2018-10-09 03:50:34 -11:00 |
|
|
jl777
|
ad0e6b93b8
|
Merge pull request #905 from DeckerSU/dev
+ freq:5 for EMC2
|
2018-10-07 03:07:19 -11:00 |
|
|
jl777
|
35cb5f61d9
|
Merge pull request #903 from Mixa84/channelCCFSM
Updated channel CC docs
|
2018-10-02 02:35:52 -11:00 |
|
|
jl777
|
cc2cd73ae0
|
Merge pull request #904 from himu007/patch-7
Update dpowassets
|
2018-10-02 02:14:27 -11:00 |
|
|
jl777
|
ae6574ee79
|
Merge pull request #902 from Mixa84/channelCCFSM
Channel CC
|
2018-10-01 06:01:06 -11:00 |
|
|
jl777
|
9b400140dc
|
Merge pull request #900 from himu007/patch-5
Update README.md
|
2018-10-01 00:35:33 -11:00 |
|