Commit Graph

108 Commits

Author SHA1 Message Date
Crypto City
5e5ad0f715 Fluorine Fermi
-----BEGIN PGP SIGNATURE-----
 
 iQFJBAABCAAzFiEEh3erj3eO6JSHovjn9KygGDZB4BAFAmQrcQUVHGx1aWdpMTEx
 MXdAZ21haWwuY29tAAoJEPSsoBg2QeAQx2kH/AjGrkHYqvwiwUwxPHvUG3IE2+47
 j2pZAd55yg1l4clECRwFSicdNHqInXYqj03GeVl+NW9mcIe52cY1GLYYwwHFdfgk
 BMRdfYTZypoe84qzAupN0miAHHFgIcnQdR90MVt/mMWc67JUPA0XdJC2jpOho7ob
 h8rjRSv/QEpGQ3CeoG3/brAIc2/TNRFJHCq9eVc1fhZUJ2gWHieo/EbtnbArwbpU
 NWZ9GAoWyy5fUhmYgzHPwqGzbvzlmWl5C4dw3HdjvXL2Ah7DPuG3tY3b29z0xBD3
 C3bCGEYkOvtmJ/bBQyu3ZVfj2W3Z7pDItQ1fyFxbhWzakgPICWXjbyR7K1w=
 =TDpE
 -----END PGP SIGNATURE-----

Merge tag 'v0.18.2.2' into cc

Fluorine Fermi
2023-06-08 14:31:22 +00:00
tobtoht
15384cc135
depends: bump hidapi/libusb
fixes Trezor connectivity issues on Windows 10/11

Co-authored-by: selsta <selsta@sent.at>
2023-01-25 21:52:42 +01:00
Crypto City
088538c160 Merge remote-tracking branch 'origin/master' into HEAD
b6a029f222

