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,343 Commits 9 Branches 78 Tags
ff6b8f2e591a9af4e24700193c06a8decfabb13c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Riccardo Spagni a569b264bc Merge pull request #991 
f88029e db_lmdb: do not try to modify the database in read only mode (moneromooo-monero)
 2016-08-26 20:39:21 +02:00
Riccardo Spagni 416c1da51c Merge pull request #989 
0ed35f7 README.md: Boost version updated for windows (tobiasw2)
 2016-08-26 10:34:29 +02:00
Riccardo Spagni 009bea43ce Merge pull request #986 
da58422 Update README.i18n (arb0r)
 2016-08-26 10:34:00 +02:00
Riccardo Spagni 2702e4999a Merge pull request #984 
78035d2 Fix fake 'network synchronized, begin using' messages (Thomas Winget)
 2016-08-26 10:33:10 +02:00
Riccardo Spagni 7000ed45ec Merge pull request #982 
65238d2 fix #691 removed help about leaving wallet name empty on --generate-new-wallet (guzzi_jones)
 2016-08-26 10:32:30 +02:00
Riccardo Spagni 9308b4e8b9 Merge pull request #978 
99dd572 libwallet_api: tests: checking for result while opening wallet (Ilya Kitaev)
bcf7b67 libwallet_api: Wallet::amountFromString fixed (Ilya Kitaev)
32bc7b4 libwallet_api: helper method to return maximumAllowedAmount (Ilya Kitaev)
cbe534d libwallet_api: tests: removed logged passwords (Ilya Kitaev)
b1a5a93 libwallet_api: do not store wallet on close if status is not ok (Ilya Kitaev)
 2016-08-26 10:32:00 +02:00
Riccardo Spagni 391c567f37 Merge pull request #976 
c2f4e16 simplewallet: default to max-concurrency 1 on MacOS X (moneromooo-monero)
 2016-08-26 10:31:24 +02:00
Riccardo Spagni 2c544257f5 Merge pull request #988 
5f873ea added Symas as a sponsor (Riccardo Spagni)
 2016-08-24 18:09:50 +02:00
Riccardo Spagni 5f873eaea0 added Symas as a sponsor 2016-08-24 17:47:53 +02:00
Riccardo Spagni 73ec1e6421 Merge pull request #981 
3729ac8 Docs: re-introduce Boost 1.58 min req from 2a2b655 (anonimal)
 2016-08-24 17:46:15 +02:00
Riccardo Spagni b63d04fb84 Merge branch 'ranok-patch-1' 2016-08-24 17:45:28 +02:00
Riccardo Spagni 68039eccc2 resolved conflicts in readme.md 2016-08-24 17:45:09 +02:00
Riccardo Spagni db909a224c Merge branch 'radfish-PR--readme-clarify-conf-syntax' 2016-08-22 23:00:06 +02:00
Riccardo Spagni dfab703eab fix README conflicts 2016-08-22 22:59:45 +02:00
Riccardo Spagni 17157f8a22 Merge pull request #972 
2c5e68f cmake: fix typo in handling of STACK_TRACE (redfish)
 2016-08-22 22:55:53 +02:00
Riccardo Spagni 79cdedb90c Merge pull request #970 
25f529a wallet: store key images after importing them (moneromooo-monero)
 2016-08-22 22:55:24 +02:00
Riccardo Spagni 13222f9ff5 Merge pull request #968 
9cca53a wallet: fix build on Mac and Windows (missing include) (moneromooo-monero)
 2016-08-22 22:55:00 +02:00
Riccardo Spagni 1843d189c3 Merge pull request #967 
e596e25 simplewallet: do not suggest removing cache if the password was wrong (moneromooo-monero)
 2016-08-22 22:54:22 +02:00
Riccardo Spagni e152fd20e9 Merge pull request #964 
2a2b655 Build: make boost 1.58 minimum requirement. Fixes #956 (anonimal)
 2016-08-22 22:52:51 +02:00
