Merge pull request #42 from gcash/schnorr

Update depenencies to use schnorr sigs

Gopkg.toml

@@ -26,16 +26,16 @@
 
 
 [[constraint]]
-  branch = "master"
-  name = "github.com/btcsuite/golangcrypto"
+  name = "github.com/boltdb/bolt"
+  version = "1.3.1"
 
 [[constraint]]
   branch = "master"
-  name = "github.com/btcsuite/websocket"
+  name = "github.com/btcsuite/golangcrypto"
 
 [[constraint]]
   branch = "master"
-  name = "github.com/boltdb/bolt"
+  name = "github.com/btcsuite/websocket"
 
 [[constraint]]
   branch = "master"
@@ -59,7 +59,7 @@
 
 [[constraint]]
   name = "github.com/golang/protobuf"
-  version = "1.2.0"
+  version = "1.3.1"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"
@@ -73,6 +73,10 @@
   branch = "master"
   name = "github.com/lightninglabs/gozmq"
 
+[[constraint]]
+  name = "github.com/miekg/dns"
+  version = "1.1.9"
+
 [[constraint]]
   name = "github.com/tyler-smith/go-bip39"
   version = "1.0.0"
@@ -87,11 +91,11 @@
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.16.0"
+  version = "1.20.1"
 
 [[constraint]]
-  name = "github.com/miekg/dns"
-  version = "1.1.3"
+  name = "gopkg.in/jarcoal/httpmock.v1"
+  version = "1.0.4"
 
 [prune]
   go-tests = true

pymtproto/paymentprotocol.go

@@ -3,13 +3,13 @@ package pymtproto
 import (
 	"bytes"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"github.com/gcash/bchd/chaincfg"
 	"github.com/gcash/bchd/txscript"
 	"github.com/gcash/bchd/wire"
 	"github.com/gcash/bchutil"
 	"github.com/gcash/bchwallet/pymtproto/payments"
-	"github.com/go-errors/errors"
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/proxy"
 	"io/ioutil"

votingpool/withdrawal.go

@@ -888,7 +888,7 @@ func getRawSigs(transactions []*withdrawalTx) (map[Ntxid]TxSigs, error) {
 					}
 					log.Debugf("Generating raw sig for input %d of tx %s with privkey of %s",
 						inputIdx, ntxid, pubKey.String())
-					sig, err = txscript.RawTxInSignature(
+					sig, err = txscript.RawTxInECDSASignature(
 						msgtx, inputIdx, redeemScript, txscript.SigHashAll, ecPrivKey, int64(input.Amount.ToUnit(bchutil.AmountSatoshi)))
 					if err != nil {
 						return nil, newError(ErrRawSigning, "failed to generate raw signature", err)

waddrmgr/scoped_manager.go

@@ -1,8 +1,8 @@
 package waddrmgr
 
 import (
+	"errors"
 	"fmt"
-	"github.com/go-errors/errors"
 	"sync"
 
 	"github.com/gcash/bchd/bchec"