gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-07-30 23:50:24 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,223 Commits 9 Branches 78 Tags
b249482e1e59f89a685c229eaafc9fc8d1d74db0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Riccardo Spagni 8e143fcf1d Merge pull request #911 
d7b681c remove hf_starting_height db (moneromooo-monero)
 2016-07-20 14:01:27 +02:00
Riccardo Spagni b52b2ed00b Merge pull request #917 
ea44142 change travis badge (Riccardo Spagni)
 2016-07-20 14:00:23 +02:00
Riccardo Spagni ea44142d2f change travis badge 2016-07-20 13:59:47 +02:00
Riccardo Spagni c20a6d9069 Merge pull request #909 
bbba197 Docs: update 'Development Resources' in README. (anonimal)
2feb94b Travis-CI: add build-status badge to README.md (anonimal)
f025622 Travis-CI: remote redundant make release-test. (anonimal)
b332da3 Travis-CI: implement first-draft configuration. (anonimal)
 2016-07-20 13:57:25 +02:00
Riccardo Spagni 77015e8132 Merge pull request #904 
f07f120 cmake: don't try to link with atomic on Apple (redfish)
19349d7 cmake: ARM: clang: make warning non-fatal: inline asm (redfish)
f3e09f3 cmake: link with -latomic for clang (redfish)
f4b35ae cmake: include -ldl via cmake built-in var (redfish)
fa85cd8 common: stack trace: make clang happy with func ptrs (redfish)
4dce26b cmake: do not pass -stdlib=c++ to clang >=3.7 (redfish)
 2016-07-20 13:56:59 +02:00
Riccardo Spagni fc3e135b83 Merge pull request #902 
014f3a0 Add a daemon RPC version, and make simplewallet check it (moneromooo-monero)
 2016-07-20 13:55:59 +02:00
Riccardo Spagni b1bec02ce5 Merge pull request #900 
78cc10f daemon: fix ban seconds being misinterpreted as absolute (moneromooo-monero)
34ecfdb rpc: fix get_bans and set_bans RPC names, they were missing a _ (moneromooo-monero)
 2016-07-20 13:53:25 +02:00
Riccardo Spagni 07f1d4e04d Merge pull request #899 
a95a2cb wallet_rpc_server: add payment id from integrated addresses to extra (moneromooo-monero)
 2016-07-20 13:52:54 +02:00
Riccardo Spagni 992b6cce06 Merge pull request #897 
ce6b831 daemonizer: posix: keep parent's working dir and umask (redfish)
 2016-07-20 13:52:27 +02:00
Riccardo Spagni 255ff79416 Merge pull request #896 
1e89f4f cmake: do not ignore dangerous warnings with -Wno-error (redfish)
 2016-07-20 13:51:54 +02:00
Riccardo Spagni 83ccaf316d Merge pull request #887 
ab25075 cmake: pass -fno-strict-aliasing to fix build with GCC 6.1.1 (redfish)
 2016-07-20 13:51:27 +02:00
Riccardo Spagni 77e1d8774a Merge pull request #818 
89d9f38 wallet: add command and RPC to sign/verify data (moneromooo-monero)
 2016-07-20 13:50:41 +02:00
Riccardo Spagni 18dd507024 Merge pull request #889 
a0bf85d wallet2_api: make this build (smatch needs .str() for /=) (moneromooo-monero)
 2016-07-08 23:00:38 +02:00
Riccardo Spagni 59172156bf Merge pull request #885 
b727a1f updated README to reflect Windows changes (Riccardo Spagni)
 2016-07-06 18:22:16 +02:00
Riccardo Spagni 18fa01c092 Merge pull request #884 
c2ad9ca allow peers without port (moneromooo-monero)
 2016-07-06 18:20:17 +02:00
Riccardo Spagni 1088ed862b Merge pull request #883 
459ec60 daemon: print exception errors when failing to parse config file (moneromooo-monero)
 2016-07-06 18:19:40 +02:00
