Commit graph

284 commits

Author SHA1 Message Date
Byron Hambly
0f2eb6fd58 Merge aa774f3e11 into merged_master (Bitcoin PR bitcoin/bitcoin#25829) 2024-11-03 15:50:57 +02:00
Byron Hambly
1269611e85 Merge b63c24a509 into merged_master (Bitcoin PR bitcoin/bitcoin#25809) 2024-11-02 17:08:58 +02:00
James Dorfman
b6df20eb34 Merge d4475ea7ae into merged_master (Bitcoin PR bitcoin/bitcoin#22235) 2024-08-09 04:52:58 +00:00
Byron Hambly
c8dedb9c2b Merge b6b7815ddc into merged_master (Bitcoin PR bitcoin/bitcoin#24277) 2023-06-30 13:12:30 +00:00
Byron Hambly
9099fda5c7 Merge 32ee7675fa into merged_master (Bitcoin PR bitcoin/bitcoin#24111) 2023-06-29 12:25:23 +00:00
Byron Hambly
47626b5a64 Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912) 2023-06-14 15:44:11 +00:00
James Dorfman
4a713e72bb Merge aec631bccc into merged_master (Bitcoin PR bitcoin/bitcoin#23462) 2023-05-24 20:35:27 +00:00
Byron Hambly
b708aecb74 Merge 571bb94dfb into merged_master (Bitcoin PR bitcoin/bitcoin#23123) 2023-04-28 13:31:37 +00:00
Byron Hambly
4756e1f59a Merge 8f022a59b8 into merged_master (Bitcoin PR bitcoin/bitcoin#22993) 2023-04-22 07:54:57 +00:00
Byron Hambly
27c8679174 Merge b5ede2aa7f into merged_master (Bitcoin PR bitcoin-core/gui#418) 2023-04-21 08:17:29 +00:00
Byron Hambly
639d71f0d1 Merge f5a406f003 into merged_master (Bitcoin PR bitcoin/bitcoin#22633) 2023-04-10 12:59:14 +00:00
Andrew Poelstra
1339dae913
Merge ElementsProject/elements#1167: Add native support for liquidtestnet
c6e074e25b liquidtestnet: Fix chain name in windows installer (Pablo Greco)
d0f391cfdb liquidtestnet: Add style for Elements-Qt (Pablo Greco)
48ddfbf8d7 liquidtestnet: Add fixed seeds (Pablo Greco)
3b34c8e927 liquidtestnet: Add seed nodes (Pablo Greco)
0d1964766f liquidtestnet: Accept multi OP_RETURN (Pablo Greco)
f955cb3d9c liquidtestnet: Add chainparams (Pablo Greco)
0fa20d006d CCustomParams: Move some defaults away from UpdateFromArgs (Pablo Greco)
e9df51121f Add text version of the fixed seeds for liquidv1 and liquidtestnet (Pablo Greco)

Pull request description:

  Currently using liquidtestnet requires a big config file, which is error-prone and uncomfortable for users, this MR adds support for just using `-chain=liquidtestnet`.

  There are a few things that need to be discussed/addressed

  1. Main port (currently set to 18891 because that's the one used originally, and the one that's configured in `liquidtestnet.com`)
  1. RPC and extra ports, I just chose some non-overlapping ports that are "close" to the ones in the other liquid/elements networks.
  1. Icon color, I just used something different than `liquidv1` and `elementsregtest`, suggestions accepted 😉
  1. `liquid-testnet.blockstream.com` is still using port 18892, it will be changed to 18891 soon.
  1. both seeds are just CNAME dns records at the moment, they should be changed to real seed nodes (no changes in code required, but important for review)

ACKs for top commit:
  delta1:
    ACK c6e074e
  wintercooled:
    ACK c6e074e25b
  apoelstra:
    utACK c6e074e25b

Tree-SHA512: 48c17b8b90ba5a33ae987935ffb368737167f6ca5ae772f6dd8c0c5e7efb39355d81e2677cd02d3e22984f2592fdd67caaf838003902b3c827f6ade01f18a040
2022-11-23 15:31:39 +00:00
Pablo Greco
fde2277034
Merge pull request #1168 from andreabonel/fix_windows_installer_icons
Fix nsis-header.bmp and nsis-wizard.bmp for Elements Windows installer
2022-10-15 18:10:00 -03:00
Pablo Greco
f09a276eb0
Merge pull request #1171 from andreabonel/master-replace-icons
Replace icons
2022-10-15 18:09:26 -03:00
Andrea Bonel
f5399df08a Replace Bitcoin icons with the corresponding for Elements 2022-09-19 14:31:33 -03:00
Andrea Bonel
66477ef9ad Fix Windows uninstaller icon 2022-09-17 13:18:32 -03:00
Andrea Bonel
b22a34728d Remove unused image - not present in Bitcoin anymore 2022-09-16 22:01:09 -03:00
Andrea Bonel
04805d5b59 Fix nsis-header.bmp and nsis-wizard.bmp for elements 2022-09-11 01:24:57 +00:00
Pablo Greco
c6e074e25b liquidtestnet: Fix chain name in windows installer 2022-09-09 10:44:33 +00:00
James Dorfman
457a5645fe
Merge pull request #869 from stevenroose/win-installer
Fix Bitcoin name usage in Windows installer
2022-09-06 15:50:12 -04:00
fanquake
495caa9a01
build: add example bitcoin conf to win installer
Addresses
https://github.com/bitcoin/bitcoin/pull/22235#discussion_r946359661.
2022-08-16 11:32:46 +01:00
fanquake
0eac1f7ba4
build: include share/rpcauth in tarball & installer
Fixes #19081.
2022-08-16 11:32:42 +01:00
fanquake
d755ffc327
build: package test_bitcoin in Windows installer 2022-08-09 09:13:23 +01:00
fanquake
aa30e046ac
build: remove entire docs dir from Windows installer 2022-08-09 09:08:46 +01:00
josibake
b483084d86
doc: replace bitcoin.conf with placeholder file 2022-05-02 15:38:07 +02:00
Glenn Willen
df04042bcc Merge 023e343b50 into merged_master (Elements PR ElementsProject/elements#1093) 2022-04-20 23:38:17 -07:00
opacey
15f29a4eff
Typo correction: 'hrinkdebugfile'
Amending "# hrinkdebugfile=1" to "# shrinkdebugfile=1"
2022-02-16 16:57:37 +00:00
Hennadii Stepanov
a5f67b4ca8
build: Fix make deploy for Windows when building out of source tree 2022-02-06 13:34:49 +02:00
fanquake
b3ccf26df4
build: force CRCCheck in Windows installer
Otherwise a user can pass /NCRC on the command line and bypass the
crc check, meaning they could install a potentially corrupted
installer.
2022-01-20 18:06:26 +08:00
Hennadii Stepanov
f47dda2c58
scripted-diff: Bump copyright headers
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-

Commits of previous years:
* 2020: fa0074e2d8
* 2019: aaaaad6ac9
2021-12-30 19:36:57 +02:00
Steven Roose
de75222ef7
Fix Bitcoin name usage in Windows installer 2021-11-25 17:04:43 +00:00
Hennadii Stepanov
9a1ad7bc0d
test: Enable SC2086 shellcheck rule 2021-11-13 16:54:56 +02:00
Samuel Dobson
bccd1d942d Remove -rescan startup parameter 2021-09-30 12:06:27 +13:00
fanquake
a43b8e9555
build: set OSX_MIN_VERSION to 10.15
This is required to use std::filesystem on macOS as support for it only
landed in the libc++ dylib shipped with 10.15.

See also: https://developer.apple.com/documentation/xcode-release-notes/xcode-11-release-notes

Clang now supports the C++17 <filesystem> library for iOS 13, macOS 10.15, watchOS 6, and tvOS 13.
2021-09-16 17:50:19 +08:00
Jarol Rodriguez
3765c486ef qt: fix bitcoin-qt app categorization on apple silicon
On master, the deployed bitcoin-qt application is categorized as an IOS application.
This is obviously incorrect, and the built executable is not an IOS executable.
To fix this, we set the CFBundleSupportedPlatforms key in our info.plist
2021-09-13 05:17:18 -04:00
Zero-1729
021daedfa1
refactor: replace remaining binascii method calls 2021-08-16 19:30:56 +01:00
Andrew Poelstra
57dadc1274 Merge 8462cd5601 into merged_master (Bitcoin PR bitcoin/bitcoin#22080) 2021-07-19 16:02:52 +00:00
fanquake
60a5632f77 build: set minimum supported macOS to 10.14 2021-07-11 18:43:54 +00:00
Andrew Poelstra
9f4f65bbbe Merge 6d1d33d334 into merged_master (Bitcoin PR bitcoin-core/gui#323) 2021-07-10 21:40:24 +00:00
Andrew Poelstra
a5a02a17ab Merge 54617fad99 into merged_master (Bitcoin PR bitcoin/bitcoin#21709) 2021-07-06 21:57:10 +00:00
Andrew Poelstra
3c9222f410 Merge 59869704c0 into merged_master (Bitcoin PR bitcoin/bitcoin#21818) 2021-07-05 01:03:56 +00:00
Andrew Poelstra
256ce55913 Merge 3bcd278aa6 into merged_master (Bitcoin PR bitcoin-core/gui#154) 2021-06-28 18:11:45 +00:00
Andrew Poelstra
b5501dcbec Merge e797388f8b into merged_master (Bitcoin PR #21384) 2021-06-26 13:11:42 +00:00
Andrew Poelstra
745b03542a Merge 3a8fc51a56 into merged_master (Bitcoin PR #21333) 2021-06-25 20:41:10 +00:00
Andrew Poelstra
bf8b9387ba Merge 18017152c2 into merged_master (Bitcoin PR #20619) 2021-06-17 18:02:38 +00:00
Andrew Poelstra
27930edc9c Merge 4a540683ec into merged_master (Bitcoin PR #20813) 2021-06-16 14:11:07 +00:00
apitko
947f9734da doc: add maxuploadtarget to bitcoin.conf example
Introduce the maxuploadtarget option to the example bitcoin.conf file. This adds visibility for this option which is useful to those looking to configure bandwidth usage.
2021-05-28 12:53:17 -04:00
Hennadii Stepanov
55c012d20c qt: Extract translations correctly from UTF-8 formatted source 2021-05-17 13:21:13 +02:00
Andrew Poelstra
0ecb5364be Merge 555b5d1bf9 into merged_master (Bitcoin PR #20419) 2021-05-07 17:59:54 +00:00
Andrew Poelstra
4008c6f872 Merge b0c9024a7c into merged_master (Bitcoin PR #20449) 2021-05-07 17:39:27 +00:00