Skip to content

Commit f85243b

Browse files
removing references to legacy libraries (#10)
* removing references to legacy libraries * ump to 1.17 * re-vendor * revendor with 1.17 * keep original copyright
1 parent dbd220e commit f85243b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+19435
-34
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ISC License
22

3-
Copyright (c) 2018-2020 The libsv developers
3+
Copyright (c) 2018-2021 The libsv developers
44

55
Permission to use, copy, modify, and distribute this software for any
66
purpose with or without fee is hereby granted, provided that the above

bip32/bench_test.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ package bip32_test
77
import (
88
"testing"
99

10-
"github.com/bitcoinsv/bsvutil/hdkeychain"
11-
1210
"github.com/libsv/go-bk/bip32"
1311
)
1412

@@ -28,15 +26,15 @@ func BenchmarkDeriveHardened(b *testing.B) {
2826
b.StartTimer()
2927

3028
for i := 0; i < b.N; i++ {
31-
masterKey.Child(hdkeychain.HardenedKeyStart)
29+
masterKey.Child(bip32.HardenedKeyStart)
3230
}
3331
}
3432

3533
// BenchmarkDeriveNormal benchmarks how long it takes to derive a normal
3634
// (non-hardened) child from a master private extended key.
3735
func BenchmarkDeriveNormal(b *testing.B) {
3836
b.StopTimer()
39-
masterKey, err := hdkeychain.NewKeyFromString(bip0032MasterPriv1)
37+
masterKey, err := bip32.NewKeyFromString(bip0032MasterPriv1)
4038
if err != nil {
4139
b.Errorf("Failed to decode master seed: %v", err)
4240
}
@@ -51,7 +49,7 @@ func BenchmarkDeriveNormal(b *testing.B) {
5149
// key to a public extended key.
5250
func BenchmarkPrivToPub(b *testing.B) {
5351
b.StopTimer()
54-
masterKey, err := hdkeychain.NewKeyFromString(bip0032MasterPriv1)
52+
masterKey, err := bip32.NewKeyFromString(bip0032MasterPriv1)
5553
if err != nil {
5654
b.Errorf("Failed to decode master seed: %v", err)
5755
}
@@ -66,15 +64,15 @@ func BenchmarkPrivToPub(b *testing.B) {
6664
// extended key.
6765
func BenchmarkDeserialise(b *testing.B) {
6866
for i := 0; i < b.N; i++ {
69-
hdkeychain.NewKeyFromString(bip0032MasterPriv1)
67+
bip32.NewKeyFromString(bip0032MasterPriv1)
7068
}
7169
}
7270

7371
// BenchmarkSerialise benchmarks how long it takes to serialise a private
7472
// extended key.
7573
func BenchmarkSerialise(b *testing.B) {
7674
b.StopTimer()
77-
masterKey, err := hdkeychain.NewKeyFromString(bip0032MasterPriv1)
75+
masterKey, err := bip32.NewKeyFromString(bip0032MasterPriv1)
7876
if err != nil {
7977
b.Errorf("Failed to decode master seed: %v", err)
8078
}

bip32/example_test.go

+11-19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Copyright (c) 2014 The btcsuite developers
2+
// Copyright (c) 2021 The libsv developers
23
// Use of this source code is governed by an ISC
34
// license that can be found in the LICENSE file.
45

@@ -7,8 +8,7 @@ package bip32_test
78
import (
89
"fmt"
910

10-
"github.com/bitcoinsv/bsvd/chaincfg"
11-
"github.com/bitcoinsv/bsvutil/hdkeychain"
11+
"github.com/libsv/go-bk/chaincfg"
1212

1313
"github.com/libsv/go-bk/bip32"
1414
)
@@ -17,14 +17,14 @@ import (
1717
// then use it to create a new master node (extended key).
1818
func ExampleNewMaster() {
1919
// Generate a random seed at the recommended length.
20-
seed, err := bip32.GenerateSeed(hdkeychain.RecommendedSeedLen)
20+
seed, err := bip32.GenerateSeed(bip32.RecommendedSeedLen)
2121
if err != nil {
2222
fmt.Println(err)
2323
return
2424
}
2525

2626
// Generate a new master node using the seed.
27-
key, err := hdkeychain.NewMaster(seed, &chaincfg.MainNetParams)
27+
key, err := bip32.NewMaster(seed, &chaincfg.MainNet)
2828
if err != nil {
2929
fmt.Println(err)
3030
return
@@ -65,15 +65,15 @@ func Example_defaultWalletLayout() {
6565
// Start by getting an extended key instance for the master node.
6666
// This gives the path:
6767
// m
68-
masterKey, err := hdkeychain.NewKeyFromString(master)
68+
masterKey, err := bip32.NewKeyFromString(master)
6969
if err != nil {
7070
fmt.Println(err)
7171
return
7272
}
7373

7474
// Derive the extended key for account 0. This gives the path:
7575
// m/0H
76-
acct0, err := masterKey.Child(hdkeychain.HardenedKeyStart + 0)
76+
acct0, err := masterKey.Child(bip32.HardenedKeyStart + 0)
7777
if err != nil {
7878
fmt.Println(err)
7979
return
@@ -120,22 +120,14 @@ func Example_defaultWalletLayout() {
120120

121121
// Get and show the address associated with the extended keys for the
122122
// main bitcoin network.
123-
acct0ExtAddr, err := acct0Ext10.Address(&chaincfg.MainNetParams)
124-
if err != nil {
125-
fmt.Println(err)
126-
return
127-
}
128-
acct0IntAddr, err := acct0Int0.Address(&chaincfg.MainNetParams)
129-
if err != nil {
130-
fmt.Println(err)
131-
return
132-
}
123+
acct0ExtAddr := acct0Ext10.Address(&chaincfg.MainNet)
124+
acct0IntAddr := acct0Int0.Address(&chaincfg.MainNet)
133125
fmt.Println("Account 0 External Address 10:", acct0ExtAddr)
134126
fmt.Println("Account 0 Internal Address 0:", acct0IntAddr)
135127

136128
// Output:
137-
// Account 0 External Address 10: qz6wkeydwnmhsf0w9ac4rwhnx8jmlqsp9yvnt5qaux
138-
// Account 0 Internal Address 0: qzak20c4paxssre0a2zvgk8e0r22p06j9s20636fgv
129+
// Account 0 External Address 10: 1HVccubUT8iKTapMJ5AnNA4sLRN27xzQ4F
130+
// Account 0 Internal Address 0: 1J5rebbkQaunJTUoNVREDbeB49DqMNFFXk
139131
}
140132

141133
// This example demonstrates the audits use case in BIP0032.
@@ -161,7 +153,7 @@ func Example_audits() {
161153
// Start by getting an extended key instance for the master node.
162154
// This gives the path:
163155
// m
164-
masterKey, err := hdkeychain.NewKeyFromString(master)
156+
masterKey, err := bip32.NewKeyFromString(master)
165157
if err != nil {
166158
fmt.Println(err)
167159
return

go.mod

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
module github.com/libsv/go-bk
22

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173
7-
github.com/bitcoinsv/bsvutil v0.0.0-20181216182056-1d77cf353ea9
86
github.com/davecgh/go-spew v1.1.1
97
github.com/stretchr/testify v1.7.0
108
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
119
)
10+
11+
require (
12+
github.com/pmezard/go-difflib v1.0.0 // indirect
13+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
14+
)

go.sum

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173 h1:2yTIV9u7H0BhRDGXH5xrAwAz7XibWJtX2dNezMeNsUo=
2-
github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173/go.mod h1:BZ1UcC9+tmcDEcdVXgpt13hMczwJxWzpAn68wNs7zRA=
3-
github.com/bitcoinsv/bsvutil v0.0.0-20181216182056-1d77cf353ea9 h1:hFI8rT84FCA0FFy3cFrkW5Nz4FyNKlIdCvEvvTNySKg=
4-
github.com/bitcoinsv/bsvutil v0.0.0-20181216182056-1d77cf353ea9/go.mod h1:p44KuNKUH5BC8uX4ONEODaHUR4+ibC8todEAOGQEJAM=
51
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
62
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
73
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

vendor/github.com/davecgh/go-spew/LICENSE

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/davecgh/go-spew/spew/bypass.go

+145
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/davecgh/go-spew/spew/bypasssafe.go

+38
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)