Commit graph

4598 commits

Author SHA1 Message Date
OracionSeis
9f1ffe0473 OS X compilation fixed 2014-05-22 17:12:33 +04:00
OracionSeis
9012feb0c5 Merge branch 'master' into BCN_master 2014-05-22 16:48:53 +04:00
OracionSeis
e6b4583a13 Merge remote-tracking branch 'bytecoin/master' 2014-05-22 16:24:48 +04:00
OracionSeis
850634b962 OS X compilation fixed 2014-05-22 15:00:48 +04:00
OracionSeis
626f257928 Fixed compilation error 2014-05-22 09:06:26 +04:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
b3e2face1e Update slow-hash.c
1. Added AES-NI support for modern processors.
2014-05-22 08:52:03 +04:00
Neozaru
7c3783f5b1 Merge pull request #1 from monero-project/master
Attempting an online merge in my own repo
2014-05-21 23:51:45 +02:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
3c5d7468d7 Update CMakeLists.txt
1. Fixed build error on machines not supporting aes-ni.
2014-05-21 13:02:46 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
6d94334ad5 Update version.h.in
1. Updated version to 0.8.8.2
2014-05-21 09:43:59 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
44f61c3965 Update slow-hash.c
1. Added AES-NI support for modern processors.
2014-05-21 09:29:34 -07:00
Antonio Juarez
2b8558a48f JSON RPC v2 support 2014-05-21 14:49:50 +01:00
amjuarez
d22ea471d9 Merge pull request #17 from ekimmo/rpc+fixes
JSON RPC 2.0 + JSON over TCP + fixes
2014-05-21 12:58:29 +00:00
amjuarez
4a55818752 Merge pull request #19 from quazarcoin/BCN_master
Optimized cn_slow_hash
2014-05-21 12:54:33 +00:00
OracionSeis
30b4c34499 Merge branch 'master' into BCN_master 2014-05-20 20:28:16 +04:00
OracionSeis
62225805ef Remove swap_blocks() from slow-hash.c 2014-05-20 19:53:20 +04:00
OracionSeis
7a3a6739e2 Optimize cn_slow_hash 2014-05-20 19:33:30 +04:00
OracionSeis
776cc89696 Merge branch 'bytecoin/master' 2014-05-20 17:35:16 +04:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
3b887decca Update version.h.in
1. Version to 0.8.8.1
2014-05-17 16:43:09 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
ab7b25da5e Create aesb.c 2014-05-17 16:25:58 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
49d55d3c30 Update slow-hash.c
1. Various optimizations for faster hashing performance.
2014-05-17 16:25:00 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
e4f7b92ff9 Update oaes_lib.c
1. Moved structs oaes_ctx and oaes_key into oeas_lib header.
2014-05-17 16:22:07 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
98e0326596 Update oaes_lib.h
1. Moved structs oaes_ctx and oaes_key into oeas_lib header.
2014-05-17 16:20:47 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
e41c808d8d Update oaes_config.h
1. Disabled OAES_DEBUG flag
2014-05-17 15:39:46 -07:00
Erik Kimmo
033724ec4d correct whitespacing in epee/* 2014-05-16 20:13:38 +04:00
Erik Kimmo
ae315cfa1a Merge branch 'master' into rpc+fixes 2014-05-16 16:43:42 +04:00
monero-project
dda8b3432b Merge pull request #11 from Neozaru/master
'save_bc' command for requesting blockchain saving remotely
2014-05-15 18:47:12 -04:00
Neozaru
eb2db3cf61 Added 'save_bc' command in daemon for saving blockchain remotely 2014-05-16 00:26:35 +02:00
Neozaru
4690670031 Added 'save_bc' command in daemon for saving blockchain remotely 2014-05-16 00:21:43 +02:00
Antonio Juarez
baaa348427 Blockchain issues and UI improvements 2014-05-15 17:40:40 +01:00
amjuarez
7c23c01d41 Merge pull request #14 from amphibia/BCN_mm_spend_fix
Fix for non-spendable merged mining reward
2014-05-15 16:10:14 +00:00
Erik Kimmo
ef0cf7aaa1 1) JSON RPC v2.0 compatibility
2) JSON RPC over TCP added (epee)
3) minor fixes
2014-05-15 14:34:15 +04:00
monero-project
0217572cb2 Merge pull request #10 from NoodleDoodleNoodleDoodleNoodleDoodleNoo/patch-8
Update daemon_commands_handler.h
2014-05-14 11:49:15 -04:00
monero-project
73158c7edc Merge pull request #9 from NoodleDoodleNoodleDoodleNoodleDoodleNoo/patch-7
Update tx_extra.h
2014-05-14 11:49:09 -04:00
monero-project
5c820f902b Merge pull request #8 from NoodleDoodleNoodleDoodleNoodleDoodleNoo/patch-5
Update serialization.h
2014-05-14 11:49:05 -04:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
a03b13b50b Update daemon_commands_handler.h
1. Added "diff" command to show current estimated difficulty and hash-rate.
2014-05-13 17:55:50 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
b5b061e0e8 Update tx_extra.h
1. Fixed bug where it's impossible to spend merge-mining blocks due to missing serialization support for "tx_etra_merge_mining_tag".
2014-05-13 17:53:20 -07:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
c0cf78a1d1 Update serialization.h
1. Added VARINT_FIELD_N(t,f) macro required for tx_extra_merge_mining_tag serialization.
2014-05-13 16:10:58 -07:00
Amphibian
d3e86238e0 Fix for non-spendable merged mining reward 2014-05-13 20:12:06 +04:00
quazarcoin
c8bb56dda6 Merge pull request #1 from amphibia/mm_spend_fix
Fix for non-spendable merged mining reward
2014-05-13 15:54:54 +00:00
Amphibian
3038de51e4 Fix for non-spendable merged mining reward 2014-05-13 19:42:32 +04:00
monero-project
9b2d1bc4c2 20s timeout for zone117x pool 2014-05-12 21:30:00 -04:00
monero-project
90a67a9900 Merge pull request #6 from NoodleDoodleNoodleDoodleNoodleDoodleNoo/patch-3
Update simpleminer.cpp
2014-05-12 09:01:32 -04:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
26c1a8569c Update simpleminer.cpp
1. Modified connection timeout from 1 second to 10 seconds
2. Modified behavior to retry instead of exiting when the miner fails to get a new job
2014-05-11 14:10:24 -07:00
Antonio Juarez
04dab2ab20 Release version 0.8.7 2014-05-09 13:01:18 +01:00
amjuarez
7cf1efaa1e Merge pull request #11 from quazarcoin/bytecoin_upmerge
Bytecoin upmerge
2014-05-09 11:29:56 +00:00
OracionSeis
e3cf75a7a5 Merge branch 'master' into BCN_merge 2014-05-09 00:44:23 +04:00
NoodleDoodleNoodleDoodleNoodleDoodleNoo
0a63100f73 Update cryptonote_format_utils.cpp
Fixed problem with integer saturation when summing summary_amounts and out_amounts in a 32-bit platform.
2014-05-08 23:24:07 +04:00
OracionSeis
fad044e0de Quazarcoin initial commit 2014-05-08 19:50:47 +04:00
monero-project
5ceffa8c8a disable checkpointing for security reasons
Further investigation of fast sync security is required
2014-05-08 11:12:54 -04:00
monero-project
d8e3a0c346 Merge pull request #3 from NoodleDoodleNoodleDoodleNoodleDoodleNoo/patch-2
Update cryptonote_format_utils.cpp
2014-05-07 20:17:45 -04:00