Merge pull request #828 from NebulousLabs/version

bump version to v0.4.7

Makefile

@@ -52,7 +52,7 @@ release-std: REBUILD
 # Cross Compile - makes binaries for windows, linux, and mac, 32 and 64 bit.
 xc: dependencies test test-long REBUILD
 	goxc -arch="386 amd64 arm" -bc="darwin linux windows" -d=release \
-	     -pv=v0.4.6 -br=beta -include=LICENSE,README.md,doc/API.md   \
+	     -pv=v0.4.7 -br=beta -include=LICENSE,README.md,doc/API.md   \
 	     -main-dirs-exclude=siae -tasks-=deb,deb-dev,deb-source,go-test \
 	     -n=Sia
 

README.md

@@ -1,4 +1,4 @@
-Sia 0.4.6
+Sia 0.4.7
 =========
 
 [![Build Status](https://travis-ci.org/NebulousLabs/Sia.svg?branch=master)](https://travis-ci.org/NebulousLabs/Sia)
@@ -144,6 +144,9 @@ Version History
 
 October 2015:
 
+v0.4.7 (patch)
+- Dropped support for v0.3.3.x
+
 v0.4.6 (patch)
 - Removed over-agressive consistency check
 

build/version.go

@@ -6,7 +6,7 @@ import (
 )
 
 // Version is the current version of siad.
-const Version = "0.4.6"
+const Version = "0.4.7"
 
 // IsVersion returns whether str is a valid version number.
 func IsVersion(str string) bool {

modules/transactionpool.go

@@ -17,8 +17,7 @@ var (
 	ErrLargeTransactionSet     = errors.New("transaction set is too large for this transaction pool")
 	ErrInvalidArbPrefix        = errors.New("transaction contains non-standard arbitrary data")
 
-	PrefixNonSia    = types.Specifier{'N', 'o', 'n', 'S', 'i', 'a'}
-	PrefixStrNonSia = "NonSia" // COMPATv0.3.3.3
+	PrefixNonSia = types.Specifier{'N', 'o', 'n', 'S', 'i', 'a'}
 
 	TransactionPoolDir = "transactionpool"
 )

modules/transactionpool/standard.go

@@ -2,7 +2,6 @@ package transactionpool
 
 import (
 	"errors"
-	"strings"
 
 	"github.com/NebulousLabs/Sia/encoding"
 	"github.com/NebulousLabs/Sia/modules"
@@ -106,12 +105,6 @@ func (tp *TransactionPool) IsStandardTransaction(t types.Transaction) error {
 			continue
 		}
 
-		// COMPATv0.3.3.3 - deprecated whitelisted prefixes.
-		strData := string(arb)
-		if strings.HasPrefix(strData, modules.PrefixStrNonSia) {
-			continue
-		}
-
 		return modules.ErrInvalidArbPrefix
 	}
 	return nil