Riccardo Spagni 0b65717a5d Merge pull request #882 
f11191a rpc: restrict number of fake outs requested in restricted rpc mode (moneromooo-monero)
 2016-07-06 18:17:08 +02:00
Riccardo Spagni 00fd89a36d Merge pull request #879 
6b08001 simplewallet: mention the background refresh thread when starting (moneromooo-monero)
 2016-07-06 18:15:36 +02:00
Riccardo Spagni 3923cbddaf Merge pull request #878 
945c272 wallet: add a fee multiplier (moneromooo-monero)
 2016-07-06 18:14:34 +02:00
Riccardo Spagni 65df33fb06 Merge pull request #877 
ecd0f2d makefile: remove unnecessary ARM-specific targets (redfish)
c650160 cmake: disable AES on ARM (redfish)
804b1bc cmake: initialize ARCH for native builds (redfish)
bb39034 cmake: remove repetitive code in handling of NO_AES (redfish)
 2016-07-06 18:14:03 +02:00
Riccardo Spagni c9f66dfaba Merge pull request #876 
72287d1 contrib: epee: add missing noexcept spec to class decl (redfish)
 2016-07-06 18:13:28 +02:00
Riccardo Spagni 160e808796 Merge pull request #875 
14f7538 readme: move license to separate file for packaging (redfish)
 2016-07-06 18:12:53 +02:00
Riccardo Spagni 628f57b212 Merge pull request #873 
d718960 remove POSIX_C_SOURCE and remove dlfcn.h for static builds (luigi1111)
 2016-07-06 18:12:03 +02:00