Riccardo Spagni 63ba2447e2 Merge pull request #963 
44dab04 Build: use libstdc++ with clang < 3.7 (anonimal)
455ded4 Build: use Boost 1.58 for Travis build. Refs #956 (anonimal)
 2016-08-16 14:40:51 +02:00
Riccardo Spagni 40e8c6c403 Merge pull request #959 
7e4e002 daemon: print time to next fork (moneromooo-monero)
 2016-08-16 14:40:32 +02:00
Riccardo Spagni 45f4ef7a6d Merge pull request #955 
7442dd0 More for Issue #855 (Howard Chu)
 2016-08-11 22:44:29 +02:00
Riccardo Spagni 0faf572db8 Merge pull request #948 
11dc091 Fake outs set is now decided by the wallet (moneromooo-monero)
1593553 new unlocked parameter to output_histogram (moneromooo-monero)
 2016-08-11 22:43:14 +02:00
Riccardo Spagni cb17c4da4f Merge pull request #953 
240864f db_lmdb: errors dropping hf starting height db on reset are not fatal (moneromooo-monero)
 2016-08-11 14:58:04 +02:00
Riccardo Spagni b026650be9 Merge pull request #952 
709c724 Better fix (#4) (hyc)
d2644c1 fix restore-deterministic height (luigi1111)
 2016-08-11 14:57:33 +02:00
Riccardo Spagni 9273899ee7 Merge pull request #949 
da1007f simplewallet: make the refresh thread into more generic idle thread (moneromooo-monero)
 2016-08-11 14:56:40 +02:00
Riccardo Spagni d46a58dab0 Merge pull request #947 
663fc32 wallet2: if importing key images fails, print failure index (moneromooo-monero)
 2016-08-11 14:53:16 +02:00
Riccardo Spagni 8d098610a7 Merge pull request #943 
f0c0a3f Fix #864 Squashed commit of the following: commit 9af9e4223b     fixed some formatting commit c7920e1cf8 Merge: 97eb28b 1da1c68     fix#864 fix using boolean commit 97eb28ba5d     Fix #864 boolean value used to verify on new wallet commit 1da1c68bd3     fix #864 changed to boolean to prompt for verify commit 5bee966524     fix 864; made variable names easier for understanding branching. commit 45715960d3     fix #864;  allow password to be entered twice for new wallets for verification. fix #864 password entry verification; ammended boolean fix #864 ; default constructor for password_container should set verify=true (guzzi_jones)
 2016-08-11 14:52:53 +02:00
Riccardo Spagni 66f89797e0 Merge pull request #940 
e890f51 Build: take out tests in Travis CI (anonimal)
198e408 Build: add vanilla clang to Travis CI (anonimal)
659bee6 Build: add make release-test to Travis CI (anonimal)
 2016-08-11 14:52:33 +02:00
Riccardo Spagni f003315563 Merge pull request #939 
33b5ebd cmake: do not pass -O2 in debug build on ARM (redfish)
35dc40a cmake: libatomic only needed for 32-bit Clang builds (redfish)
042db0b cmake: cleanup logic that sets flags per target/subdir (redfish)
 2016-08-11 14:49:39 +02:00
Riccardo Spagni 0fbe9cfcdb Merge pull request #937 
0f990d0 cmake,common: flag for stack trace (redfish)
 2016-07-27 11:07:38 +02:00
Riccardo Spagni 72f2934e20 Merge pull request #936 
4618873 tests: fix a bitflag test typo (moneromooo-monero)
89e68d7 unit_tests: check adding checkpoints succeeded (moneromooo-monero)
121165f db_lmdb: add some missing api call checks (moneromooo-monero)
22d8344 core_rpc_server: fix gray/white peer list mixup (moneromooo-monero)
 2016-07-27 11:06:57 +02:00
Riccardo Spagni b34506da81 Merge pull request #928 
ebf97d7 wallet: new {ex,im}port_key_images commands and RPC calls (moneromooo-monero)
 2016-07-26 08:55:25 +02:00
Riccardo Spagni 1daef32844 Merge pull request #931 
b3801fa hardfork: fix off by one in rescaning fork state after restart (moneromooo-monero)
 2016-07-26 08:54:23 +02:00
Riccardo Spagni 9565d3ffbc Merge pull request #934 
4b3a788 cmake: install throw hook in OSX build too (redfish)
3c92c2f cmake: do not install hook on throw when building tests (redfish)
 2016-07-26 08:53:20 +02:00
Riccardo Spagni a834105bed Merge pull request #927 
8bed9a4 cmake: wallet: libunbound is not always static (redfish)
 2016-07-24 20:41:22 +02:00
Riccardo Spagni 47618c2710 Merge pull request #923 
8312887 simplewallet: suggest removing cache when loading fails (moneromooo-monero)
 2016-07-23 09:20:18 +02:00
Riccardo Spagni 07f974a499 Merge pull request #916 
b89b963 wallet: add unconfirmed incoming txes from the txpool (moneromooo-monero)
 2016-07-23 09:19:39 +02:00
Riccardo Spagni b582764bd6 Merge pull request #915 
d7597c5 refreshing wallet even if error happened (Ilya Kitaev)
6d32a3d wallet_api: async init, Wallet::connected status, log level (Ilya Kitaev)
193d251 libwallet_api cmake: conditionally creating libwallet_merged2 only for STATIC build (Ilya Kitaev)
10c06dd wallet_api: segfault on refresh fixed (Ilya Kitaev)
9d2cb4f WalletListener functionality (Ilya Kitaev)
d27b883 hack to successfull linking for MSYS2 (Ilya Kitaev)
083380c Transaction fee multiplier aka priority integraged (Ilya Kitaev)
00ed12b Wallet::paymentIdValid (Ilya Kitaev)
 2016-07-23 09:17:21 +02:00
Riccardo Spagni 90f2e19d51 Merge pull request #910 
080a606 simplewallet: revert to foreground refresh at startup (moneromooo-monero)
 2016-07-23 09:13:15 +02:00
Riccardo Spagni d4af91134c Merge pull request #886 
dca9fe1 cmake: do not pass -Werror when building tests (redfish)
 2016-07-23 09:11:24 +02:00
Riccardo Spagni 28f9348fea Merge pull request #920 
ca33ce6 include result in the notifications template (Riccardo Spagni)
2a8352d only alert on IRC when the status changes (Riccardo Spagni)
6b6fb7f add IRC notifications to travis (Riccardo Spagni)
 2016-07-23 09:10:15 +02:00
Riccardo Spagni ca33ce6458 include result in the notifications template 2016-07-23 09:09:40 +02:00
Riccardo Spagni 2a8352db2e only alert on IRC when the status changes 2016-07-23 09:05:30 +02:00
Riccardo Spagni 3720c27b7d Merge pull request #924 
61ed40a Tests: fix signed/unsigned comparison in hash-target (anonimal)
 2016-07-23 09:03:55 +02:00
Riccardo Spagni 6b6fb7f7d0 add IRC notifications to travis 2016-07-20 14:50:44 +02:00
Riccardo Spagni 38e5156392 Merge pull request #914 
87b1153 wallet2_api: use uint64_t for amounts (moneromooo-monero)
 2016-07-20 14:29:33 +02:00
Riccardo Spagni c6c761c45c Merge pull request #919 
48e14ef fix atomic library to only fire off for clang (Riccardo Spagni)
39f7fad fix duplicate clang block in cmake (Riccardo Spagni)
 2016-07-20 14:29:01 +02:00
Riccardo Spagni 2b1c4a9f64 Merge pull request #918 
b249482 Docs: fix 'Development Resources' formatting in README. (anonimal)
 2016-07-20 14:28:09 +02:00
Riccardo Spagni 48e14ef66c fix atomic library to only fire off for clang 2016-07-20 14:25:59 +02:00
Riccardo Spagni 39f7fad71d fix duplicate clang block in cmake 2016-07-20 14:24:50 +02:00
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