From a4aa29de0c796cb3be2705b0c69024f54671ee18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 22 May 2025 15:50:27 +0400 Subject: [PATCH 1/2] Upgrade NBXplorer, BTCPay Server --- site-cookbooks/kosmos-bitcoin/attributes/default.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos-bitcoin/attributes/default.rb b/site-cookbooks/kosmos-bitcoin/attributes/default.rb index f01035b..6eca5d4 100644 --- a/site-cookbooks/kosmos-bitcoin/attributes/default.rb +++ b/site-cookbooks/kosmos-bitcoin/attributes/default.rb @@ -90,7 +90,7 @@ node.default['dotnet']['ms_packages_src_url'] = "https://packages.microsoft.com/ node.default['dotnet']['ms_packages_src_checksum'] = "4df5811c41fdded83eb9e2da9336a8dfa5594a79dc8a80133bd815f4f85b9991" node.default['nbxplorer']['repo'] = 'https://github.com/dgarage/NBXplorer' -node.default['nbxplorer']['revision'] = 'v2.5.23' +node.default['nbxplorer']['revision'] = 'v2.5.26' node.default['nbxplorer']['source_dir'] = '/opt/nbxplorer' node.default['nbxplorer']['config_path'] = "/home/#{node['bitcoin']['username']}/.nbxplorer/Main/settings.config" node.default['nbxplorer']['port'] = '24445' @@ -98,7 +98,7 @@ node.default['nbxplorer']['postgres']['database'] = 'nbxplorer' node.default['nbxplorer']['postgres']['user'] = 'nbxplorer' node.default['btcpay']['repo'] = 'https://github.com/btcpayserver/btcpayserver' -node.default['btcpay']['revision'] = 'v2.0.7' +node.default['btcpay']['revision'] = 'v2.1.1' node.default['btcpay']['source_dir'] = '/opt/btcpay' node.default['btcpay']['config_path'] = "/home/#{node['bitcoin']['username']}/.btcpayserver/Main/settings.config" node.default['btcpay']['log_path'] = "/home/#{node['bitcoin']['username']}/.btcpayserver/debug.log" From 2089999cc81ebae4df4200f55773ded3fc84038e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 22 May 2025 15:52:22 +0400 Subject: [PATCH 2/2] Upgrade bitcoind to 29.0, switch to cmake --- .../kosmos-bitcoin/attributes/default.rb | 4 ++-- .../kosmos-bitcoin/recipes/bitcoind.rb | 16 ++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/site-cookbooks/kosmos-bitcoin/attributes/default.rb b/site-cookbooks/kosmos-bitcoin/attributes/default.rb index 6eca5d4..c95e033 100644 --- a/site-cookbooks/kosmos-bitcoin/attributes/default.rb +++ b/site-cookbooks/kosmos-bitcoin/attributes/default.rb @@ -1,5 +1,5 @@ -node.default['bitcoin']['version'] = '28.0' -node.default['bitcoin']['checksum'] = '700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f' +node.default['bitcoin']['version'] = '29.0' +node.default['bitcoin']['checksum'] = '882c782c34a3bf2eacd1fae5cdc58b35b869883512f197f7d6dc8f195decfdaa' node.default['bitcoin']['username'] = 'satoshi' node.default['bitcoin']['usergroup'] = 'bitcoin' node.default['bitcoin']['network'] = 'mainnet' diff --git a/site-cookbooks/kosmos-bitcoin/recipes/bitcoind.rb b/site-cookbooks/kosmos-bitcoin/recipes/bitcoind.rb index ba76f8b..f586a4b 100644 --- a/site-cookbooks/kosmos-bitcoin/recipes/bitcoind.rb +++ b/site-cookbooks/kosmos-bitcoin/recipes/bitcoind.rb @@ -34,7 +34,7 @@ end execute "compile_bitcoin-core_dependencies" do cwd "/usr/local/bitcoind/depends" environment ({'CC' => 'gcc-13', 'CXX' => 'g++-13', 'NO_QT' => '1'}) - command "make -j 2" + command "make -j $(($(nproc)/2))" action :nothing notifies :run, 'bash[compile_bitcoin-core]', :immediately end @@ -43,21 +43,13 @@ bash "compile_bitcoin-core" do cwd "/usr/local/bitcoind" environment ({'CC' => 'gcc-13', 'CXX' => 'g++-13', 'NO_QT' => '1'}) code <<-EOH - ./autogen.sh - ./configure --prefix=$PWD/depends/x86_64-pc-linux-gnu - make + cmake -B build --toolchain depends/x86_64-pc-linux-gnu/toolchain.cmake + cmake --build build -j $(($(nproc)/2)) + cmake --install build EOH action :nothing end -link "/usr/local/bin/bitcoind" do - to "/usr/local/bitcoind/src/bitcoind" -end - -link "/usr/local/bin/bitcoin-cli" do - to "/usr/local/bitcoind/src/bitcoin-cli" -end - bitcoin_user = node['bitcoin']['username'] bitcoin_group = node['bitcoin']['usergroup'] bitcoin_datadir = node['bitcoin']['datadir']