Riccardo Spagni fc58069731 Merge pull request #872 
beb6d92 CMake: GPL 'libutils' script removed (Ilya Kitaev)
4e5521d PendingTransactionImpl: pointer->reference (Ilya Kitaev)
7b7cf21 commented regex (Ilya Kitaev)
eec0f57 Typo fixed (Ilya Kitaev)
f1c4a37 Wallet::createTransaction: added mixin_count param (Ilya Kitaev)
3318add double/string to monero integer convertion methods (Ilya Kitaev)
3ac20a4 wallet::default_mixin exposed to public interface as Wallet::setDefaultMixin, Wallet::defaultMixin; wallet::create_transaction_2 used in Wallet::createTransaction (Ilya Kitaev)
c554055 Wallet::filename, Wallet::keysFilename, tests for move wallet (Ilya Kitaev)
8f9d98b removed unused "using" (Ilya Kitaev)
2facbe7 Wallet API : WalletManager::findWallets() added (Ilya Kitaev)
ec949c3 scripts for faster test wallets generation (Ilya Kitaev)
7f3d28f regenerated test wallets, basic functions got broken (Ilya Kitaev)
4327548 installing wallet_api header (Ilya Kitaev)
7ac1342 cmake: BUILD_TESTS as option explicitly; added missed dependency (Ilya Kitaev)
1f0d016 cmake libutils dependency added (Ilya Kitaev)
d43ad22 all wallet dependencies merged to single static lib (Ilya Kitaev)
9ae4e87 WalletListener::moneyReceived test (Ilya Kitaev)
40087a7 WalletListener::moneySpent test (Ilya Kitaev)
27d86b7 WalletListener::moneySpent(), WalletListener::moneyReceived() (Ilya Kitaev)
ff52c67 i_wallet_callback: virtual dtor (Ilya Kitaev)
5dbd2b8 started WalletListener (Ilya Kitaev)
71131a8 TransactionHistory continued (Ilya Kitaev)
9311934 TransactionHistory continued (Ilya Kitaev)
566166a merged with upstream (Ilya Kitaev)
53a97bd Wallet API: transaction history in progress (Ilya Kitaev)
02c9df5 Wallet API : transaction history in progress (Ilya Kitaev)
a213887 transaction history api in progress (Ilya Kitaev)
b6aaf53 transaction history api in progress (Ilya Kitaev)
f83f3cb api implementation splitted over separate files (Ilya Kitaev)
4e1c2dc TransactionInfo / TransactionHistory APIs design (Ilya Kitaev)
1774d95 TODOs for Transaction/Transfer interface (Ilya Kitaev)
d97e9ef Transaction API continued (Ilya Kitaev)
079fbd3 Wallet::createTransaction API introduced (Ilya Kitaev)
ee5bb17 Wallet::transfer() continued (Ilya Kitaev)
c37c856 Wallet::transfer in progress (Ilya Kitaev)
830c19c Wallet::refresh + tests (Ilya Kitaev)
1ae9cdc "testnet" is default parameter (Ilya Kitaev)
2157a9a testnet option, Wallet::balance(), Wallet::unlockedBalance() (Ilya Kitaev)
8790904 - testnet option added to api; (Ilya Kitaev)
2cce329 wallet2::store() implemented within wallet2::store_to (Ilya Kitaev)
d608647 WalletManager::findWallets: searching by "keys" files instead of "address.txt" files (Ilya Kitaev)
ca61153 Wallet: payment id and integrated address (Ilya Kitaev)
23cbf6f PendingTransactionImpl: pointer->reference (Ilya Kitaev)
c1d9e7c commented regex (Ilya Kitaev)
563baf1 Typo fixed (Ilya Kitaev)
2efec04 Wallet::createTransaction: added mixin_count param (Ilya Kitaev)
85a6322 double/string to monero integer convertion methods (Ilya Kitaev)
e7d8f2a wallet::default_mixin exposed to public interface as Wallet::setDefaultMixin, Wallet::defaultMixin; wallet::create_transaction_2 used in Wallet::createTransaction (Ilya Kitaev)
a537489 Wallet::filename, Wallet::keysFilename, tests for move wallet (Ilya Kitaev)
a1eddcd removed unused "using" (Ilya Kitaev)
8390bfa Wallet API : WalletManager::findWallets() added (Ilya Kitaev)
44cc0ef scripts for faster test wallets generation (Ilya Kitaev)
2060bfe regenerated test wallets, basic functions got broken (Ilya Kitaev)
dbc0b03 installing wallet_api header (Ilya Kitaev)
653c7e3 cmake: BUILD_TESTS as option explicitly; added missed dependency (Ilya Kitaev)
ef9a74c cmake libutils dependency added (Ilya Kitaev)
191cb59 all wallet dependencies merged to single static lib (Ilya Kitaev)
91eeeb8 WalletListener::moneyReceived test (Ilya Kitaev)
64348a2 WalletListener::moneySpent test (Ilya Kitaev)
060bb62 WalletListener::moneySpent(), WalletListener::moneyReceived() (Ilya Kitaev)
214014c i_wallet_callback: virtual dtor (Ilya Kitaev)
3745770 started WalletListener (Ilya Kitaev)
e6fdd5d TransactionHistory continued (Ilya Kitaev)
3dd4b4c merged with upstream (Ilya Kitaev)
d500272 Wallet API : transaction history in progress (Ilya Kitaev)
663ed04 transaction history api in progress (Ilya Kitaev)
12345d3 api implementation splitted over separate files (Ilya Kitaev)
60508e6 TransactionInfo / TransactionHistory APIs design (Ilya Kitaev)
951f3b5 Wallet::createTransaction API introduced (Ilya Kitaev)
7c51227 Wallet::transfer in progress (Ilya Kitaev)
e04c67a Wallet::refresh + tests (Ilya Kitaev)
9cdf0b7 "testnet" is default parameter (Ilya Kitaev)
caf0e02 testnet option, Wallet::balance(), Wallet::unlockedBalance() (Ilya Kitaev)
8df820b - testnet option added to api; (Ilya Kitaev)
94eaeb5 wallet2::store() implemented within wallet2::store_to (Ilya Kitaev)
 2016-07-06 18:11:04 +02:00
