Commit Graph

19616 Commits

Author SHA1 Message Date
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
blackjok3r
0367b1a685 < 2018-10-02 00:53:28 +08:00
blackjok3r
478370fd6c numutxos < 2 instead of 0... cant merge 1 utxo 2018-10-02 00:52:12 +08:00
blackjok3r
f882623570 remove prints and fix utxo counter in wrong place 2018-10-02 00:42:14 +08:00
blackjok3r
5d8a1637ae remove prints to speed it up 2018-10-01 23:43:20 +08:00
blackjok3r
30c320d1f6 = 2018-10-01 23:32:21 +08:00
blackjok3r
41fddfc0bf fix 2018-10-01 23:31:05 +08:00
blackjok3r
cd6fbe0977 add exeption for iguana utxo 2018-10-01 23:25:24 +08:00
blackjok3r
743131799f , 2018-10-01 23:10:53 +08:00
blackjok3r
dfba8357f3 fingers crossed 2018-10-01 23:09:36 +08:00
blackjok3r
4bdd7e26cd try 2018-10-01 22:58:42 +08:00
blackjok3r
a0c1d43977 long 2018-10-01 22:48:24 +08:00
blackjok3r
93253d38ea make memo last feild again 2018-10-01 22:43:03 +08:00
blackjok3r
2b81045e2b ; 2018-10-01 22:27:58 +08:00
blackjok3r
2499a4fef8 ld 2018-10-01 22:25:17 +08:00
blackjok3r
57d237b5bc ; 2018-10-01 22:24:04 +08:00
blackjok3r
4f1650383a test 2018-10-01 22:21:49 +08:00
blackjok3r
d411178c7e syntax 2018-10-01 22:18:05 +08:00
blackjok3r
12e14f15a0 add some prints to see where values are 2018-10-01 22:13:35 +08:00
Alrighttt
644ae923c0 derp 2018-10-01 08:09:21 -04:00
Alrighttt
0332703448 add ac_priv chains 2018-09-30 11:32:39 +00:00
Alrighttt
c6bbf4caea Merge pull request #17 from StakedChain/privtest
merge privtest to master
2018-09-30 05:26:03 -04:00
blackjok3r
220df8ac00 hard code number of notaries 2018-09-30 13:12:33 +08:00
blackjok3r
d5f8644985 change array to non static and remove init 2018-09-30 13:07:38 +08:00
blackjok3r
c6fb1e9117 try this instead 2018-09-30 13:00:09 +08:00
blackjok3r
f56c91238a change ac_private pubkeys to use STAKED notaries instead of elected 2018-09-30 12:49:40 +08:00
Alrighttt
2441d7ab6c Merge branch 'jl777-dev' into privtest
Testing ac_private dpow
2018-09-29 16:00:12 +00:00
Alrighttt
78e10a3b60 merge lastest jl-dev branch 2018-09-29 15:59:47 +00:00
blackjok3r
396d4e4209 Add error for sending coin to source chain 2018-09-26 17:25:02 +08:00
blackjok3r
ff9e1c7f36 Merge branch 'master' of https://github.com/StakedChain/komodo 2018-09-26 11:30:56 +08:00
blackjok3r
dcffb1c796 change ERA's 2018-09-26 11:30:31 +08:00
Alrighttt
2e25cdf0a4 add STAKEDED 2018-09-26 02:26:48 +00:00
blackjok3r
6ecc2a17bf new timestamps try again lol 2018-09-25 18:53:32 +08:00
blackjok3r
4becb91f8e fix silly mistake 2018-09-25 18:42:30 +08:00
blackjok3r
8abbd8e183 meh 2018-09-25 17:56:49 +08:00
blackjok3r
15fe2fb59d I think this might be it 2018-09-25 17:50:51 +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
blackjok3r
1a948db4fd who knows 2018-09-25 16:38:39 +08:00
blackjok3r
dcb7ed78c0 ) 2018-09-25 15:41:55 +08:00
blackjok3r
211f57fb45 tidy up 2018-09-25 15:40:44 +08:00
blackjok3r
a2d3bd9f84 try 2018-09-25 15:21:04 +08:00
blackjok3r
6eec4962bd opps 2018-09-25 15:19:21 +08:00
blackjok3r
07f90f9852 move cross chain choose to staked.cpp 2018-09-25 15:17:51 +08:00
blackjok3r
f16893312f try that 2018-09-25 14:29:22 +08:00
blackjok3r
d6726e1bd6 1 2018-09-25 14:27:08 +08:00
blackjok3r
84f0f23626 try call function 2018-09-25 14:25:27 +08:00
blackjok3r
562d0132f7 test 2018-09-25 14:20:21 +08:00
blackjok3r
7db608e7c5 timstaps 2018-09-25 14:16:39 +08:00
blackjok3r
3e86777927 try move crosschain auth to a function, and clean up code a bit. 2018-09-25 13:49:15 +08:00