txscript: Fix typo in README

CHANGES

@@ -1,6 +1,6 @@
 ============================================================================
-User visible changes for btcd
-  A full-node bitcoin implementation written in Go
+User visible changes for dcrd
+  A full-node decred implementation written in Go
 ============================================================================
 
 Changes in 0.11.1 (Wed May 27 2015)
@@ -44,7 +44,7 @@ Changes in 0.11.0 (Wed May 06 2015)
       forking from the network on non-standard transactions (#425)
     - Add a new checkpoint at block height 352940 (#418)
     - Optimized script execution (#395, #400, #404, #409)
-    - Fix a case that could lead stalled syncs (#138, #296) 
+    - Fix a case that could lead stalled syncs (#138, #296)
   - Network address manager changes:
     - Implement eclipse attack countermeasures as proposed in
       http://cs-people.bu.edu/heilman/eclipse (#370, #373)
@@ -513,7 +513,7 @@ Changes in 0.7.0 (Thu Feb 20 2014)
     - Add getnetworkhashps command
     - Add gettransaction command (wallet-specific)
     - Add signmessage command (wallet-specific)
-    - Update getwork command to accept 
+    - Update getwork command to accept
   - Continue cleanup and work on implementing the RPC API:
     - Implement getnettotals command
       (https://github.com/conformal/btcd/issues/84)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015 The btcsuite developers
+Copyright (c) 2013-2016 The btcsuite developers
 Copyright (c) 2015-2016 The Decred developers
 
 Permission to use, copy, modify, and distribute this software for any

docs/code_contribution_guidelines.md

@@ -67,7 +67,7 @@ security and performance implications.
 
 - [Effective Go](http://golang.org/doc/effective_go.html) - The entire dcrd
   suite follows the guidelines in this document.  For your code to be accepted,
-  it must follow the guidelinestherein.
+  it must follow the guidelines therein.
 - [Original Satoshi Whitepaper](http://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&ved=0CCkQFjAA&url=http%3A%2F%2Fbitcoin.org%2Fbitcoin.pdf&ei=os3VUuH8G4SlsASV74GoAg&usg=AFQjCNEipPLigou_1MfB7DQjXCNdlylrBg&sig2=FaHDuT5z36GMWDEnybDJLg&bvm=bv.59378465,d.b2I) - This is the white paper that started it all.  Having a solid
   foundation to build on will make the code much more comprehensible.
 

params.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2014 The btcsuite developers
+// Copyright (c) 2013-2016 The btcsuite developers
 // Copyright (c) 2015 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.

peer/peer.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2015 The btcsuite developers
+// Copyright (c) 2013-2016 The btcsuite developers
 // Copyright (c) 2016 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
@@ -11,7 +11,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	prand "math/rand"
+	"math/rand"
 	"net"
 	"strconv"
 	"sync"
@@ -821,36 +821,34 @@ func (p *Peer) pushVersionMsg() error {
 // addresses.  This function is useful over manually sending the message via
 // QueueMessage since it automatically limits the addresses to the maximum
 // number allowed by the message and randomizes the chosen addresses when there
-// are too many.  No message will be sent if there are no entries in the
-// provided addresses slice.
-// It is safe for concurrent access.
+// are too many.  It returns the addresses that were actually sent and no
+// message will be sent if there are no entries in the provided addresses slice.
+//
+// This function is safe for concurrent access.
 func (p *Peer) PushAddrMsg(addresses []*wire.NetAddress) ([]*wire.NetAddress, error) {
+
 	// Nothing to send.
 	if len(addresses) == 0 {
 		return nil, nil
 	}
 
-	r := prand.New(prand.NewSource(time.Now().UnixNano()))
-	numAdded := 0
 	msg := wire.NewMsgAddr()
-	for _, na := range addresses {
-		// Randomize the list with the remaining addresses when the
-		// max addresses limit has been reached.
-		if numAdded == wire.MaxAddrPerMsg {
-			msg.AddrList[r.Intn(wire.MaxAddrPerMsg)] = na
-			continue
+	msg.AddrList = make([]*wire.NetAddress, len(addresses))
+	copy(msg.AddrList, addresses)
+
+	// Randomize the addresses sent if there are more than the maximum allowed.
+	if len(msg.AddrList) > wire.MaxAddrPerMsg {
+		// Shuffle the address list.
+		for i := range msg.AddrList {
+			j := rand.Intn(i + 1)
+			msg.AddrList[i], msg.AddrList[j] = msg.AddrList[j], msg.AddrList[i]
 		}
 
-		// Add the address to the message.
-		err := msg.AddAddress(na)
-		if err != nil {
-			return nil, err
-		}
-		numAdded++
-	}
-	if numAdded > 0 {
-		p.QueueMessage(msg, nil)
+		// Truncate it to the maximum size.
+		msg.AddrList = msg.AddrList[:wire.MaxAddrPerMsg]
 	}
+
+	p.QueueMessage(msg, nil)
 	return msg.AddrList, nil
 }
 
@@ -2065,3 +2063,7 @@ func NewOutboundPeer(cfg *Config, addr string) (*Peer, error) {
 
 	return p, nil
 }
+
+func init() {
+	rand.Seed(time.Now().UnixNano())
+}

server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2015 The btcsuite developers
+// Copyright (c) 2013-2016 The btcsuite developers
 // Copyright (c) 2015-2016 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.

txscript/README.md

@@ -15,7 +15,7 @@ package for any projects needing to use or validate decred transaction scripts.
 
 ## Decred Scripts
 
-Decred provides a stack-based, FORTH-like langauge for the scripts in
+Decred provides a stack-based, FORTH-like language for the scripts in
 the decred transactions.  This language is not turing complete
 although it is still fairly powerful.
 

txscript/data/script_valid.json

@@ -257,8 +257,8 @@
 ["'abcdefghijklmnopqrstuvwxyz'", "HASH256 0x4c 0x20 0x513d6e9cb7f369fa60933bc48818da2cd0c0a079ebdd29a0cce382d4625dcb39 EQUAL", "P2SH,STRICTENC"],
 
 
-["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"],
-["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"],
+["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"],
+["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"],
 
 ["1", "NOP", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "Discourage NOPx flag allows OP_NOP"],
 
@@ -467,7 +467,7 @@
 ["NOP", "1", "P2SH,STRICTENC"],
 
 ["NOP", "NOP1 1", "P2SH,STRICTENC"],
-["NOP", "NOP2 1", "P2SH,STRICTENC"],
+["NOP", "CHECKLOCKTIMEVERIFY 1", "P2SH,STRICTENC"],
 ["NOP", "NOP3 1", "P2SH,STRICTENC"],
 ["NOP", "NOP4 1", "P2SH,STRICTENC"],
 ["NOP", "NOP5 1", "P2SH,STRICTENC"],

txscript/sigcache.go

@@ -40,7 +40,7 @@ type SigCache struct {
 
 // NewSigCache creates and initializes a new instance of SigCache. Its sole
 // parameter 'maxEntries' represents the maximum number of entries allowed to
-// exist in the SigCache and any particular moment. Random entries are evicted
+// exist in the SigCache at any particular moment. Random entries are evicted
 // to make room for new entries that would cause the number of entries in the
 // cache to exceed the max.
 func NewSigCache(maxEntries uint) *SigCache {
@@ -64,7 +64,7 @@ func (s *SigCache) Exists(sigHash chainhash.Hash, sig chainec.Signature, pubKey
 
 // Add adds an entry for a signature over 'sigHash' under public key 'pubKey'
 // to the signature cache. In the event that the SigCache is 'full', an
-// existing entry it randomly chosen to be evicted in order to make space for
+// existing entry is randomly chosen to be evicted in order to make space for
 // the new entry.
 //
 // NOTE: This function is safe for concurrent access. Writers will block

txscript/sigcache_test.go

@@ -14,8 +14,8 @@ import (
 	"github.com/decred/dcrd/chaincfg/chainhash"
 )
 
-// genRandomSig returns a random message, public key, and a signature of the
-// message under the public key. This function is used to generate randomized
+// genRandomSig returns a random message, a signature of the message under the
+// public key and the public key. This function is used to generate randomized
 // test data.
 func genRandomSig() (*chainhash.Hash, chainec.Signature, chainec.PublicKey, error) {
 	secp256k1 := chainec.Secp256k1
@@ -94,7 +94,7 @@ func TestSigCacheAddEvictEntry(t *testing.T) {
 	}
 
 	// Add a new entry, this should cause eviction of a randomly chosen
-	// previously entry.
+	// previous entry.
 	msgNew, sigNew, keyNew, err := genRandomSig()
 	if err != nil {
 		t.Fatalf("unable to generate random signature test data")

wire/message.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2015 The btcsuite developers
+// Copyright (c) 2013-2016 The btcsuite developers
 // Copyright (c) 2015 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
@@ -254,19 +254,17 @@ func WriteMessageN(w io.Writer, msg Message, pver uint32, dcrnet CurrencyNet) (i
 
 	// Write header.
 	n, err := w.Write(hw.Bytes())
+	totalBytes += n
 	if err != nil {
-		totalBytes += n
 		return totalBytes, err
 	}
-	totalBytes += n
 
 	// Write payload.
 	n, err = w.Write(payload)
+	totalBytes += n
 	if err != nil {
-		totalBytes += n
 		return totalBytes, err
 	}
-	totalBytes += n
 
 	return totalBytes, nil
 }
@@ -289,11 +287,10 @@ func WriteMessage(w io.Writer, msg Message, pver uint32, dcrnet CurrencyNet) err
 func ReadMessageN(r io.Reader, pver uint32, dcrnet CurrencyNet) (int, Message, []byte, error) {
 	totalBytes := 0
 	n, hdr, err := readMessageHeader(r)
+	totalBytes += n
 	if err != nil {
-		totalBytes += n
 		return totalBytes, nil, nil, err
 	}
-	totalBytes += n
 
 	// Enforce maximum message payload.
 	if hdr.length > MaxMessagePayload {
@@ -342,11 +339,10 @@ func ReadMessageN(r io.Reader, pver uint32, dcrnet CurrencyNet) (int, Message, [
 	// Read payload.
 	payload := make([]byte, hdr.length)
 	n, err = io.ReadFull(r, payload)
+	totalBytes += n
 	if err != nil {
-		totalBytes += n
 		return totalBytes, nil, nil, err
 	}
-	totalBytes += n
 
 	// Test checksum.
 	checksum := chainhash.HashFuncB(payload)[0:4]

wire/msgversion.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2015 The btcsuite developers
+// Copyright (c) 2013-2016 The btcsuite developers
 // Copyright (c) 2015 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
@@ -62,10 +62,7 @@ type MsgVersion struct {
 // HasService returns whether the specified service is supported by the peer
 // that generated the message.
 func (msg *MsgVersion) HasService(service ServiceFlag) bool {
-	if msg.Services&service == service {
-		return true
-	}
-	return false
+	return msg.Services&service == service
 }
 
 // AddService adds service as a supported service by the peer generating the