Riccardo Spagni b727a1ffbf updated README to reflect Windows changes 2016-07-03 16:42:26 +02:00
Riccardo Spagni de91bb75a1 Merge pull request #870 
57dce80 gmtime for Windows (luigi1111)
 2016-06-21 09:32:32 +02:00
Riccardo Spagni fd32a3b52a Merge pull request #869 
03e545d More fixing for Windows (iDunk)
e8baa57 CMakeLists.txt: fix build for mingw (iDunk)
 2016-06-21 09:32:12 +02:00
Riccardo Spagni 8c34cca0f0 Merge pull request #867 
f0b85c1 simplewallet: add a status command (moneromooo-monero)
 2016-06-21 09:31:50 +02:00
Riccardo Spagni 03477063ba Merge pull request #868 
15c2b69 common: fix build without libunwind (moneromooo-monero)
f72388c CMakeLists: fix build without libunwind (moneromooo-monero)
 2016-06-21 09:30:56 +02:00
Riccardo Spagni a645a3e5ff Merge pull request #865 
3c3537e cmake: add missing FindLibunwind.cmake (moneromooo-monero)
 2016-06-20 08:48:29 +02:00
Riccardo Spagni 21b3a1b43c Merge pull request #863 
0c6e9e4 rpc: fix getblock RPC sending blob as binary, not hex dump (moneromooo-monero)
 2016-06-19 21:52:35 +02:00
Riccardo Spagni 2072c642d1 Merge pull request #862 
5dc09f2 wallet_rpc_server: fix some string values being returned between <> (moneromooo-monero)
f8213c0 Require 64/16 characters for payment ids (moneromooo-monero)
 2016-06-19 21:51:32 +02:00
Riccardo Spagni 724dfda6d1 Merge pull request #857 
d6f5d54 Fix Issue #855 (Howard Chu)
 2016-06-19 21:50:50 +02:00
Riccardo Spagni 551d44a989 Merge pull request #856 
c5f00bc cn_deserialize: add minergate data (moneromooo-monero)
2470b20 cn_deserialize: print extra nonce as hex data (moneromooo-monero)
77d8fc3 tx_extra: parse new chunk added by minergate (blashyrkh)
 2016-06-19 21:30:20 +02:00
Riccardo Spagni ba61f37f9c Merge pull request #846 
de030d9 fix: error: -Werror=misleading-indentation (moneroexample)
c2d7300 contrib: epee: add exception spec to throwing destructors (redfish)
6898741 src: p2p: add exception spec to throwing destructors (redfish)
21dbc95 crypto: slow-hash: fix misleading indent (redfish)
70f3634 crypto: slow-hash: remove unused hash list for ARM (redfish)
1a7772f crypto: oaes_lib: remove unused _NR array (redfish)
6462a3a crypto: fix compile error: use named type in sizeof (redfish)
 2016-06-19 21:25:52 +02:00
Riccardo Spagni e97d96ccfb Merge pull request #775 
e409e59 Print stack trace on exceptions (moneromooo-monero)
ef4ff42 connection_basic: avoid gratuitous exception (moneromooo-monero)
 2016-06-19 21:14:11 +02:00
Riccardo Spagni 30ef965f9a Merge pull request #854 
14d10e7 readme: notes on config file and fg/bg run mode (redfish)
 2016-06-03 16:40:55 +02:00
Riccardo Spagni 0ec8bc944c Merge pull request #850 
95be58e crypto: slow-hash: disable mul implemented in asm for ARM (redfish)
 2016-06-03 16:40:28 +02:00
Riccardo Spagni a837c9cb0f Merge pull request #842 
d539be3 crypto: make clear generate_random_bytes is not thread safe (moneromooo-monero)
 2016-05-17 19:09:57 +02:00
Riccardo Spagni f03def87ad Merge pull request #840 
1c0bffb Restrict also 'get_connections' and 'getbans' APIs. (osensei)
9f8bc49 Don't allow 'flush_txpool' and 'setbans' JSON_RPC methods when running in restricted mode. (osensei)
 2016-05-17 19:09:11 +02:00
