From 328ccabc66f93292cff96ffb55c7181eccb47b82 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@danwin1210.de>
Date: Sat, 1 Oct 2022 05:42:24 +0000
Subject: [PATCH 1/2] Switch to upstream btcd

The last outstanding patch was merged upstream.
---
 namecoin/namecoin.go                | 2 +-
 ncdt/ncdt.go                        | 2 +-
 ncdumpzone/ncdumpzone/ncdumpzone.go | 2 +-
 server/server.go                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/namecoin/namecoin.go b/namecoin/namecoin.go
index 13a7443..1f20d03 100644
--- a/namecoin/namecoin.go
+++ b/namecoin/namecoin.go
@@ -2,7 +2,7 @@ package namecoin
 
 import (
 	"github.com/btcsuite/btcd/btcjson"
-	"github.com/namecoin/btcd/rpcclient"
+	"github.com/btcsuite/btcd/rpcclient"
 	"gopkg.in/hlandau/madns.v2/merr"
 
 	"github.com/namecoin/ncbtcjson"
diff --git a/ncdt/ncdt.go b/ncdt/ncdt.go
index 4202d11..bcc415d 100644
--- a/ncdt/ncdt.go
+++ b/ncdt/ncdt.go
@@ -7,7 +7,7 @@ import "fmt"
 import "os"
 import "strconv"
 import "io/ioutil"
-import "github.com/namecoin/btcd/rpcclient"
+import "github.com/btcsuite/btcd/rpcclient"
 import "github.com/namecoin/ncdns/util"
 
 var rpchost = flag.String("rpchost", "", "Namecoin RPC host:port")
diff --git a/ncdumpzone/ncdumpzone/ncdumpzone.go b/ncdumpzone/ncdumpzone/ncdumpzone.go
index 2f6fc11..2960ff0 100644
--- a/ncdumpzone/ncdumpzone/ncdumpzone.go
+++ b/ncdumpzone/ncdumpzone/ncdumpzone.go
@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/hlandau/xlog"
-	"github.com/namecoin/btcd/rpcclient"
+	"github.com/btcsuite/btcd/rpcclient"
 	"gopkg.in/hlandau/easyconfig.v1"
 	"gopkg.in/hlandau/easyconfig.v1/cflag"
 
diff --git a/server/server.go b/server/server.go
index f0b5f25..f2a8631 100644
--- a/server/server.go
+++ b/server/server.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hlandau/buildinfo"
 	"github.com/hlandau/xlog"
 	"github.com/miekg/dns"
-	"github.com/namecoin/btcd/rpcclient"
+	"github.com/btcsuite/btcd/rpcclient"
 	"github.com/namecoin/ncdns/backend"
 	"github.com/namecoin/ncdns/namecoin"
 	madns "gopkg.in/hlandau/madns.v2"

From f3549bd01c39a5d38211a2694bc2958afbd7e339 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@danwin1210.de>
Date: Sat, 1 Oct 2022 06:47:37 +0000
Subject: [PATCH 2/2] Cirrus: Require "Modules Off" tasks to succeed

The btcd issue that made them non-mandatory is resolved.
---
 .cirrus.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7618bb1..2e8dd82 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -16,8 +16,6 @@ task:
         GO111MODULE: "off"
         GOLANGCI_MODULES_ARGS: "--disable=gomoddirectives,gomodguard"
         MODULES_NAME: " Modules Off"
-      # TODO: Stop allowing failures once btcd v0.22.1 is released.
-      allow_failures: true
       fetch_script:
         - go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
         - GOOS=windows go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
@@ -111,8 +109,6 @@ task:
     - env:
         GO111MODULE: "off"
         MODULES_NAME: " Modules Off"
-      # TODO: Stop allowing failures once btcd v0.22.1 is released.
-      allow_failures: true
       fetch_script:
         - go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
         - GOOS=windows go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
@@ -179,8 +175,6 @@ task:
     - env:
         GO111MODULE: "off"
         MODULES_NAME: " Modules Off"
-      # TODO: Stop allowing failures once btcd v0.22.1 is released.
-      allow_failures: true
       gox_script:
         - go get github.com/mitchellh/gox
       fetch_script: