Merge branch 'v2' into master

BitcoinSchema · Jan 28, 2022 · e6bb7fd · e6bb7fd
2 parents ba2e4b1 + b7d7c76
commit e6bb7fd
Show file tree

Hide file tree

Showing 30 changed files with 91 additions and 56 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -31,3 +31,35 @@ updates:
     labels:
       - "chore"
     open-pull-requests-limit: 10
+
+  # Maintain dependencies for the core library (deprecated V1)
+  - package-ecosystem: "gomod"
+    target-branch: "v1"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      time: "10:00"
+      timezone: "UTC"
+    reviewers:
+      - "mrz1836"
+    assignees:
+      - "mrz1836"
+    labels:
+      - "chore"
+    open-pull-requests-limit: 10
+
+  # Maintain dependencies for GitHub Actions (deprecated V1)
+  - package-ecosystem: "github-actions"
+    target-branch: "v1"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+    reviewers:
+      - "mrz1836"
+    assignees:
+      - "mrz1836"
+    labels:
+      - "chore"
+    open-pull-requests-limit: 10
+
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -8,8 +8,6 @@ pull_request_rules:
     conditions:
       - -draft
       - author~=^dependabot(|-preview)\[bot\]$
-      - check-success='test (1.15.x, ubuntu-latest)'
-      - check-success='test (1.16.x, ubuntu-latest)'
       - check-success='test (1.17.x, ubuntu-latest)'
       - check-success='Analyze (go)'
       - title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\.
@@ -22,8 +20,6 @@ pull_request_rules:
   - name: Alert on major version detection
     conditions:
       - author~=^dependabot(|-preview)\[bot\]$
-      - check-success='test (1.15.x, ubuntu-latest)'
-      - check-success='test (1.16.x, ubuntu-latest)'
       - check-success='test (1.17.x, ubuntu-latest)'
       - check-success='Analyze (go)'
       - -title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\.
@@ -38,8 +34,6 @@ pull_request_rules:
   - name: Automatic Merge ⬇️ on Approval ✔
     conditions:
       - "#approved-reviews-by>=1"