Riccardo Spagni 36dfbf9e00 Merge pull request #837 
bc99b5d Update README with TAILS instructions (dEBRUYNE-1)
 2016-05-17 19:08:19 +02:00
Riccardo Spagni e54e4d96a4 Merge pull request #831 
9ef8c7b tests: fix tests broken by the removal of the block reward accumulation loop (moneromooo-monero)
a6e717e cn_deserialize: deserialize tx_extra too (moneromooo-monero)
3eff37f unit_tests: add a write_varint/read_varint test (moneromooo-monero)
7a66387 unit_tests: fix UNBOUND_LIBRARIES/UNBOUND_LIBRARY typo (moneromooo-monero)
d6bce4b core: move tx_extra parsing errors to log level 1 (moneromooo-monero)
 2016-05-17 19:07:28 +02:00
Riccardo Spagni ae205020f6 Merge pull request #827 
f1e70d1 Only log 1/N skipped blocks (Howard Chu)
cebb97c Move refresh height to keys file from cache file (Howard Chu)
590c439 Make fast_refresh interruptible (Howard Chu)
687855d Set refresh height earlier (Howard Chu)
2fb00c0 Fix 19fe8ae3ef (Howard Chu)
 2016-05-17 19:04:41 +02:00
Riccardo Spagni 30dce45643 Merge branch 'performance' of https://github.com/LMDB/bitmonero 2016-04-29 21:41:43 +02:00
Riccardo Spagni 8b0d22a2aa Merge pull request #826 
76c6bf1 simplewallet: display all settings on set with no arguments (moneromooo-monero)
 2016-04-29 10:44:59 +02:00
Riccardo Spagni 5b734c2a3a Merge pull request #825 
513a658 add a --max-concurrency flag (moneromooo-monero)
 2016-04-29 10:43:48 +02:00
Riccardo Spagni aee3214d86 Merge pull request #824 
09dddf2 wallet: add a filter_by_height field to get_transfers (moneromooo-monero)
 2016-04-29 10:42:39 +02:00
Riccardo Spagni bdb93cbf3d Merge pull request #823 
a687e6e simplewallet: fix pending transfers fee display in show_transfers (moneromooo-monero)
 2016-04-27 09:18:28 +02:00
Riccardo Spagni 29b2cfa3d9 Merge pull request #822 
48ab3f9 wallet: add get_transfers rpc call (moneromooo-monero)
 2016-04-27 09:15:15 +02:00
Riccardo Spagni 5247c063ea Merge pull request #821 
d7bb175 simplewallet: more threading fixes (moneromooo-monero)
 2016-04-27 09:09:21 +02:00
Riccardo Spagni b6f19a485c Merge pull request #816 
7baed9b wallet: allow attaching notes to txids (moneromooo-monero)
ce6f8a6 wallet: add GMT timestamps to transfers/payments (moneromooo-monero)
 2016-04-26 20:36:35 +02:00
Riccardo Spagni 3d984854a6 Merge pull request #819 
31587bd random: call abort(3) instead of assert in must_succeed macro (moneromooo-monero)
 2016-04-26 18:11:04 +02:00
Riccardo Spagni cde9dce9c4 Merge pull request #817 
4b1c0d6 simplewallet: some background refresh threading fixes (moneromooo-monero)
 2016-04-26 18:08:59 +02:00
Riccardo Spagni 714dcc2866 Merge pull request #815 
b0850a9 wallet: add a new sweep_all command and RPC command (moneromooo-monero)
 2016-04-26 18:08:09 +02:00
Riccardo Spagni 7098ad6804 Merge pull request #814 
68cbe15 	modified:   src/wallet/wallet2.cpp 	modified:   src/wallet/wallet2.h (awfulcrawler)
4b325bd 	modified:   src/simplewallet/simplewallet.cpp 	modified:   src/wallet/wallet2.cpp 	modified:   src/wallet/wallet2.h (awfulcrawler)
 2016-04-26 18:04:00 +02:00
