diff --git a/site-cookbooks/kosmos-bitcoin/attributes/default.rb b/site-cookbooks/kosmos-bitcoin/attributes/default.rb index 8883d71..6c5d65d 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'] = '26.0' -node.default['bitcoin']['checksum'] = 'ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1' +node.default['bitcoin']['version'] = '28.0' +node.default['bitcoin']['checksum'] = '700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f' node.default['bitcoin']['username'] = 'satoshi' node.default['bitcoin']['usergroup'] = 'bitcoin' node.default['bitcoin']['network'] = 'mainnet' @@ -24,7 +24,8 @@ node.default['bitcoin']['conf'] = { rpcbind: "127.0.0.1:8332", gen: 0, zmqpubrawblock: 'tcp://127.0.0.1:8337', - zmqpubrawtx: 'tcp://127.0.0.1:8338' + zmqpubrawtx: 'tcp://127.0.0.1:8338', + deprecatedrpc: 'warnings' # TODO remove when upgrading to LND 0.18.4 } # Also enables Tor for LND diff --git a/site-cookbooks/kosmos-bitcoin/recipes/bitcoind.rb b/site-cookbooks/kosmos-bitcoin/recipes/bitcoind.rb index a4991ff..ba76f8b 100644 --- a/site-cookbooks/kosmos-bitcoin/recipes/bitcoind.rb +++ b/site-cookbooks/kosmos-bitcoin/recipes/bitcoind.rb @@ -12,8 +12,15 @@ if node["bitcoin"]["blocksdir_mount_type"] include_recipe "kosmos-bitcoin::blocksdir-mount" end -%w{ libtool autotools-dev make automake cmake curl g++-multilib libtool - binutils-gold bsdmainutils pkg-config python3 patch }.each do |pkg| +apt_repository "ubuntu-toolchain-r" do + # provides g++-13, needed for better c++-20 support + uri "ppa:ubuntu-toolchain-r/test" +end + +%w{ + gcc-13 g++-13 libtool autotools-dev make automake cmake curl bison + binutils-gold pkg-config python3 patch +}.each do |pkg| apt_package pkg end @@ -26,20 +33,21 @@ end execute "compile_bitcoin-core_dependencies" do cwd "/usr/local/bitcoind/depends" - command "make NO_QT=1" + environment ({'CC' => 'gcc-13', 'CXX' => 'g++-13', 'NO_QT' => '1'}) + command "make -j 2" action :nothing notifies :run, 'bash[compile_bitcoin-core]', :immediately end 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 EOH action :nothing - notifies :restart, "systemd_unit[bitcoind.service]", :delayed end link "/usr/local/bin/bitcoind" do