roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Removed debugging log

Browse Source
This commit is contained in:
obscuren 2014-04-30 17:43:48 +02:00
parent c3293641e7
commit d2ab322267
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethchain/transaction_pool.go
View File

@ -91,14 +91,16 @@ func (pool *TxPool) addTransaction(tx *Transaction) {
// Process transaction validates the Tx and processes funds from the // Process transaction validates the Tx and processes funds from the
// sender to the recipient. // sender to the recipient.
func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block, toContract bool) (err error) { func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block, toContract bool) (err error) {
/*
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
log.Println(r) log.Println(r)
err = fmt.Errorf("%v", r) err = fmt.Errorf("%v", r)
} }
}() }()
*/
// Get the sender // Get the sender
sender := block.state.GetStateObject(tx.Sender()) sender := block.state.GetAccount(tx.Sender())
if sender.Nonce != tx.Nonce { if sender.Nonce != tx.Nonce {
return fmt.Errorf("[TXPL] Invalid account nonce, state nonce is %d transaction nonce is %d instead", sender.Nonce, tx.Nonce) return fmt.Errorf("[TXPL] Invalid account nonce, state nonce is %d transaction nonce is %d instead", sender.Nonce, tx.Nonce)
@ -112,7 +114,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block, toContract
} }
// Get the receiver // Get the receiver
receiver := block.state.GetStateObject(tx.Recipient) receiver := block.state.GetAccount(tx.Recipient)
sender.Nonce += 1 sender.Nonce += 1
// Send Tx to self // Send Tx to self

16
peer.go
View File

@ -320,14 +320,11 @@ func (p *Peer) HandleInbound() {
// We requested blocks and now we need to make sure we have a common ancestor somewhere in these blocks so we can find // We requested blocks and now we need to make sure we have a common ancestor somewhere in these blocks so we can find
// common ground to start syncing from // common ground to start syncing from
lastBlock = ethchain.NewBlockFromRlpValue(msg.Data.Get(msg.Data.Len() - 1)) lastBlock = ethchain.NewBlockFromRlpValue(msg.Data.Get(msg.Data.Len() - 1))
if p.ethereum.StateManager().BlockChain().HasBlock(lastBlock.Hash()) { if !p.ethereum.StateManager().BlockChain().HasBlock(lastBlock.Hash()) {
fmt.Println("[PEER] We found a common ancestor, let's continue.")
} else {
// If we can't find a common ancenstor we need to request more blocks. // If we can't find a common ancenstor we need to request more blocks.
// FIXME: At one point this won't scale anymore since we are not asking for an offset // FIXME: At one point this won't scale anymore since we are not asking for an offset
// we just keep increasing the amount of blocks. // we just keep increasing the amount of blocks.
fmt.Println("[PEER] No common ancestor found, requesting more blocks.") //fmt.Println("[PEER] No common ancestor found, requesting more blocks.")
p.blocksRequested = p.blocksRequested * 2 p.blocksRequested = p.blocksRequested * 2
p.catchingUp = false p.catchingUp = false
p.SyncWithBlocks() p.SyncWithBlocks()
@ -336,17 +333,13 @@ func (p *Peer) HandleInbound() {
for i := msg.Data.Len() - 1; i >= 0; i-- { for i := msg.Data.Len() - 1; i >= 0; i-- {
block = ethchain.NewBlockFromRlpValue(msg.Data.Get(i)) block = ethchain.NewBlockFromRlpValue(msg.Data.Get(i))
// Do we have this block on our chain? If so we can continue // Do we have this block on our chain? If so we can continue
if p.ethereum.StateManager().BlockChain().HasBlock(block.Hash()) { if !p.ethereum.StateManager().BlockChain().HasBlock(block.Hash()) {
ethutil.Config.Log.Debugf("[PEER] Block found, checking next one.\n")
} else {
// We don't have this block, but we do have a block with the same prevHash, diversion time! // We don't have this block, but we do have a block with the same prevHash, diversion time!
if p.ethereum.StateManager().BlockChain().HasBlockWithPrevHash(block.PrevHash) { if p.ethereum.StateManager().BlockChain().HasBlockWithPrevHash(block.PrevHash) {
ethutil.Config.Log.Infof("[PEER] Local and foreign chain have diverted after %x, finding best chain!\n", block.PrevHash) //ethutil.Config.Log.Infof("[PEER] Local and foreign chain have diverted after %x, finding best chain!\n", block.PrevHash)
if p.ethereum.StateManager().BlockChain().FindCanonicalChainFromMsg(msg, block.PrevHash) { if p.ethereum.StateManager().BlockChain().FindCanonicalChainFromMsg(msg, block.PrevHash) {
return return
} }
} else {
ethutil.Config.Log.Debugf("[PEER] Both local and foreign chain have same parent. Continue normally\n")
} }
} }
} }
@ -644,7 +637,6 @@ func (p *Peer) SyncWithBlocks() {
for _, block := range blocks { for _, block := range blocks {
hashes = append(hashes, block.Hash()) hashes = append(hashes, block.Hash())
} }
fmt.Printf("Requesting hashes from network: %x", hashes)
msgInfo := append(hashes, uint64(50)) msgInfo := append(hashes, uint64(50))