Riccardo Spagni fbfb8f46a9 Merge pull request #813 
70c8656 blockchain: add missing overflow check for already generated coins (moneromooo-monero)
d6fd6be blockchain: update cumulative block limit when popping a block (moneromooo-monero)
 2016-04-26 18:03:31 +02:00
Riccardo Spagni 0fb0e7701b Merge pull request #812 
3102feb abstract_tcp_server2: fix send queue limit warning spam (moneromooo-monero)
6bca9a8 abstract_tcp_server2: avoid deadlock waiting for send queue to drain (moneromooo-monero)
7450656 net_node: fix connection leak when ping fails with bad response (moneromooo-monero)
 2016-04-26 18:02:57 +02:00
Riccardo Spagni 0922ae2b43 Merge pull request #811 
672162d tests: fix compile failure on wallet2::transfer (moneromooo-monero)
b0c18ef wallet2: move output selection api public (moneromooo-monero)
 2016-04-26 18:02:26 +02:00
Riccardo Spagni 94a291f8fb Merge pull request #806 
19fe8ae Add --restore-height option (Howard Chu)
b6e42c3 Speed up new wallet refresh (Howard Chu)
b7140da Add GET_HASHES_FAST rpc, use it in wallet (Howard Chu)
 2016-04-26 18:01:57 +02:00
Riccardo Spagni 1c66fe04bc Merge pull request #803 
c33ffc8 simplewallet: save fixes in RPC mode (moneromooo-monero)
 2016-04-14 16:26:46 +09:00
Riccardo Spagni b52148201b Merge pull request #786 
5092e45 tests: unbound API is only accessible in static builds (moneromooo-monero)
 2016-04-14 16:26:29 +09:00
Riccardo Spagni 0ecb152810 Merge pull request #785 
1a58d20 simplewallet: optional address in --generate-from-json (moneromooo-monero)
 2016-04-14 16:26:11 +09:00
Riccardo Spagni 8f78f1407e Merge pull request #784 
087373e Fix potential race with parallel processing of txes/signatures/blocks (moneromooo-monero)
 2016-04-14 16:25:53 +09:00
Riccardo Spagni 6bfb8799c3 Merge pull request #783 
48d0747 wallet: better output selection for transfer/transfer_new (moneromooo-monero)
 2016-04-14 16:25:38 +09:00
Riccardo Spagni 17049fa8e8 Merge pull request #782 
113cdc1 core: keep the acc loop for the genesis block (moneromooo-monero)
 2016-04-14 16:25:18 +09:00
Riccardo Spagni a299e5269b Merge pull request #801 
ed61a2c simplewallet: set strict umask at start (moneromooo-monero)
7385c03 util: add a function to set umask to 077 (moneromooo-monero)
 2016-04-14 16:21:29 +09:00
Riccardo Spagni 784a2108f4 Merge pull request #800 
4cfb4df blockchain: remove the tx validation result cache (moneromooo-monero)
 2016-04-14 16:21:08 +09:00
Riccardo Spagni c2e9866fc6 Merge pull request #797 
d662ab5 rpc: print human readable time since received when printing pool (moneromooo-monero)
5c9dd23 rpc: add a do_not_relay boolean to tx submission (moneromooo-monero)
 2016-04-14 16:20:41 +09:00
Riccardo Spagni da277e17b5 Merge pull request #796 
d817aec tx_pool: ensure no txes that fail check_inputs get in the block template (moneromooo-monero)
 2016-04-14 16:20:17 +09:00
Riccardo Spagni 8f63e89c7f Merge pull request #791 
f17b2f4 rpc: add pool/blockchain and block height results to gettransactions (moneromooo-monero)
 2016-04-14 16:19:49 +09:00
Riccardo Spagni 977ec85c5d Merge pull request #789 
17cac41 tests: fix build with older GCC (Javier Smooth)
 2016-04-14 16:19:14 +09:00
