DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
24,173 Commits 5 Branches 7 Tags
b9779b671c58466c299bb7df5bb1eb83edbd2a91
Commit Graph
62 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
blackjok3rtt 04f7f39d23 Merge pull request #79 from KMDLabs/mastertest 
Merge MaterTest to master.
 2019-01-25 18:09:07 +08:00
blackjok3rtt ec1abe2be2 Merge pull request #13 from jl777/jl777 
Jl777
 2019-01-24 16:58:22 +08:00
blackjok3rtt cad982a5b9 Merge pull request #11 from jl777/FSM 
Fsm
 2019-01-18 16:59:56 +08:00
blackjok3rtt a5d60caf7d Merge pull request #9 from jl777/FSM 
Fsm
 2019-01-11 23:23:14 +08:00
blackjok3rtt 896ea15cd9 Merge pull request #8 from jl777/FSM 
Fsm
 2019-01-10 22:32:26 +08:00
blackjok3rtt 5d34792067 fix 2019-01-07 20:41:54 +08:00
blackjok3rtt 07f7ad3717 Merge pull request #5 from jl777/FSM 
Fsm
 2019-01-06 20:46:26 +08:00
blackjok3rtt be07d63f99 Merge pull request #69 from StakedChain/ac_import 
try to fix invalid burntx decode error
 2019-01-03 09:57:08 +08:00
blackjok3rtt ad78d2f1ec Merge pull request #68 from StakedChain/ac_import 
Merge in latest FSM to test migrates and new RPC call.
 2019-01-03 01:07:02 +08:00
blackjok3rtt 080d02e673 Merge pull request #67 from jl777/FSM 
merge latest FSM in, to add sourcechain to burn tx.
 2019-01-03 01:03:22 +08:00
blackjok3rtt 3bee7f5af6 Merge pull request #4 from jl777/FSM 
Fsm
 2018-12-28 16:09:23 +08:00
blackjok3rtt fe8f79cd50 Merge pull request #2 from jl777/FSM 
Fsm
 2018-12-20 20:13:34 +08:00
blackjok3rtt 9fc9804ced Merge pull request #1 from jl777/FSM 
Fsm
 2018-12-18 02:24:20 +08:00
blackjok3rtt ca2129e81d Merge pull request #63 from blackjok3rtt/FSM 
Fsm
 2018-12-17 11:49:40 +08:00
blackjok3rtt 4a2ea81f3c Merge branch 'master' into FSM 2018-12-17 11:49:30 +08:00
blackjok3rtt c17728c00c fix format 2018-12-17 00:26:10 +08:00
blackjok3rtt 5c4fe22eb4 Merge pull request #62 from jl777/FSM 
Fsm
 2018-12-16 22:07:46 +08:00
blackjok3rtt 28ae322fdf Merge pull request #60 from jl777/FSM 
Fsm
 2018-12-15 09:26:18 +08:00
blackjok3rtt 3bcb934292 Merge pull request #24 from jl777/FSM 
Fsm
 2018-12-15 01:03:53 +08:00
blackjok3rtt 1d668381a4 Merge pull request #22 from jl777/FSM 
Fsm
 2018-12-14 19:38:19 +08:00
blackjok3rtt 9d9974442d fix formatting again... 2018-12-14 17:49:23 +08:00
blackjok3rtt 5f3a589dff Merge pull request #20 from jl777/FSM 
Fsm
 2018-12-06 22:00:39 +08:00
blackjok3rtt 0480ddbfba Merge pull request #19 from libscott/manymomoms 
check many MoMoMs on tx import
 2018-12-06 20:24:02 +08:00
blackjok3rtt d8a94218c5 Merge pull request #18 from jl777/FSM 
Fsm
 2018-12-06 20:23:13 +08:00
blackjok3rtt d72bc11da2 Merge pull request #57 from StakedChain/periodic_founders 
Periodic founders and fix getnotarysendmany
 2018-12-06 00:31:36 +08:00
blackjok3rtt 9b8bd2c605 Merge pull request #56 from StakedChain/noStreamer 
No streamer
 2018-12-05 20:13:56 +08:00
blackjok3rtt 6b8d3d392a Delete rpcmisc.cpp 2018-12-05 20:13:30 +08:00
blackjok3rtt dbada96ce0 Merge pull request #55 from StakedChain/noStreamer 
Merge sapling into master
 2018-12-05 18:47:18 +08:00
blackjok3rtt 70f32532eb Merge pull request #54 from jl777/FSM 
Fsm
 2018-12-04 22:16:15 +08:00
blackjok3rtt 857edc21a4 Merge pull request #52 from StakedChain/master 
attempt wallet fix for empty vin issue
 2018-12-01 14:07:02 +08:00
blackjok3rtt b783b872b8 Merge pull request #16 from jl777/FSM 
Fsm
 2018-12-01 12:49:42 +08:00
blackjok3rtt ec86a7c941 Merge pull request #51 from jl777/FSM 
Fsm
 2018-12-01 09:07:47 +08:00
