DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
22,894 Commits 5 Branches 7 Tags
1e058154e3dafba74b1c707caf06120d90dc70ca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jl777 1e058154e3 Merge branch 'FSM' into jl777 2019-01-17 23:22:48 -11:00
jl777 901c795204 Test 2019-01-17 23:22:46 -11:00
jl777 68597fa670 Add CC out 2019-01-17 22:56:06 -11:00
jl777 bc04276465 refmatures 2019-01-17 22:49:41 -11:00
jl777 6e4d54fb7b Refunlockht 2019-01-17 22:48:50 -11:00
jl777 e555995f19 Marmaralock 2019-01-17 22:46:56 -11:00
jl777 81c866f1e8 Merge branch 'FSM' into jl777 2019-01-17 22:10:38 -11:00
jl777 0b257f6dfa Add 1of2 add and coin balances 2019-01-17 21:49:55 -11:00
jl777 8aa8284e61 Merge branch 'FSM' into jl777 
# Conflicts:
#	src/cc/CCtx.cpp
 2019-01-17 20:24:28 -11:00
jl777 6ab103a5bc Merge branch 'FSM' into jl777 2019-01-17 20:21:43 -11:00
jl777 8bdab1fc34 Ref amount 2019-01-17 05:02:34 -11:00
jl777 a9369c2811 Handle short credit loop 2019-01-17 04:49:20 -11:00
jl777 4f0a54f26f 'D' 2019-01-16 23:44:01 -11:00
jl777 f2a11ac0af Settletxid 2019-01-16 23:37:38 -11:00
jl777 d320e88b53 Test 2019-01-16 23:35:14 -11:00
jl777 fe514fd5b6 Tweak 2019-01-16 23:31:08 -11:00
jl777 80d27512be Result 2019-01-16 23:27:08 -11:00
jl777 5de16764e7 Test 2019-01-16 23:26:24 -11:00
jl777 3d93fa24d9 'S' mode 2019-01-16 23:22:10 -11:00
jl777 8d87e118df batontxid = spenttxid; 2019-01-16 23:17:12 -11:00
jl777 ec2c612206 N 2019-01-16 23:15:16 -11:00
jl777 4ec27d22e8 +print 2019-01-16 23:13:21 -11:00
jl777 8099e3af55 Test 2019-01-16 22:46:45 -11:00
jl777 5415bbed42 Print 2019-01-16 22:23:06 -11:00
jl777 41b29fcc39 Automatic flag -> lsb of matures 2019-01-16 22:07:30 -11:00
jl777 d4bdc4d79f Dont forget to pass in pubkeys 2019-01-16 21:58:39 -11:00
jl777 0480189b29 Coinaddr 2019-01-16 21:56:47 -11:00
jl777 9bbfa5e89c Test 2019-01-16 21:56:08 -11:00
jl777 7708731563 Coinaddr 2019-01-16 21:50:39 -11:00
jl777 39a1f86d68 CCpriv 2019-01-16 21:49:31 -11:00
jl777 d42000a838 extern std::vector<CPubKey> NULL_pubkeys; 2019-01-16 21:48:21 -11:00
jl777 8ef1410d28 Cast 2019-01-16 21:46:39 -11:00
jl777 dc737540cf NULL 2019-01-16 21:43:20 -11:00
jl777 1f3dd2947c Pubkeys vector 2019-01-16 21:42:08 -11:00
jl777 a47537398f Sign with mypk 2019-01-16 21:29:43 -11:00
jl777 c9b9d1f26f Unlockht 2019-01-16 21:25:42 -11:00
jl777 62d50529ed Fix 2019-01-16 21:24:53 -11:00
jl777 024a9fd81e implemented marmarasettlement 2019-01-16 21:23:26 -11:00
jl777 af6dae789e syntax 2019-01-15 23:23:10 -11:00
jl777 e1037c704c Prepare to create settlement tx 2019-01-15 23:22:00 -11:00
jl777 8ef46649e5 Fix 2019-01-15 21:02:23 -11:00
jl777 88e77b7851 Allow null batontxid for issue 2019-01-15 20:56:41 -11:00
jl777 0609869874 Ise fixes 2019-01-15 20:26:02 -11:00
jl777 3dcde0ccf1 +ht 2019-01-15 06:07:36 -11:00
jl777 3d8083fb4d -print 2019-01-15 06:05:05 -11:00
jl777 c8af7b80f7 -print 2019-01-15 06:03:51 -11:00
jl777 2dc911558b -print 2019-01-15 05:40:47 -11:00
jl777 1d946f8812 Test 2019-01-15 05:30:48 -11:00
jl777 97f40221f9 Test 2019-01-15 05:21:09 -11:00
jl777 72e7bc73b8 Test 2019-01-15 05:20:20 -11:00
jl777 3231c57262 Test 2019-01-15 05:13:57 -11:00
jl777 6617435e16 Test 2019-01-15 05:12:15 -11:00
jl777 503f753e7b Test 2019-01-15 05:11:01 -11:00
jl777 32a6eb7cce Test 2019-01-15 05:04:43 -11:00
jl777 5e8d1a2d87 Test 2019-01-15 05:01:45 -11:00
jl777 6e8e24cbc8 Init marmarapk 2019-01-15 04:57:38 -11:00
jl777 f1046be9dc Test 2019-01-15 04:53:16 -11:00
jl777 3e2991000f Fix 2019-01-15 04:52:18 -11:00
jl777 6dc61c6bcf GetCCaddress1of2 2019-01-15 04:49:21 -11:00
jl777 6206090faa EVAL_MARMARA 2019-01-15 04:47:12 -11:00
jl777 7faabcef68 Mine to 1of2 CC addr 2019-01-15 04:44:29 -11:00
jl777 28d6643b3a -senderpk 2019-01-15 04:32:23 -11:00
jl777 6745e98d48 GetCCaddress1of2 2019-01-15 04:30:37 -11:00
jl777 f1971e0054 Test 2019-01-15 04:26:59 -11:00
jl777 fa75602795 Test 2019-01-15 04:24:30 -11:00
jl777 e1e112fc24 Set three 2019-01-15 04:19:16 -11:00
jl777 b51a551dde Refbatontxid 2019-01-15 04:06:31 -11:00
jl777 422182a9d7 Fix 2019-01-15 04:05:14 -11:00
jl777 6620e4cec2 marmara_settlement skeleton 2019-01-15 04:04:00 -11:00
jl777 4f194e6053 Destaddr 2019-01-15 02:14:52 -11:00
jl777 fba668fa07 Test 2019-01-15 02:12:06 -11:00
jl777 b41b4e3a4c Test 2019-01-15 02:08:25 -11:00
jl777 bad70de66a Test 2019-01-15 02:02:23 -11:00
jl777 a5f19e3399 Fix 2019-01-15 02:01:28 -11:00
jl777 76ff3a0275 Conditional recv/send pk 2019-01-15 01:56:17 -11:00
jl777 23093607b0 Test 2019-01-15 01:47:50 -11:00
jl777 49ac671671 Test 2019-01-15 01:46:00 -11:00
jl777 4ceddd6a93 ; 2019-01-15 01:31:35 -11:00
jl777 ac7814aa59 Numbers 2019-01-15 01:30:46 -11:00
jl777 e2a8009162 numerrs 2019-01-15 01:29:54 -11:00
jl777 0bf08eedd0 - 2019-01-15 01:17:30 -11:00
jl777 e56e7dd8f8 Fix 2019-01-15 01:16:46 -11:00
jl777 61cbecbe0a Mypubkey() 2019-01-15 01:15:36 -11:00
jl777 9ec06006d7 Getscriptaddress 2019-01-15 01:07:06 -11:00
jl777 fdfef30eb9 Test 2019-01-15 01:04:54 -11:00
jl777 c3d105361d -{ 2019-01-15 01:02:46 -11:00
jl777 8f55cee678 Test 2019-01-15 01:02:12 -11:00
jl777 f03daaf2eb Baton address 2019-01-15 00:58:49 -11:00
jl777 41ed37e969 Funcid 2019-01-15 00:50:18 -11:00
jl777 a19b5608f7 ) 2019-01-15 00:49:26 -11:00
jl777 e620f47e51 N 2019-01-15 00:48:54 -11:00
jl777 d604d63d94 Test 2019-01-15 00:48:02 -11:00
jl777 ba76bd2d70 Declare vars 2019-01-15 00:47:36 -11:00
jl777 389e07d1fb marmara_creditloop 2019-01-15 00:46:27 -11:00
jl777 9bf61c2259 Tweak batontxid searching 2019-01-15 00:22:43 -11:00
jl777 1cf607f70f c_str 2019-01-15 00:16:16 -11:00
jl777 50cbe82c68 Hash -> taxied 2019-01-15 00:13:48 -11:00
jl777 6873cb6653 Get credit loop 2019-01-15 00:09:07 -11:00
jl777 9755dbc647 Print batontxid 2019-01-14 23:25:17 -11:00
jl777 cc839d6f77 Approvaltxid 2019-01-14 23:10:21 -11:00