Merge branch 'develop' into refactor/e2e-scripts

docs/openapi/openapi.go

@@ -2,42 +2,30 @@ package openapi
 
 import (
 	"embed"
-	"html/template"
 	"net/http"
 
 	"github.com/gorilla/mux"
 )
 
 const (
-	apiFile      = "openapi.swagger.yaml"
-	templateFile = "template.tpl"
+	apiFile  = "openapi.swagger.yaml"
+	htmlFile = "openapi.html"
 )
 
 //go:embed openapi.swagger.yaml
 var staticFS embed.FS
 
-//go:embed template.tpl
-var templateFS embed.FS
+//go:embed openapi.html
+var html []byte
 
 func RegisterOpenAPIService(router *mux.Router) {
 	router.Handle("/"+apiFile, http.FileServer(http.FS(staticFS)))
 	router.HandleFunc("/", openAPIHandler())
 }
 
 func openAPIHandler() http.HandlerFunc {
-	tmpl, err := template.ParseFS(templateFS, templateFile)
-	if err != nil {
-		panic(err)
-	}
-
 	return func(w http.ResponseWriter, _ *http.Request) {
-		err := tmpl.Execute(w, struct {
-			URL string
-		}{
-			"/" + apiFile,
-		})
-		if err != nil {
-			http.Error(w, "Failed to render template", http.StatusInternalServerError)
-		}
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		_, _ = w.Write(html)
 	}
 }

docs/openapi/template.tpl → docs/openapi/openapi.html

@@ -20,7 +20,7 @@
     <script>
       window.onload = function() {
           window.ui = SwaggerUIBundle({
-              url: {{ .URL }},
+              url: "./openapi.swagger.yaml",
               dom_id: "#swagger-ui",
               deepLinking: true,
               layout: "BaseLayout",

x/crosschain/types/tx_body_verification.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/btcsuite/btcd/btcec"
-	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcd/btcec/v2"
+	"github.com/btcsuite/btcd/btcutil"
 	eth "github.com/ethereum/go-ethereum/common"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
@@ -136,7 +136,7 @@ func verifyOutboundBodyBTC(msg MsgAddOutboundTracker, txBytes []byte, tssBtc str
 		if len(vin.Witness) != 2 { // outTx is SegWit transaction for now
 			return fmt.Errorf("not a SegWit transaction")
 		}
-		pubKey, err := btcec.ParsePubKey(vin.Witness[1], btcec.S256())
+		pubKey, err := btcec.ParsePubKey(vin.Witness[1])
 		if err != nil {
 			return fmt.Errorf("failed to parse public key")
 		}