Multisig functional test broken
2022-08-08 17:44:32 +00:00
mj-xmr
da9aa1f7f8
Copyright: Update to 2022 2022-03-04 06:59:20 +01:00
selsta
7bc261b506
cmake: find readline on macOS ARM 2021-11-17 02:09:58 +01:00
selsta
9c6111017b
cmake: use CMAKE_CURRENT_LIST_DIR for git version 2021-10-19 17:27:16 +02:00
Crypto City
489a261db0 Merge remote-tracking branch 'origin/master' into cc
8fde011dbe
2021-09-01 15:50:02 +00:00
luigi1111
e3b3fb577a
Merge pull request #7794
4414ed4 cmake: test is a reserved keyword (selsta)
2021-08-02 18:54:15 -04:00
luigi1111
e91e2c4a2b
Merge pull request #7758
42b74a3 Include Libusb and hidapi on android (malinero)
2021-07-27 16:57:06 -04:00
selsta
4414ed401d
cmake: test is a reserved keyword 2021-07-15 15:35:03 +02:00
malinero
42b74a37d3 Include Libusb and hidapi on android 2021-06-21 19:52:56 +02:00
luigi1111
21c6376f33
Merge pull request #7715
0c13623 cmake: fix check_linker_flag (selsta)
2021-06-01 22:09:01 -05:00
luigi1111
126ff6b0ee
Merge pull request #7711
4969f39 cmake: use CMAKE_CURRENT_LIST_DIR in FindLibUSB (selsta)
2021-06-01 22:07:47 -05:00
selsta
0c13623411
cmake: fix check_linker_flag 2021-05-12 02:09:55 +02:00
selsta
4969f39c09
cmake: use CMAKE_CURRENT_LIST_DIR in FindLibUSB 2021-05-11 01:29:44 +02:00
selsta
cbd54ea524
cmake: set 3.5 as minimum version 2021-04-27 11:02:05 +02:00
Crypto City
931773c40e Merge remote-tracking branch 'origin/master' into cc 2021-04-24 13:46:11 +00:00
anon
1fbb33c18b
cmake: fix ccache detection 2021-03-16 13:41:15 +00:00
Crypto City
4956a6aa5e Merge remote-tracking branch 'origin/master' into cc 2021-01-18 01:33:53 +00:00
Alexander Blair
ebdc617408
Merge pull request #7102
8ee3ec729 cmake: fix "release" version string on tagged releases (moneromooo-monero)
2020-12-10 17:52:18 -08:00
moneromooo-monero
8ee3ec7296
cmake: fix "release" version string on tagged releases
It would not say "release" if we're on a previous tag
2020-12-09 22:18:44 +00:00
mj-xmr
e591341237 Clang-tidy integrated into CMakeLists.txt
Can be called from the source directory with:
utils/health/clang-tidy-run.sh
2020-12-02 20:42:38 +01:00
Crypto City
43b8112c1e Merge branch 'master' into cc 2020-10-18 00:33:51 +00:00
Alexander Blair
bf65b07718
Merge pull request #6867
826a84478 cmake: Version - use CMAKE_CURRENT_LIST_DIR (xiphon)
2020-10-14 15:25:00 -07:00
xiphon
826a84478d cmake: Version - use CMAKE_CURRENT_LIST_DIR 2020-10-07 20:21:25 +00:00
xiphon
b4c775663a cmake: CheckTrezor - use ${CMAKE_CURRENT_LIST_DIR} to locate tests 2020-10-06 14:37:00 +00:00
Crypto City
5ebcd37ece remove a few user visible mentions of monero, replace with Townforge/gold 2020-09-20 14:44:47 +00:00
Alexander Blair
a0d179e528
Merge pull request #6512
5ef0607da Update copyright year to 2020 (SomaticFanatic)
2020-07-19 03:32:59 -07:00
SomaticFanatic
5ef0607da6 Update copyright year to 2020
Update copyright year to 2020
2020-05-06 22:36:54 -04:00
mj-xmr
3843a6aba5 Made ccache optional (opt out) and tidied up the FindCcache.cmake 2020-05-04 09:46:31 +02:00
mj-xmr
d3e77ccb59 FindCcache automatically 2020-04-22 17:17:25 +02:00
TrasherDK
7bca3e069f CMake build out of source 2019-10-26 15:10:23 +02:00
Nathan Dorfman
56895ee07a cmake: Fix generation of version.cpp 2019-10-23 16:43:30 -06:00
Jesus Ramirez
f9b3f6ef3b Removed Berkeley DB and db switching logic 2019-09-16 16:18:05 +02:00
moneromooo-monero
33e91e1a1e
wallet, rpc: add a release field to get_version
It does not leak much since you can make a fair guess by RPC
version already, and some people want to avoid non release
clients when using third parties' nodes (because they'd never
lie about it)
2019-08-26 19:28:25 +00:00
xiphon
45c28d8a0e build: fix OSX static libusb check and link against static libobjc 2019-07-09 22:13:59 +00:00
Howard Chu
1dc4ebfd6c
Use 9 digit build IDs 2019-06-12 16:47:33 +01:00
moneromooo-monero
7d5cc0358b
cmake: fix some case of "backtrace lib not found" breaking
It fixes at least one case of building on ARM with Docker
2019-05-01 10:11:41 +00:00
Riccardo Spagni
613588e1a8
Merge pull request #5410
d4a78c74 build: libusb static compilation fix (Dusan Klinec)
2019-04-16 22:35:16 +02:00
Martijn Otto
8df827075f
Fix linker issues using easylogging 2019-04-10 11:37:02 +02:00
Dusan Klinec
d4a78c74ac
build: libusb static compilation fix 2019-04-07 18:52:25 +02:00
Riccardo Spagni
4c91eb23a0
Merge pull request #5061
1f2930ce Update 2019 copyright (binaryFate)
2019-03-17 17:49:30 +02:00
binaryFate
1f2930ce0b Update 2019 copyright 2019-03-05 22:05:34 +01:00
Dusan Klinec
5ea17909ca
device/trezor: debugging features, trezor tests 2019-03-05 14:02:45 +01:00
Dusan Klinec
e37154a879
build: protobuf dependency fixes, libusb build
- docker protobuf dependencies, cross-compilation
- device/trezor protobuf build fixes, try_compile
- libusb built under all platforms, used by trezor for direct connect
2018-12-18 16:50:19 +01:00
Dusan Klinec
d71f89e2a2
device/trezor: device/trezor: correct device initialization, status check
- checks if the device is in the correct usable state
- implements check for the v2.0.9 firmware which does not support payment IDs
- simple transacttion check, payment id fmt consistency
- minor fixes, refactoring, webusb session counting fix
2018-12-04 20:12:03 +01:00
Dusan Klinec
2ffe53d9e6
device/trezor: webusb transport added, cmake fixes
- webusb transport based on libusb added. Provides direct access to Trezor via USB, no need for Trezor bridge.
- trezor protocol message handler improved, no recursion used. Ready for upcoming integration tests.
- libusb (for docker) bumped from v1.0.9 to v1.0.22, newer version required for webusb transport, for device enumeration.
- cmake improvements and fixes. Cmake Trezor checks are moved to a dedicated CheckTrezor.cmake file. In case of a problem Trezor is excluded from build.
- ifdefs made consistent to Ledger.
- UDP Transport enumeration disabled by default in release mode
2018-11-25 11:57:19 +01:00
moneromooo-monero
dff0adfee5
cmake: fix readline detection when the readline library is not found 2018-10-26 11:47:15 +00:00
iDunk5400
cbdd6b910b
Linux: Fix building of static binaries with hw device support
This should enable building static binaries on Linux systems where dependencies are already built with -fPIC, such as Ubuntu 18.04.
2018-10-06 16:48:14 +02:00
Riccardo Spagni
8e07e26555
Merge pull request #4425
a69271fa Fixed a typo (Piotr Kąkol)
2018-09-29 22:19:47 +02:00