feat(SPV-936): upgrade to go-sdk

authentication.go

@@ -6,16 +6,24 @@
 	"net/http"
 	"time"
 
+	bip32 "github.com/bitcoin-sv/go-sdk/compat/bip32"
+	bec "github.com/bitcoin-sv/go-sdk/primitives/ec"
+	bscript "github.com/bitcoin-sv/go-sdk/script"
+	sighash "github.com/bitcoin-sv/go-sdk/transaction/sighash"
+
 	"github.com/bitcoin-sv/spv-wallet-go-client/utils"
 	"github.com/bitcoin-sv/spv-wallet/models"
 	"github.com/bitcoinschema/go-bitcoin/v2"
-	"github.com/libsv/go-bk/bec"
-	"github.com/libsv/go-bk/bip32"
 	"github.com/libsv/go-bt/v2"
-	"github.com/libsv/go-bt/v2/bscript"
-	"github.com/libsv/go-bt/v2/sighash"
 )
 
+// TODO: Issues with "github.com/bitcoinschema/go-bitcoin/v2"
+
+// TODO: Tx - go-sdk txJSON ?
+// TODO: NewTxFromString - no replacement in v2
+// TODO: NewFromHexString - no replacement in v2
+// TODO: NewP2PKHUnlockingScript - not found
+
 // SetSignature will set the signature on the header for the request
 func setSignature(header *http.Header, xPriv *bip32.ExtendedKey, bodyString string) error {
 	// Create the signature
@@ -60,11 +68,11 @@
 
 func setPreviousTxScript(tx *bt.Tx, inputIndex uint32, dst *models.Destination) (err error) {
 	var ls *bscript.Script
 	if ls, err = bscript.NewFromHexString(dst.LockingScript); err != nil {
 		return
 	}
 
 	tx.Inputs[inputIndex].PreviousTxScript = ls
 	return
 }
 
@@ -79,14 +87,14 @@
 		return
 	}
 
 	tx.Inputs[inputIndex].UnlockingScript = s
 	return
 }
 
 func getDerivedKeyForDestination(xPriv *bip32.ExtendedKey, dst *models.Destination) (key *bec.PrivateKey, err error) {
 	// Derive the child key (m/chain/num)
 	var derivedKey *bip32.ExtendedKey
 	if derivedKey, err = bitcoin.GetHDKeyByPath(xPriv, dst.Chain, dst.Num); err != nil {
 		return
 	}
 
@@ -99,7 +107,7 @@
 		}
 	}
 
 	if key, err = bitcoin.GetPrivateKeyFromHDKey(derivedKey); err != nil {
 		return
 	}
 
@@ -110,7 +118,7 @@
 func getUnlockingScript(tx *bt.Tx, inputIndex uint32, privateKey *bec.PrivateKey) (*bscript.Script, error) {
 	sigHashFlags := sighash.AllForkID
 
 	sigHash, err := tx.CalcInputSignatureHash(inputIndex, sigHashFlags)
 	if err != nil {
 		return nil, err
 	}
@@ -124,7 +132,7 @@
 	signature := sig.Serialise()
 
 	var script *bscript.Script
 	if script, err = bscript.NewP2PKHUnlockingScript(pubKey, signature, sigHashFlags); err != nil {
 		return nil, err
 	}
 
@@ -142,7 +150,7 @@
 	// Get the xPub
 	payload = new(models.AuthPayload)
 	if payload.XPub, err = bitcoin.GetExtendedPublicKey(
 		xPriv,
 	); err != nil { // Should never error if key is correct
 		return
 	}

client_options.go

@@ -5,12 +5,17 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/bitcoinschema/go-bitcoin/v2"
-	"github.com/libsv/go-bk/bec"
+	bec "github.com/bitcoin-sv/go-sdk/primitives/ec"
 	"github.com/libsv/go-bk/wif"
+
+	"github.com/bitcoinschema/go-bitcoin/v2"
+
 	"github.com/pkg/errors"
 )
 
