DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
27,426 Commits 5 Branches 7 Tags
93bba030ee26a7ea74b2b0ebd2a18cb67eb673a1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
blackjok3rtt 4b90e548a6 Merge branch 'master' into jl777 2019-05-14 08:47:56 +08:00
blackjok3rtt dc3bc1e89a Merge pull request #81 from jl777/jl777 
Jl777
 2019-05-14 08:41:48 +08:00
blackjok3rtt a4611893e5 Merge pull request #79 from jl777/jl777 
Jl777
 2019-05-09 14:37:50 +08:00
blackjok3rtt 5d9da3da03 Merge pull request #108 from blackjok3rtt/jl777 
Jl777
 2019-05-06 12:11:01 +08:00
blackjok3rtt c7ab203920 Merge pull request #77 from KMDLabs/master 
paymentsCC
 2019-05-06 01:02:38 +08:00
blackjok3rtt aa32b1f963 Merge pull request #107 from blackjok3rtt/jl777 
add daily snapshot address to getsnapshot (top = -1)
 2019-05-03 22:39:24 +08:00
blackjok3rtt b750ac018f revert back to rogue 2019-05-03 13:08:29 +08:00
blackjok3rtt 06899adea0 Merge pull request #106 from KMDLabs/paymentsCC 
Payments cc
 2019-05-03 01:20:20 +08:00
blackjok3rtt bb23c59d1f Merge pull request #105 from blackjok3rtt/jl777 
Jl777
 2019-05-03 00:23:03 +08:00
blackjok3rtt a9e350b8b6 Merge pull request #104 from blackjok3rtt/jl777 
merge paymentsCC in
 2019-05-02 20:29:08 +08:00
blackjok3rtt 8615cf68f7 Merge pull request #75 from blackjok3rtt/paymentsAD 
Payments airdrop
 2019-04-29 22:52:43 +08:00
blackjok3rtt 13d6ab4f87 Merge pull request #76 from jl777/jl777 
Jl777
 2019-04-29 22:50:53 +08:00
blackjok3rtt 6d910a2c0d Merge pull request #102 from blackjok3rtt/dev 
walelt fix dpow fix
 2019-04-29 11:36:25 +08:00
blackjok3rtt dd063f7913 Merge pull request #73 from jl777/jl777 
Jl777
 2019-04-26 12:25:41 +08:00
blackjok3rtt 4762558067 Merge pull request #72 from jl777/jl777 
Jl777
 2019-04-25 10:07:21 +08:00
blackjok3rtt a44390244c Merge pull request #101 from KMDLabs/mastertest 
Mastertest
 2019-04-20 13:15:24 +08:00
blackjok3rtt 9900063ced Merge pull request #100 from blackjok3rtt/newLABS 
New labs
 2019-04-20 13:12:23 +08:00
blackjok3rtt d12fb49e80 Merge pull request #70 from jl777/jl777 
Jl777
 2019-04-20 11:13:56 +08:00
blackjok3rtt e36ef072c9 Merge pull request #69 from jl777/jl777 
Merge token back down
 2019-04-20 10:02:14 +08:00
blackjok3rtt 9f1c4f88e9 Merge pull request #68 from jl777/jl777 
Jl777
 2019-04-17 17:38:24 +08:00
blackjok3rtt f2666b3293 Merge pull request #67 from jl777/FSM 
Fsm
 2019-04-17 14:36:14 +08:00
blackjok3rtt c2c425d855 Merge pull request #66 from jl777/jl777 
Jl777
 2019-04-17 10:38:18 +08:00
blackjok3rtt 7f89532c03 Merge pull request #64 from blackjok3rtt/jl777 
fix wallet code. Force daemon close and reccomend zapwallettxns for n…
 2019-04-16 16:08:41 +08:00
blackjok3rtt 4049f9f6be Merge pull request #63 from jl777/jl777 
Jl777
 2019-04-16 11:52:45 +08:00
blackjok3rtt 0666dc7cd8 Merge pull request #62 from jl777/dev 
Dev
 2019-04-15 13:07:42 +08:00
blackjok3rtt 47e290017f Merge pull request #61 from blackjok3rtt/jl777 
Jl777
 2019-04-15 13:06:25 +08:00
blackjok3rtt 741f5b7d58 Merge pull request #60 from jl777/jl777 
Jl777
 2019-04-15 12:02:19 +08:00
blackjok3rtt b33d2342a1 Merge pull request #59 from jl777/jl777 
Jl777
 2019-04-12 17:10:28 +08:00
blackjok3rtt fcc5b36c77 Merge pull request #58 from jl777/jl777 
Jl777
 2019-04-12 15:38:08 +08:00
blackjok3rtt 0d3f1b0515 Merge pull request #57 from jl777/jl777 
Another qsort revert
 2019-04-12 14:53:26 +08:00
blackjok3rtt 44a9cb6085 Merge pull request #56 from jl777/jl777 
Jl777
 2019-04-12 14:51:10 +08:00
blackjok3rtt 12a7bf62cf Merge pull request #55 from jl777/jl777 
Jl777
 2019-04-12 13:39:05 +08:00
blackjok3rtt e5ea4d5c1c Merge pull request #54 from jl777/jl777 
Jl777
 2019-04-10 15:18:30 +08:00
blackjok3rtt 2fbb858bef remove git link 2019-04-10 12:27:53 +08:00
blackjok3rtt da4cf952ce Merge pull request #53 from jl777/jl777 
Jl777
 2019-04-09 16:16:38 +08:00
blackjok3rtt 292dbd8d9a Merge pull request #52 from jl777/jl777 
Jl777
 2019-04-07 12:03:20 +08:00
blackjok3rtt fb800071f9 Merge pull request #51 from jl777/jl777 
Jl777
 2019-04-02 17:10:57 +08:00
