Commit Graph

18626 Commits

Author SHA1 Message Date
Asher Dawes
a491b97f4e Merge pull request #104 from VerusCoin/master
updating versions
2018-08-10 00:04:16 -07:00
Asher Dawes
64cdd60ea3 Merge branch 'dev' into master 2018-08-10 00:04:07 -07:00
miketout
6debab306c Merge pull request #103 from miketout/dev
Put staking readout once per staking loop so people know it's staking
2018-08-09 18:20:26 -07:00
Michael Toutonghi
4ca6678c70 Put staking readout once per staking loop so people know it's staking 2018-08-09 18:19:18 -07:00
miketout
1012289e8c Merge pull request #102 from miketout/dev
Staking and mining improvements
2018-08-09 18:05:45 -07:00
Michael Toutonghi
bf9c36f4ed Staking and mining timeing improvements 2018-08-09 18:04:19 -07:00
Michael Toutonghi
049e890a79 Remove unnecessary staking delay 2018-08-09 17:09:09 -07:00
miketout
855948d2e8 Merge pull request #100 from miketout/dev
Merge latest Komodo changes, network decentralization, bug fixes
2018-08-09 15:45:17 -07:00
Michael Toutonghi
0ba2065183 Network decentralizatoin and bug fixes 2018-08-09 15:32:48 -07:00
Michael Toutonghi
5034d1c134 Sync with latest Komodo changes 2018-08-06 12:52:22 -07:00
Asher Dawes
2a0d52ab43 Merge pull request #99 from VerusCoin/dave-dev
Get version to 0.3.12
2018-08-04 17:18:36 -07:00
Asher Dawes
3ccaf5de85 Put undefines for _cpuid back. 2018-08-04 17:15:27 -07:00
Asher Dawes
5ddb85b297 Change version to 0.3.12 for gilab CI. 2018-08-04 16:48:11 -07:00
Asher Dawes
f76a2ec064 Merge branch 'master' into dave-dev 2018-08-04 16:42:55 -07:00
Asher Dawes
d6e6917177 Version to 0.3.12-beta. 2018-08-04 16:42:23 -07:00
miketout
55135eed8a Merge pull request #17 from VerusCoin/dev
Merge all VerusCoin changes for 0.3.11-beta
2018-07-31 13:46:53 -07:00
jl777
cbd0560df3 Merge pull request #796 from letolabs/coinsupply
Docs for coinsupply RPC and improved error-checking on block height
2018-07-30 22:47:53 -11:00
Jonathan "Duke" Leto
61f7f5dfce Docs for coinsupply RPC and improved error-checking on block height 2018-07-30 23:31:45 -07:00
jl777
a4cbb9d6b2 Merge pull request #795 from lukechilds/patch-5
Don't exit fiat-cli on error
2018-07-29 23:54:51 -11:00
Luke Childs
c2cff33674 Don't exit fiat-cli on error 2018-07-30 11:52:30 +01:00
jl777
cb5f1c00c4 Merge pull request #794 from jl777/jl777
@jl777
Put process block's check block call inside lock
2018-07-29 21:39:07 -11:00
jl777
809f2e257b Put process block's check block call inside lock, revert mining testblockvalidity outside lock 2018-07-29 20:17:54 -11:00
jl777
135ead85b2 Test 2018-07-29 05:46:28 -11:00
jl777
4d5488bbab Test 2018-07-29 05:45:12 -11:00
jl777
7d82111255 Dice bet 2018-07-29 05:42:18 -11:00
jl777
b483858c81 dicefund 2018-07-29 05:34:02 -11:00
jl777
c857567a62 Dice list and dice info 2018-07-29 05:31:42 -11:00
jl777
6a046438dd Fix 2018-07-29 05:24:18 -11:00
jl777
587e715dc9 Diceaddfunds 2018-07-29 05:20:48 -11:00
jl777
14182ebaf1 Test 2018-07-29 05:14:35 -11:00
jl777
5bd03ad7b6 Fix 2018-07-29 05:13:38 -11:00
jl777
3f9f82297e Test 2018-07-29 05:09:58 -11:00
jl777
0e84bf9273 Fix 2018-07-29 05:09:19 -11:00
jl777
d0d96ab044 Initial dice morph from rewards.cpp 2018-07-29 05:06:39 -11:00
jl777
ba30129fa6 Test 2018-07-29 04:27:59 -11:00
jl777
f4e21be41c Fix c script 2018-07-29 04:16:26 -11:00
jl777
05eccd86e6 Test 2018-07-29 04:14:19 -11:00
jl777
733a1c4c30 Test 2018-07-29 04:11:25 -11:00
jl777
42106faf18 Test 2018-07-29 04:05:14 -11:00
jl777
0cec24398f Test 2018-07-29 03:56:08 -11:00
jl777
10078e85a9 +print 2018-07-29 03:54:39 -11:00
jl777
15185682b2 Merge branch 'dev' into jl777 2018-07-29 00:41:45 -11:00
jl777
6850e9858e Merge pull request #793 from jl777/jl777
Parameterize KOMODO_FIRSTFUNGIBLEID to 100
2018-07-29 00:41:33 -11:00
jl777
072dba5f83 Parameterize KOMODO_FIRSTFUNGIBLEID to 100 2018-07-29 00:37:37 -11:00
jl777
9fce9d679c Merge pull request #792 from jl777/jl777
Code complete token, faucet and rewards CC contracts

Improve PoW diff adjustment for PoS/PoW mode (breaks backward compatibility)
2018-07-28 01:11:05 -11:00
jl777
572ce78169 Activate CCduration constraint 2018-07-28 01:02:00 -11:00
jl777
f1c75a6632 Test 2018-07-28 00:59:46 -11:00
jl777
43b91cca46 Test 2018-07-28 00:47:41 -11:00
jl777
763ec3cae7 Test 2018-07-28 00:44:12 -11:00
jl777
85afb4f060 Test 2018-07-28 00:40:42 -11:00