From 40fe4038797c20b369f9ef9933a3a219ed80cca4 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 26 Jan 2021 12:33:09 +0100 Subject: [PATCH 1/4] Stop c-lightning before compilation See https://github.com/ElementsProject/lightning/issues/4346 for potential issues with not doing that. --- site-cookbooks/kosmos-bitcoin/recipes/c-lightning.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/site-cookbooks/kosmos-bitcoin/recipes/c-lightning.rb b/site-cookbooks/kosmos-bitcoin/recipes/c-lightning.rb index 5eedd82..67c6c97 100644 --- a/site-cookbooks/kosmos-bitcoin/recipes/c-lightning.rb +++ b/site-cookbooks/kosmos-bitcoin/recipes/c-lightning.rb @@ -24,6 +24,7 @@ end bash "compile_c-lightning" do cwd node['c-lightning']['source_dir'] code <<-EOH + systemctl stop lightningd.service ./configure make make install From 152edbc958185c472330e53c27f8a1691a84a878 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 26 Jan 2021 12:45:17 +0100 Subject: [PATCH 2/4] Update bitcoind to 0.21 --- 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 a270116..3240b96 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'] = '0.20.1' -node.default['bitcoin']['checksum'] = '4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978' +node.default['bitcoin']['version'] = '0.21.0' +node.default['bitcoin']['checksum'] = '1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37' node.default['bitcoin']['username'] = 'satoshi' node.default['bitcoin']['usergroup'] = 'bitcoin' node.default['bitcoin']['network'] = 'mainnet' From 0d2a04f8ba259569e4426f6eb1ac79e48450b545 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 26 Jan 2021 12:45:28 +0100 Subject: [PATCH 3/4] Refactor bitcoind recipe Fixes various issues, like compilation not starting on subsequent version updates, service not restarting after compilation, and a TODO note on the compilation script itself. --- .../kosmos-bitcoin/recipes/source.rb | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/site-cookbooks/kosmos-bitcoin/recipes/source.rb b/site-cookbooks/kosmos-bitcoin/recipes/source.rb index 34e138d..dfd993b 100644 --- a/site-cookbooks/kosmos-bitcoin/recipes/source.rb +++ b/site-cookbooks/kosmos-bitcoin/recipes/source.rb @@ -37,23 +37,25 @@ ark 'bitcoind' do url "https://bitcoincore.org/bin/bitcoin-core-#{node['bitcoin']['version']}/bitcoin-#{node['bitcoin']['version']}.tar.gz" checksum node['bitcoin']['checksum'] action :put + notifies :run, 'execute[compile_bitcoin-core_dependencies]', :immediately end -execute "Compile bitcoin-core dependencies" do +execute "compile_bitcoin-core_dependencies" do cwd "/usr/local/bitcoind/depends" command "make NO_QT=1" - not_if { ::File.directory?("/usr/local/bitcoind/depends/x86_64-pc-linux-gnu") } + action :nothing + notifies :run, 'bash[compile_bitcoin-core]', :immediately end -execute "Configure, compile bitcoin-core" do +bash "compile_bitcoin-core" do cwd "/usr/local/bitcoind" - # FIXME only executes first array item? - command [ - "./autogen.sh", - "./configure --prefix=$PWD/depends/x86_64-pc-linux-gnu", - "make" - ] - not_if { ::File.exist?("/usr/local/bitcoind/src/bitcoind") } + 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 From 65185b1a1bc4cb4c156c7c47569c07b6cd7e3d87 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Wed, 27 Jan 2021 18:05:30 +0100 Subject: [PATCH 4/4] Update lnd to 0.12.0 --- site-cookbooks/kosmos-bitcoin/attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos-bitcoin/attributes/default.rb b/site-cookbooks/kosmos-bitcoin/attributes/default.rb index 3240b96..812f9c3 100644 --- a/site-cookbooks/kosmos-bitcoin/attributes/default.rb +++ b/site-cookbooks/kosmos-bitcoin/attributes/default.rb @@ -35,7 +35,7 @@ node.default['c-lightning']['log_level'] = 'info' node.default['c-lightning']['public_ip'] = '148.251.237.73' node.default['lnd']['repo'] = 'https://github.com/lightningnetwork/lnd' -node.default['lnd']['revision'] = 'v0.11.1-beta' +node.default['lnd']['revision'] = 'v0.12.0-beta' node.default['lnd']['source_dir'] = '/opt/lnd' node.default['lnd']['lnd_dir'] = "/home/#{node['bitcoin']['username']}/.lnd" node.default['lnd']['alias'] = 'ln2.kosmos.org'