Merge #1041: deps: update ruby and dependencies for debian bookworm

046e555 Use id for link anchor rather than `a` tag (Ava Chow)
2b6422f deps: Update Gemfile.lock dependencies (Ava Chow)
6acd9df deps: Force html-proofer to 3.x (Ava Chow)
925982f ruby: Update to 3.1.2 and debian bookworm (Ava Chow)

Pull request description:

  The build server updated to debian bookworm which has ruby 3.1.2, so update everything to require that. Also updates the other dependencies in the Gemfile.lock.

ACKs for top commit:
  fanquake:
    ACK 046e555

Tree-SHA512: a1a4c0d30f57854f564dfbb252ac07eceb707255532756a596782ef4330efb324516a1151ac98f1283eceda019958f24dd5c5cdd8391d86c8adda59a97fd3700

Author: achow101

.cirrus.yml

@@ -1,5 +1,5 @@
 container:
-  image: ruby:2.7.4
+  image: ruby:3.1.2
 
 env:
     JEKYLL_ENV: production
@@ -9,7 +9,7 @@ env:
 task:
   name: Bundler build
 
-  bootstrap_script: gem install bundler -v 2.4.22
+  bootstrap_script: gem install bundler
   bundler_cache:
     folder: /usr/local/bundle
     fingerprint_script:
@@ -22,7 +22,7 @@ task:
 task:
   name: debian only
   container:
-    image: debian:bullseye
+    image: debian:bookworm
   install_script: 
     - apt update
     - >

.ruby-version

@@ -1 +1 @@
-2.7.4
+3.1.2

Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 ## If you update the version here, also update it in .ruby-version, .cirrus.yml
 ## and README.md. Then push your branch and make sure Cirrus supports that
 ## version.
-ruby '2.7.4'
+ruby '3.1.2'
 
 ## If you add a new Gem below, run `bundle install` to install it.
 group :development do
@@ -14,5 +14,5 @@ group :development do
 end
 
 group :testing do
-  gem 'html-proofer'
+  gem 'html-proofer', "~> 3.19"
 end

Gemfile.lock

@@ -1,95 +1,105 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.3.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    ffi (1.15.4)
+    ffi (1.17.0)
     forwardable-extended (2.6.0)
-    html-proofer (3.19.2)
+    google-protobuf (4.27.2)
+      bigdecimal
+      rake (>= 13)
+    html-proofer (3.19.4)
       addressable (~> 2.3)
       mercenary (~> 0.3)
-      nokogumbo (~> 2.0)
-      parallel (~> 1.3)
+      nokogiri (~> 1.13)
+      parallel (~> 1.10)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.0)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.0)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.6.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    mercenary (0.4.0)
+    mini_portile2 (2.8.7)
+    nokogiri (1.16.6)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.21.0)
+    parallel (1.25.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    racc (1.6.0)
-    rainbow (3.0.0)
-    rb-fsevent (0.11.0)
-    rb-inotify (0.10.1)
+    public_suffix (6.0.0)
+    racc (1.8.0)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.26.0)
+    rexml (3.3.1)
+      strscan
+    rouge (4.3.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    typhoeus (1.4.0)
+    sass-embedded (1.77.5)
+      google-protobuf (>= 3.25, < 5.0)
+      rake (>= 13)
+    strscan (3.1.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
     yell (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  html-proofer
+  html-proofer (~> 3.19)
   jekyll
   jekyll-redirect-from
   kramdown-parser-gfm
 
 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 3.1.2p20
 
 BUNDLED WITH
-   2.4.12
+   2.5.14

README.md

@@ -41,7 +41,7 @@ permalink: /en/2016/01/01/short-title
 ## Building
 
 This website is based on [Jekyll](https://jekyllrb.com/).  To build
-locally, [install Ruby 2.7.4](https://gorails.com/setup) using system
+locally, [install Ruby 3.1.2](https://gorails.com/setup) using system
 packages, [rvm](https://rvm.io), [rbenv](https://github.com/rbenv/rbenv), or another method.
 Then clone this repository and change directory into it:
 

logs/2016-05-zurich-meeting-notes.html

@@ -502,9 +502,7 @@ <h3>Encrypted transactions and UTXO set commitments</h3>
 
 <p>Bundle committed transactions with a hard-fork, and this different reduced SPV model. Luke disagrees that they implement SPV because they don't even do fraud proofs. </p>
 
-<p><a name="lightning-network-key-derivation"></a></p>
-
-<h3>Lightning Network key derivation function</h3>
+<h3 id="lightning-network-key-derivation">Lightning Network key derivation function</h3>
 
 <p>Say you have 5 channels. Yo uwant to be pretty clear that they are actually yours. So you can build network graphs. If you just have a bunch of edges, you can't sort of link them all together into a vertex, it doesn't help. But if you say this edge and this edge are all connected, even if I'm not using the same public key for these 2-of-2 multisig, I must have had a key in common to generate all of these.</p>