upgrade btcwallet and walletdb

ZeusLN · Sep 21, 2024 · 52ed703 · 52ed703
1 parent 761608e
commit 52ed703
Show file tree

Hide file tree

Showing 35 changed files with 2,243 additions and 1,669 deletions.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ require (
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344
 	github.com/andybalholm/brotli v1.1.0
 	github.com/breez/breez v0.0.0-20240503132701-33b83b83c2fe
-	github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46
+	github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026
 	github.com/btcsuite/btcd/btcec/v2 v2.3.3
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/btcsuite/btcd/btcutil/psbt v1.1.8
@@ -228,9 +228,9 @@ replace github.com/lightningnetwork/lnd/sqldb => ./sqldb
 // Speedloader
 replace github.com/breez/breez => github.com/djkazic/breez v0.0.8
 
-replace github.com/btcsuite/btcwallet => github.com/djkazic/btcwallet v1.7.2
+replace github.com/btcsuite/btcwallet => github.com/djkazic/btcwallet v1.7.3
 
-replace github.com/btcsuite/btcwallet/walletdb => github.com/djkazic/btcwallet/walletdb v1.7.2
+replace github.com/btcsuite/btcwallet/walletdb => github.com/djkazic/btcwallet/walletdb v1.7.3
 
 // Neutrino high latency perf
 replace github.com/lightninglabs/neutrino => github.com/djkazic/neutrino v0.16.1-6

diff --git a/go.sum b/go.sum
@@ -477,9 +477,8 @@ github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZg
 github.com/btcsuite/btcd v0.23.4/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
 github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
 github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
-github.com/btcsuite/btcd v0.24.1-0.20240318151728-2fc99e0496d2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
-github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46 h1:tjpNTdZNQqE14menwDGAxWfzN0DFHVTXFEyEL8yvA/4=
-github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
+github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026 h1:s8/96vQSj05bqLl9RyM/eMX8gLtiayEj520TVE4YGy0=
+github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
 github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.1/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
@@ -625,10 +624,10 @@ github.com/dhui/dktest v0.4.0/go.mod h1:v/Dbz1LgCBOi2Uki2nUqLBGa83hWBGFMu5MrgMDC
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/djkazic/breez v0.0.8 h1:R/Sn20IfUnbxc5NyJc7SlSor9E0nv8oS6JUJ+7QUbWI=
 github.com/djkazic/breez v0.0.8/go.mod h1:9d/Py06qGfcQnbkLVF6BystyDwLcPTxnD0soMrEjMLk=
-github.com/djkazic/btcwallet v1.7.2 h1:9x1nByPxHr7QK8WB5NAxMYZSOZsc+vYWyxzz3bofHf4=
-github.com/djkazic/btcwallet v1.7.2/go.mod h1:2C3Q/MhYAKmk7F+Tey6LfKtKRTdQsrCf8AAAzzDPmH4=
-github.com/djkazic/btcwallet/walletdb v1.7.2 h1:ygWFJwYJ2p9yBCNiNCNmxcvKyHxPDA2sx5ADWsJfAHA=
-github.com/djkazic/btcwallet/walletdb v1.7.2/go.mod h1:7ZQ+BvOEre90YT7eSq8bLoxTsgXidUzA/mqbRS114CQ=
+github.com/djkazic/btcwallet v1.7.3 h1:6BIV4Ix9GsHSxu8BPvmY2X6Nvo41C6bb6saMw8Xg5Is=
+github.com/djkazic/btcwallet v1.7.3/go.mod h1:SLFUSQbP8ON/wxholYMfVLvGPJyk7boczOW/ob+nww4=
+github.com/djkazic/btcwallet/walletdb v1.7.3 h1:ZrdVjzkyPSbLSRTSfrEIxl1ZDwiVeBuY73gBBRZWhP8=
+github.com/djkazic/btcwallet/walletdb v1.7.3/go.mod h1:7ZQ+BvOEre90YT7eSq8bLoxTsgXidUzA/mqbRS114CQ=
 github.com/djkazic/neutrino v0.16.1-6 h1:e9K2wyMiQYQnF9LIaxfHDh7rePA7JkDNxMga/8P5Nfk=
 github.com/djkazic/neutrino v0.16.1-6/go.mod h1:x3OmY2wsA18+Kc3TSV2QpSUewOCiscw2mKpXgZv2kZk=
 github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=

diff --git a/lnrpc/autopilotrpc/autopilot.pb.gw.go b/lnrpc/autopilotrpc/autopilot.pb.gw.go
diff --git a/lnrpc/autopilotrpc/autopilot.swagger.json b/lnrpc/autopilotrpc/autopilot.swagger.json
@@ -217,14 +217,11 @@
     "protobufAny": {
       "type": "object",
       "properties": {
-        "type_url": {
+        "@type": {
           "type": "string"
-        },
-        "value": {
-          "type": "string",
-          "format": "byte"
         }
-      }
+      },
+      "additionalProperties": {}
     },
     "rpcStatus": {
       "type": "object",