WIP miner

core/block_processor.go

@@ -84,6 +84,35 @@ func (sm *BlockProcessor) TransitionState(statedb *state.StateDB, parent, block
 	return receipts, nil
 }
 
+func (self *BlockProcessor) ApplyTransaction(coinbase *state.StateObject, state *state.StateDB, block *types.Block, tx *types.Transaction, usedGas *big.Int, transientProcess bool) (*types.Receipt, *big.Int, error) {
+	// If we are mining this block and validating we want to set the logs back to 0
+	state.EmptyLogs()
+
+	txGas := new(big.Int).Set(tx.Gas())
+
+	cb := state.GetStateObject(coinbase.Address())
+	st := NewStateTransition(NewEnv(state, self.bc, tx, block), tx, cb)
+	_, err := st.TransitionState()
+
+	txGas.Sub(txGas, st.gas)
+
+	// Update the state with pending changes
+	state.Update(txGas)
+
+	cumulative := new(big.Int).Set(usedGas.Add(usedGas, txGas))
+	receipt := types.NewReceipt(state.Root(), cumulative)
+	receipt.SetLogs(state.Logs())
+	receipt.Bloom = types.CreateBloom(types.Receipts{receipt})
+	chainlogger.Debugln(receipt)
+
+	// Notify all subscribers
+	if !transientProcess {
+		go self.eventMux.Post(TxPostEvent{tx})
+	}
+
+	return receipt, txGas, err
+}
+
 func (self *BlockProcessor) ApplyTransactions(coinbase *state.StateObject, state *state.StateDB, block *types.Block, txs types.Transactions, transientProcess bool) (types.Receipts, types.Transactions, types.Transactions, types.Transactions, error) {
 	var (
 		receipts           types.Receipts
@@ -96,15 +125,10 @@ func (self *BlockProcessor) ApplyTransactions(coinbase *state.StateObject, state
 
 done:
 	for i, tx := range txs {
-		// If we are mining this block and validating we want to set the logs back to 0
-		state.EmptyLogs()
-
-		txGas := new(big.Int).Set(tx.Gas())
-
-		cb := state.GetStateObject(coinbase.Address())
-		st := NewStateTransition(NewEnv(state, self.bc, tx, block), tx, cb)
-		_, err = st.TransitionState()
+		receipt, txGas, err := self.ApplyTransaction(coinbase, state, block, tx, totalUsedGas, transientProcess)
 		if err != nil {
+			return nil, nil, nil, nil, err
+
 			switch {
 			case IsNonceErr(err):
 				err = nil // ignore error
@@ -119,30 +143,10 @@ done:
 				err = nil
 			}
 		}
-
-		txGas.Sub(txGas, st.gas)
-		cumulativeSum.Add(cumulativeSum, new(big.Int).Mul(txGas, tx.GasPrice()))
-
-		// Update the state with pending changes
-		state.Update(txGas)
-
-		cumulative := new(big.Int).Set(totalUsedGas.Add(totalUsedGas, txGas))
-		receipt := types.NewReceipt(state.Root(), cumulative)
-		receipt.SetLogs(state.Logs())
-		receipt.Bloom = types.CreateBloom(types.Receipts{receipt})
-		chainlogger.Debugln(receipt)
-
-		// Notify all subscribers
-		if !transientProcess {
-			go self.eventMux.Post(TxPostEvent{tx})
-		}
-
 		receipts = append(receipts, receipt)
 		handled = append(handled, tx)
 
-		if ethutil.Config.Diff && ethutil.Config.DiffType == "all" {
-			state.CreateOutputForDiff()
-		}
+		cumulativeSum.Add(cumulativeSum, new(big.Int).Mul(txGas, tx.GasPrice()))
 	}
 
 	block.Reward = cumulativeSum
@@ -285,6 +289,10 @@ func (sm *BlockProcessor) AccumelateRewards(statedb *state.StateDB, block, paren
 			return UncleError(fmt.Sprintf("Uncle's parent unknown (%x)", uncle.ParentHash[0:4]))
 		}
 
+		if !sm.Pow.Verify(types.NewBlockWithHeader(uncle)) {
+			return ValidationError("Uncle's nonce is invalid (= %v)", ethutil.Bytes2Hex(uncle.Nonce))
+		}
+
 		r := new(big.Int)
 		r.Mul(BlockReward, big.NewInt(15)).Div(r, big.NewInt(16))
 
@@ -299,14 +307,6 @@ func (sm *BlockProcessor) AccumelateRewards(statedb *state.StateDB, block, paren
 	// Reward amount of ether to the coinbase address
 	account.AddAmount(reward)
 
-	statedb.Manifest().AddMessage(&state.Message{
-		To:        block.Header().Coinbase,
-		Input:     nil,
-		Origin:    nil,
-		Timestamp: int64(block.Header().Time), Coinbase: block.Header().Coinbase, Number: block.Header().Number,
-		Value: new(big.Int).Add(reward, block.Reward),
-	})
-
 	return nil
 }
 

core/types/block.go

@@ -6,7 +6,6 @@ import (
 	"math/big"
 	"sort"
 	"time"
-
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/rlp"
@@ -146,6 +145,10 @@ func (self *Block) SetTransactions(transactions Transactions) {
 	self.transactions = transactions
 	self.header.TxHash = DeriveSha(transactions)
 }
+func (self *Block) AddTransaction(transaction *Transaction) {
+	self.transactions = append(self.transactions, transaction)
+	self.SetTransactions(self.transactions)
+}
 
 func (self *Block) Receipts() Receipts {
 	return self.receipts
@@ -156,6 +159,10 @@ func (self *Block) SetReceipts(receipts Receipts) {
 	self.header.ReceiptHash = DeriveSha(receipts)
 	self.header.Bloom = CreateBloom(receipts)
 }
+func (self *Block) AddReceipt(receipt *Receipt) {
+	self.receipts = append(self.receipts, receipt)
+	self.SetReceipts(self.receipts)
+}
 
 func (self *Block) RlpData() interface{} {
 	return []interface{}{self.header, self.transactions, self.uncles}
@@ -166,16 +173,13 @@ func (self *Block) RlpDataForStorage() interface{} {
 }
 
 // Header accessors (add as you need them)
-func (self *Block) Number() *big.Int   { return self.header.Number }
-func (self *Block) NumberU64() uint64  { return self.header.Number.Uint64() }
-func (self *Block) Bloom() []byte      { return self.header.Bloom }
-func (self *Block) Coinbase() []byte   { return self.header.Coinbase }
-func (self *Block) Time() int64        { return int64(self.header.Time) }
-func (self *Block) GasLimit() *big.Int { return self.header.GasLimit }
-func (self *Block) GasUsed() *big.Int  { return self.header.GasUsed }
-
-//func (self *Block) Trie() *ptrie.Trie         { return ptrie.New(self.header.Root, ethutil.Config.Db) }
-//func (self *Block) State() *state.StateDB     { return state.New(self.Trie()) }
+func (self *Block) Number() *big.Int          { return self.header.Number }
+func (self *Block) NumberU64() uint64         { return self.header.Number.Uint64() }
+func (self *Block) Bloom() []byte             { return self.header.Bloom }
+func (self *Block) Coinbase() []byte          { return self.header.Coinbase }
+func (self *Block) Time() int64               { return int64(self.header.Time) }
+func (self *Block) GasLimit() *big.Int        { return self.header.GasLimit }
+func (self *Block) GasUsed() *big.Int         { return self.header.GasUsed }
 func (self *Block) Root() []byte              { return self.header.Root }
 func (self *Block) SetRoot(root []byte)       { self.header.Root = root }
 func (self *Block) Size() ethutil.StorageSize { return ethutil.StorageSize(len(ethutil.Encode(self))) }