blackjok3rtt e11cef924b Merge pull request #14 from jl777/FSM 
Fsm
 2018-11-29 18:30:15 +08:00
blackjok3rtt 85250d52fa Merge pull request #11 from jl777/FSM 
Fix rounding error:  + 0.00000000499999
 2018-11-14 18:08:52 +08:00
blackjok3rtt 4632956f4a Merge pull request #9 from jl777/FSM 
Fsm
 2018-11-13 23:10:07 +08:00
blackjok3rtt 4de1a81b3a Merge pull request #8 from jl777/FSM 
Fsm
 2018-11-12 18:57:14 +08:00
blackjok3rtt e4e541e347 Merge pull request #46 from StakedChain/master 
merge master updates to test branch
 2018-11-11 17:05:37 +08:00
blackjok3rtt 0026050cfb Merge pull request #45 from blackjok3rtt/cleanwalletnotarisations 
Cleanwalletnotarisations
 2018-11-11 16:25:36 +08:00
blackjok3rtt 62fa9bddbb Merge pull request #44 from StakedChain/pool_test 
Pool test
 2018-11-11 13:02:34 +08:00
blackjok3rtt 0e29c2219e Merge pull request #5 from jl777/FSM 
Fsm
 2018-11-10 11:34:51 +08:00
blackjok3rtt 8cd4e220ec Merge pull request #43 from StakedChain/mastertest 
Mastertest
 2018-11-09 20:46:24 +08:00
blackjok3rtt 85f207e10c Merge pull request #42 from StakedChain/dwy_mitigation 
Test merge dwy_mitigation into master
 2018-11-09 18:29:39 +08:00
blackjok3rtt ad7b12d2ad Merge branch 'mastertest' into dwy_mitigation 2018-11-09 18:29:26 +08:00
blackjok3rtt af5144e2ae Merge pull request #4 from jl777/FSM 
Fsm merge in upstream
 2018-11-09 18:09:42 +08:00
blackjok3rtt 70999bc672 Merge pull request #41 from blackjok3rtt/cleanwalletnotarisations 
Cleanwalletnotarisations
 2018-11-09 17:53:41 +08:00
blackjok3rtt 4e72b45fb9 Merge pull request #3 from jl777/dev 
Merge dev upstream in
 2018-11-09 14:04:38 +08:00
blackjok3rtt 5fe4e9d6f3 Merge pull request #40 from blackjok3rtt/fixgettransactioncrash 
Fixgettransactioncrash
 2018-11-03 21:13:22 +08:00
blackjok3rtt 7258003351 Merge branch 'dwy_mitigation2' into fixgettransactioncrash 2018-11-03 21:13:11 +08:00
blackjok3rtt 969689713d Merge branch 'libscottFIX' into fixgettransactioncrash 2018-11-03 20:58:06 +08:00
blackjok3rtt e955c22d23 Merge pull request #37 from StakedChain/master 
Era fix and print
 2018-11-02 16:47:54 +08:00
blackjok3rtt 3ecd12ca8b Merge pull request #30 from StakedChain/blackjok3r 
merge blackjok3r branch and FSM fixes into master
 2018-11-01 14:01:09 +08:00
blackjok3rtt 3cf81c0753 Merge pull request #29 from StakedChain/ac_address 
Merge in the streamer
 2018-11-01 13:48:47 +08:00
blackjok3rtt e4e1c3874e Merge branch 'momom_printsonly' into master 2018-10-31 12:05:38 +08:00
blackjok3rtt 2d5ed3ee6a Merge pull request #27 from StakedChain/streamer_recv 
merge streamer branch into copy of master to check conflicts
 2018-10-30 22:39:50 +08:00
blackjok3rtt 1abcc36518 Merge branch 'ac_address' into streamer_recv 2018-10-30 22:39:30 +08:00
blackjok3rtt f4a4641c56 Merge pull request #1 from jl777/FSM 
Fsm
 2018-10-28 05:35:56 +08:00
blackjok3rtt 0cfd7009d7 Merge pull request #21 from StakedChain/master 
merge master down
 2018-10-07 00:23:08 +08:00
blackjok3rtt 99dad8d238 Merge pull request #18 from StakedChain/min_merge_address 
Upgrade z_mergetoaddress to take an extra prameter for utxo size
 2018-10-02 01:39:14 +08:00
blackjok3rtt 3aee2fae5e hopefully fixed that lol 2018-09-25 17:38:18 +08:00
blackjok3rtt 93e35be732 Merge pull request #13 from StakedChain/blackjok3r3 
Height Activation
 2018-09-25 16:41:11 +08:00
blackjok3rtt c0128ed414 fix issue where if there are not two notarisations the MoMoM is indeterninate 2018-09-15 14:17:18 +08:00
blackjok3rtt 36f90242d0 Merge pull request #7 from StakedChain/web 
update webworker keys
 2018-09-11 22:12:09 +08:00