From ad45b1669227cd867c31aafc346b553044083589 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:18:59 +0000 Subject: [PATCH 1/2] build(deps): bump the go_modules group across 2 directories with 1 update Bumps the go_modules group with 1 update in the / directory: [github.com/bitcoin-sv/go-sdk](https://github.com/bitcoin-sv/go-sdk). Bumps the go_modules group with 1 update in the /examples directory: [github.com/bitcoin-sv/go-sdk](https://github.com/bitcoin-sv/go-sdk). Updates `github.com/bitcoin-sv/go-sdk` from 1.1.14 to 1.1.16 - [Release notes](https://github.com/bitcoin-sv/go-sdk/releases) - [Changelog](https://github.com/bitcoin-sv/go-sdk/blob/master/CHANGELOG.md) - [Commits](https://github.com/bitcoin-sv/go-sdk/compare/v1.1.14...v1.1.16) Updates `github.com/bitcoin-sv/go-sdk` from 1.1.14 to 1.1.16 - [Release notes](https://github.com/bitcoin-sv/go-sdk/releases) - [Changelog](https://github.com/bitcoin-sv/go-sdk/blob/master/CHANGELOG.md) - [Commits](https://github.com/bitcoin-sv/go-sdk/compare/v1.1.14...v1.1.16) --- updated-dependencies: - dependency-name: github.com/bitcoin-sv/go-sdk dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go_modules - dependency-name: github.com/bitcoin-sv/go-sdk dependency-type: indirect update-type: version-update:semver-patch dependency-group: go_modules ... Signed-off-by: dependabot[bot] --- examples/go.mod | 2 +- examples/go.sum | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 4b967cc..d2ed351 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 a41839d..bb96715 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.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= @@ -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= diff --git a/go.mod b/go.mod index 88bd832..2dd3d32 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.33 github.com/pquerna/otp v1.4.0 github.com/stretchr/testify v1.10.0 diff --git a/go.sum b/go.sum index 83afe01..a7d3e2d 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.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= From 6eee3bf30221eeeb8ade56c4329c44de9a7cd9ae Mon Sep 17 00:00:00 2001 From: ac4ch Date: Wed, 11 Dec 2024 11:45:40 +0100 Subject: [PATCH 2/2] build(deps): resolving conflicts --- go.sum | 7 ------- 1 file changed, 7 deletions(-) diff --git a/go.sum b/go.sum index 3349c5f..8571902 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,7 @@ -<<<<<<< HEAD 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.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/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.34 h1:9MMqlZSyCP+RFt0FNnwcbJEgUsRKy5w9Ga7FXHs/XXo= github.com/bitcoin-sv/spv-wallet/models v1.0.0-beta.34/go.mod h1:PEJdH9ZWKOiKHyOZkzYsRbKuZjzlRaEJy3GsM75Icdo= ->>>>>>> main 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=