From 8533bd7a6786498a2e144a7f9427e0cf264f3104 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:24:28 +0100 Subject: [PATCH 01/19] build(deps): bump the go_modules group across 2 directories with 1 update (#288) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mgosek-4chain --- examples/go.mod | 2 +- examples/go.sum | 4 ++-- go.mod | 2 +- go.sum | 6 ++---- http.go | 2 +- totp_test.go | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 3f670b6..c82c43c 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/bitcoin-sv/go-sdk v1.1.9 // indirect + github.com/bitcoin-sv/go-sdk v1.1.14 // indirect github.com/boombuler/barcode v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pquerna/otp v1.4.0 // indirect diff --git a/examples/go.sum b/examples/go.sum index 53a449e..1e5fc01 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,5 +1,5 @@ -github.com/bitcoin-sv/go-sdk v1.1.9 h1:N/LlZUMHNYKjEBuY72c3XSlzUI/q7IN34R0p6J0Qtjc= -github.com/bitcoin-sv/go-sdk v1.1.9/go.mod h1:NOAkJLbjqKOLuxJmb9ABG86ExTZp4HS8+iygiDIUps4= +github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= +github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31 h1:Y7JZ1oxjQnINGuDxK7VMOQiTCCuEm3BXC/SLhpaZoPs= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= diff --git a/go.mod b/go.mod index d565b59..be7b537 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/bitcoin-sv/spv-wallet-go-client go 1.22.5 require ( - github.com/bitcoin-sv/go-sdk v1.1.9 + github.com/bitcoin-sv/go-sdk v1.1.14 github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31 github.com/pquerna/otp v1.4.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 19d6f61..b637d3e 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ -github.com/bitcoin-sv/go-sdk v1.1.9 h1:N/LlZUMHNYKjEBuY72c3XSlzUI/q7IN34R0p6J0Qtjc= -github.com/bitcoin-sv/go-sdk v1.1.9/go.mod h1:NOAkJLbjqKOLuxJmb9ABG86ExTZp4HS8+iygiDIUps4= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.30 h1:ISfi6nkJ+hHGexkI89bAUjT44SPWNW82qE6QKa90bIs= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.30/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= +github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31 h1:Y7JZ1oxjQnINGuDxK7VMOQiTCCuEm3BXC/SLhpaZoPs= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= diff --git a/http.go b/http.go index a896026..29c8c1a 100644 --- a/http.go +++ b/http.go @@ -487,7 +487,7 @@ func createSignatureAccessKey(privateKeyHex, bodyString string) (payload *models // Get the AccessKey payload = new(models.AuthPayload) - payload.AccessKey = hex.EncodeToString(publicKey.SerializeCompressed()) + payload.AccessKey = hex.EncodeToString(publicKey.Compressed()) // auth_nonce is a random unique string to seed the signing message // this can be checked server side to make sure the request is not being replayed diff --git a/totp_test.go b/totp_test.go index d2c3e24..f63bb80 100644 --- a/totp_test.go +++ b/totp_test.go @@ -129,5 +129,5 @@ func makeMockPKI(xpub string) string { panic(err) } - return hex.EncodeToString(pubKey.SerializeCompressed()) + return hex.EncodeToString(pubKey.Compressed()) } From 756ac95ea0a2f429b080991483f64a0d39f4a7c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:38:59 +0100 Subject: [PATCH 02/19] build(deps): bump github.com/bitcoin-sv/spv-wallet/models from 1.0.0-beta.31 to 1.0.0-beta.32 (#282) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index be7b537..50d6e36 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.5 require ( github.com/bitcoin-sv/go-sdk v1.1.14 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32 github.com/pquerna/otp v1.4.0 github.com/stretchr/testify v1.9.0 ) diff --git a/go.sum b/go.sum index b637d3e..859a5e8 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31 h1:Y7JZ1oxjQnINGuDxK7VMOQiTCCuEm3BXC/SLhpaZoPs= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32 h1:YXiGH7gNKSR7qsLrOiO6zeWmGsA0RynNWeKJ0g5QRBk= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= From 634801948e78ae92f4eab491dfc401542c9c8b74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:47:47 +0100 Subject: [PATCH 03/19] build(deps): bump github.com/bitcoin-sv/spv-wallet/models from 1.0.0-beta.31 to 1.0.0-beta.32 in /examples (#283) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/go.mod | 2 +- examples/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index c82c43c..2b25e20 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -6,7 +6,7 @@ replace github.com/bitcoin-sv/spv-wallet-go-client => ../ require ( github.com/bitcoin-sv/spv-wallet-go-client v0.0.0-00010101000000-000000000000 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32 ) require ( diff --git a/examples/go.sum b/examples/go.sum index 1e5fc01..8c4cdde 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31 h1:Y7JZ1oxjQnINGuDxK7VMOQiTCCuEm3BXC/SLhpaZoPs= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.31/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32 h1:YXiGH7gNKSR7qsLrOiO6zeWmGsA0RynNWeKJ0g5QRBk= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= From 2222ff3c299b8d12b8f374027f2ac566b9b42703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20=C5=BB=C3=B3=C5=82towski?= Date: Fri, 15 Nov 2024 10:44:44 +0100 Subject: [PATCH 04/19] deps(SPV-887): bump spv-wallet model (#292) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 50d6e36..f3c7be6 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.5 require ( github.com/bitcoin-sv/go-sdk v1.1.14 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 github.com/pquerna/otp v1.4.0 github.com/stretchr/testify v1.9.0 ) diff --git a/go.sum b/go.sum index 859a5e8..ff9237c 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32 h1:YXiGH7gNKSR7qsLrOiO6zeWmGsA0RynNWeKJ0g5QRBk= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 h1:hKB8uen+pdFjt/zXdv42JotRihyaXXZ+vxxrsIxKPEY= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= From 95d70afa884e8b4f7d342cfa55a00d39b30ce3d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:23:39 +0100 Subject: [PATCH 05/19] build(deps): bump goreleaser/goreleaser-action from 6.0.0 to 6.1.0 in the gh_actions group (#290) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b0bec9b..be8854a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: with: go-version-file: go.mod - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v6.0.0 + uses: goreleaser/goreleaser-action@v6.1.0 with: distribution: goreleaser version: v1 From 2bacb87f6dd2bff5d23d976f5f3b5145aef155ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:25:47 +0100 Subject: [PATCH 06/19] build(deps): bump github.com/bitcoin-sv/spv-wallet/models from 1.0.0-beta.32 to 1.0.0-beta.33 in /examples (#293) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Wojciech Regulski <48433067+wregulski@users.noreply.github.com> --- examples/go.mod | 2 +- examples/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 2b25e20..4b967cc 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -6,7 +6,7 @@ replace github.com/bitcoin-sv/spv-wallet-go-client => ../ require ( github.com/bitcoin-sv/spv-wallet-go-client v0.0.0-00010101000000-000000000000 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 ) require ( diff --git a/examples/go.sum b/examples/go.sum index 8c4cdde..a41839d 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32 h1:YXiGH7gNKSR7qsLrOiO6zeWmGsA0RynNWeKJ0g5QRBk= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.32/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 h1:hKB8uen+pdFjt/zXdv42JotRihyaXXZ+vxxrsIxKPEY= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= From ef4620b4b9c9024cda3957f54b609a867c7000a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:27:31 +0100 Subject: [PATCH 07/19] build(deps): bump github.com/stretchr/testify from 1.9.0 to 1.10.0 in the go_modules group across 1 directory (#294) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Wojciech Regulski <48433067+wregulski@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f3c7be6..88bd832 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/bitcoin-sv/go-sdk v1.1.14 github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 github.com/pquerna/otp v1.4.0 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 ) require ( diff --git a/go.sum b/go.sum index ff9237c..83afe01 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 9117306286544495c2d1f3394a8efee897a5b16c Mon Sep 17 00:00:00 2001 From: Damian Orzepowski Date: Sat, 7 Dec 2024 11:28:54 +0100 Subject: [PATCH 08/19] feat(SPV-1271): initialise regression test workflow (#302) --- .../workflows/trigger-regression-tests.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/trigger-regression-tests.yml diff --git a/.github/workflows/trigger-regression-tests.yml b/.github/workflows/trigger-regression-tests.yml new file mode 100644 index 0000000..6abc79e --- /dev/null +++ b/.github/workflows/trigger-regression-tests.yml @@ -0,0 +1,24 @@ +name: "Regression Tests" +run-name: "Regression Tests for ${{ github.head_ref || github.ref }} | ID: ${{ github.run_id }}-${{ github.run_attempt }}" + +on: + workflow_dispatch: + inputs: + keep_instances: + description: 'When should it keep instances created during tests?' + required: true + default: 'never' + type: choice + options: + - 'always' + - 'failure' + - 'never' + pull_request_target: + types: [labeled] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: print + run: echo "Hello, World!" From 5a6450f876bbed13cc79f4e4769d85178f3dd6f8 Mon Sep 17 00:00:00 2001 From: Damian Orzepowski Date: Wed, 11 Dec 2024 08:19:23 +0100 Subject: [PATCH 09/19] ci(SPV-1271): trigger regression test workflow (#303) --- .github/labels.yml | 3 +++ .../workflows/trigger-regression-tests.yml | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/labels.yml b/.github/labels.yml index 2543132..dfd3c30 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -55,3 +55,6 @@ - color: 50e061 description: "PR was tested by a team member" name: "tested" +- color: "8e7cc3" + description: "Runs regression tests" + name: "regression-tests" diff --git a/.github/workflows/trigger-regression-tests.yml b/.github/workflows/trigger-regression-tests.yml index 6abc79e..40d4945 100644 --- a/.github/workflows/trigger-regression-tests.yml +++ b/.github/workflows/trigger-regression-tests.yml @@ -18,7 +18,18 @@ on: jobs: test: - runs-on: ubuntu-latest - steps: - - name: print - run: echo "Hello, World!" + uses: 4chain-ag/spv-wallet-regression/.github/workflows/run-regression-tests.yaml@main + with: + image_tag: ${{ needs.release.outputs.imageVersion }} + run_id: '${{ github.run_id }}-${{ github.run_attempt }}' + keep_instances: ${{ inputs.keep_instances }} + go_client_ref: ${{ github.head_ref || github.ref }} + run_js_client_tests: false + secrets: + MASTER_INSTANCE_URL: ${{ secrets.REG_MASTER_INSTANCE_URL }} + MASTER_INSTANCE_XPRIV: ${{ secrets.REG_MASTER_INSTANCE_XPRIV }} + BLOCK_HEADERS_SERVICE_URL: ${{ secrets.REG_BLOCK_HEADERS_SERVICE_URL }} + BLOCK_HEADERS_SERVICE_AUTH_TOKEN: ${{ secrets.REG_BLOCK_HEADERS_SERVICE_AUTH_TOKEN }} + ARGOCD_SERVER: ${{ secrets.REG_ARGOCD_SERVER }} + ARGOCD_USERNAME: ${{ secrets.REG_ARGOCD_USERNAME }} + ARGOCD_PASSWORD: ${{ secrets.REG_ARGOCD_PASSWORD }} From d7d9eb02ffb3d6098614b7b550fac757d94fea21 Mon Sep 17 00:00:00 2001 From: Damian Orzepowski Date: Wed, 11 Dec 2024 09:36:42 +0100 Subject: [PATCH 10/19] fix: workflow not using latest spv-wallet --- .github/workflows/trigger-regression-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/trigger-regression-tests.yml b/.github/workflows/trigger-regression-tests.yml index 40d4945..9833567 100644 --- a/.github/workflows/trigger-regression-tests.yml +++ b/.github/workflows/trigger-regression-tests.yml @@ -20,7 +20,6 @@ jobs: test: uses: 4chain-ag/spv-wallet-regression/.github/workflows/run-regression-tests.yaml@main with: - image_tag: ${{ needs.release.outputs.imageVersion }} run_id: '${{ github.run_id }}-${{ github.run_attempt }}' keep_instances: ${{ inputs.keep_instances }} go_client_ref: ${{ github.head_ref || github.ref }} From ff0c03b3211b4adbb6474c31b2cb563f13f72b1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:25:48 +0100 Subject: [PATCH 11/19] build(deps): bump github.com/bitcoin-sv/spv-wallet/models from 1.0.0-beta.33 to 1.0.0-beta.34 in /examples (#300) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: augustyn chmiel <149666032+ac4ch@users.noreply.github.com> --- examples/go.mod | 2 +- examples/go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 4b967cc..2347b09 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -6,7 +6,7 @@ replace github.com/bitcoin-sv/spv-wallet-go-client => ../ require ( github.com/bitcoin-sv/spv-wallet-go-client v0.0.0-00010101000000-000000000000 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 ) require ( diff --git a/examples/go.sum b/examples/go.sum index a41839d..02c578b 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 h1:hKB8uen+pdFjt/zXdv42JotRihyaXXZ+vxxrsIxKPEY= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 h1:9MMqlZSyCP+RFt0FNnwcbJEgUsRKy5w9Ga7FXHs/XXo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= @@ -16,8 +16,8 @@ github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg= github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= From 917b70d6ccf8733697c2348c96b63cfb621784bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:39:30 +0100 Subject: [PATCH 12/19] build(deps): bump github.com/bitcoin-sv/spv-wallet/models from 1.0.0-beta.33 to 1.0.0-beta.34 (#299) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: augustyn chmiel <149666032+ac4ch@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 88bd832..23059bf 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.5 require ( github.com/bitcoin-sv/go-sdk v1.1.14 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 github.com/pquerna/otp v1.4.0 github.com/stretchr/testify v1.10.0 ) diff --git a/go.sum b/go.sum index 83afe01..f4bbfc1 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33 h1:hKB8uen+pdFjt/zXdv42JotRihyaXXZ+vxxrsIxKPEY= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.33/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 h1:9MMqlZSyCP+RFt0FNnwcbJEgUsRKy5w9Ga7FXHs/XXo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= From 027902fdbec08097d4db969f627bcb133e0a1f78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:54:12 +0100 Subject: [PATCH 13/19] build(deps): bump the go_modules group across 2 directories with 1 update (#298) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: augustyn chmiel <149666032+ac4ch@users.noreply.github.com> Co-authored-by: ac4ch --- examples/go.mod | 2 +- examples/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 2347b09..2242616 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/bitcoin-sv/go-sdk v1.1.14 // indirect + github.com/bitcoin-sv/go-sdk v1.1.16 // indirect github.com/boombuler/barcode v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pquerna/otp v1.4.0 // indirect diff --git a/examples/go.sum b/examples/go.sum index 02c578b..8083c67 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,5 +1,5 @@ -github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= -github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= +github.com/bitcoin-sv/go-sdk v1.1.16 h1:n2X0RiENFGD/1fQ/1y6osbostRB7I/xq9I7tcIKcCPY= +github.com/bitcoin-sv/go-sdk v1.1.16/go.mod h1:3CsNdEDBwB+SIv6UBcJPC9bTvPqxQvg3GULt7wsuL58= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 h1:9MMqlZSyCP+RFt0FNnwcbJEgUsRKy5w9Ga7FXHs/XXo= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= diff --git a/go.mod b/go.mod index 23059bf..1d2a399 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/bitcoin-sv/spv-wallet-go-client go 1.22.5 require ( - github.com/bitcoin-sv/go-sdk v1.1.14 + github.com/bitcoin-sv/go-sdk v1.1.16 github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 github.com/pquerna/otp v1.4.0 github.com/stretchr/testify v1.10.0 diff --git a/go.sum b/go.sum index f4bbfc1..8571902 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/bitcoin-sv/go-sdk v1.1.14 h1:65PrWc8H5in138fplswpxpXuV3HwQQgyXDBegioyVbY= -github.com/bitcoin-sv/go-sdk v1.1.14/go.mod h1:khREs6RkJuYkxFD3ZB9I+zcGjfxoHeACg9Zr3f7Fn7s= +github.com/bitcoin-sv/go-sdk v1.1.16 h1:n2X0RiENFGD/1fQ/1y6osbostRB7I/xq9I7tcIKcCPY= +github.com/bitcoin-sv/go-sdk v1.1.16/go.mod h1:3CsNdEDBwB+SIv6UBcJPC9bTvPqxQvg3GULt7wsuL58= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 h1:9MMqlZSyCP+RFt0FNnwcbJEgUsRKy5w9Ga7FXHs/XXo= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= From 3d7a6f8c3354c5d9f975b47502443904fad11f79 Mon Sep 17 00:00:00 2001 From: Jakub Kowalski <155538368+jakubmkowalski@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:31:48 +0100 Subject: [PATCH 14/19] feat(SPV-1225): add admin confirmation for contacts (#301) --- http.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/http.go b/http.go index 29c8c1a..bcb4d87 100644 --- a/http.go +++ b/http.go @@ -1106,6 +1106,20 @@ func (wc *WalletClient) AdminRejectContact(ctx context.Context, id string) (*mod return &contact, WrapError(err) } +// AdminConfirmContacts executes an HTTP POST request to confirm a contact using their xPubs IDs and paymails. +func (wc *WalletClient) AdminConfirmContacts(ctx context.Context, paymailA, paymailB string) error { + jsonStr, err := json.Marshal(map[string]interface{}{ + "paymailA": paymailA, + "paymailB": paymailB, + }) + if err != nil { + return WrapError(err) + } + + err = wc.doHTTPRequest(ctx, http.MethodPost, "/admin/contacts/confirmations", jsonStr, wc.adminXPriv, true, nil) + return WrapError(err) +} + // FinalizeTransaction will finalize the transaction func (wc *WalletClient) FinalizeTransaction(draft *models.DraftTransaction) (string, error) { res, err := GetSignedHex(draft, wc.xPriv) From 4d017af1f10029a4b65cf7ab1f36a48ec0a809e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 21:02:48 +0100 Subject: [PATCH 15/19] build(deps): bump github.com/bitcoin-sv/spv-wallet/models from 1.0.0-beta.34 to 1.0.0-beta.37 (#304) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1d2a399..6125413 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.5 require ( github.com/bitcoin-sv/go-sdk v1.1.16 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37 github.com/pquerna/otp v1.4.0 github.com/stretchr/testify v1.10.0 ) diff --git a/go.sum b/go.sum index 8571902..7a86a2a 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.16 h1:n2X0RiENFGD/1fQ/1y6osbostRB7I/xq9I7tcIKcCPY= github.com/bitcoin-sv/go-sdk v1.1.16/go.mod h1:3CsNdEDBwB+SIv6UBcJPC9bTvPqxQvg3GULt7wsuL58= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 h1:9MMqlZSyCP+RFt0FNnwcbJEgUsRKy5w9Ga7FXHs/XXo= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37 h1:0zKPUJu9kBo1OzCg21yf4NGQSsCpftkP1tW85MkWfDE= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37/go.mod h1:UdY5AGsO9IomUEYSPilcSY+3BTQRJswdfZNveLt6LZQ= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= From fa54f9fcc92b0bfacf171d1bfca4857da1319d83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 21:12:59 +0100 Subject: [PATCH 16/19] build(deps): bump github.com/bitcoin-sv/spv-wallet/models from 1.0.0-beta.34 to 1.0.0-beta.37 in /examples (#305) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/go.mod | 2 +- examples/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 2242616..0f58e0e 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -6,7 +6,7 @@ replace github.com/bitcoin-sv/spv-wallet-go-client => ../ require ( github.com/bitcoin-sv/spv-wallet-go-client v0.0.0-00010101000000-000000000000 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37 ) require ( diff --git a/examples/go.sum b/examples/go.sum index 8083c67..82cf8b4 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.16 h1:n2X0RiENFGD/1fQ/1y6osbostRB7I/xq9I7tcIKcCPY= github.com/bitcoin-sv/go-sdk v1.1.16/go.mod h1:3CsNdEDBwB+SIv6UBcJPC9bTvPqxQvg3GULt7wsuL58= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34 h1:9MMqlZSyCP+RFt0FNnwcbJEgUsRKy5w9Ga7FXHs/XXo= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37 h1:0zKPUJu9kBo1OzCg21yf4NGQSsCpftkP1tW85MkWfDE= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37/go.mod h1:UdY5AGsO9IomUEYSPilcSY+3BTQRJswdfZNveLt6LZQ= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= From 155281c22904142356b58d7b6044acc7e639187b Mon Sep 17 00:00:00 2001 From: Wojciech Regulski <48433067+wregulski@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:15:55 +0100 Subject: [PATCH 17/19] feat(SPV-1296): add method to create contact by admin (#307) --- http.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/http.go b/http.go index bcb4d87..2a7fd63 100644 --- a/http.go +++ b/http.go @@ -1086,6 +1086,22 @@ func (wc *WalletClient) AdminUpdateContact(ctx context.Context, id, fullName str return &contact, WrapError(err) } +// AdminCreateContact executes an HTTP POST request to create a new contact using the specified paymail, creator paymail, full name, and metadata. +func (wc *WalletClient) AdminCreateContact(ctx context.Context, contactPaymail, creatorPaymail, fullName string, metadata map[string]any) (*models.Contact, error) { + jsonStr, err := json.Marshal(map[string]interface{}{ + "creatorPaymail": creatorPaymail, + "fullName": fullName, + FieldMetadata: metadata, + }) + if err != nil { + return nil, WrapError(err) + } + + var contact models.Contact + err = wc.doHTTPRequest(ctx, http.MethodPost, fmt.Sprintf("/admin/contact/%s", contactPaymail), jsonStr, wc.adminXPriv, true, &contact) + return &contact, WrapError(err) +} + // AdminDeleteContact executes an HTTP DELETE request to remove a contact using their ID. func (wc *WalletClient) AdminDeleteContact(ctx context.Context, id string) error { err := wc.doHTTPRequest(ctx, http.MethodDelete, fmt.Sprintf("/admin/contact/%s", id), nil, wc.adminXPriv, true, nil) From 0d28ad661be63401ead4b5a789320145011fcc63 Mon Sep 17 00:00:00 2001 From: Jakub Kowalski <155538368+jakubmkowalski@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:10:22 +0100 Subject: [PATCH 18/19] feat(SPV-1214): admin contact filter (#308) --- examples/go.mod | 2 +- examples/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- http.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 0f58e0e..e45f5ba 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -6,7 +6,7 @@ replace github.com/bitcoin-sv/spv-wallet-go-client => ../ require ( github.com/bitcoin-sv/spv-wallet-go-client v0.0.0-00010101000000-000000000000 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.39 ) require ( diff --git a/examples/go.sum b/examples/go.sum index 82cf8b4..fb6a1ce 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.16 h1:n2X0RiENFGD/1fQ/1y6osbostRB7I/xq9I7tcIKcCPY= github.com/bitcoin-sv/go-sdk v1.1.16/go.mod h1:3CsNdEDBwB+SIv6UBcJPC9bTvPqxQvg3GULt7wsuL58= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37 h1:0zKPUJu9kBo1OzCg21yf4NGQSsCpftkP1tW85MkWfDE= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37/go.mod h1:UdY5AGsO9IomUEYSPilcSY+3BTQRJswdfZNveLt6LZQ= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.39 h1:qo74o72mcdj7AYJoCq7RG3enHJiqtbkFEY9uXvEEG2M= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.39/go.mod h1:UdY5AGsO9IomUEYSPilcSY+3BTQRJswdfZNveLt6LZQ= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= diff --git a/go.mod b/go.mod index 6125413..d0c72bc 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.5 require ( github.com/bitcoin-sv/go-sdk v1.1.16 - github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37 + github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.39 github.com/pquerna/otp v1.4.0 github.com/stretchr/testify v1.10.0 ) diff --git a/go.sum b/go.sum index 7a86a2a..fea24d8 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/bitcoin-sv/go-sdk v1.1.16 h1:n2X0RiENFGD/1fQ/1y6osbostRB7I/xq9I7tcIKcCPY= github.com/bitcoin-sv/go-sdk v1.1.16/go.mod h1:3CsNdEDBwB+SIv6UBcJPC9bTvPqxQvg3GULt7wsuL58= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37 h1:0zKPUJu9kBo1OzCg21yf4NGQSsCpftkP1tW85MkWfDE= -github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.37/go.mod h1:UdY5AGsO9IomUEYSPilcSY+3BTQRJswdfZNveLt6LZQ= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.39 h1:qo74o72mcdj7AYJoCq7RG3enHJiqtbkFEY9uXvEEG2M= +github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.39/go.mod h1:UdY5AGsO9IomUEYSPilcSY+3BTQRJswdfZNveLt6LZQ= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4= github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= diff --git a/http.go b/http.go index 2a7fd63..2f372b0 100644 --- a/http.go +++ b/http.go @@ -1060,8 +1060,8 @@ func (wc *WalletClient) AdminRecordTransaction(ctx context.Context, hex string) } // AdminGetContacts executes an HTTP POST request to search for contacts based on specified conditions, metadata, and query parameters. -func (wc *WalletClient) AdminGetContacts(ctx context.Context, conditions *filter.ContactFilter, metadata map[string]any, queryParams *filter.QueryParams) (*models.SearchContactsResponse, error) { - return Search[filter.ContactFilter, *models.SearchContactsResponse]( +func (wc *WalletClient) AdminGetContacts(ctx context.Context, conditions *filter.AdminContactFilter, metadata map[string]any, queryParams *filter.QueryParams) (*models.SearchContactsResponse, error) { + return Search[filter.AdminContactFilter, *models.SearchContactsResponse]( ctx, http.MethodPost, "/admin/contact/search", wc.adminXPriv, From b333b42e226f3fedce3e84b120c7dc95f508e075 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:47:15 +0100 Subject: [PATCH 19/19] build(deps): bump golang.org/x/crypto from 0.26.0 to 0.31.0 in /examples (#306) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/go.mod | 2 +- examples/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index e45f5ba..0cc3217 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -14,5 +14,5 @@ require ( github.com/boombuler/barcode v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pquerna/otp v1.4.0 // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.31.0 // indirect ) diff --git a/examples/go.sum b/examples/go.sum index fb6a1ce..759c639 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -18,7 +18,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=