DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
22,744 Commits 5 Branches 7 Tags
62d50529edbba03c7af0234927d73fd6c2baef99
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jl777 3c03185b00 Add batontxid to transfer 2019-01-14 23:09:04 -11:00
jl777 52c163fe45 Dont increment matures on non-1st 'R' 2019-01-14 23:05:27 -11:00
jl777 fccecf9b31 Total amount 2019-01-14 22:54:40 -11:00
jl777 a362c04ae9 Send baton amount 2019-01-14 22:26:31 -11:00
jl777 54b98b8460 batonamount 2019-01-14 22:24:29 -11:00
jl777 5e4375ef81 'R" to fund 'I' and 'T' 2019-01-14 22:23:31 -11:00
jl777 98a81709d7 Test 2019-01-14 22:13:46 -11:00
jl777 00ba2f4420 Set createtxid to txid for 'R" 2019-01-14 22:08:26 -11:00
jl777 3246b4306b Allow 'R' 2019-01-14 22:07:24 -11:00
jl777 362a279cb7 Fix 2019-01-14 21:32:18 -11:00
jl777 4f9ce5d4cc -ToString() 2019-01-14 21:27:14 -11:00
jl777 fe0e9bd44e Syntax 2019-01-14 21:26:39 -11:00
jl777 920a182c2b marmarainfo firstheight lastheight minamount maxamount [currency issuerpk] 2019-01-14 21:21:37 -11:00
jl777 db56173b67 Merge branch 'FSM' into jl777 2019-01-13 14:10:33 -11:00
jl777 cf9f6577fc Adjust assert 2019-01-13 14:10:11 -11:00
jl777 5ee83c628c -print 2019-01-13 08:24:46 -11:00
jl777 c50181ee6b Use BitcoinMiner for staking verushash 2019-01-13 08:10:52 -11:00
jl777 d220b73974 Split commission calc 2019-01-13 07:59:28 -11:00
jl777 b7f3a6778a Test 2019-01-13 07:58:01 -11:00
jl777 05f3d0f872 Test 2019-01-13 07:52:01 -11:00
jl777 31bad59a04 Test 2019-01-13 07:46:32 -11:00
jl777 6922cdfa83 Test 2019-01-13 07:43:40 -11:00
jl777 265c9b3c3b Test 2019-01-13 07:40:06 -11:00
jl777 290926a05f Test 2019-01-13 07:34:22 -11:00
jl777 2df475e0ea Test 2019-01-13 07:26:02 -11:00
jl777 3118af7d07 +print 2019-01-13 07:24:38 -11:00
jl777 db879566f5 Test 2019-01-13 07:16:34 -11:00
jl777 6c9d66ed0d Set isStaked 2019-01-13 07:10:50 -11:00
jl777 530fb39013 +print 2019-01-13 07:04:45 -11:00
jl777 aa7d0e8d88 Fix pos64 with verushash 2019-01-13 06:57:20 -11:00
jl777 e565e0b720 Break 2019-01-13 06:15:44 -11:00
jl777 e06138fecf Cap -ac_perc to be based on million max 2019-01-13 05:34:42 -11:00
jl777 c334d5c2e4 Marmara transfer 2019-01-13 03:36:14 -11:00
jl777 8ae7b65569 Off by 1 2019-01-13 03:26:43 -11:00
jl777 c10dfbb858 marmara_issue 2019-01-13 03:21:20 -11:00
jl777 46069b7159 funcid 2019-01-13 03:12:07 -11:00