bitcoin: natpmp toggle; bump bitcoind 31.1, lnd 0.20.2-betaHEADmain

Add bitcoind_natpmp (default on, matching Core 28+); upnp dropped since the
official binaries ship without miniupnpc. Bump bitcoind 31.0 -> 31.1 and lnd
0.20.x -> 0.20.2-beta, with sha256 hashes updated from the signed bitcoin
SHA256SUMS and the lnd release manifest.

3 files changed, 13 insertions, 6 deletions

diff --git a/bitcoind/defaults/main.yaml b/bitcoind/defaults/main.yaml
index 779c5d0..82202c8 100644
--- a/bitcoind/defaults/main.yaml
+++ b/bitcoind/defaults/main.yaml
@@ -2,7 +2,7 @@
 
 bitcoind_user: "bitcoin"
 # https://bitcoincore.org/bin
-bitcoind_version: "31.0"
+bitcoind_version: "31.1"
 bitcoind_arch: "{{ansible_facts['architecture']}}"
 bitcoind_url: "https://bitcoincore.org/bin/bitcoin-core-{{bitcoind_version}}/bitcoin-{{bitcoind_version}}-{{bitcoind_arch}}-linux-gnu.tar.gz"
 # Release tarball sha256 per arch, pinned from
@@ -10,11 +10,15 @@ bitcoind_url: "https://bitcoincore.org/bin/bitcoin-core-{{bitcoind_version}}/bit
 # bumping bitcoind_version, and verify the SHA256SUMS gpg signature per
 # https://bitcoincore.org/en/download/ while at it.
 bitcoind_sha256:
-  aarch64: "4de1d568dedd48604f75132421bc0abeca432639589b49a3909c81db3a813112"
-  x86_64: "d3e4c58a35b1d0a97a457462c94f55501ad167c660c245cb1ffa565641c65074"
+  aarch64: "dcf1873f2208ba4f962f3398d47e154c39c0084be8f4553e05c940d0ace3d004"
+  x86_64: "b80d9c3e04da78fb6f0569685673418cf686fadba9042d926d13fb87ff503f9e"
 bitcoind_conf_dir: "/home/{{bitcoind_user}}/.bitcoin"
 bitcoind_enable_txindex: "0"
 bitcoind_enable_filterindex: "1"
+# Router port mapping via NAT-PMP/PCP. Default matches bitcoind's own default
+# (on since Core 28.0). Disable where the p2p port is forwarded manually. UPnP
+# is omitted: the official binaries ship without miniupnpc and warn on `upnp`.
+bitcoind_natpmp: "1"
 bitcoind_add_node: []
 bitcoind_rpc_allow_ip: []
 bitcoind_rpc_bind: []
diff --git a/bitcoind/templates/bitcoin.conf.j2 b/bitcoind/templates/bitcoin.conf.j2
index 0d9e6cb..d66c2f0 100644
--- a/bitcoind/templates/bitcoin.conf.j2
+++ b/bitcoind/templates/bitcoin.conf.j2
@@ -9,6 +9,9 @@ par={{bitcoind_threads}}
 checkblocks=6
 checklevel=0
 
+# Port mapping: ask the router (NAT-PMP/PCP) to open the p2p port.
+natpmp={{bitcoind_natpmp}}
+
 server=1
 rpcbind=127.0.0.1
 {% for ip in bitcoind_rpc_bind %}rpcbind={{ip}}
diff --git a/lnd/defaults/main.yaml b/lnd/defaults/main.yaml
index d7fdcbb..bbdb43e 100644
--- a/lnd/defaults/main.yaml
+++ b/lnd/defaults/main.yaml
@@ -2,7 +2,7 @@
 
 lnd_user: "{{node_user}}"
 # https://github.com/lightningnetwork/lnd/releases
-lnd_version: "0.20.1-beta"
+lnd_version: "0.20.2-beta"
 lnd_arch: "arm64"
 lnd_tar_name: "lnd-linux-{{lnd_arch}}-v{{lnd_version}}"
 lnd_tar: "{{lnd_tar_name}}.tar.gz"
@@ -12,8 +12,8 @@ lnd_conf_dir: "/home/{{lnd_user}}/.lnd"
 # manifest-v<version>.txt on the github release page. Update when bumping
 # lnd_version, and verify the manifest signature while at it.
 lnd_sha256:
-  arm64: "013489343eebe8b0213b5f52fc7570e6f873f3f17974826cb94125ee1287d306"
-  amd64: "e01f755ba18e45a7b20f9fd645a328a250aae241e23b8c1eca06efeb2974570a"
+  arm64: "caf8ac9d4169e492fb6c065cc1ac5624314247f4dff74c416b5ab5431d9caae1"
+  amd64: "bcec401ae34ad15fbd1970e9836ba8334a1a466bcfbf587dff6aae2a0c220206"
 
 lndconnect_user: "{{node_user}}"
 lndconnect_version: "0.2.0"