From d01f2feda1da79e305d08b299f18af0f0e14786e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Lewandowski?= Date: Thu, 7 Sep 2023 09:53:00 +0200 Subject: [PATCH] chore(BUX-175): replace tonicpow/go-paymail --- README.md | 2 +- client.go | 4 ++-- client_internal.go | 4 ++-- client_options.go | 4 ++-- client_options_test.go | 2 +- client_paymail.go | 2 +- client_test.go | 2 +- go.mod | 13 ++----------- go.sum | 27 ++++----------------------- interface.go | 2 +- model_paymail_addresses.go | 2 +- model_sync_transactions.go | 2 +- model_transaction_config.go | 2 +- paymail.go | 2 +- paymail_mocks_test.go | 4 ++-- paymail_service_provider.go | 4 ++-- paymail_test.go | 4 ++-- tester/paymail.go | 4 ++-- 18 files changed, 29 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 44b6c852..cc8e8d12 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ This repository was created using [MrZ's `go-template`](https://github.com/mrz18 - [robfig/cron](https://github.com/robfig/cron) - [stretchr/testify](https://github.com/stretchr/testify) - [tonicpow/go-minercraft](https://github.com/tonicpow/go-minercraft) -- [tonicpow/go-paymail](https://github.com/tonicpow/go-paymail) +- [bitcoin-sv/go-paymail](https://github.com/bitcoin-sv/go-paymail) - [vmihailenco/taskq](https://github.com/vmihailenco/taskq) diff --git a/client.go b/client.go index 2d384ac1..5a72be48 100644 --- a/client.go +++ b/client.go @@ -9,12 +9,12 @@ import ( "github.com/BuxOrg/bux/cluster" "github.com/BuxOrg/bux/notifications" "github.com/BuxOrg/bux/taskmanager" + "github.com/bitcoin-sv/go-paymail" + "github.com/bitcoin-sv/go-paymail/server" "github.com/mrz1836/go-cachestore" "github.com/mrz1836/go-datastore" zLogger "github.com/mrz1836/go-logger" "github.com/newrelic/go-agent/v3/newrelic" - "github.com/tonicpow/go-paymail" - "github.com/tonicpow/go-paymail/server" ) type ( diff --git a/client_internal.go b/client_internal.go index eae5edb1..31eb1a4a 100644 --- a/client_internal.go +++ b/client_internal.go @@ -9,10 +9,10 @@ import ( "github.com/BuxOrg/bux/cluster" "github.com/BuxOrg/bux/notifications" "github.com/BuxOrg/bux/taskmanager" + "github.com/bitcoin-sv/go-paymail" + "github.com/bitcoin-sv/go-paymail/server" "github.com/mrz1836/go-cachestore" "github.com/mrz1836/go-datastore" - "github.com/tonicpow/go-paymail" - "github.com/tonicpow/go-paymail/server" ) // loadCache will load caching configuration and start the Cachestore client diff --git a/client_options.go b/client_options.go index 4226549f..6de098a0 100644 --- a/client_options.go +++ b/client_options.go @@ -13,6 +13,8 @@ import ( "github.com/BuxOrg/bux/taskmanager" "github.com/bitcoin-sv/go-broadcast-client/broadcast" broadcastclient "github.com/bitcoin-sv/go-broadcast-client/broadcast/broadcast-client" + "github.com/bitcoin-sv/go-paymail" + "github.com/bitcoin-sv/go-paymail/server" "github.com/coocood/freecache" "github.com/go-redis/redis/v8" "github.com/mrz1836/go-cache" @@ -21,8 +23,6 @@ import ( zLogger "github.com/mrz1836/go-logger" "github.com/newrelic/go-agent/v3/newrelic" "github.com/tonicpow/go-minercraft/v2" - "github.com/tonicpow/go-paymail" - "github.com/tonicpow/go-paymail/server" taskq "github.com/vmihailenco/taskq/v3" "go.mongodb.org/mongo-driver/mongo" ) diff --git a/client_options_test.go b/client_options_test.go index 52bce9da..31f0c043 100644 --- a/client_options_test.go +++ b/client_options_test.go @@ -11,6 +11,7 @@ import ( "github.com/BuxOrg/bux/taskmanager" "github.com/BuxOrg/bux/tester" "github.com/BuxOrg/bux/utils" + "github.com/bitcoin-sv/go-paymail" "github.com/coocood/freecache" "github.com/go-redis/redis/v8" "github.com/mrz1836/go-cachestore" @@ -19,7 +20,6 @@ import ( "github.com/newrelic/go-agent/v3/newrelic" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tonicpow/go-paymail" ) // TestNewRelicOptions will test the method enable() diff --git a/client_paymail.go b/client_paymail.go index 78f71672..f51df601 100644 --- a/client_paymail.go +++ b/client_paymail.go @@ -1,7 +1,7 @@ package bux import ( - "github.com/tonicpow/go-paymail" + "github.com/bitcoin-sv/go-paymail" ) // PaymailClient will return the Paymail if it exists diff --git a/client_test.go b/client_test.go index f69934af..0d04fde5 100644 --- a/client_test.go +++ b/client_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/BuxOrg/bux/tester" + "github.com/bitcoin-sv/go-paymail" "github.com/mrz1836/go-cachestore" "github.com/mrz1836/go-datastore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tonicpow/go-paymail" ) // todo: finish unit tests! diff --git a/go.mod b/go.mod index f0b9a366..9a02ffc8 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/99designs/gqlgen v0.17.37 github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/bitcoin-sv/go-broadcast-client v0.1.1 + github.com/bitcoin-sv/go-paymail v0.0.1 github.com/bitcoinschema/go-bitcoin/v2 v2.0.5 github.com/bitcoinschema/go-map v0.1.0 github.com/centrifugal/centrifuge-go v0.10.1 @@ -34,7 +35,6 @@ require ( github.com/stretchr/testify v1.8.4 github.com/tidwall/gjson v1.16.0 github.com/tonicpow/go-minercraft/v2 v2.0.4 - github.com/tonicpow/go-paymail v0.9.3 github.com/tryvium-travels/memongo v0.9.0 github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43 github.com/vmihailenco/taskq/v3 v3.2.9 @@ -64,14 +64,11 @@ require ( github.com/go-resty/resty/v2 v2.7.0 // indirect github.com/go-sql-driver/mysql v1.7.1 // indirect github.com/gocraft/dbr/v2 v2.7.5 // indirect - github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/gojektech/heimdall/v6 v6.1.0 // indirect github.com/gojektech/valkyrie v0.0.0-20190210220504-8f62c1e7ba45 // indirect - github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.3.1 // indirect - github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/iancoleman/strcase v0.3.0 // indirect @@ -87,15 +84,10 @@ require ( github.com/lestrrat-go/strftime v1.0.6 // indirect github.com/lib/pq v1.10.9 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/matryer/respond v1.0.1 // indirect github.com/mattn/go-sqlite3 v1.14.17 // indirect github.com/miekg/dns v1.1.55 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/montanaflynn/stats v0.7.1 // indirect - github.com/mrz1836/go-api-router v0.5.2 // indirect - github.com/mrz1836/go-parameters v0.3.1 // indirect - github.com/mrz1836/go-sanitize v1.3.1 // indirect - github.com/mrz1836/go-validate v0.2.0 // indirect github.com/newrelic/go-agent/v3/integrations/nrhttprouter v1.0.2 // indirect github.com/newrelic/go-agent/v3/integrations/nrmongo v1.1.1 // indirect github.com/onsi/gomega v1.20.0 // indirect @@ -111,7 +103,6 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/tidwall/sjson v1.2.5 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/vektah/gqlparser/v2 v2.5.9 // indirect github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect @@ -125,7 +116,7 @@ require ( go.opentelemetry.io/otel/trace v1.17.0 // indirect golang.org/x/crypto v0.13.0 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect diff --git a/go.sum b/go.sum index 8efee720..fd060b08 100644 --- a/go.sum +++ b/go.sum @@ -55,6 +55,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg github.com/aws/aws-sdk-go v1.43.45 h1:2708Bj4uV+ym62MOtBnErm/CDX61C4mFe9V2gXy1caE= github.com/bitcoin-sv/go-broadcast-client v0.1.1 h1:PXoq+JbOt6V1Cr78qMAf0b5NzJp732ZOIhbHDqxB7lk= github.com/bitcoin-sv/go-broadcast-client v0.1.1/go.mod h1:EGTrUK2r81moZbgaNalEZJaIBYp7/kOVXy17J9AFQJQ= +github.com/bitcoin-sv/go-paymail v0.0.1 h1:eVF+ebqV6RQ/EWuEzSrBK2UyLy65zrZNXV2gAi1kVhU= +github.com/bitcoin-sv/go-paymail v0.0.1/go.mod h1:b99fWseikUGFeYcmVJc0Er4NxuLVAcgXBNWcGaK1Tvo= 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.0 h1:adsAEboLQCg0D6e9vwcJUJEJScszsouAYCYu35UAiGo= @@ -81,7 +83,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -141,15 +142,11 @@ github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gocraft/dbr/v2 v2.7.5 h1:TlXAEjDHazPKVsvUW9ZXug96B/vTqm+sSOCPb56rtTI= github.com/gocraft/dbr/v2 v2.7.5/go.mod h1:8IH98S8M8J0JSEiYk0MPH26ZDUKemiQ/GvmXL5jo+Uw= -github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= -github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gojektech/heimdall/v6 v6.1.0 h1:M9L1xryMKGWUlAA33D0r0BaKiXWzvuReltDPPkC5loM= github.com/gojektech/heimdall/v6 v6.1.0/go.mod h1:8g/ohsh0GXn8fzOf+qVrjX5pQLf7qQy8vEBjBUJ/9L4= github.com/gojektech/valkyrie v0.0.0-20180215180059-6aee720afcdf/go.mod h1:tDYRk1s5Pms6XJjj5m2PxAzmQvaDU8GqDf1u6x7yxKw= github.com/gojektech/valkyrie v0.0.0-20190210220504-8f62c1e7ba45 h1:MO2DsGCZz8phRhLnpFvHEQgTH521sVN/6F2GZTbNO3Q= github.com/gojektech/valkyrie v0.0.0-20190210220504-8f62c1e7ba45/go.mod h1:tDYRk1s5Pms6XJjj5m2PxAzmQvaDU8GqDf1u6x7yxKw= -github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= -github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -221,8 +218,6 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -288,8 +283,6 @@ 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/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/matryer/respond v1.0.1 h1:RSG07jdn32pH46t4UO1TnpnKlR/ayIpEa4aiK2f9k1U= -github.com/matryer/respond v1.0.1/go.mod h1:XHpqRsK4LZQgk6twGA/CrtxNBaayoYiKUqj0Mjkj3Hg= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/goveralls v0.0.6/go.mod h1:h8b4ow6FxSPMQHF6o2ve3qsclnffZjYTNEKmLesRwqw= @@ -301,8 +294,6 @@ github.com/mitchellh/hashstructure v1.1.0/go.mod h1:xUDAozZz0Wmdiufv0uyhnHkUTN6/ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/mrz1836/go-api-router v0.5.2 h1:ssPASiHDxWUkHkvuE4hFnukZMVPWBEx+7V6S1ZaXD4I= -github.com/mrz1836/go-api-router v0.5.2/go.mod h1:p11Ggz69rImuQ3Wv693ZxeLOMX08fanz5OOzdHBmovE= github.com/mrz1836/go-cache v0.8.2 h1:7w94kF5q/j40uXgxea7ZX+9hql4GsVAmuc/X4tjMLLI= github.com/mrz1836/go-cache v0.8.2/go.mod h1:KBMYLOW/h58QeVmPx/tiPpFKq4osVCFBhdFNLx0uVoc= github.com/mrz1836/go-cachestore v0.2.3 h1:qfwuVb4LsJ1dzeMWjKEp6CraboiatLZR9oFjHTco1KY= @@ -313,12 +304,6 @@ github.com/mrz1836/go-logger v0.3.2 h1:bjd23NwVaLWncXgXAyxAwWLQ02of0Ci3iJIZZEakk github.com/mrz1836/go-logger v0.3.2/go.mod h1:8gWPdqxOAFNJOHDXS2ducgsokUOf0wWtAAM3LXPrhYo= github.com/mrz1836/go-nownodes v0.1.0 h1:Q7GGaJcee+WB6sytutxTbMBVY4cUD/YcfywWa+5V5YY= github.com/mrz1836/go-nownodes v0.1.0/go.mod h1:P6dlCgibdkoMDCvmMfDVRUCS6oh4WWeI7CeaFNaA7Qo= -github.com/mrz1836/go-parameters v0.3.1 h1:tGfDEMnzqKfI5x0y+ZwMYfSSjQm0NFoaEcESGnbFYr4= -github.com/mrz1836/go-parameters v0.3.1/go.mod h1:ceRTTC2WzJqSCproV8+smxvUgTSqQGNGjqYFPDiUq0k= -github.com/mrz1836/go-sanitize v1.3.1 h1:bTxpzDXzGh9cp3XLTeVKgL2iLqEwCaLqqe+3BmpnCbo= -github.com/mrz1836/go-sanitize v1.3.1/go.mod h1:Js6Gq1uiarNReoOeOKxPXxNpKy1FRlbgDDZnJG4THdM= -github.com/mrz1836/go-validate v0.2.0 h1:F8AcgJRW0B/hUNFAXijrN/EGqYlAIkIIpMDkIMMRUho= -github.com/mrz1836/go-validate v0.2.0/go.mod h1:IoGAb4rTAL6KgAxOiWL4ICwLqxGbKCKT1GyaSuE/4bk= github.com/mrz1836/go-whatsonchain v0.13.0 h1:ZUc0bhzuIcFoRtzIDkPjW1Cw4Cj5LBM6TqDJ4Ao+GtM= github.com/mrz1836/go-whatsonchain v0.13.0/go.mod h1:RRBz1PHILAWq3erXmZlAvjTVzNbD+NCAf+YrsU81+G8= github.com/newrelic/go-agent/v3 v3.24.1 h1:qJc+cKtc0v9vrsnMHuHy4r6Fh9iigNJj3O3KUKPOD0M= @@ -405,14 +390,10 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/tonicpow/go-minercraft/v2 v2.0.4 h1:J8hrAwU4XgI5MHWMTCOQbaZFcqdL9HaUvLFa8AXZOHk= github.com/tonicpow/go-minercraft/v2 v2.0.4/go.mod h1:OErQyBDd8Qu+qEy1fU22hPVto+lMBllciD4tkXvhXCs= -github.com/tonicpow/go-paymail v0.9.3 h1:ihyc0g55Vp2XmBj7bVIgtvtfLI03oW/mo9bcWugpRPs= -github.com/tonicpow/go-paymail v0.9.3/go.mod h1:9MJynyvcqJr4mGdhmdPN6PiemKHL/s/U5otpdrC7E9M= github.com/tryvium-travels/memongo v0.9.0 h1:k5kuTHSDdITN+aMaNoKr1nzTyNvhwOXtb9SnrMjRg+I= github.com/tryvium-travels/memongo v0.9.0/go.mod h1:riRUHKRQ5JbeX2ryzFfmr7P2EYXIkNwgloSQJPpBikA= github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43 h1:QEePdg0ty2r0t1+qwfZmQ4OOl/MB2UXIeJSpIZv56lg= github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43/go.mod h1:OYRfF6eb5wY9VRFkXJH8FFBi3plw2v+giaIu7P054pM= -github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/vektah/gqlparser/v2 v2.5.9 h1:bFju9t/E8shqIcDGayKdpl6OHBplFZEeYac9SALiRZE= @@ -541,8 +522,8 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/interface.go b/interface.go index 322feff0..2cffb355 100644 --- a/interface.go +++ b/interface.go @@ -9,11 +9,11 @@ import ( "github.com/BuxOrg/bux/cluster" "github.com/BuxOrg/bux/notifications" "github.com/BuxOrg/bux/taskmanager" + "github.com/bitcoin-sv/go-paymail" "github.com/libsv/go-bc" "github.com/mrz1836/go-cachestore" "github.com/mrz1836/go-datastore" zLogger "github.com/mrz1836/go-logger" - "github.com/tonicpow/go-paymail" ) // AccessKeyService is the access key actions diff --git a/model_paymail_addresses.go b/model_paymail_addresses.go index 51c3ab7f..aa3e174a 100644 --- a/model_paymail_addresses.go +++ b/model_paymail_addresses.go @@ -5,10 +5,10 @@ import ( "errors" "github.com/BuxOrg/bux/utils" + "github.com/bitcoin-sv/go-paymail" "github.com/bitcoinschema/go-bitcoin/v2" "github.com/libsv/go-bk/bip32" "github.com/mrz1836/go-datastore" - "github.com/tonicpow/go-paymail" ) // PaymailAddress is an "external model example" - this model is not part of the standard models loaded and runtime diff --git a/model_sync_transactions.go b/model_sync_transactions.go index f5679e54..4206846c 100644 --- a/model_sync_transactions.go +++ b/model_sync_transactions.go @@ -15,10 +15,10 @@ import ( "github.com/BuxOrg/bux/chainstate" "github.com/BuxOrg/bux/notifications" "github.com/BuxOrg/bux/taskmanager" + "github.com/bitcoin-sv/go-paymail" "github.com/libsv/go-bt/v2" "github.com/mrz1836/go-datastore" customTypes "github.com/mrz1836/go-datastore/custom_types" - "github.com/tonicpow/go-paymail" ) // SyncTransaction is an object representing the chain-state sync configuration and results for a given transaction diff --git a/model_transaction_config.go b/model_transaction_config.go index 66b760a0..2f079b08 100644 --- a/model_transaction_config.go +++ b/model_transaction_config.go @@ -11,10 +11,10 @@ import ( "time" "github.com/BuxOrg/bux/utils" + "github.com/bitcoin-sv/go-paymail" magic "github.com/bitcoinschema/go-map" "github.com/libsv/go-bt/v2/bscript" "github.com/mrz1836/go-cachestore" - "github.com/tonicpow/go-paymail" ) // TransactionConfig is the configuration used to start a transaction diff --git a/paymail.go b/paymail.go index a90e09dc..298c35b3 100644 --- a/paymail.go +++ b/paymail.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/bitcoin-sv/go-paymail" "github.com/mrz1836/go-cachestore" - "github.com/tonicpow/go-paymail" ) // getCapabilities is a utility function to retrieve capabilities for a Paymail provider diff --git a/paymail_mocks_test.go b/paymail_mocks_test.go index abcd9dfb..288a35a3 100644 --- a/paymail_mocks_test.go +++ b/paymail_mocks_test.go @@ -3,8 +3,8 @@ package bux import ( "context" - "github.com/tonicpow/go-paymail" - "github.com/tonicpow/go-paymail/server" + "github.com/bitcoin-sv/go-paymail" + "github.com/bitcoin-sv/go-paymail/server" ) // Mock implementation of a service provider diff --git a/paymail_service_provider.go b/paymail_service_provider.go index 87eb033b..801b280f 100644 --- a/paymail_service_provider.go +++ b/paymail_service_provider.go @@ -9,13 +9,13 @@ import ( "time" "github.com/BuxOrg/bux/utils" + "github.com/bitcoin-sv/go-paymail" + "github.com/bitcoin-sv/go-paymail/server" "github.com/bitcoinschema/go-bitcoin/v2" "github.com/libsv/go-bk/bec" "github.com/libsv/go-bt/v2" "github.com/mrz1836/go-datastore" customTypes "github.com/mrz1836/go-datastore/custom_types" - "github.com/tonicpow/go-paymail" - "github.com/tonicpow/go-paymail/server" ) // PaymailDefaultServiceProvider is an interface for overriding the paymail actions in go-paymail/server diff --git a/paymail_test.go b/paymail_test.go index be084017..78c43343 100644 --- a/paymail_test.go +++ b/paymail_test.go @@ -9,13 +9,13 @@ import ( "github.com/BuxOrg/bux/chainstate" "github.com/BuxOrg/bux/taskmanager" xtester "github.com/BuxOrg/bux/tester" + "github.com/bitcoin-sv/go-paymail" + "github.com/bitcoin-sv/go-paymail/server" "github.com/jarcoal/httpmock" "github.com/mrz1836/go-cache" "github.com/mrz1836/go-datastore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tonicpow/go-paymail" - "github.com/tonicpow/go-paymail/server" ) const ( diff --git a/tester/paymail.go b/tester/paymail.go index 3d011b70..151c431e 100644 --- a/tester/paymail.go +++ b/tester/paymail.go @@ -4,8 +4,8 @@ import ( "net" "time" - "github.com/tonicpow/go-paymail" - "github.com/tonicpow/go-paymail/tester" + "github.com/bitcoin-sv/go-paymail" + "github.com/bitcoin-sv/go-paymail/tester" ) // PaymailMockClient will return a client for testing purposes