blackjok3rtt 4ed9e1949a Merge pull request #50 from jl777/dev 
Dev
 2019-04-02 00:49:57 +08:00
blackjok3rtt def0d4b9d9 Merge pull request #49 from jl777/jl777 
Fix strange data bug
 2019-04-01 16:28:15 +08:00
blackjok3rtt d724d3fb29 Merge pull request #48 from jl777/jl777 
Jl777
 2019-04-01 12:50:08 +08:00
blackjok3rtt 0b75096839 Merge pull request #47 from jl777/jl777 
Jl777
 2019-03-29 13:27:56 +08:00
blackjok3rtt 05b408657a Merge pull request #46 from jl777/jl777 
Jl777
 2019-03-28 14:38:45 +08:00
blackjok3rtt 4116c611ff Merge pull request #45 from jl777/jl777 
Jl777
 2019-03-27 08:47:23 +08:00
blackjok3rtt 766d07857f Merge pull request #44 from jl777/jl777 
Jl777
 2019-03-26 13:51:48 +08:00
blackjok3rtt 0286144142 Merge pull request #43 from jl777/jl777 
Jl777
 2019-03-25 19:52:46 +08:00
blackjok3rtt ed8bdae295 Merge pull request #42 from jl777/jl777 
Jl777
 2019-03-25 16:42:16 +08:00
blackjok3rtt b7183cec33 Merge pull request #40 from jl777/jl777 
Jl777
 2019-03-22 16:53:03 +08:00
blackjok3rtt 7006f4ef9c Merge pull request #39 from jl777/jl777 
Jl777
 2019-03-22 15:57:39 +08:00
blackjok3rtt 768e621b11 Merge pull request #38 from jl777/jl777 
Shift payments vouts to put change in vout0
 2019-03-22 15:10:23 +08:00
blackjok3rtt 540720b50d Merge pull request #36 from jl777/jl777 
Jl777
 2019-03-22 09:16:58 +08:00
blackjok3rtt b296b5da6b Merge pull request #34 from jl777/dev 
Dev
 2019-03-21 22:21:50 +08:00
blackjok3rtt d8d7463ea0 Fix sendmany bug for Alright (#1336) 
* fix sendmany bug, when sending to multiple address diffrent amounts would always use the first seen value.

* Possible fix for multi node musig. Needs to be tested. Was getting stuck at nonce stage, as reported by gcharang.
 2019-03-17 20:22:20 -11:00
blackjok3rtt b97f4e091e fix 100% PoS chain (#1332) 2019-03-13 21:47:09 -11:00
blackjok3rtt 18aaa118be Merge pull request #28 from jl777/FSM 
Fsm
 2019-02-26 21:42:37 +08:00
blackjok3rtt c35503c4d4 Merge pull request #27 from jl777/dev 
Dev
 2019-02-26 16:30:10 +08:00
blackjok3rtt 9d36bc5ad9 Merge pull request #26 from KMDLabs/FSM_test 
Fsm test
 2019-02-26 12:39:20 +08:00
blackjok3rtt 954dd86f2e Merge pull request #25 from jl777/FSM 
Fsm
 2019-02-26 09:44:18 +08:00
blackjok3rtt 735b082aec Merge pull request #24 from jl777/jl777 
Jl777
 2019-02-25 14:27:56 +08:00
blackjok3rtt 1f16c05625 Merge pull request #22 from jl777/jl777 
Jl777
 2019-02-23 11:40:34 +08:00
blackjok3rtt af32286560 Merge pull request #21 from jl777/jl777 
Jl777
 2019-02-22 08:27:58 +08:00
blackjok3rtt c32cb40947 Merge pull request #20 from jl777/jl777 
Jl777
 2019-02-21 11:28:12 +08:00
blackjok3rtt d29ce2b050 Merge pull request #82 from jl777/FSM 
Merge latest FSM down
 2019-02-18 19:20:07 +08:00
blackjok3rtt 871b765999 fix 2019-02-15 17:18:40 +08:00
blackjok3rtt 1a26a2b4ed Merge pull request #17 from jl777/dev 
Dev
 2019-01-28 14:16:45 +08:00
blackjok3rtt 0d8bd51091 Merge pull request #16 from jl777/jl777 
Jl777
 2019-01-26 11:01:54 +08:00
blackjok3rtt eceffe5f5a Merge pull request #15 from jl777/dev 
Dev
 2019-01-25 21:14:36 +08:00
blackjok3rtt 04f7f39d23 Merge pull request #79 from KMDLabs/mastertest 
Merge MaterTest to master.
 2019-01-25 18:09:07 +08:00
blackjok3rtt 6a8a3731f0 Merge pull request #14 from jl777/jl777 
Jl777
 2019-01-24 22:28:04 +08:00
blackjok3rtt ec1abe2be2 Merge pull request #13 from jl777/jl777 
Jl777
 2019-01-24 16:58:22 +08:00
blackjok3rtt b0896b8782 Merge pull request #12 from jl777/FSM 
Fsm
 2019-01-23 21:20:26 +08:00
blackjok3rtt cad982a5b9 Merge pull request #11 from jl777/FSM 
Fsm
 2019-01-18 16:59:56 +08:00
blackjok3rtt 556ccca0a4 Merge pull request #10 from jl777/dev 
Dev
 2019-01-11 23:35:23 +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 7bbc40a9a7 Merge pull request #7 from jl777/dev 
Dev
 2019-01-10 02:30:13 +08:00
blackjok3rtt fc5f85c388 Merge pull request #6 from jl777/dev 
Dev
 2019-01-08 11:04:19 +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 da8d76060a Merge pull request #21 from jl777/dev 
Dev
 2018-12-10 18:39:00 +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