aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-09-12versioning now includes the commit hash, or -final for tagged releasesRiccardo Spagni7-37/+38
2014-09-12always check git diffRiccardo Spagni1-6/+1
2014-09-12Merge pull request #129 from Jebes/masterRiccardo Spagni6-79/+177
Added documentation to varint.h and util.h
2014-09-11HOW DO I ENGLISH?jebes1-1/+1
2014-09-11mispelled brief, corrected itjebes2-14/+14
2014-09-11Merge remote-tracking branch 'upstream/master'jebes23-145/+553
2014-09-11HOW DO I GIT?jebes1-1/+1
2014-09-11Documented varintjebes4-40/+80
2014-09-11Merge pull request #128 from fluffypony/masterRiccardo Spagni1-2/+6
fixed UPNP_LIBRARIES scope
2014-09-11fixed UPNP_LIBRARIES scopefluffypony1-2/+6
2014-09-11Merge pull request #127 from fluffypony/masterRiccardo Spagni23-145/+549
FreeBSD compatibility and default log level changes
2014-09-11cpu affinity fixes in performance tests for FreeBSDfluffypony1-2/+2
2014-09-11gtest patches for FreeBSDfluffypony2-1/+9
2014-09-11fixed upnp libs in tests cmakefluffypony1-1/+31
2014-09-11added license to CMakefluffypony3-0/+92
2014-09-11more CMake tweaks to allow detection on OS Xfluffypony3-190/+197
2014-09-10more dynamic miniupnp fixesfluffypony3-7/+19
2014-09-10miniupnpc includes fixedfluffypony1-2/+2
2014-09-10use external miniupnpc if availablefluffypony3-7/+193
2014-09-10miniupnpc changes for freebsdfluffypony2-2/+6
2014-09-10mmap on FreeBSD doesn't have MAP_HUGETLBfluffypony1-1/+1
2014-09-10Include sys/time.h on BSDfluffypony1-0/+2
2014-09-10replace ftime with gettimeofday on FreeBSD because lcompat is stupidfluffypony3-8/+32
2014-09-10make FreeBSD use -lcompat till we can fix ftime()fluffypony2-4/+8
2014-09-09commented util.hjebes5-44/+102
2014-09-09more FreeBSD fixesfluffypony1-2/+7
2014-09-09malloc.h reference fixed for FreeBSDfluffypony1-2/+2
2014-09-09exclude local miniupnpc for FreeBSD, install from ports insteadfluffypony2-10/+29
2014-09-09FreeBSD alloca.h reference fixedfluffypony2-2/+12
2014-09-09a few more error messages moved to log level 1fluffypony2-15/+15
2014-09-09moved non-critical warnings and errors to log level 1fluffypony12-107/+108
2014-09-07Merge pull request #123 from fluffypony/masterRiccardo Spagni1-1/+1
build number increase after release
2014-09-07build number increase after releasefluffypony1-1/+1
2014-09-06Merge pull request #121 from fluffypony/masterv0.8.8.3Riccardo Spagni4-10/+96
Fix tree_hash, patch for bad block 202612
2014-09-06fix checkpointsiamsmooth2-4/+7
2014-09-06bug fix to checkpoint-on-restore; still fails on 612iamsmooth1-1/+1
2014-09-06checkpoints on restore; currently fails on 212 checkpointiamsmooth2-2/+24
2014-09-06Fix tree-hash cnt n^2. Asserts, comment. Squash2rfree2monero1-6/+48
2014-09-06override for get_block_longhash for block 202612Thomas Winget1-0/+7
2014-09-06added double-check for 202612 block idThomas Winget1-1/+13
if a new block has the same block id as 202612 but the wrong blobdata, this will tell the caller that the block id is actually null_hash rather than the 202612 block id.
2014-09-06hex_to_pod needs the destination as an arg, as opposed to it returning the podThomas Winget1-1/+1
2014-09-06Override for block hashing for block 202612Thomas Winget1-0/+10
Since we need to fix tree_hash, but doing so would invalidate the block id for block 202612, this fix should check to see if we're trying to get the block id for 202612 (if its blob hash matches) and return the "old" block id, for backwards compatibility.
2014-09-02Merge pull request #112 from fluffypony/masterRiccardo Spagni1-1/+4
fixed OS X malloc.h reference
2014-09-02fixed OS X malloc.h referencefluffypony1-1/+4
2014-08-30Merge pull request #109 from fluffypony/masterRiccardo Spagni2-162/+98
readme -> markdown
2014-08-30readme -> markdownfluffypony2-162/+98
2014-08-25bumped build numberfluffypony1-1/+1
2014-08-23Merge pull request #104 from fluffypony/masterRiccardo Spagni1-2/+2
Fees temporarily bumped to 0.1 XMR per tx to prevent spam attack
2014-08-23quick additional patchfluffypony1-2/+1
2014-08-23quick fee ramp to prevent spam attackfluffypony1-3/+4
2014-08-05Merge pull request #86 from jakoblind/seedRiccardo Spagni7-1/+97
Query view key and seed
2014-08-05added view_key to wallet RPC command query_keyJakob Lind1-0/+4
2014-08-05added viewkey command to CLIJakob Lind2-0/+9
2014-08-05query_key command in wallet rpc.Jakob Lind3-0/+44
only support mnemonic as key_type currently
2014-08-03refactoring. get seed code in wallet2Jakob Lind3-12/+23
2014-08-03check its deterministic wallet before printing seedJakob Lind1-3/+19
when running the seed command
2014-08-03remove help text about seed only displayed onceJakob Lind1-2/+2
2014-08-03added seed command to get deterministic seed.Jakob Lind2-0/+12
not yet password protected
2014-08-03Merge pull request #81 from tewinget/restore-fixThomas Winget1-1/+17
restored wallets will have timestamp set to June 8 2014.
2014-08-03restored wallets will have timestamp set to June 8 2014.Thomas Winget1-1/+17
2014-08-02Merge pull request #77 from fluffypony/masterRiccardo Spagni1-1/+1
build number increased in staging
2014-08-02build number increased in stagingfluffypony1-1/+1
2014-08-02Merge pull request #73 from jakoblind/refresh_heightRiccardo Spagni9-26/+41
Optional height parameter for wallet refresh
2014-08-01Merge pull request #64 from mikezackles/bytecoin_tx_pool_tmpRiccardo Spagni3-95/+82
tx pool fixes, courtesy of Bytecoin
2014-08-01#36 make it compile and work properlyJakob Lind1-4/+2
2014-08-01#36 simplewallet refresh include optional height paramJakob Lind9-22/+39
height param is used optionally in refresh command TODO: This should also be the default behaviour when generating a new wallet.
2014-07-25Merge pull request #72 from fluffypony/masterRiccardo Spagni104-2671/+2067
move modified epee code to new classes, revert license
2014-07-25move modified epee code to new classes, revert licensefluffypony104-2671/+2067
2014-07-24Merge pull request #71 from Jojatekok/masterRiccardo Spagni1-0/+45
Added a build script for Windows
2014-07-24Added license for the Windows build scriptJojatekok1-1/+29
2014-07-24Added a build script for WindowsJojatekok1-0/+17
2014-07-23Merge pull request #70 from fluffypony/masterRiccardo Spagni311-2694/+8794
New readme, license changes
2014-07-23Merge pull request #69 from ekimmo/monero/masterRiccardo Spagni2-2/+2
wallet rpc: actually populate the extra while assembling a transaction
2014-07-23wallet rpc: actually populate the extra while assembling a transactionErik Kimmo2-2/+2
2014-07-23License updated to BSD 3-clausefluffypony311-2664/+8655
2014-07-23New READMEfluffypony1-32/+141
2014-07-23Merge pull request #68 from tewinget/daemon_rpcThomas Winget2-3/+4
daemon rpc get_connections call minor changes
2014-07-23Changed time_t to uint64_t for serializationThomas Winget1-3/+3
time_t is implementation-, architecture-, and apparently compiler-dependent. As an example, on my machine if I build a 64-bit binary, sizeof(time_t) is 8, but for a 32-bit binary it's 4. uint64_t is therefore much more consistent for serialization, given that RPC calls are potentially made between different machines.
2014-07-22Missed serializing a get_connections RPC response parameterThomas Winget1-0/+1
2014-07-22Merge pull request #67 from mikezackles/get_infomikezackles2-0/+26
Add get_info command to daemon json rpc
2014-07-22Add get_info command to daemon json rpcZachary Michaels2-0/+26
2014-07-22Merge pull request #66 from mikezackles/mastermikezackles5-5/+81
Add get_bulk_payments rpc call
2014-07-22Add get_bulk_payments rpc callZachary Michaels5-5/+81
2014-07-18Merge pull request #65 from tewinget/daemon_rpcThomas Winget6-0/+116
Added get_connections RPC call to daemon Only consists of new functionality and doesn't break build, merging per request.
2014-07-18Added get_connections RPC call to daemonThomas Winget6-0/+116
2014-07-17Merge pull request #63 from mikezackles/bytecoin_for_mergemikezackles16-61/+53
Misc fixes from bytecoin
2014-07-17Remove dead codeZachary Michaels1-17/+0
2014-07-17Remove second tx size checkZachary Michaels1-7/+0
2014-07-17Don't check max tx size when adding to blockZachary Michaels1-8/+0
This is now done when adding transactions to the pool.
2014-07-17Don't check for min fee when adding tx to blockZachary Michaels1-5/+0
This is now done when transactions enter the pool.
2014-07-17Decrease max block size from 200% median to 130%Zachary Michaels1-1/+3
2014-07-17Use print_money in logZachary Michaels1-1/+1
2014-07-17Minimum tx fee for entering poolZachary Michaels1-0/+8
2014-07-17Start fresh if tx_pool deserialize failsZachary Michaels1-2/+6
2014-07-17Add transaction size limitZachary Michaels1-0/+24
Transactions larger than the limit will not enter the pool
2014-07-17Use const where appropriate in tx_poolZachary Michaels3-50/+36
2014-07-17Make some tx_pool methods staticZachary Michaels1-2/+2
2014-07-17Make some tx_pool methods privateZachary Michaels1-6/+6
2014-07-06Merge pull request #56 from tewinget/masterThomas Winget9-49/+378
transaction splitting
2014-07-01Fix thread count argument handling in simplewalletZachary Michaels1-2/+2
2014-07-01Match empty RPC request with other requestsZachary Michaels1-1/+5
2014-07-01Switch list to vector for RPC serializationZachary Michaels1-2/+2
2014-07-01Allow conditional compilation with VS 2013+Zachary Michaels1-1/+1
2014-07-01Remove unused functionZachary Michaels2-19/+0
2014-07-01Fix assert bug in base58 encodeZachary Michaels1-1/+1
The previous implementation was almost certainly a typo. full_block_size is the maximum index in the encoded_block_sizes array, and size is used as an index in this array. So now 1 <= size <= full_block_size == 8 instead of 1 <= size <= sizeof(full_block_size) == size_of(size_t) == ? (maybe 4 on 32-bit systems!)
2014-07-01Explicit namespacesZachary Michaels1-11/+8
2014-07-01Remove redeclarationZachary Michaels1-1/+0
2014-07-01C++ style castZachary Michaels1-1/+1
2014-07-01Comment unused functions in cryptonote_coreZachary Michaels2-15/+14
2014-07-01Improved (fixed?) serialization for vec<uint32_t>Zachary Michaels1-0/+7
2014-07-01Add missing pragmaZachary Michaels1-0/+2
2014-07-01Add missing pragmaZachary Michaels1-0/+2
2014-07-01Add missing pragmaZachary Michaels1-0/+2
2014-07-01Allow priority peers when there are exclusive peersZachary Michaels1-1/+1
Per my reading this change makes sense since a subset of the exclusive peers could be priority peers. Priority peers that are not exclusive will not get loaded, and priority peers that *are* exclusive will get special treatment. Prior to this change it looks like priority peers were silently ignored when exclusive peers were provided.
2014-07-01Explicit error constructorsZachary Michaels1-5/+5
2014-07-01Remove unused array in cn_slow_hashZachary Michaels1-1/+0
2014-06-30needed to remove REQUIRED from find_package(Threads)Thomas Winget1-1/+1
2014-06-30wallet RPC converted to use new transaction semanticsThomas Winget7-184/+305
wallet RPC now uses wallet2::create_transactions and wallet2::commit_tx instead of wallet2::transfer. This made it possible to add the RPC call /transfer_split, which will split transactions automatically if they are too large. The old call to /transfer will return an error stating to use /transfer_split if multiple transactions are needed to fulfill the request.
2014-06-30removed erroneous printing of newlinesThomas Winget1-1/+0
2014-06-30missed removing a debug printThomas Winget1-2/+0
2014-06-30removed some debugging code (really stupid printf-style debuggng..Thomas Winget1-11/+2
2014-06-30Transaction splitting *seems* to be working!!!tom2-6/+24
2014-06-30Added confirmation prompt if transactions are to be splitThomas Winget1-0/+16
2014-06-30added back successful tx message. oops.Thomas Winget1-1/+3
2014-06-30up tx splits limit 5 -> 30Thomas Winget1-1/+1
2014-06-30final changes to get transaction splitting building. needs testing.Thomas Winget6-43/+139
2014-06-30working on dividing functions in prep for tx splittingtom2-9/+84
2014-06-30Added comments to wallet functionsThomas Winget2-0/+13
2014-06-30Merge pull request #55 from monero-project/revert-54-masterThomas Winget1-2/+1
Revert "Do not fall over when refreshing balance fails"
2014-06-30Revert "Do not fall over when refreshing balance fails"Thomas Winget1-2/+1
2014-06-29Merge pull request #54 from zone117x/mastermonero-project1-1/+2
Do not fall over when refreshing balance fails
2014-06-29Do not fall over when refreshing balance failsMatthew Little1-1/+2
2014-06-26set max block size for gbtmydesktop2-0/+9
2014-06-24fix function typomonero-project1-1/+1
2014-06-24Fix copy/paste bug, thx Boolberrymonero-project1-3/+3
2014-06-19Update slow-hash.cNoodleDoodleNoodleDoodleNoodleDoodleNoo1-0/+5
1. Fix for Mac OSX compilation errors.
2014-06-19Merge pull request #48 from NoodleDoodleNoodleDoodleNoodleDoodleNoo/mastermonero-project2-111/+299
Update slow-hash.c with optimized scratchpad operations
2014-06-16Update slow-hash.cNoodleDoodleNoodleDoodleNoodleDoodleNoo1-1/+8
1. Added multiplication support in 32-bit mode
2014-06-16Update miner.cppNoodleDoodleNoodleDoodleNoodleDoodleNoo1-1/+4
1. Added support for scratchpad memory allocation.
2014-06-16Update slow-hash.cNoodleDoodleNoodleDoodleNoodleDoodleNoo1-110/+288
1. Added huge pages support and optimized scratchpad twiddling. (credits to dga). 2. Added aes-ni key expansion support. 3. Minor speedup to scratchpad initialization/finalization.
2014-06-16Merge branch 'master' of https://github.com/monero-project/bitmoneroNoodleDoodleNoodleDoodleNoodleDoodleNoo77-664/+8048
2014-06-16Revert "Update slow-hash.c"NoodleDoodleNoodleDoodleNoodleDoodleNoo1-404/+118
This reverts commit 37c5f393f1693da23416a2a294752f0c3e997c31.
2014-06-16Revert "Update miner.cpp"NoodleDoodleNoodleDoodleNoodleDoodleNoo1-19/+5
This reverts commit c0520ad63d71f94bc78a119c61ade30876e95ed6.
2014-06-16Update miner.cppNoodleDoodleNoodleDoodleNoodleDoodleNoo1-5/+19
1. Added scratchpad memory allocation support.
2014-06-16Update slow-hash.cNoodleDoodleNoodleDoodleNoodleDoodleNoo1-118/+404
1. Added huge pages support and optimized scratchpad twiddling. (credits to dga). 2. Added aes-ni key expansion support. 3. Minor speedup to scratchpad initialization/finalization.
2014-06-15Merge pull request #33 from mikezackles/arch_linux_build_fixesmonero-project3-13/+23
Arch Linux build fixes
2014-06-15Merge pull request #41 from fluffypony/mastermonero-project4-1/+36
proper tx_pool handling from CryptoZoidberg / BBR
2014-06-15proper tx_pool handling from CryptoZoidberg / BBRfluffypony4-1/+36
2014-06-14added checkpoint @ 80000monero-project1-0/+1
2014-06-13Merge pull request #37 from tewinget/signals_fixmonero-project1-1/+7
Fixed console handler not properly exiting on SIGINT and such
2014-06-13Fixed console handler not properly exiting on SIGINT and suchThomas Winget1-1/+7
2014-06-12Merge pull request #35 from tewinget/mastermonero-project2-12/+14
Add electrum-seed wallet backup/recovery 2
2014-06-12changed wallet mnemonic to use cout so it doesn't print to logThomas Winget1-1/+2
2014-06-12change hash for keygen from blake to keccaktom1-2/+2
2014-06-12changed text a bit moretom1-10/+11
2014-06-12changed some print messagestom1-2/+2
2014-06-12Merge pull request #34 from tewinget/mastermonero-project15-35/+3567
Add electrum-seed wallet backup/recovery
2014-06-12allow two-random-numbers wallet generation (but not as default)Thomas Winget6-42/+52
2014-06-12reworked command line args for simplewallet.Thomas Winget2-19/+30
--generate-new-wallet and --wallet-file are now properly mutually-exclusive.
2014-06-12DRY cin input_line (and test replacement of non-DRY usage)Thomas Winget3-6/+19
2014-06-12stupid signed arithmetic.Thomas Winget1-6/+3
2014-06-12more pointer-based derpThomas Winget3-8/+23
2014-06-12fixed some pointer- and loop-based derpsThomas Winget3-1/+6
2014-06-12builds, but doesn't link. other than that, electrum-style recovery ↵Thomas Winget9-19/+56
implemented (but not tested\!)
2014-06-12missing '.at' on two map calls. built on some machines, very strange...Thomas Winget1-2/+2
2014-06-12revert 'dirty hack' change to crypto.h. need a better way for sure.Thomas Winget1-4/+1
2014-06-12compile issues, resolve later. commiting because switching machinestom3-2/+83
2014-06-12defaulted new parameters in modified functionstom2-2/+2
2014-06-12most functions prototyped/modified for wallet recoveryThomas Winget10-9/+3371
2014-06-12added vim swap files to .gitignoreThomas Winget1-0/+4
2014-06-12Fix to disable LTO for ClangZachary Michaels1-1/+1
The previous code was assuming Apple == Clang. This change should both enable LTO when using gcc on Apple and fix Clang when using it on other platforms.
2014-06-11new error code for rpcmydesktop1-2/+1
2014-06-11Fix for orphan fix (check blocksize)mydesktop3-0/+22
2014-06-11Link to pthreads on non-apple unixZachary Michaels3-12/+17
2014-06-11Gcc 4.9 LTO fixZachary Michaels1-0/+5
The new lto format requires use of the gcc-provided gcc-ar and gcc-ranlib binaries.
2014-06-11Correcting high orphan rate of blocks at poolmonero-project1-3/+12
2014-06-10Merge pull request #29 from fluffypony/mastermonero-project2-3/+10
New seed nodes & temporary get_line fix
2014-06-10added new seed nodesfluffypony1-0/+9
2014-06-06removed continue issuefluffypony1-1/+0
2014-06-06Merge remote-tracking branch 'upstream/master'fluffypony6-1/+23
2014-06-05Merge pull request #24 from Neozaru/mastermonero-project6-1/+23
'getinfo' daemon HTTP-RPC returns 'target_height' for progress estimation
2014-06-04Added static_cast to hshd.current_heightNeozaru1-1/+1
2014-06-04don't fall apart if you can't get_linefluffypony1-3/+2
2014-06-04'getinfo' daemon HTTP-RPC returns 'target_height' for progress estimationsNeozaru6-1/+23
2014-06-04Merge pull request #23 from paybee/mastermonero-project4-5/+95
Added incoming_transfers RPC API method
2014-06-04Merge pull request #22 from Neozaru/mastermonero-project2-1/+2327
Added Doxyfile for future documentation
2014-06-03Merge pull request #2 from monero-project/masterNeozaru2-18/+23
Merging daemon RPC availability changes
2014-06-02fixed conflictpaybee11-43/+177
2014-06-02Added incoming_transfers RPC API methodpaybee2-15/+1
2014-06-02Updated README for documentationNeozaru1-1/+17
2014-06-02Added Doxyfile for (uggly) documentation generationNeozaru1-0/+2310
2014-06-02Merge pull request #21 from Neozaru/mastermonero-project5-16/+48
Added 'payment_id' optional argument to 'transfer' wallet RPC method
2014-06-02Merge pull request #20 from artifexd/wallet_refreshmonero-project2-18/+23
Enable wallet refresh before blockchain is saved or completely sync'd.
2014-06-02Added 'payment_id' optional argument to 'transfer' wallet RPC methodNeozaru5-16/+48
2014-06-01Enable wallet refresh before blockchain is saved or completely sync'd.artifexd2-18/+23
2014-06-01Merge pull request #14 from Neozaru/mastermonero-project9-9/+106
'get_address' RPC method for 'simplewallet'
2014-06-01Merge bitmonero@monero-projectNeozaru50-431/+1200
2014-05-29Merge remote-tracking branch 'upstream/master'paybee50-418/+1185
2014-05-28Merge branch '0.8.8update'mydesktop50-415/+1177
Update to newest version 0.8.8. See change log for details.
2014-05-28simplewallet returns 0 when no errorNeozaru1-1/+1