-      - check-success='test (1.15.x, ubuntu-latest)'
-      - check-success='test (1.16.x, ubuntu-latest)'
       - check-success='test (1.17.x, ubuntu-latest)'
       - check-success='Analyze (go)'
       - label!=work-in-progress

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -17,7 +17,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [ 1.15.x, 1.16.x, 1.17.x ]
+        go-version: [ 1.17.x ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
 # go-bitcoin
 > A library for working with Bitcoin (BSV) transactions, addresses, keys, encryption, and more.
 
-[![Release](https://img.shields.io/github/release-pre/BitcoinSchema/go-bitcoin.svg?logo=github&style=flat&v=4)](https://github.com/BitcoinSchema/go-bitcoin/releases)
-[![Build Status](https://img.shields.io/github/workflow/status/BitcoinSchema/go-bitcoin/run-go-tests?logo=github&v=3)](https://github.com/BitcoinSchema/go-bitcoin/actions)
-[![Report](https://goreportcard.com/badge/github.com/BitcoinSchema/go-bitcoin?style=flat&v=4)](https://goreportcard.com/report/github.com/BitcoinSchema/go-bitcoin)
-[![codecov](https://codecov.io/gh/BitcoinSchema/go-bitcoin/branch/master/graph/badge.svg?v=4)](https://codecov.io/gh/BitcoinSchema/go-bitcoin)
-[![Go](https://img.shields.io/github/go-mod/go-version/BitcoinSchema/go-bitcoin?v=4)](https://golang.org/)
+[![Release](https://img.shields.io/github/release-pre/BitcoinSchema/go-bitcoin.svg?logo=github&style=flat&v=2)](https://github.com/BitcoinSchema/go-bitcoin/releases)
+[![Build Status](https://img.shields.io/github/workflow/status/BitcoinSchema/go-bitcoin/run-go-tests?logo=github&v=2)](https://github.com/BitcoinSchema/go-bitcoin/actions)
+[![Report](https://goreportcard.com/badge/github.com/BitcoinSchema/go-bitcoin?style=flat&v=2)](https://goreportcard.com/report/github.com/BitcoinSchema/go-bitcoin)
+[![codecov](https://codecov.io/gh/BitcoinSchema/go-bitcoin/branch/master/graph/badge.svg?v=2)](https://codecov.io/gh/BitcoinSchema/go-bitcoin)
+[![Go](https://img.shields.io/github/go-mod/go-version/BitcoinSchema/go-bitcoin?v=2)](https://golang.org/)
 <br>
-[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/BitcoinSchema/go-bitcoin)
-[![Mergify Status](https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/BitcoinSchema/go-bitcoin&style=flat&v=4)](https://mergify.io)
-[![Sponsor](https://img.shields.io/badge/sponsor-BitcoinSchema-181717.svg?logo=github&style=flat&v=4)](https://github.com/sponsors/BitcoinSchema)
-[![Donate](https://img.shields.io/badge/donate-bitcoin-ff9900.svg?logo=bitcoin&style=flat&v=4)](https://gobitcoinsv.com/#sponsor?utm_source=github&utm_medium=sponsor-link&utm_campaign=go-bitcoin&utm_term=go-bitcoin&utm_content=go-bitcoin)
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod&v=2)](https://gitpod.io/#https://github.com/BitcoinSchema/go-bitcoin)
+[![Mergify Status](https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/BitcoinSchema/go-bitcoin&style=flat&v=2)](https://mergify.io)
+[![Sponsor](https://img.shields.io/badge/sponsor-BitcoinSchema-181717.svg?logo=github&style=flat&v=2)](https://github.com/sponsors/BitcoinSchema)
+[![Donate](https://img.shields.io/badge/donate-bitcoin-ff9900.svg?logo=bitcoin&style=flat&v=2)](https://gobitcoinsv.com/#sponsor?utm_source=github&utm_medium=sponsor-link&utm_campaign=go-bitcoin&utm_term=go-bitcoin&utm_content=go-bitcoin)
 
 <br/>
 
@@ -33,7 +33,12 @@
 **go-bitcoin** requires a [supported release of Go](https://golang.org/doc/devel/release.html#policy).
 
 ```shell script
-go get -u github.com/bitcoinschema/go-bitcoin
+go get -u github.com/bitcoinschema/go-bitcoin/v2
+```
+
+> If you want to install the **deprecated V1**:
+```shell script
+go get -u github.com/bitcoinschema/go-bitcoin@v1
 ```
 
 <br/>
@@ -42,7 +47,7 @@ go get -u github.com/bitcoinschema/go-bitcoin
 
 View the generated [documentation](https://pkg.go.dev/github.com/bitcoinschema/go-bitcoin)
 
-[![GoDoc](https://godoc.org/github.com/bitcoinschema/go-bitcoin?status.svg&style=flat)](https://pkg.go.dev/github.com/bitcoinschema/go-bitcoin)
+[![GoDoc](https://godoc.org/github.com/bitcoinschema/go-bitcoin/?status.svg&style=flat)](https://pkg.go.dev/github.com/bitcoinschema/go-bitcoin)
 
 ### Features
 
@@ -156,7 +161,7 @@ vet                  Run the Go vet application
 
 ## Examples & Tests
 All unit tests and [examples](examples) run via [Github Actions](https://github.com/BitcoinSchema/go-bitcoin/actions) and
-uses [Go version 1.15.x](https://golang.org/doc/go1.15). View the [configuration file](.github/workflows/run-tests.yml).
+uses [Go version 1.17.x](https://golang.org/doc/go1.17). View the [configuration file](.github/workflows/run-tests.yml).
 
 Run all tests (including integration tests)
 
@@ -196,9 +201,9 @@ Checkout all the [examples](examples)!
 
 ## Maintainers
 
-| [<img src="https://github.com/rohenaz.png" height="50" alt="MrZ" />](https://github.com/rohenaz) | [<img src="https://github.com/mrz1836.png" height="50" alt="MrZ" />](https://github.com/mrz1836) |
-| :----------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------: |
-|                              [Satchmo](https://github.com/rohenaz)                               |                                [MrZ](https://github.com/mrz1836)                                 |
+| [<img src="https://github.com/mrz1836.png" height="50" alt="MrZ" />](https://github.com/mrz1836) | [<img src="https://github.com/rohenaz.png" height="50" alt="MrZ" />](https://github.com/rohenaz) |
+|:------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------:|
+|                                [MrZ](https://github.com/mrz1836)                                 |                              [Satchmo](https://github.com/rohenaz)                               |
 
 <br/>
 
@@ -219,4 +224,4 @@ or by making a [**bitcoin donation**](https://gobitcoinsv.com/#sponsor?utm_sourc
 
 ## License
 
-[![License](https://img.shields.io/github/license/BitcoinSchema/go-bitcoin.svg?style=flat&v=4)](LICENSE)
+[![License](https://img.shields.io/github/license/BitcoinSchema/go-bitcoin.svg?style=flat&v=2)](LICENSE)
diff --git a/examples/address_from_private_key/address_from_private_key.go b/examples/address_from_private_key/address_from_private_key.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/address_from_wif/address_from_wif.go b/examples/address_from_wif/address_from_wif.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/calculate_fee_for_tx/calculate_fee_for_tx.go b/examples/calculate_fee_for_tx/calculate_fee_for_tx.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/create_pubkey/create_pubkey.go b/examples/create_pubkey/create_pubkey.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/create_tx/create_tx.go b/examples/create_tx/create_tx.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 	"github.com/libsv/go-bt"
 )
 

diff --git a/examples/create_tx_using_wif/create_tx_using_wif.go b/examples/create_tx_using_wif/create_tx_using_wif.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/create_tx_with_change/create_tx_with_change.go b/examples/create_tx_with_change/create_tx_with_change.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/decrypt_with_private_key/decrypt_with_private_key.go b/examples/decrypt_with_private_key/decrypt_with_private_key.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/encrypt_shared_keys/encrypt_shared_keys.go b/examples/encrypt_shared_keys/encrypt_shared_keys.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 	"github.com/bitcoinsv/bsvd/bsvec"
 )
 

diff --git a/examples/encrypt_with_private_key/encrypt_with_private_key.go b/examples/encrypt_with_private_key/encrypt_with_private_key.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/generate_hd_key/generate_hd_key.go b/examples/generate_hd_key/generate_hd_key.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/get_address_from_hd_key/get_address_from_hd_key.go b/examples/get_address_from_hd_key/get_address_from_hd_key.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 	"github.com/bitcoinsv/bsvutil"
 )
 

diff --git a/examples/get_addresses_for_path/get_addresses_for_path.go b/examples/get_addresses_for_path/get_addresses_for_path.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/get_extended_public_key/get_extended_public_key.go b/examples/get_extended_public_key/get_extended_public_key.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/get_hd_key_from_xpub/get_hd_key_from_xpub.go b/examples/get_hd_key_from_xpub/get_hd_key_from_xpub.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/get_private_key_for_path/get_private_key_for_path.go b/examples/get_private_key_for_path/get_private_key_for_path.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 	"github.com/bitcoinsv/bsvd/bsvec"
 )
 

diff --git a/examples/get_public_keys_for_path/get_public_keys_for_path.go b/examples/get_public_keys_for_path/get_public_keys_for_path.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 	"github.com/bitcoinsv/bsvd/bsvec"
 )
 

diff --git a/examples/private_key_to_wif/private_key_to_wif.go b/examples/private_key_to_wif/private_key_to_wif.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/script_from_address/script_from_address.go b/examples/script_from_address/script_from_address.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/sign_message/sign_message.go b/examples/sign_message/sign_message.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/tx_from_hex/tx_from_hex.go b/examples/tx_from_hex/tx_from_hex.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/verify_signature/verify_signature.go b/examples/verify_signature/verify_signature.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/verify_signature_der/verify_signature_der.go b/examples/verify_signature_der/verify_signature_der.go
@@ -4,7 +4,7 @@ import (
 	"crypto/sha256"
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/examples/wif_to_private_key/wif_to_private_key.go b/examples/wif_to_private_key/wif_to_private_key.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/bitcoinschema/go-bitcoin"
+	"github.com/bitcoinschema/go-bitcoin/v2"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,13 +1,12 @@
-module github.com/bitcoinschema/go-bitcoin
+module github.com/bitcoinschema/go-bitcoin/v2
 
-go 1.15
+go 1.17
 
 require (
-	github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173
 	github.com/bitcoinsv/bsvlog v0.0.0-20181216181007-cb81b076bf2e // indirect
-	github.com/bitcoinsv/bsvutil v0.0.0-20181216182056-1d77cf353ea9
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/libsv/go-bt v1.0.4
-	github.com/stretchr/testify v1.7.0
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
+	github.com/libsv/go-bk v0.1.5 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )