Update lnd and btcd to latest version

_defaults.sh

@@ -70,7 +70,7 @@ export ECLAIR_AUTO_NAME_PREFIX=${ECLAIR_AUTO_NAME_PREFIX:-eclair}
 
 # here we define base docker images for individual containers, they should be based on alpine
 export DEFAULT_DOCKER_IMAGE=${DEFAULT_DOCKER_IMAGE:-alpine:3.10}
-export DEFAULT_DOCKER_BUILDTIME_GO_IMAGE=${DEFAULT_DOCKER_BUILDTIME_GO_IMAGE:-golang:1.13-alpine3.10}
+export DEFAULT_DOCKER_BUILDTIME_GO_IMAGE=${DEFAULT_DOCKER_BUILDTIME_GO_IMAGE:-golang:1.19-alpine}
 export DEFAULT_DOCKER_BUILDTIME_JAVA_IMAGE=${DEFAULT_DOCKER_BUILDTIME_JAVA_IMAGE:-adoptopenjdk/openjdk11:jdk-11.0.3_7-alpine} # see https://github.com/ACINQ/eclair/blob/master/Dockerfile#L1
 export DEFAULT_DOCKER_BUILDTIME_IMAGE=${DEFAULT_DOCKER_BUILDTIME_IMAGE:-$DEFAULT_DOCKER_IMAGE}
 export DEFAULT_DOCKER_RUNTIME_IMAGE=${DEFAULT_DOCKER_RUNTIME_IMAGE:-$DEFAULT_DOCKER_IMAGE}

recipes/cookbook/scaffold/docker/btcd/Dockerfile

@@ -30,6 +30,7 @@ WORKDIR /root/build
 # we want to populate the module cache based on the go.{mod,sum} files.
 COPY "$BTCD_REPO_PATH/go.mod" .
 COPY "$BTCD_REPO_PATH/go.sum" .
+COPY "$BTCD_REPO_PATH/btcutil/go.mod" ./btcutil/
 
 # pre-cache deps
 # see https://container-solutions.com/faster-builds-in-docker-with-go-1-11/

recipes/cookbook/scaffold/docker/btcd/patches/btcctl-regtest.patch

@@ -1,55 +1,15 @@
 diff --git a/cmd/btcctl/config.go b/cmd/btcctl/config.go
-index cd232a9e..03a17d73 100644
+index 3db735c..0710f20 100644
 --- a/cmd/btcctl/config.go
 +++ b/cmd/btcctl/config.go
-@@ -105,13 +105,14 @@ type config struct {
- 	ProxyPass     string `long:"proxypass" default-mask:"-" description:"Password for proxy server"`
- 	TestNet3      bool   `long:"testnet" description:"Connect to testnet"`
- 	SimNet        bool   `long:"simnet" description:"Connect to the simulation test network"`
-+	RegTest       bool   `long:"regtest" description:"Connect to the regtest test network"`
- 	TLSSkipVerify bool   `long:"skipverify" description:"Do not verify tls certificates (not recommended!)"`
- 	Wallet        bool   `long:"wallet" description:"Connect to wallet"`
- }
-
- // normalizeAddress returns addr with the passed default port appended if
- // there is not already a port specified.
--func normalizeAddress(addr string, useTestNet3, useSimNet, useWallet bool) string {
-+func normalizeAddress(addr string, useTestNet3, useSimNet, useWallet, useRegTest bool) string {
- 	_, _, err := net.SplitHostPort(addr)
- 	if err != nil {
- 		var defaultPort string
-@@ -128,6 +129,12 @@ func normalizeAddress(addr string, useTestNet3, useSimNet, useWallet bool) strin
- 			} else {
- 				defaultPort = "18556"
+@@ -133,9 +133,7 @@ func normalizeAddress(addr string, chain *chaincfg.Params, useWallet bool) (stri
  			}
-+		case useRegTest:
-+			if useWallet {
-+				defaultPort = "18443"
-+			} else {
-+				defaultPort = "18334"
-+			}
- 		default:
+ 		case &chaincfg.RegressionNetParams:
  			if useWallet {
- 				defaultPort = "8332"
-@@ -254,8 +261,11 @@ func loadConfig() (*config, []string, error) {
- 	if cfg.SimNet {
- 		numNets++
- 	}
-+	if cfg.RegTest {
-+		numNets++
-+	}
- 	if numNets > 1 {
--		str := "%s: The testnet and simnet params can't be used " +
-+		str := "%s: The testnet, simnet, regtest params can't be used " +
- 			"together -- choose one of the two"
- 		err := fmt.Errorf(str, "loadConfig")
- 		fmt.Fprintln(os.Stderr, err)
-@@ -274,7 +284,7 @@ func loadConfig() (*config, []string, error) {
- 	// Add default port to RPC server based on --testnet and --wallet flags
- 	// if needed.
- 	cfg.RPCServer = normalizeAddress(cfg.RPCServer, cfg.TestNet3,
--		cfg.SimNet, cfg.Wallet)
-+		cfg.SimNet, cfg.Wallet, cfg.RegTest)
-
- 	return &cfg, remainingArgs, nil
- }
+-				// TODO: add port once regtest is supported in btcwallet
+-				paramErr := fmt.Errorf("cannot use -wallet with -regtest, btcwallet not yet compatible with regtest")
+-				return "", paramErr
++				defaultPort = "18443"
+ 			} else {
+ 				defaultPort = "18334"
+ 			}

simverse

@@ -851,20 +851,7 @@ get_repo_url() {
 
 tweak_repos() {
   # ad-hoc tweaks to repos, pinning/patches etc.
-
-  # https://github.com/darwin/simverse/issues/8
-  cd "$SIMVERSE_REPOS_ABSOLUTE/btcwallet"
-  say "pinning btcwallet to work around https://github.com/btcsuite/btcd/issues/1473"
-  present_cwd
-  git fetch --depth=100
-  present git checkout 95d7aa0b4953bd67cd265f4a378ea2cde52c54d1
-
-  # https://github.com/lightningnetwork/lnd/issues/4076
-  cd "$SIMVERSE_REPOS_ABSOLUTE/btcd"
-  say "pinning btcd to work around https://github.com/lightningnetwork/lnd/issues/4076"
-  present_cwd
-  git fetch --depth=1000 --tags
-  present git checkout v0.20.1-beta
+  echo "No tweaks to apply ..."
 }
 
 init_repo() {