Merge branch 'master' into benches

Conflicts:
	sync/trymutex_test.go

Author: David Vorick

CHANGELOG.md

@@ -3,6 +3,11 @@ Version History
 
 April 2017:
 
+v1.2.1 (patch release)
+- Faster host upgrading
+- Fix wallet bugs
+- Add siac command to cancel allowance
+
 v1.2.0 (minor release)
 - Host overhaul
 - Wallet overhaul

README.md

@@ -1,4 +1,4 @@
-# [![Sia Logo](http://sia.tech/img/svg/sia-green-logo.svg)](http://sia.tech) v1.2.0 (Blue Moon)
+# [![Sia Logo](http://sia.tech/img/svg/sia-green-logo.svg)](http://sia.tech) v1.2.1 (Blue Moon)
 
 [![Build Status](https://travis-ci.org/NebulousLabs/Sia.svg?branch=master)](https://travis-ci.org/NebulousLabs/Sia)
 [![GoDoc](https://godoc.org/github.com/NebulousLabs/Sia?status.svg)](https://godoc.org/github.com/NebulousLabs/Sia)

api/renter.go

@@ -19,7 +19,7 @@ import (
 
 var (
 	// recommendedHosts is the number of hosts that the renter will form
-	// contracts with if the value is not specified explicity in the call to
+	// contracts with if the value is not specified explicitly in the call to
 	// SetSettings.
 	recommendedHosts = build.Select(build.Var{
 		Standard: uint64(50),

api/server_helpers_test.go

@@ -400,7 +400,7 @@ func createServerTester(name string) (*serverTester, error) {
 
 // createAuthenticatedServerTester creates an authenticated server tester
 // object that is ready for testing, including money in the wallet and all
-// modules initalized.
+// modules initialized.
 func createAuthenticatedServerTester(name string, password string) (*serverTester, error) {
 	// createAuthenticatedServerTester should not get called during short
 	// tests, as it takes a long time to run.

api/wallet_test.go

@@ -833,3 +833,122 @@ func TestWalletReset(t *testing.T) {
 		t.Error("wallet is not unlocked")
 	}
 }
+
+func TestWalletSiafunds(t *testing.T) {
+	if testing.Short() {
+		t.SkipNow()
+	}
+	t.Parallel()
+
+	walletPassword := "testpass"
+	key := crypto.TwofishKey(crypto.HashObject(walletPassword))
+	testdir := build.TempDir("api", t.Name())
+	st, err := assembleServerTester(key, testdir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer st.server.Close()
+
+	// mine some money
+	for i := types.BlockHeight(0); i <= types.MaturityDelay; i++ {
+		_, err := st.miner.AddBlock()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	// record transactions
+	var wtg WalletTransactionsGET
+	err = st.getAPI("/wallet/transactions?startheight=0&endheight=100", &wtg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	numTxns := len(wtg.ConfirmedTransactions)
+
+	// load siafunds into the wallet
+	siagPath, _ := filepath.Abs("../types/siag0of1of1.siakey")
+	loadSiagValues := url.Values{}
+	loadSiagValues.Set("keyfiles", siagPath)
+	loadSiagValues.Set("encryptionpassword", walletPassword)
+	err = st.stdPostAPI("/wallet/siagkey", loadSiagValues)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = st.getAPI("/wallet/transactions?startheight=0&endheight=100", &wtg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(wtg.ConfirmedTransactions) != numTxns+1 {
+		t.Errorf("expected %v transactions, got %v", numTxns+1, len(wtg.ConfirmedTransactions))
+	}
+
+	// check balance
+	var wg WalletGET
+	err = st.getAPI("/wallet", &wg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if wg.SiafundBalance.Cmp64(2000) != 0 {
+		t.Fatalf("bad siafund balance: expected %v, got %v", 2000, wg.SiafundBalance)
+	}
+
+	// spend the siafunds into the wallet seed
+	var wag WalletAddressGET
+	err = st.getAPI("/wallet/address", &wag)
+	if err != nil {
+		t.Fatal(err)
+	}
+	sendSiafundsValues := url.Values{}
+	sendSiafundsValues.Set("amount", "2000")
+	sendSiafundsValues.Set("destination", wag.Address.String())
+	err = st.stdPostAPI("/wallet/siafunds", sendSiafundsValues)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Announce the host and form an allowance with it. This will result in a
+	// siafund claim.
+	err = st.announceHost()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = st.setHostStorage()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = st.acceptContracts()
+	if err != nil {
+		t.Fatal(err)
+	}
+	// mine a block so that the announcement makes it into the blockchain
+	_, err = st.miner.AddBlock()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// form allowance
+	allowanceValues := url.Values{}
+	testFunds := "10000000000000000000000000000" // 10k SC
+	testPeriod := "20"
+	allowanceValues.Set("funds", testFunds)
+	allowanceValues.Set("period", testPeriod)
+	err = st.stdPostAPI("/renter", allowanceValues)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// mine a block so that the file contract makes it into the blockchain
+	_, err = st.miner.AddBlock()
+	if err != nil {
+		t.Fatal(err)
+	}
+	// wallet should now have a claim balance
+	err = st.getAPI("/wallet", &wg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if wg.SiacoinClaimBalance.IsZero() {
+		t.Fatal("expected non-zero claim balance")
+	}
+}

build/version.go

@@ -7,7 +7,7 @@ import (
 
 const (
 	// Version is the current version of siad.
-	Version = "1.2.0"
+	Version = "1.2.1"
 
 	// MaxEncodedVersionLength is the maximum length of a version string encoded
 	// with the encode package. 100 is much larger than any version number we send

doc/api/Renter.md

@@ -101,7 +101,7 @@ hosts
 // Duration of contracts formed. Must be nonzero.
 period // block height
 
-// Renew window specifies how many blocks before the expriation of the current
+// Renew window specifies how many blocks before the expiration of the current
 // contracts the renter will wait before renewing the contracts. A smaller
 // renew window means that Sia must be run more frequently, but also means
 // fewer total transaction fees. Storage spending is not affected by the renew

doc/whitepaper.tex

@@ -302,7 +302,7 @@ \section{Siafunds}
 
 \section{Economics of Sia}
 The primary currency of Sia is the siacoin.
-The supply of siacoins will increase permanently, and all fresh supply will be given to miners as a block subisdy.
+The supply of siacoins will increase permanently, and all fresh supply will be given to miners as a block subsidy.
 The first block will have 300,000 coins minted.
 This number will decrease by 1 coin per block, until a minimum of 30,000 coins per block is reached.
 Following a target of 10 minutes between blocks, the annual growth in supply is:\\

modules/consensus/accept.go

@@ -60,7 +60,7 @@ func (cs *ConsensusSet) validateHeaderAndBlock(tx dbTx, b types.Block) error {
 	// Check that the timestamp is not too far in the past to be acceptable.
 	minTimestamp := cs.blockRuleHelper.minimumValidChildTimestamp(blockMap, &parent)
 
-	return cs.blockValidator.ValidateBlock(b, minTimestamp, parent.ChildTarget, parent.Height+1)
+	return cs.blockValidator.ValidateBlock(b, minTimestamp, parent.ChildTarget, parent.Height+1, cs.log)
 }
 
 // checkHeaderTarget returns true if the header's ID meets the given target.

modules/consensus/accept_test.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/NebulousLabs/Sia/modules"
+	"github.com/NebulousLabs/Sia/persist"
 	"github.com/NebulousLabs/Sia/types"
 )
 
@@ -163,7 +164,7 @@ func (brh mockBlockRuleHelper) minimumValidChildTimestamp(blockMap dbBucket, pb
 
 // ValidateBlock stores the parameters it receives and returns the mock error
 // defined by mockBlockValidator.err.
-func (bv mockBlockValidator) ValidateBlock(b types.Block, minTimestamp types.Timestamp, target types.Target, height types.BlockHeight) error {
+func (bv mockBlockValidator) ValidateBlock(b types.Block, minTimestamp types.Timestamp, target types.Target, height types.BlockHeight, log *persist.Logger) error {
 	validateBlockParamsGot = validateBlockParams{true, b, minTimestamp, target, height}
 	return bv.err
 }

modules/consensus/block_validation.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 
 	"github.com/NebulousLabs/Sia/modules"
+	"github.com/NebulousLabs/Sia/persist"
 	"github.com/NebulousLabs/Sia/types"
 )
 
@@ -20,7 +21,7 @@ var (
 type blockValidator interface {
 	// ValidateBlock validates a block against a minimum timestamp, a block
 	// target, and a block height.
-	ValidateBlock(types.Block, types.Timestamp, types.Target, types.BlockHeight) error
+	ValidateBlock(types.Block, types.Timestamp, types.Target, types.BlockHeight, *persist.Logger) error
 }
 
 // stdBlockValidator is the standard implementation of blockValidator.
@@ -63,7 +64,7 @@ func checkTarget(b types.Block, target types.Target) bool {
 // ValidateBlock validates a block against a minimum timestamp, a block target,
 // and a block height. Returns nil if the block is valid and an appropriate
 // error otherwise.
-func (bv stdBlockValidator) ValidateBlock(b types.Block, minTimestamp types.Timestamp, target types.Target, height types.BlockHeight) error {
+func (bv stdBlockValidator) ValidateBlock(b types.Block, minTimestamp types.Timestamp, target types.Target, height types.BlockHeight, log *persist.Logger) error {
 	// Check that the timestamp is not too far in the past to be acceptable.
 	if minTimestamp > b.Timestamp {
 		return errEarlyTimestamp
@@ -75,7 +76,8 @@ func (bv stdBlockValidator) ValidateBlock(b types.Block, minTimestamp types.Time
 	}
 
 	// Check that the block is below the size limit.
-	if uint64(len(bv.marshaler.Marshal(b))) > types.BlockSizeLimit {
+	blockSize := len(bv.marshaler.Marshal(b))
+	if uint64(blockSize) > types.BlockSizeLimit {
 		return errLargeBlock
 	}
 
@@ -98,5 +100,9 @@ func (bv stdBlockValidator) ValidateBlock(b types.Block, minTimestamp types.Time
 	if b.Timestamp > bv.clock.Now()+types.FutureThreshold {
 		return errFutureTimestamp
 	}
+
+	if log != nil {
+		log.Debugf("validated block at height %v, block size: %vB", height, blockSize)
+	}
 	return nil
 }

modules/consensus/block_validation_test.go

@@ -78,7 +78,7 @@ func TestUnitValidateBlock(t *testing.T) {
 				now: tt.now,
 			},
 		}
-		err := blockValidator.ValidateBlock(b, tt.minTimestamp, types.RootDepth, 0)
+		err := blockValidator.ValidateBlock(b, tt.minTimestamp, types.RootDepth, 0, nil)
 		if err != tt.errWant {
 			t.Errorf("%s: got %v, want %v", tt.msg, err, tt.errWant)
 		}

modules/consensus/consensusdb.go

@@ -108,7 +108,7 @@ func (cs *ConsensusSet) createConsensusDB(tx *bolt.Tx) error {
 		UnlockHash: types.UnlockHash{},
 	})
 
-	// Add the genesis block to the block strucutres - checksum must be taken
+	// Add the genesis block to the block structures - checksum must be taken
 	// after pushing the genesis block into the path.
 	pushPath(tx, cs.blockRoot.Block.ID())
 	if build.DEBUG {

modules/consensus/diffs.go

@@ -16,7 +16,7 @@ var (
 	errDiffsNotGenerated             = errors.New("applying diff set before generating errors")
 	errInvalidSuccessor              = errors.New("generating diffs for a block that's an invalid successsor to the current block")
 	errNegativePoolAdjustment        = errors.New("committing a siafund pool diff with a negative adjustment")
-	errNonApplySiafundPoolDiff       = errors.New("commiting a siafund pool diff that doesn't have the 'apply' direction")
+	errNonApplySiafundPoolDiff       = errors.New("committing a siafund pool diff that doesn't have the 'apply' direction")
 	errRevertSiafundPoolDiffMismatch = errors.New("committing a siafund pool diff with an invalid 'adjusted' field")
 	errWrongAppliedDiffSet           = errors.New("applying a diff set that isn't the current block")
 	errWrongRevertDiffSet            = errors.New("reverting a diff set that isn't the current block")

modules/consensus/maintenance.go

@@ -184,7 +184,7 @@ func applyFileContractMaintenance(tx *bolt.Tx, pb *processedBlock) {
 }
 
 // applyMaintenance applies block-level alterations to the consensus set.
-// Maintenance is applied after all of the transcations for the block have been
+// Maintenance is applied after all of the transactions for the block have been
 // applied.
 func applyMaintenance(tx *bolt.Tx, pb *processedBlock) {
 	applyMinerPayouts(tx, pb)

modules/consensus/processedblock.go

@@ -120,7 +120,7 @@ func (cs *ConsensusSet) setChildTarget(blockMap *bolt.Bucket, pb *processedBlock
 }
 
 // newChild creates a blockNode from a block and adds it to the parent's set of
-// children. The new node is also returned. It necessairly modifies the database
+// children. The new node is also returned. It necessarily modifies the database
 func (cs *ConsensusSet) newChild(tx *bolt.Tx, pb *processedBlock, b types.Block) *processedBlock {
 	// Create the child node.
 	childID := b.ID()