From 14a40cc56b540ce564b206e1772e9a6d1ce9cb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Lewandowski?= Date: Tue, 19 Dec 2023 11:11:04 +0100 Subject: [PATCH 1/3] feat(BUX-207): add logger to go-paymail config --- client_internal.go | 3 +++ go.mod | 2 ++ 2 files changed, 5 insertions(+) diff --git a/client_internal.go b/client_internal.go index 41748d5e..53eb2ca3 100644 --- a/client_internal.go +++ b/client_internal.go @@ -231,6 +231,9 @@ func (c *Client) loadDefaultPaymailConfig() (err error) { ) } + paymailLogger := c.Logger().With().Str("subservice", "go-paymail").Logger() + c.options.paymail.serverConfig.options = append(c.options.paymail.serverConfig.options, server.WithLogger(&paymailLogger)) + // Create the paymail configuration using the client and default service provider c.options.paymail.serverConfig.Configuration, err = server.NewConfig( &PaymailDefaultServiceProvider{client: c}, diff --git a/go.mod b/go.mod index fae61598..e835c6c9 100644 --- a/go.mod +++ b/go.mod @@ -153,3 +153,5 @@ replace github.com/centrifugal/protocol => github.com/centrifugal/protocol v0.9. // Issue: go.mongodb.org/mongo-driver/x/bsonx: cannot find module providing package go.mongodb.org/mongo-driver/x/bsonx // Need to convert bsonx to bsoncore replace go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.11.7 + +//replace github.com/bitcoin-sv/go-paymail => ../../bitcoin-sv/go-paymail From 6de1cacc4eb8c022c9579190173d2635c3ff0f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Lewandowski?= Date: Wed, 20 Dec 2023 10:04:59 +0100 Subject: [PATCH 2/3] chore(BUX-206): remove unnecessary comment --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index e835c6c9..fae61598 100644 --- a/go.mod +++ b/go.mod @@ -153,5 +153,3 @@ replace github.com/centrifugal/protocol => github.com/centrifugal/protocol v0.9. // Issue: go.mongodb.org/mongo-driver/x/bsonx: cannot find module providing package go.mongodb.org/mongo-driver/x/bsonx // Need to convert bsonx to bsoncore replace go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.11.7 - -//replace github.com/bitcoin-sv/go-paymail => ../../bitcoin-sv/go-paymail From dae1a9124b535171ae08775d69d247bcd496b085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Lewandowski?= Date: Thu, 21 Dec 2023 10:09:25 +0100 Subject: [PATCH 3/3] chore(BUX-206): update go-paymail version --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index fae61598..2aa31f5e 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/klauspost/compress v1.17.4 // indirect github.com/lestrrat-go/strftime v1.0.6 // indirect github.com/lib/pq v1.10.9 // indirect - github.com/libsv/go-p2p v0.1.4 // indirect + github.com/libsv/go-p2p v0.1.5 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -126,7 +126,7 @@ require ( golang.org/x/sync v0.5.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.16.0 // indirect + golang.org/x/tools v0.16.1 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/go.sum b/go.sum index 7e515a36..2889eec1 100644 --- a/go.sum +++ b/go.sum @@ -288,8 +288,8 @@ github.com/libsv/go-bt v1.0.8 h1:nWLLcnUm0dxNO3exqrL5jvAcTGkl0dsnBuQqB6+M6vQ= github.com/libsv/go-bt v1.0.8/go.mod h1:yO023bNYLh5DwcOYl+ZqLAeTemoy6K+2UbQlIBMv+EQ= github.com/libsv/go-bt/v2 v2.2.5 h1:VoggBLMRW9NYoFujqe5bSYKqnw5y+fYfufgERSoubog= github.com/libsv/go-bt/v2 v2.2.5/go.mod h1:cV45+jDlPOLfhJLfpLmpQoWzrIvVth9Ao2ZO1f6CcqU= -github.com/libsv/go-p2p v0.1.4 h1:0L6CM3UTdO+lNXRJ4lZNjXN9jomIYhltVzL+tdF8lFI= -github.com/libsv/go-p2p v0.1.4/go.mod h1:I85AinxGAYzDiInbH6iv/Eb8st4BroEkztH04wqzL2U= +github.com/libsv/go-p2p v0.1.5 h1:zbUE1UQ73J7LN/s3gruQBTh3Sz0DSSmj3cWhC1ZQVM0= +github.com/libsv/go-p2p v0.1.5/go.mod h1:9KhX8e+3oEmGiYQSeF/CrHj22YNHqiof3TH77VqcMCs= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -702,8 +702,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= -golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= +golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=