From 77c72290cf35c305e1cbff5be42aa2130d0829f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Tigerstr=C3=B6m?= Date: Fri, 9 Jun 2023 10:26:58 +0200 Subject: [PATCH 1/2] mod: Update taproot-assets dependency Update the taproot-assets dependency to a version of the main branch that includes a commit which contains a fix that removes the js build tag requirement when using the taprpc packages' JSON callback functions. Also replace the google.golang.org/protobuf dependency to forked version which is required for the taproot-assets dependency to work properly. --- go.mod | 9 +++++++-- go.sum | 25 ++++--------------------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 256cabdf5..5c2bb8fc7 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/lightninglabs/pool v0.6.4-beta github.com/lightninglabs/pool/auctioneerrpc v1.1.0 github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display - github.com/lightninglabs/taproot-assets v0.2.0 + github.com/lightninglabs/taproot-assets v0.2.0-lit-0 github.com/lightningnetwork/lnd v0.16.3-beta github.com/lightningnetwork/lnd/cert v1.2.1 github.com/lightningnetwork/lnd/kvdb v1.4.1 @@ -37,7 +37,7 @@ require ( golang.org/x/net v0.8.0 golang.org/x/sync v0.1.0 google.golang.org/grpc v1.45.0 - google.golang.org/protobuf v1.28.1 + google.golang.org/protobuf v1.30.0 gopkg.in/macaroon-bakery.v2 v2.1.0 gopkg.in/macaroon.v2 v2.1.0 ) @@ -224,6 +224,11 @@ require ( replace github.com/lightninglabs/lightning-terminal/autopilotserverrpc => ./autopilotserverrpc +// We want to format raw bytes as hex instead of base64. The forked version +// allows us to specify that as an option. This is required for the +// taproot-assets dependency to function properly. +replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display + // We need to use grpc v1.39.0 because of a change in how HTTP errors are // formatted and sent to the client. This change was introduced in grpc v1.40.0 // with https://github.com/grpc/grpc-go/pull/4474. diff --git a/go.sum b/go.sum index 4517c7295..3dcd975fb 100644 --- a/go.sum +++ b/go.sum @@ -664,10 +664,6 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= @@ -1049,10 +1045,12 @@ github.com/lightninglabs/pool v0.6.4-beta h1:W37Zxv5y30QGxmw5qCLyyR10gmAHLxjmGWf github.com/lightninglabs/pool v0.6.4-beta/go.mod h1:kmV+ctTnTAZsGGEW7sH5z/+vuv0sBwWVrN1DR1eqBhU= github.com/lightninglabs/pool/auctioneerrpc v1.1.0 h1:XOhmaFKRvQ1smwkY9SRTA0+FCloTExuhaQX4jgtrBB0= github.com/lightninglabs/pool/auctioneerrpc v1.1.0/go.mod h1:F9uND5Kpj2eYeYe0RLi8IWQHsRjQ88FUp8itkYmX1Mo= +github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wleRN1L2fJXd6ZoQ9ZegVFTAb2bOQfruJPKcY= +github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display h1:RZJ8H4ueU/aQ9pFtx5wqsuD3B/DezrewJeVwDKKYY8E= github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display/go.mod h1:2oKOBU042GKFHrdbgGiKax4xVrFiZu51lhacUZQ9MnE= -github.com/lightninglabs/taproot-assets v0.2.0 h1:GSrptDcsUwB9JRT+Tf0zF61prN+0NZOFSNxST3q54vQ= -github.com/lightninglabs/taproot-assets v0.2.0/go.mod h1:F5wkRu25T1zS+BI31sxK0L989vZ8nSGGqcPvCn0/t1Q= +github.com/lightninglabs/taproot-assets v0.2.0-lit-0 h1:ZiA5+hhUnlciZrssMd+iYAzwL4Y052s7W//9jGgiek8= +github.com/lightninglabs/taproot-assets v0.2.0-lit-0/go.mod h1:F5wkRu25T1zS+BI31sxK0L989vZ8nSGGqcPvCn0/t1Q= github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5/go.mod h1:7dDx73ApjEZA0kcknI799m2O5kkpfg4/gr7N092ojNo= github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 h1:Wm0g70gkcAu2pGpNZwfWPSVOY21j8IyYsNewwK4OkT4= github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1/go.mod h1:7dDx73ApjEZA0kcknI799m2O5kkpfg4/gr7N092ojNo= @@ -2159,21 +2157,6 @@ google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2I google.golang.org/grpc v1.39.0 h1:Klz8I9kdtkIN6EpHHUOMLCYhTn/2WAe5a0s1hcBkdTI= google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From f981d960ae31d9569d36f032a72c4268eee9dd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Tigerstr=C3=B6m?= <11711198+ViktorTigerstrom@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:55:12 +0200 Subject: [PATCH 2/2] litclient: add taprpc packages to `Registrations` Add the `taprpc`, `assetwalletrpc`, `mintrpc` and the `universerpc` JSON callbacks to the litclient's `Registrations` array. This allows the litclient to use the rpc functions contained in the JSON callbacks. --- litclient/jsoncallbacks.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/litclient/jsoncallbacks.go b/litclient/jsoncallbacks.go index 492876bf5..52ca02529 100644 --- a/litclient/jsoncallbacks.go +++ b/litclient/jsoncallbacks.go @@ -7,6 +7,10 @@ import ( "github.com/lightninglabs/lightning-terminal/litrpc" "github.com/lightninglabs/loop/looprpc" "github.com/lightninglabs/pool/poolrpc" + "github.com/lightninglabs/taproot-assets/taprpc" + "github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc" + "github.com/lightninglabs/taproot-assets/taprpc/mintrpc" + "github.com/lightninglabs/taproot-assets/taprpc/universerpc" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/autopilotrpc" "github.com/lightningnetwork/lnd/lnrpc/chainrpc" @@ -46,4 +50,8 @@ var Registrations = []StubPackageRegistration{ litrpc.RegisterAccountsJSONCallbacks, litrpc.RegisterAutopilotJSONCallbacks, litrpc.RegisterFirewallJSONCallbacks, + taprpc.RegisterTaprootAssetsJSONCallbacks, + assetwalletrpc.RegisterAssetWalletJSONCallbacks, + universerpc.RegisterUniverseJSONCallbacks, + mintrpc.RegisterMintJSONCallbacks, }