Riccardo Spagni abea280dd3 Merge pull request #799 
aaaf9e2 Fix get_tick_count() on Windows (Howard Chu)
 2016-04-06 12:21:14 +09:00
Riccardo Spagni 151f4b63f7 Merge pull request #787 
b1aaf20 epee: flush output after a message (moneromooo-monero)
 2016-04-06 11:25:15 +09:00
Riccardo Spagni fafb43f3cd Merge pull request #798 
1aad759 tx_pool: fix (hopefully) save/load of kept_by_block (moneromooo-monero)
 2016-04-06 11:25:00 +09:00
Riccardo Spagni e7c8a32a28 Merge pull request #780 
a42e19e bumped version number (Riccardo Spagni)
 2016-04-02 12:22:31 +09:00
Riccardo Spagni a42e19e1b7 bumped version number 2016-04-02 12:21:59 +09:00
Riccardo Spagni cc54e2764a Merge pull request #779 
daac1cc core: remove the block reward accumulation loop (moneromooo-monero)
 2016-04-02 12:05:57 +09:00
Riccardo Spagni dea1aa75bc Merge pull request #778 
efbdde2 Detect map resize failures (Howard Chu)
 2016-04-02 12:05:40 +09:00
Riccardo Spagni ab43e80331 Merge pull request #777 
8757e46 add blockhashing blob to getblocktemplate (Howard Chu)
 2016-04-02 12:05:07 +09:00
Riccardo Spagni 590d5d8f20 Merge pull request #774 
34957fc tests: add test for needed OpenSSL algorithms in unbound (moneromooo-monero)
 2016-04-02 12:04:26 +09:00
Riccardo Spagni 3d06e2bc81 Merge pull request #773 
587e2e9 README: mention TORSOCKS_ALLOW_INBOUND for wallet connections (moneromooo-monero)
 2016-04-02 12:03:51 +09:00
Riccardo Spagni b22f550c67 Merge pull request #772 
ead6956 simplewallet: always gracefully exit on EOF (moneromooo-monero)
 2016-04-02 12:03:25 +09:00
Riccardo Spagni 4ac6bdbb3f Merge pull request #769 
b4eada9 wallet: make load_keys check types when loading JSON (moneromooo-monero)
3e55725 wallet: make the JSON reading type safe (moneromooo-monero)
f8d05f3 common: new json_util.h (moneromooo-monero)
 2016-04-02 12:02:49 +09:00
Riccardo Spagni 2572706c2c Merge pull request #768 
43962f4 abstract_tcp_server2: possible fix for exception in handle_accept (moneromooo-monero)
 2016-04-02 12:02:33 +09:00
Riccardo Spagni a38ad63f8f Merge pull request #767 
24b3e90 Convey tx verification failure reasons to the RPC client (moneromooo-monero)
 2016-04-02 12:02:07 +09:00
Riccardo Spagni f68670a80e Merge pull request #766 
77d1c6b simplewallet: default to trusted daemon for loopback address (moneromooo-monero)
 2016-04-02 12:01:29 +09:00
Riccardo Spagni 44559ca4b0 Merge pull request #764 
f746c9d minor corrections/clarifications (Thomas Winget)
c6bb201 Transaction pool documentation (and some cleanup) (Thomas Winget)
 2016-04-02 12:01:15 +09:00
Riccardo Spagni 0ee87e6305 Merge pull request #770 
878ab5d wallet: fix --generate-from-keys saving as watch only (moneromooo-monero)
 2016-03-28 23:43:06 +02:00
Riccardo Spagni 2b57845766 Merge pull request #765 
d5d46e6 tests: obligatory hardfork unit build fix after interface change (moneromooo-monero)
25672d3 wallet: pass std::function by const ref, not value (moneromooo-monero)
0be6e08 wallet: do not leak owned amounts to the daemon unless --trusted-daemon (moneromooo-monero)
12146da wallet: change sweep_dust to sweep_unmixable (moneromooo-monero)
600a3cf New RPC and daemon command to get output histogram (moneromooo-monero)
f9a2fd2 wallet: handle rare case where fee adjustment can bump to the next kB (moneromooo-monero)
f26651a wallet: factor fee calculation (moneromooo-monero)
 2016-03-27 14:09:53 +02:00
