From 657671edea14998307f2af1a9aa2f9b53503aceb Mon Sep 17 00:00:00 2001 From: Augustyn Chmiel Date: Thu, 6 Jun 2024 09:06:12 +0200 Subject: [PATCH 1/6] test(spv-827) testing main so commiting local changes --- config/defaults.go | 7 ++++--- go.mod | 2 +- go.sum | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/defaults.go b/config/defaults.go index 77f606b4..ed09daa4 100644 --- a/config/defaults.go +++ b/config/defaults.go @@ -3,8 +3,9 @@ package config import ( "time" - "github.com/bitcoin-sv/spv-wallet/engine/datastore" "github.com/google/uuid" + + "github.com/bitcoin-sv/spv-wallet/engine/datastore" ) // DefaultAdminXpub is the default admin xpub used for authenticate requests. @@ -174,7 +175,7 @@ func getMetricsDefaults() *MetricsConfig { func getExperimentalFeaturesConfig() *ExperimentalConfig { return &ExperimentalConfig{ - PikeContactsEnabled: false, - PikePaymentEnabled: false, + PikeContactsEnabled: true, + PikePaymentEnabled: true, } } diff --git a/go.mod b/go.mod index 7d8cf320..86d45c4d 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/KyleBanks/depth v1.2.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bitcoin-sv/go-paymail v0.16.0 // indirect + github.com/bitcoin-sv/go-paymail v0.16.1-0.20240605052525-5d449cc8c786 // indirect github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 github.com/bitcoinschema/go-bpu v0.1.3 // indirect github.com/bitcoinschema/go-map v0.1.1 // indirect diff --git a/go.sum b/go.sum index 3d2b54a9..bf459a78 100644 --- a/go.sum +++ b/go.sum @@ -20,10 +20,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bitcoin-sv/go-broadcast-client v0.18.1 h1:9cnBvIxQeysM5YU02+N/Stmf1h4dnedO6cdhaFq0aCg= github.com/bitcoin-sv/go-broadcast-client v0.18.1/go.mod h1:GRAliwumNBjEbLRIEkXqIKJpsgmMfjvlIDqgyw/NoJE= -github.com/bitcoin-sv/go-paymail v0.15.1-0.20240528124933-ddea4830f279 h1:ekpylxZNdOPg/v98kZf/fJbRng9LMQkLnR0Qk69gTQ8= -github.com/bitcoin-sv/go-paymail v0.15.1-0.20240528124933-ddea4830f279/go.mod h1:5ai39WtNxg7E2UrDKvMpFVMlWvXRidCcJHBexjJjFFA= -github.com/bitcoin-sv/go-paymail v0.16.0 h1:9Yj7ca7+9RodOFw0TI5LgXCjlv+yUucbNbfU15aI0a0= -github.com/bitcoin-sv/go-paymail v0.16.0/go.mod h1:5ai39WtNxg7E2UrDKvMpFVMlWvXRidCcJHBexjJjFFA= +github.com/bitcoin-sv/go-paymail v0.16.1-0.20240605052525-5d449cc8c786 h1:EgIQ5aAVcOq4vNxSXinXtmMPZUMhrWfEBHKfIJAsZu4= +github.com/bitcoin-sv/go-paymail v0.16.1-0.20240605052525-5d449cc8c786/go.mod h1:5ai39WtNxg7E2UrDKvMpFVMlWvXRidCcJHBexjJjFFA= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 h1:Sgh5Eb746Zck/46rFDrZZEXZWyO53fMuWYhNoZa1tck= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5/go.mod h1:JjO1ivfZv6vhK0uAXzyH08AAHlzNMAfnyK1Fiv9r4ZA= github.com/bitcoinschema/go-bob v0.4.3 h1:0iboiIQ3PY2+rrqPr8Gsh5RX+9Ha6Uzyo0bw720Ljlc= From dd530ef57a01b20ff8ae8fd5762bdbdd08d429b8 Mon Sep 17 00:00:00 2001 From: Augustyn Chmiel Date: Fri, 7 Jun 2024 11:32:38 +0200 Subject: [PATCH 2/6] fix(spv-827) added fix for new capabilites functionality --- engine/go.mod | 12 ++++++------ engine/go.sum | 24 ++++++++++++------------ engine/paymail_servant.go | 2 +- go.mod | 12 ++++++------ go.sum | 20 ++++++++++++-------- 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/engine/go.mod b/engine/go.mod index c4ae2c65..3ad9669e 100644 --- a/engine/go.mod +++ b/engine/go.mod @@ -7,7 +7,7 @@ toolchain go1.22.3 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/bitcoin-sv/go-broadcast-client v0.18.1 - github.com/bitcoin-sv/go-paymail v0.16.0 + github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 github.com/bitcoinschema/go-map v0.1.1 github.com/coocood/freecache v1.2.4 @@ -111,13 +111,13 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76 // indirect - golang.org/x/crypto v0.23.0 // indirect + golang.org/x/crypto v0.24.0 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect - golang.org/x/tools v0.21.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.1 // indirect diff --git a/engine/go.sum b/engine/go.sum index 1673a7b9..8a82e165 100644 --- a/engine/go.sum +++ b/engine/go.sum @@ -16,10 +16,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bitcoin-sv/go-broadcast-client v0.18.1 h1:9cnBvIxQeysM5YU02+N/Stmf1h4dnedO6cdhaFq0aCg= github.com/bitcoin-sv/go-broadcast-client v0.18.1/go.mod h1:GRAliwumNBjEbLRIEkXqIKJpsgmMfjvlIDqgyw/NoJE= -github.com/bitcoin-sv/go-paymail v0.15.1-0.20240528124933-ddea4830f279 h1:ekpylxZNdOPg/v98kZf/fJbRng9LMQkLnR0Qk69gTQ8= -github.com/bitcoin-sv/go-paymail v0.15.1-0.20240528124933-ddea4830f279/go.mod h1:5ai39WtNxg7E2UrDKvMpFVMlWvXRidCcJHBexjJjFFA= -github.com/bitcoin-sv/go-paymail v0.16.0 h1:9Yj7ca7+9RodOFw0TI5LgXCjlv+yUucbNbfU15aI0a0= -github.com/bitcoin-sv/go-paymail v0.16.0/go.mod h1:5ai39WtNxg7E2UrDKvMpFVMlWvXRidCcJHBexjJjFFA= +github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e h1:Yuy4nr76DBDUE76lX8gdJP9SngY7bI1nNxIP9hGyYE0= +github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e/go.mod h1:WCyS7JsadXs4KIft0mI5U1S0YRUeZKBswJe9oEMlDD8= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 h1:Sgh5Eb746Zck/46rFDrZZEXZWyO53fMuWYhNoZa1tck= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5/go.mod h1:JjO1ivfZv6vhK0uAXzyH08AAHlzNMAfnyK1Fiv9r4ZA= github.com/bitcoinschema/go-bob v0.4.3 h1:0iboiIQ3PY2+rrqPr8Gsh5RX+9Ha6Uzyo0bw720Ljlc= @@ -171,8 +169,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libsv/go-bc v0.1.28 h1:LubB5VmRGF3EfkOVbb8Gmoq9Ku7XvtkwIkSW55sfnlo= -github.com/libsv/go-bc v0.1.28/go.mod h1:l6epTfcakN8YKId/hrpUzlu1QeT3ODF1MI3DeYhG1O8= github.com/libsv/go-bc v0.1.29 h1:w3ZnpZxLkTrjklwkr9x/y/xv0vJz5FVVZjd/gvtvGQs= github.com/libsv/go-bc v0.1.29/go.mod h1:l6epTfcakN8YKId/hrpUzlu1QeT3ODF1MI3DeYhG1O8= github.com/libsv/go-bk v0.1.6 h1:c9CiT5+64HRDbzxPl1v/oiFmbvWZTuUYqywCf+MBs/c= @@ -327,8 +323,9 @@ golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -350,8 +347,9 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -383,8 +381,9 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -400,8 +399,9 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -412,8 +412,8 @@ golang.org/x/tools v0.0.0-20200530233709-52effbd89c51/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= 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.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= -golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= 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= diff --git a/engine/paymail_servant.go b/engine/paymail_servant.go index fa6def91..d24de003 100644 --- a/engine/paymail_servant.go +++ b/engine/paymail_servant.go @@ -59,7 +59,7 @@ func (s *PaymailServant) AddContactRequest(ctx context.Context, receiverPaymail return nil, ErrCapabilitiesPikeUnsupported } - url := capabilities.GetString(paymail.BRFCPike, "") + url := capabilities.ExtractPikeInviteURL() response, err := s.pc.AddContactRequest(url, receiverPaymail.Alias, receiverPaymail.Domain, contactData) if err != nil { return nil, fmt.Errorf("error during requesting new contact: %w", err) diff --git a/go.mod b/go.mod index 86d45c4d..ea2bc3dc 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/KyleBanks/depth v1.2.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bitcoin-sv/go-paymail v0.16.1-0.20240605052525-5d449cc8c786 // indirect + github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e // indirect github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 github.com/bitcoinschema/go-bpu v0.1.3 // indirect github.com/bitcoinschema/go-map v0.1.1 // indirect @@ -141,14 +141,14 @@ require ( go.mongodb.org/mongo-driver v1.15.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.23.0 // indirect + golang.org/x/crypto v0.24.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect - golang.org/x/tools v0.21.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.1 // indirect diff --git a/go.sum b/go.sum index bf459a78..f3915523 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bitcoin-sv/go-broadcast-client v0.18.1 h1:9cnBvIxQeysM5YU02+N/Stmf1h4dnedO6cdhaFq0aCg= github.com/bitcoin-sv/go-broadcast-client v0.18.1/go.mod h1:GRAliwumNBjEbLRIEkXqIKJpsgmMfjvlIDqgyw/NoJE= -github.com/bitcoin-sv/go-paymail v0.16.1-0.20240605052525-5d449cc8c786 h1:EgIQ5aAVcOq4vNxSXinXtmMPZUMhrWfEBHKfIJAsZu4= -github.com/bitcoin-sv/go-paymail v0.16.1-0.20240605052525-5d449cc8c786/go.mod h1:5ai39WtNxg7E2UrDKvMpFVMlWvXRidCcJHBexjJjFFA= +github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e h1:Yuy4nr76DBDUE76lX8gdJP9SngY7bI1nNxIP9hGyYE0= +github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e/go.mod h1:WCyS7JsadXs4KIft0mI5U1S0YRUeZKBswJe9oEMlDD8= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 h1:Sgh5Eb746Zck/46rFDrZZEXZWyO53fMuWYhNoZa1tck= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5/go.mod h1:JjO1ivfZv6vhK0uAXzyH08AAHlzNMAfnyK1Fiv9r4ZA= github.com/bitcoinschema/go-bob v0.4.3 h1:0iboiIQ3PY2+rrqPr8Gsh5RX+9Ha6Uzyo0bw720Ljlc= @@ -378,8 +378,9 @@ golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= @@ -404,8 +405,9 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -437,8 +439,9 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -454,8 +457,9 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -466,8 +470,8 @@ golang.org/x/tools v0.0.0-20200530233709-52effbd89c51/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= 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.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= -golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= 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= From 0dc29f78f7a128a06a468626db61071ef9350103 Mon Sep 17 00:00:00 2001 From: Augustyn Chmiel Date: Fri, 7 Jun 2024 11:37:15 +0200 Subject: [PATCH 3/6] fix(spv-827) added fix for new capabilites functionality --- config/defaults.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/defaults.go b/config/defaults.go index ed09daa4..689d5696 100644 --- a/config/defaults.go +++ b/config/defaults.go @@ -175,7 +175,7 @@ func getMetricsDefaults() *MetricsConfig { func getExperimentalFeaturesConfig() *ExperimentalConfig { return &ExperimentalConfig{ - PikeContactsEnabled: true, - PikePaymentEnabled: true, + PikeContactsEnabled: false, + PikePaymentEnabled: false, } } From 4939748efee4c15476cd2e1f48c4b8dbb39d43b3 Mon Sep 17 00:00:00 2001 From: Augustyn Chmiel Date: Fri, 7 Jun 2024 11:40:47 +0200 Subject: [PATCH 4/6] fix(spv-827) added fix for linter --- config/defaults.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/defaults.go b/config/defaults.go index 689d5696..77f606b4 100644 --- a/config/defaults.go +++ b/config/defaults.go @@ -3,9 +3,8 @@ package config import ( "time" - "github.com/google/uuid" - "github.com/bitcoin-sv/spv-wallet/engine/datastore" + "github.com/google/uuid" ) // DefaultAdminXpub is the default admin xpub used for authenticate requests. From 5577b0866d0a321aee55a22399b76919763c2128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Lewandowski?= Date: Fri, 7 Jun 2024 12:21:36 +0200 Subject: [PATCH 5/6] tests(SPV-827): fix contact tests --- engine/contact_service_test.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/engine/contact_service_test.go b/engine/contact_service_test.go index a1b1547a..3c5aa7cf 100644 --- a/engine/contact_service_test.go +++ b/engine/contact_service_test.go @@ -315,12 +315,15 @@ func (p *paymailTestMock) setup(t *testing.T, domain string, supportPike bool) { } if supportPike { - wellKnownBody.Capabilities[paymail.BRFCPike] = fmt.Sprintf("%s/pike/{alias}@{domain.tld}", serverURL) + wellKnownBody.Capabilities[paymail.BRFCPike] = map[string]string{ + paymail.BRFCPikeInvite: fmt.Sprintf("%s/contact/invite/{alias}@{domain.tld}", serverURL), + paymail.BRFCPikeOutputs: fmt.Sprintf("%s/pike/outputs/{alias}@{domain.tld}", serverURL), + } } - wellKnownReponse, _ := json.Marshal(wellKnownBody) - wellKnonwResponder := httpmock.NewStringResponder(http.StatusOK, string(wellKnownReponse)) - httpmock.RegisterResponder(http.MethodGet, wellKnownUrl, wellKnonwResponder) + wellKnownResponse, _ := json.Marshal(wellKnownBody) + wellKnownResponder := httpmock.NewStringResponder(http.StatusOK, string(wellKnownResponse)) + httpmock.RegisterResponder(http.MethodGet, wellKnownUrl, wellKnownResponder) p.serverUrl = serverURL p.paymailClient = newTestPaymailClient(t, []string{domain}) @@ -341,7 +344,13 @@ func (p *paymailTestMock) mockPki(paymail, pubkey string) { } func (p *paymailTestMock) mockPike(paymail string) { - httpmock.RegisterResponder(http.MethodPost, fmt.Sprintf("%s/pike/%s", p.serverUrl, paymail), + httpmock.RegisterResponder(http.MethodPost, fmt.Sprintf("%s/contact/invite/%s", p.serverUrl, paymail), + httpmock.NewStringResponder( + 200, + "{}", + ), + ) + httpmock.RegisterResponder(http.MethodPost, fmt.Sprintf("%s/pike/outputs%s", p.serverUrl, paymail), httpmock.NewStringResponder( 200, "{}", From 73f71baecd7079203e96c3410830f32157830cdb Mon Sep 17 00:00:00 2001 From: Augustyn Chmiel Date: Fri, 7 Jun 2024 12:42:21 +0200 Subject: [PATCH 6/6] chore(spv-827) changing go-paymal version --- engine/go.mod | 2 +- engine/go.sum | 2 ++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/engine/go.mod b/engine/go.mod index 3ad9669e..7b488dcc 100644 --- a/engine/go.mod +++ b/engine/go.mod @@ -7,7 +7,7 @@ toolchain go1.22.3 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/bitcoin-sv/go-broadcast-client v0.18.1 - github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e + github.com/bitcoin-sv/go-paymail v0.17.0 github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 github.com/bitcoinschema/go-map v0.1.1 github.com/coocood/freecache v1.2.4 diff --git a/engine/go.sum b/engine/go.sum index 8a82e165..c5f3bb49 100644 --- a/engine/go.sum +++ b/engine/go.sum @@ -18,6 +18,8 @@ github.com/bitcoin-sv/go-broadcast-client v0.18.1 h1:9cnBvIxQeysM5YU02+N/Stmf1h4 github.com/bitcoin-sv/go-broadcast-client v0.18.1/go.mod h1:GRAliwumNBjEbLRIEkXqIKJpsgmMfjvlIDqgyw/NoJE= github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e h1:Yuy4nr76DBDUE76lX8gdJP9SngY7bI1nNxIP9hGyYE0= github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e/go.mod h1:WCyS7JsadXs4KIft0mI5U1S0YRUeZKBswJe9oEMlDD8= +github.com/bitcoin-sv/go-paymail v0.17.0 h1:NwYMnWB/gcE0zeJPTv55B7NY3u1vreAlojqgj5nIuPE= +github.com/bitcoin-sv/go-paymail v0.17.0/go.mod h1:WCyS7JsadXs4KIft0mI5U1S0YRUeZKBswJe9oEMlDD8= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 h1:Sgh5Eb746Zck/46rFDrZZEXZWyO53fMuWYhNoZa1tck= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5/go.mod h1:JjO1ivfZv6vhK0uAXzyH08AAHlzNMAfnyK1Fiv9r4ZA= github.com/bitcoinschema/go-bob v0.4.3 h1:0iboiIQ3PY2+rrqPr8Gsh5RX+9Ha6Uzyo0bw720Ljlc= diff --git a/go.mod b/go.mod index ea2bc3dc..8e1fa2c7 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/KyleBanks/depth v1.2.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e // indirect + github.com/bitcoin-sv/go-paymail v0.17.0 // indirect github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 github.com/bitcoinschema/go-bpu v0.1.3 // indirect github.com/bitcoinschema/go-map v0.1.1 // indirect diff --git a/go.sum b/go.sum index f3915523..a39d2f48 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bitcoin-sv/go-broadcast-client v0.18.1 h1:9cnBvIxQeysM5YU02+N/Stmf1h4dnedO6cdhaFq0aCg= github.com/bitcoin-sv/go-broadcast-client v0.18.1/go.mod h1:GRAliwumNBjEbLRIEkXqIKJpsgmMfjvlIDqgyw/NoJE= -github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e h1:Yuy4nr76DBDUE76lX8gdJP9SngY7bI1nNxIP9hGyYE0= -github.com/bitcoin-sv/go-paymail v0.16.1-0.20240606030918-2d6ec738cb3e/go.mod h1:WCyS7JsadXs4KIft0mI5U1S0YRUeZKBswJe9oEMlDD8= +github.com/bitcoin-sv/go-paymail v0.17.0 h1:NwYMnWB/gcE0zeJPTv55B7NY3u1vreAlojqgj5nIuPE= +github.com/bitcoin-sv/go-paymail v0.17.0/go.mod h1:WCyS7JsadXs4KIft0mI5U1S0YRUeZKBswJe9oEMlDD8= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 h1:Sgh5Eb746Zck/46rFDrZZEXZWyO53fMuWYhNoZa1tck= github.com/bitcoinschema/go-bitcoin/v2 v2.0.5/go.mod h1:JjO1ivfZv6vhK0uAXzyH08AAHlzNMAfnyK1Fiv9r4ZA= github.com/bitcoinschema/go-bob v0.4.3 h1:0iboiIQ3PY2+rrqPr8Gsh5RX+9Ha6Uzyo0bw720Ljlc=