From 23ad2f02c0992c212d7d179991560eb44f1b1f78 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 6 Mar 2015 10:22:40 +0100 Subject: debug comments & pow handling --- eth/protocol.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'eth') diff --git a/eth/protocol.go b/eth/protocol.go index b52c7db42..b9b485292 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -253,10 +253,9 @@ func (self *ethProtocol) handle() error { case NewBlockMsg: var request newBlockMsgData if err := msg.Decode(&request); err != nil { - return self.protoError(ErrDecode, "msg %v: %v", msg, err) + return self.protoError(ErrDecode, "%v: %v", msg, err) } hash := request.Block.Hash() - fmt.Printf("received block: %x\n", hash) _, chainHead, _ := self.chainManager.Status() jsonlogger.LogJson(&logger.EthChainReceivedNewBlock{ -- cgit From ed84b58af57809a743e5be6f6ea53c079c50b765 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 6 Mar 2015 16:58:52 +0100 Subject: Debug option for VM & command line flag --- eth/backend.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'eth') diff --git a/eth/backend.go b/eth/backend.go index 1c711a775..799937510 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -20,6 +20,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/rpc" + "github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/whisper" ) @@ -43,6 +44,7 @@ type Config struct { LogLevel int KeyRing string LogFormat string + VmDebug bool MaxPeers int Port string @@ -212,6 +214,8 @@ func New(config *Config) (*Ethereum, error) { eth.net.ListenAddr = ":" + config.Port } + vm.Debug = config.VmDebug + return eth, nil } -- cgit From cd856cb2133d390758bb24b88fa3b538bb7bc306 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 6 Mar 2015 18:26:16 +0100 Subject: Separated block db from state db. Partial fix for #416 --- eth/backend.go | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'eth') diff --git a/eth/backend.go b/eth/backend.go index 799937510..584d60c7e 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -111,7 +111,8 @@ type Ethereum struct { shutdownChan chan bool // DB interface - db ethutil.Database + blockDb ethutil.Database + stateDb ethutil.Database //*** SERVICES *** // State manager for processing new blocks and managing the over all states @@ -140,13 +141,17 @@ func New(config *Config) (*Ethereum, error) { // Boostrap database ethlogger := logger.New(config.DataDir, config.LogFile, config.LogLevel, config.LogFormat) - db, err := ethdb.NewLDBDatabase(path.Join(config.DataDir, "blockchain")) + blockDb, err := ethdb.NewLDBDatabase(path.Join(config.DataDir, "blockchain")) + if err != nil { + return nil, err + } + stateDb, err := ethdb.NewLDBDatabase(path.Join(config.DataDir, "state")) if err != nil { return nil, err } // Perform database sanity checks - d, _ := db.Get([]byte("ProtocolVersion")) + d, _ := blockDb.Get([]byte("ProtocolVersion")) protov := ethutil.NewValue(d).Uint() if protov != ProtocolVersion && protov != 0 { path := path.Join(config.DataDir, "blockchain") @@ -157,7 +162,7 @@ func New(config *Config) (*Ethereum, error) { var keyManager *crypto.KeyManager switch config.KeyStore { case "db": - keyManager = crypto.NewDBKeyManager(db) + keyManager = crypto.NewDBKeyManager(blockDb) case "file": keyManager = crypto.NewFileKeyManager(config.DataDir) default: @@ -166,23 +171,24 @@ func New(config *Config) (*Ethereum, error) { // Initialise the keyring keyManager.Init(config.KeyRing, 0, false) - saveProtocolVersion(db) + saveProtocolVersion(blockDb) //ethutil.Config.Db = db eth := &Ethereum{ shutdownChan: make(chan bool), - db: db, + blockDb: blockDb, + stateDb: stateDb, keyManager: keyManager, eventMux: &event.TypeMux{}, logger: ethlogger, DataDir: config.DataDir, } - eth.chainManager = core.NewChainManager(db, eth.EventMux()) + eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux()) pow := ethash.New(eth.chainManager) eth.txPool = core.NewTxPool(eth.EventMux()) - eth.blockProcessor = core.NewBlockProcessor(db, pow, eth.txPool, eth.chainManager, eth.EventMux()) + eth.blockProcessor = core.NewBlockProcessor(stateDb, pow, eth.txPool, eth.chainManager, eth.EventMux()) eth.chainManager.SetProcessor(eth.blockProcessor) eth.whisper = whisper.New() eth.miner = miner.New(keyManager.Address(), eth, pow, config.MinerThreads) @@ -228,7 +234,8 @@ func (s *Ethereum) TxPool() *core.TxPool { return s.txPool } func (s *Ethereum) BlockPool() *blockpool.BlockPool { return s.blockPool } func (s *Ethereum) Whisper() *whisper.Whisper { return s.whisper } func (s *Ethereum) EventMux() *event.TypeMux { return s.eventMux } -func (s *Ethereum) Db() ethutil.Database { return s.db } +func (s *Ethereum) BlockDb() ethutil.Database { return s.blockDb } +func (s *Ethereum) StateDb() ethutil.Database { return s.stateDb } func (s *Ethereum) Miner() *miner.Miner { return s.miner } func (s *Ethereum) IsListening() bool { return true } // Always listening func (s *Ethereum) PeerCount() int { return s.net.PeerCount() } @@ -279,7 +286,8 @@ func (self *Ethereum) SuggestPeer(nodeURL string) error { func (s *Ethereum) Stop() { // Close the database - defer s.db.Close() + defer s.blockDb.Close() + defer s.stateDb.Close() s.txSub.Unsubscribe() // quits txBroadcastLoop s.blockSub.Unsubscribe() // quits blockBroadcastLoop -- cgit From 22b493a6ff3e9692676c17f8d766ff1117da9485 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 6 Mar 2015 20:07:35 +0100 Subject: Fixed tests --- eth/protocol_test.go | 1 + 1 file changed, 1 insertion(+) (limited to 'eth') diff --git a/eth/protocol_test.go b/eth/protocol_test.go index c4e3e9f1b..c118e6aae 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + ethlogger "github.com/ethereum/go-ethereu/logger" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/errs" -- cgit From fca652eeeaef41efa7bc17ea2e182586324a1e52 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sat, 7 Mar 2015 10:48:38 -0600 Subject: Fix logger import path --- eth/protocol_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'eth') diff --git a/eth/protocol_test.go b/eth/protocol_test.go index c118e6aae..f499d033e 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - ethlogger "github.com/ethereum/go-ethereu/logger" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/errs" "github.com/ethereum/go-ethereum/ethutil" + ethlogger "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" ) -- cgit