+// TODO: Issues with "github.com/bitcoinschema/go-bitcoin/v2"
+// TODO: wif "github.com/bitcoin-sv/go-sdk/compat/wif" - is not found although used in the go-sdk repo?
+
 // configurator is the interface for configuring WalletClient
 type configurator interface {
 	Configure(c *WalletClient)

http.go

@@ -10,14 +10,16 @@ import (
 	"net/http"
 	"strconv"
 
+	bip32 "github.com/bitcoin-sv/go-sdk/compat/bip32"
+	bec "github.com/bitcoin-sv/go-sdk/primitives/ec"
 	"github.com/bitcoin-sv/spv-wallet-go-client/utils"
 	"github.com/bitcoin-sv/spv-wallet/models"
 	"github.com/bitcoin-sv/spv-wallet/models/filter"
 	"github.com/bitcoinschema/go-bitcoin/v2"
-	"github.com/libsv/go-bk/bec"
-	"github.com/libsv/go-bk/bip32"
 )
 
+// TODO: Issues with "github.com/bitcoinschema/go-bitcoin/v2"
+
 // SetSignRequest turn the signing of the http request on or off
 func (wc *WalletClient) SetSignRequest(signRequest bool) {
 	wc.signRequest = signRequest

totp.go

@@ -7,15 +7,17 @@ import (
 	"fmt"
 	"time"
 
+	bip32 "github.com/bitcoin-sv/go-sdk/compat/bip32"
+	bec "github.com/bitcoin-sv/go-sdk/primitives/ec"
 	"github.com/bitcoin-sv/spv-wallet-go-client/utils"
 	"github.com/bitcoin-sv/spv-wallet/models"
 	"github.com/bitcoinschema/go-bitcoin/v2"
-	"github.com/libsv/go-bk/bec"
-	"github.com/libsv/go-bk/bip32"
 	"github.com/pquerna/otp"
 	"github.com/pquerna/otp/totp"
 )
 
+// TODO: Issues with "github.com/bitcoinschema/go-bitcoin/v2"
+
 // ErrClientInitNoXpriv error per init client with first xpriv key
 var ErrClientInitNoXpriv = errors.New("init client with xPriv first")
 
@@ -123,7 +125,7 @@ func convertPubKey(pubKey string) (*bec.PublicKey, error) {
 		return nil, err
 	}
 
-	return bec.ParsePubKey(hex, bec.S256())
+	return bec.ParsePubKey(hex)
 }
 
 // directedSecret appends a paymail to the secret and encodes it into base32 string

totp_test.go

@@ -7,10 +7,10 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	bip32 "github.com/bitcoin-sv/go-sdk/compat/bip32"
 	"github.com/bitcoin-sv/spv-wallet-go-client/fixtures"
 	"github.com/bitcoin-sv/spv-wallet-go-client/xpriv"
 	"github.com/bitcoin-sv/spv-wallet/models"
-	"github.com/libsv/go-bk/bip32"
 	"github.com/stretchr/testify/require"
 )
 

utils/utils.go

@@ -8,7 +8,7 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/libsv/go-bk/bip32"
+	bip32 "github.com/bitcoin-sv/go-sdk/compat/bip32"
 )
 
 const (

walletclient.go

@@ -3,8 +3,8 @@ package walletclient
 import (
 	"net/http"
 
-	"github.com/libsv/go-bk/bec"
-	"github.com/libsv/go-bk/bip32"
+	bip32 "github.com/bitcoin-sv/go-sdk/compat/bip32"
+	bec "github.com/bitcoin-sv/go-sdk/primitives/ec"
 )
 
 // WalletClient is the spv wallet Go client representation.

xpriv/xpriv.go

@@ -1,14 +1,19 @@
 // Package xpriv manges keys
 package xpriv
 
+// "github.com/libsv/go-bk/bip39" - no replacements
+
 import (
 	"fmt"
 
-	"github.com/libsv/go-bk/bip32"
+	bip32 "github.com/bitcoin-sv/go-sdk/compat/bip32"
+	chaincfg "github.com/bitcoin-sv/go-sdk/transaction/chaincfg"
+
 	"github.com/libsv/go-bk/bip39"
-	"github.com/libsv/go-bk/chaincfg"
 )
 
+// TODO: "github.com/libsv/go-bk/bip39" - no replacement (GenerateEntropy, Mnemonic, MnemonicToSeed)
+
 // Keys is a struct containing the xpriv, xpub and mnemonic
 type Keys struct {
 	xpriv    string