Riccardo Spagni 1559c71ef2 Merge pull request #763 
b852766 blockchain: for v3, require miner tx to have well behaved outs (moneromooo-monero)
97638b1 core: fix miner tx block reward with fees (moneromooo-monero)
 2016-03-25 19:00:08 +02:00
Riccardo Spagni 02ee0db6c5 Merge pull request #762 
287e882 remove connectivity tool, comment it out from munin plugins too (Riccardo Spagni)
51a56e7 remove unecessary and bad std::move from portable_storage_template_helper.h (Riccardo Spagni)
 2016-03-25 15:04:02 +02:00
Riccardo Spagni 287e88283c remove connectivity tool, comment it out from munin plugins too 2016-03-25 14:52:19 +02:00
Riccardo Spagni 51a56e78ae remove unecessary and bad std::move from portable_storage_template_helper.h 2016-03-25 14:33:58 +02:00
Riccardo Spagni 0d30b65785 Merge pull request #749 
bfd4a28 Update BlockchainDB documentation (Thomas Winget)
797357e Change Doxyfile, Blockchain not blockchain_storage (Thomas Winget)
c835215 remove defunct code from cryptonote::core (Thomas Winget)
50dba6d cryptonote::core doxygen documentation (Thomas Winget)
8ac329d doxygen documentation for difficulty functions (Thomas Winget)
540a76c Move checkpoint functions into checkpoints class (Thomas Winget)
1b0c98e doxygen documentation for checkpoints.{h,cpp} (Thomas Winget)
89c24ac Remove unnecessary or defunct code (Thomas Winget)
ab0ed14 doxygen include private and static members (Thomas Winget)
3a48449 Updated documentation for blockchain.* (Thomas Winget)
 2016-03-25 09:12:25 +02:00
Riccardo Spagni 46d4fd000c Merge pull request #761 
01e0a69 Revert "Merge pull request #749" (Riccardo Spagni)
 2016-03-25 08:45:19 +02:00
Riccardo Spagni 01e0a69c17 Revert "Merge pull request #749" 
This reverts commit 7fa63a82a1, reversing
changes made to cb6be986c3.
 2016-03-25 08:42:42 +02:00
Riccardo Spagni 40b8a5f327 Merge pull request #756 
a2e378b wallet: add a --generate-from-json flag (moneromooo-monero)
 2016-03-25 08:27:42 +02:00
Riccardo Spagni 7fa63a82a1 Merge pull request #749 
bfd4a28 Update BlockchainDB documentation (Thomas Winget)
797357e Change Doxyfile, Blockchain not blockchain_storage (Thomas Winget)
c835215 remove defunct code from cryptonote::core (Thomas Winget)
50dba6d cryptonote::core doxygen documentation (Thomas Winget)
8ac329d doxygen documentation for difficulty functions (Thomas Winget)
540a76c Move checkpoint functions into checkpoints class (Thomas Winget)
1b0c98e doxygen documentation for checkpoints.{h,cpp} (Thomas Winget)
89c24ac Remove unnecessary or defunct code (Thomas Winget)
ab0ed14 doxygen include private and static members (Thomas Winget)
3a48449 Updated documentation for blockchain.* (Thomas Winget)
 2016-03-25 08:22:06 +02:00
Riccardo Spagni cb6be986c3 Merge pull request #748 
cc4b19c blockchain: fix partial block reward detection (moneromooo-monero)
 2016-03-25 08:20:56 +02:00
Riccardo Spagni eb1b87d239 Merge pull request #746 
8438aeb update version number (Riccardo Spagni)
 2016-03-21 23:15:31 +02:00