From 829e87a733ddd013bdec130cdddb4663d8c454f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 3 Jan 2016 13:40:26 +0100 Subject: [PATCH 1/6] Replace *KoblitzCurve by elliptic.Curve Found via github.com/mvdan/interfacer. --- btcec/privkey.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/btcec/privkey.go b/btcec/privkey.go index 438323e6..fb21bdb6 100644 --- a/btcec/privkey.go +++ b/btcec/privkey.go @@ -6,6 +6,7 @@ package btcec import ( "crypto/ecdsa" + "crypto/elliptic" "crypto/rand" "math/big" ) @@ -17,7 +18,7 @@ type PrivateKey ecdsa.PrivateKey // PrivKeyFromBytes returns a private and public key for `curve' based on the // private key passed as an argument as a byte slice. -func PrivKeyFromBytes(curve *KoblitzCurve, pk []byte) (*PrivateKey, +func PrivKeyFromBytes(curve elliptic.Curve, pk []byte) (*PrivateKey, *PublicKey) { x, y := curve.ScalarBaseMult(pk) @@ -35,7 +36,7 @@ func PrivKeyFromBytes(curve *KoblitzCurve, pk []byte) (*PrivateKey, // NewPrivateKey is a wrapper for ecdsa.GenerateKey that returns a PrivateKey // instead of the normal ecdsa.PrivateKey. -func NewPrivateKey(curve *KoblitzCurve) (*PrivateKey, error) { +func NewPrivateKey(curve elliptic.Curve) (*PrivateKey, error) { key, err := ecdsa.GenerateKey(curve, rand.Reader) if err != nil { return nil, err From e24fe94f58e168d9f15d429a5967775cf42ed9fa Mon Sep 17 00:00:00 2001 From: David Hill Date: Tue, 5 Jan 2016 16:12:28 -0500 Subject: [PATCH 2/6] chaincfg: Remove testnet-seed.alexykot.me, it is defunct. --- chaincfg/params.go | 1 - 1 file changed, 1 deletion(-) diff --git a/chaincfg/params.go b/chaincfg/params.go index e9412459..b4be3d79 100644 --- a/chaincfg/params.go +++ b/chaincfg/params.go @@ -226,7 +226,6 @@ var TestNet3Params = Params{ Net: wire.TestNet3, DefaultPort: "18333", DNSSeeds: []string{ - "testnet-seed.alexykot.me", "testnet-seed.bitcoin.schildbach.de", "testnet-seed.bitcoin.petertodd.org", "testnet-seed.bluematt.me", From 7996eb1f9deee90a070e2d6455c71bd5738192f5 Mon Sep 17 00:00:00 2001 From: Javed Khan Date: Wed, 16 Dec 2015 23:49:27 +0530 Subject: [PATCH 3/6] peer: drain chans before exiting peerHandler Also disconnect the failed peer to allow the peerDoneHandler goroutine to exit, instead of hanging around. Fixes #583. --- server.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/server.go b/server.go index de1c584e..8d62f148 100644 --- a/server.go +++ b/server.go @@ -1494,7 +1494,7 @@ func (s *server) peerConnHandler(sp *serverPeer) { err := s.establishConn(sp) if err != nil { srvrLog.Debugf("Failed to connect to %s: %v", sp.Addr(), err) - s.donePeers <- sp + sp.Disconnect() } } @@ -1730,6 +1730,23 @@ out: } s.blockManager.Stop() s.addrManager.Stop() + + // Drain channels before exiting so nothing is left waiting around + // to send. +cleanup: + for { + select { + case <-s.newPeers: + case <-s.donePeers: + case <-s.peerHeightsUpdate: + case <-s.relayInv: + case <-s.broadcast: + case <-s.wakeup: + case <-s.query: + default: + break cleanup + } + } s.wg.Done() srvrLog.Tracef("Peer handler done") } From 1944637333bce1d7adbd74c8c693cf0f8d286454 Mon Sep 17 00:00:00 2001 From: Mawuli Adzoe Date: Wed, 6 Jan 2016 15:27:39 -0700 Subject: [PATCH 4/6] Bump copyright date to reflect fixes since the beginning of this year. --- server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.go b/server.go index 8d62f148..dff3b23c 100644 --- a/server.go +++ b/server.go @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2015 The btcsuite developers +// Copyright (c) 2013-2016 The btcsuite developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. From f5ded656366989112afa359733a4a90d38bf8a8a Mon Sep 17 00:00:00 2001 From: Mawuli Adzoe Date: Thu, 7 Jan 2016 09:01:51 -0700 Subject: [PATCH 5/6] Change copyright date for code that was updated this year(2016). --- btcec/privkey.go | 2 +- params.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/btcec/privkey.go b/btcec/privkey.go index fb21bdb6..676a8c3f 100644 --- a/btcec/privkey.go +++ b/btcec/privkey.go @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2014 The btcsuite developers +// Copyright (c) 2013-2016 The btcsuite developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. diff --git a/params.go b/params.go index 27305cfb..14eeff07 100644 --- a/params.go +++ b/params.go @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2014 The btcsuite developers +// Copyright (c) 2013-2016 The btcsuite developers // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. From 407fcc2aafa96d2bbd06b1ad2345abd5353d2ec8 Mon Sep 17 00:00:00 2001 From: Jonathan Zeppettini Date: Sat, 23 Jan 2016 16:06:10 -0500 Subject: [PATCH 6/6] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 671b93e1..ea6a3d2d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013-2015 The btcsuite developers +Copyright (c) 2013-2016 The btcsuite developers Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above