aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
Diffstat (limited to 'miner')
-rw-r--r--miner/worker.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/miner/worker.go b/miner/worker.go
index ab01ba09e..1e5d47965 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -267,6 +267,12 @@ func (self *worker) wait() {
func (self *worker) push() {
if atomic.LoadInt32(&self.mining) == 1 {
+ if core.Canary(self.current.state) {
+ glog.Infoln("Toxicity levels rising to deadly levels. Your canary has died. You can go back or continue down the mineshaft --more--")
+ glog.Infoln("You turn back and abort mining")
+ return
+ }
+
self.current.state.Sync()
self.current.block.SetRoot(self.current.state.Root())
insertions'>+15 * Updated protocol versionobscuren2015-01-031-1/+1 * Squashed commit of the following:obscuren2015-01-036-395/+4295 * Closure => Contextobscuren2015-01-0213-119/+107 * added nil checkobscuren2015-01-025-39/+8 * Removed the need of having a backend for the tx poolobscuren2015-01-024-17/+14 * Removed value check from tx validationobscuren2015-01-021-2/+6 * Added tests for valid transactionsobscuren2015-01-021-11/+10 * Refactored tx pool and added extra fields to blockobscuren2015-01-024-98/+123 * Added a query interface for world stateobscuren2015-01-021-0/+9 * Fixed using new trie iterator APIobscuren2015-01-022-22/+22 * Deletedobscuren2015-01-021-1/+0 * Set TD to block once processedobscuren2015-01-021-0/+1 * Fixed testsobscuren2015-01-021-4/+11 * Additional comments and added name to error outputobscuren2014-12-311-5/+3 * Minor improvementsobscuren2014-12-312-162/+169 * JUMPI never 'require' checked.obscuren2014-12-311-1/+1 * Merge branch 'develop' into poc8obscuren2014-12-311-5/+11 |\ | * Fixed gas check for vm testobscuren2014-12-311-5/+11 * | Merge branch 'develop' into poc8obscuren2014-12-313-50/+9 |\| | * Additional checking on gasobscuren2014-12-312-49/+8 | * SIGNEXTEND missing from stack checkobscuren2014-12-311-1/+1 * | Merge branch 'develop' into poc8obscuren2014-12-30237-14/+10825 |\| | * updated testsobscuren2014-12-30237-14/+10825 * | removed variableobscuren2014-12-301-5/+1 * | Merge branch 'develop' into poc8obscuren2014-12-302-12/+10 |\| | * Removed incorrect range check for pushobscuren2014-12-302-12/+10 * | fixed trieobscuren2014-12-302-5/+5 * | Chain testsobscuren2014-12-306-5/+48 * | Fixed chain test & added new chainobscuren2014-12-305-17/+37 * | Updated miner to new block apiobscuren2014-12-301-3/+6 * | export => importobscuren2014-12-241-1/+1 * | Fixed a bug where keys where serialised twiceobscuren2014-12-244-12/+23 * | mergeobscuren2014-12-243-2/+7 |\| | * Merge branch 'hotfix/0.7.11' into developobscuren2014-12-243-2/+8 | |\ | | * Bumpobscuren2014-12-242-2/+2 | | * Reset peer during download on discobscuren2014-12-241-0/+6 | | * Merge branch 'develop'obscuren2014-12-211-3/+1 | | |\ | | * \ Merge branch 'release/v0.7.10'vv0.7.10obscuren2014-12-20344-1445/+67743 | | |\ \ | * | | | Enable websockets for mist. Closes #218obscuren2014-12-232-0/+9 * | | | | Removed the deferred resetobscuren2014-12-241-6/+0 * | | | | Switched to new trieobscuren2014-12-2414-73/+105 * | | | | Moved import to utilsobscuren2014-12-232-18/+26 * | | | | Close the fileobscuren2014-12-231-0/+2 * | | | | Decode from stream directlyobscuren2014-12-232-3/+6 * | | | | Delete current chain for resetobscuren2014-12-231-0/+4 * | | | | Updated Mist to use new blocksobscuren2014-12-233-6/+6 * | | | | Chain importerobscuren2014-12-236-37/+66 * | | | | Refactored block & Transactionobscuren2014-12-2319-568/+450 * | | | | Removal of "debug" url :)obscuren2014-12-221-2/+1 * | | | | Concat and pad dataobscuren2014-12-223-5/+11 * | | | | Merge branch 'develop' into poc8obscuren2014-12-226-3055/+13 |\| | | | | * | | | Merge pull request #217 from ethereum/testsJeffrey Wilcke2014-12-226-3055/+13 | |\ \ \ \ | | |_|_|/ | |/| | | | | * | | Remove old fileTaylor Gerring2014-12-221-8/+0 | | * | | Move goveralls call to scriptTaylor Gerring2014-12-222-2/+2 | | * | | Add coveralls coverage badgeTaylor Gerring2014-12-221-0/+1 | | * | | Use repo default branchesTaylor Gerring2014-12-221-2/+2 | | * | | Update travis go version to tipTaylor Gerring2014-12-221-1/+1 | | * | | inline dependency installation scriptTaylor Gerring2014-12-221-1/+1 | | * | | Exclude VM testsTaylor Gerring2014-12-221-1/+4 | | * | | Merge branch 'tests' of github.com:ethereum/go-ethereum into testsTaylor Gerring2014-12-22115-8384/+20433 | | |\ \ \ | | | * \ \ Merge pull request #216 from ethereum/developTaylor Gerring2014-12-22115-8384/+20433 | | | |\ \ \ | | |_|/ / / | |/| | | | | | * | | | Update cover command installationTaylor Gerring2014-12-221-1/+1 | | |/ / / | | * | | remove temp coverage fileTaylor Gerring2014-12-221-3038/+0 | | * | | Updated tool import pathsTaylor Gerring2014-12-221-2/+2 * | | | | Added whisper js apiobscuren2014-12-227-130/+153 * | | | | updated ethereum.jsobscuren2014-12-2226-0/+1732 * | | | | movedobscuren2014-12-222-2/+3 * | | | | Merge branch 'develop' into poc8obscuren2014-12-221-3/+1 |\| | | | | * | | | Fixed EVM environment. Closes #215v0.7.10obscuren2014-12-211-3/+1 * | | | | updated whisper uiobscuren2014-12-221-2/+3 * | | | | Updated QWhisperobscuren2014-12-215-13/+80 * | | | | Merge branch 'develop' into poc8obscuren2014-12-2012-70/+89 |\| | | | | * | | | Merge branch 'release/v0.7.10' into developobscuren2014-12-2012-62/+81 | |\ \ \ \ | | | |_|/ | | |/| | | | * | | Increased peer from 10 to 30obscuren2014-12-202-2/+2 | | * | | Minor updates on gas and removed/refactored old code.obscuren2014-12-206-40/+53 | | * | | Removed OOG check. Revert should always happen.obscuren2014-12-193-6/+11 | | * | | Transaction was generating incorrect hash because of var changesobscuren2014-12-192-10/+11 | | * | | Added authorsobscuren2014-12-191-4/+4 | | * | | version bumpobscuren2014-12-192-2/+2 | |/ / / | * | | Moved VM to executionobscuren2014-12-191-10/+10 * | | | Merge branch 'ebuchman-badsig' into poc8obscuren2014-12-194-10/+14 |\ \ \ \ | * | | | Merge branch 'badsig' of https://github.com/ebuchman/go-ethereum into ebuchma...obscuren2014-12-194-10/+14 |/| | | | | * | | | fix panic on bad senderEthan Buchman2014-11-292-2/+6 * | | | | Merge branch 'develop' into poc8obscuren2014-12-197-49/+13 |\ \ \ \ \ | | |/ / / | |/| | | | * | | | Cleaned up objectsobscuren2014-12-197-49/+13 * | | | | mergeobscuren2014-12-1921-342/+2082 |\| | | | | * | | | Fixed testsobscuren2014-12-191-4/+0 | * | | | Fixed casting errorobscuren2014-12-191-3/+4 | * | | | updated testsobscuren2014-12-191-4/+4 | * | | | Fixed refund modelobscuren2014-12-193-17/+18 | * | | | updated testsobscuren2014-12-192-1/+277 | * | | | Gas corrections and vm fixesobscuren2014-12-198-83/+116 | * | | | Moved methods to messagesobscuren2014-12-186-37/+14 | * | | | Created generic message (easy for testing)obscuren2014-12-1810-102/+159 | * | | | updated testsobscuren2014-12-185-148/+1547 * | | | | Merge fixesobscuren2014-12-184-12/+8 * | | | | Merged developobscuren2014-12-1818-80/+193 |\| | | | | * | | | Updated to new methodsobscuren2014-12-188-9/+16 | * | | | Locks, refactor, testsobscuren2014-12-1812-66/+168 | * | | | Removed ethereum as dependencyobscuren2014-12-181-7/+7 | * | | | idx should return -1obscuren2014-12-181-1/+1 | * | | | Rlp shouldn't write null bytesobscuren2014-12-181-3/+7 * | | | | Merge branch 'develop' into poc8obscuren2014-12-189-31/+128 |\| | | | | * | | | Moved pre-compiled, moved depth checkobscuren2014-12-184-23/+35 | * | | | moved err checkobscuren2014-12-176-17/+102 * | | | | Whisper watches fixesobscuren2014-12-176-16/+56 * | | | | doc descobscuren2014-12-161-0/+16 * | | | | Merge pull request #211 from fjl/fix-server-discJeffrey Wilcke2014-12-161-7/+2 |\ \ \ \ \ | * | | | | p2p: fix call to Server.removePeer (might help with #209)Felix Lange2014-12-161-7/+2 |/ / / / / * | | | | Removed debug messageobscuren2014-12-161-1/+0 * | | | | During env open check for pub error which indicated unencrypted payload.obscuren2014-12-162-2/+7 * | | | | Fixed deref ptrobscuren2014-12-161-6/+4 * | | | | Identity testobscuren2014-12-161-0/+15 * | | | | Typoobscuren2014-12-161-1/+1 * | | | | Added whisper debug interface + whisper fixesobscuren2014-12-166-28/+32 * | | | | Added whisper testobscuren2014-12-161-0/+46 * | | | | Added whisper handlerobscuren2014-12-161-0/+4 * | | | | Removed goroutine from "Run"obscuren2014-12-161-8/+8 * | | | | Merge branch 'develop' into poc8obscuren2014-12-151-0/+27 |\| | | | | * | | | Added topic utility functions to whisperobscuren2014-12-151-0/+27 * | | | | made mist in a compilable, workable state using the new refactored packagesobscuren2014-12-157-29/+63 * | | | | Moved peer helper methedsobscuren2014-12-151-17/+0 * | | | | removed filter manager from baseobscuren2014-12-153-37/+32 * | | | | Merge branch 'develop' into ethersphere-ethp2pobscuren2014-12-157-8/+277 |\| | | | | * | | | Merge branch 'poc8' into developobscuren2014-12-157-8/+277 | |\ \ \ \ | | * \ \ \ Merge pull request #204 from fjl/fix-p2p-disconnectJeffrey Wilcke2014-12-157-8/+277 | | |\ \ \ \ | | | * | | | p2p: add test for base protocol disconnectFelix Lange2014-12-151-0/+58 | | | * | | | p2p: use an error type for disconnect requestsFelix Lange2014-12-152-2/+10 | | | * | | | p2p: add MsgPipe for protocol testingFelix Lange2014-12-152-0/+140 | | | * | | | p2p: improve and test eofSignalFelix Lange2014-12-122-5/+68 | | | * | | | p2p: fix decoding of disconnect reason (fixes #200)Felix Lange2014-12-121-2/+2 * | | | | | | Added old filter. Needs some refactoringobscuren2014-12-152-57/+100 * | | | | | | WIPobscuren2014-12-151-3/+5 * | | | | | | added protocol handlerobscuren2014-12-151-1/+1 * | | | | | | added whisperobscuren2014-12-152-28/+35 * | | | | | | WIPobscuren2014-12-152-47/+18 * | | | | | | WIPzelig2014-12-150-0/+0 |\ \ \ \ \ \ \ | * | | | | | | initial commit for eth blockpool + testzelig2014-12-102-0/+712 | * | | | | | | eth protocol changeszelig2014-12-102-70/+122 | * | | | | | | no logging in error (to be refactored into p2p)zelig2014-12-101-6/+0 | * | | | | | | initial commit for eth-p2p integrationzelig2014-12-103-0/+500 * | | | | | | | resolve merge conflict hellzelig2014-12-154-19/+1 * | | | | | | | adapt blockpool/backend to use pow/ezp with pow.Block for VerifyPoW funczelig2014-12-152-12/+3 * | | | | | | | adapt cmd/cli to new backendzelig2014-12-152-0/+14 * | | | | | | | blockmanager start/stop obsoletezelig2014-12-151-2/+0 * | | | | | | | adapt chain_manager to eth protocol interfacezelig2014-12-151-0/+4 * | | | | | | | blockpool rewritten , tests broken FIXMEzelig2014-12-152-292/+8 * | | | | | | | protocolzelig2014-12-151-7/+83 * | | | | | | | initial commit for eth blockpool + testzelig2014-12-151-2/+3 * | | | | | | | eth protocol changeszelig2014-12-152-11/+132 * | | | | | | | initial commit for eth-p2p integrationzelig2014-12-152-1/+165 * | | | | | | | remove wire packagezelig2014-12-156-511/+0 * | | | | | | | remove old ethereum/p2p related top level fileszelig2014-12-158-2307/+0 * | | | | | | | new cli optionszelig2014-12-152-4/+6 * | | | | | | | adapt to new backendzelig2014-12-151-14/+24 * | | | | | | | import eth pkgzelig2014-12-153-3/+3 * | | | | | | | add Status to retrieve TD, currentBlock, genesis for easy interface with eth/...zelig2014-12-151-1/+5 * | | | | | | | adapt to new eth pkg and p2pzelig2014-12-151-5/+3 * | | | | | | | add NewMinedBlockEventzelig2014-12-151-0/+3 * | | | | | | | transaction pool changeszelig2014-12-151-10/+16 * | | | | | | | adapt javascript pkg to new backend, use SuggestPeerzelig2014-12-152-3/+3 * | | | | | | | adapt miner to new backend. use events to broadcast new mined blockszelig2014-12-151-4/+3 * | | | | | | | adapt xeth pkg to new backend. FIXME JSPeer peer infozelig2014-12-153-44/+35 * | | | | | | | blockpool rewritten , tests broken FIXMEzelig2014-12-151-363/+863 * | | | | | | | add protocol error types specific to blockpoolzelig2014-12-151-0/+4 * | | | | | | | protocolzelig2014-12-151-50/+52 * | | | | | | | initial commit for new backend (eth.Ethereum)zelig2014-12-151-0/+357 * | | | | | | | initial commit for eth blockpool + testzelig2014-12-152-0/+712 * | | | | | | | eth protocol changeszelig2014-12-152-70/+122 * | | | | | | | no logging in error (to be refactored into p2p)zelig2014-12-151-6/+0 * | | | | | | | initial commit for eth-p2p integrationzelig2014-12-153-0/+500 | |/ / / / / / |/| | | | | | * | | | | | | fixed testsobscuren2014-12-132-10/+10 * | | | | | | eth-go packages ended up in whisperobscuren2014-12-131-1/+1 * | | | | | | Merge branch 'poc8' into developobscuren2014-12-131-0/+41 |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | * | | | | | Merge pull request #206 from ethereum/testsJeffrey Wilcke2014-12-131-0/+41 | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | * | | | | Fix variable nameTaylor Gerring2014-12-131-1/+1 | | * | | | | Added Dockerfile to build from sourceTaylor Gerring2014-12-131-0/+41 * | | | | | | updated testsobscuren2014-12-134-6255/+7294 * | | | | | | Implemented Qt whisper interfaceobscuren2014-12-131-0/+70 * | | | | | | Panic for "Vm"obscuren2014-12-131-1/+1 * | | | | | | Added length checkesobscuren2014-12-131-1/+18 * | | | | | | Movedobscuren2014-12-133-126/+0 * | | | | | | Implemented watching using filter packageobscuren2014-12-136-26/+145 * | | | | | | Moved filter to eventsobscuren2014-12-133-0/+126 * | | | | | | Generic filter interfaceobscuren2014-12-133-0/+126 * | | | | | | Accidentally changed max depth during testing & committedobscuren2014-12-121-1/+1 |/ / / / / / * | | | | | additional logobscuren2014-12-122-4/+3 * | | | | | Squashed commit of the following:obscuren2014-12-128-47/+85 * | | | | | moved interfacesobscuren2014-12-112-15/+10 * | | | | | states moved to chainobscuren2014-12-1111-28/+31 * | | | | | Removed start/stop methodsobscuren2014-12-102-24/+0 * | | | | | Moved powobscuren2014-12-108-91/+120 | |/ / / / |/| | | | * | | | | added simple peer serverobscuren2014-12-101-0/+40 * | | | | Updated whisper messages to new crypto api + added testsobscuren2014-12-105-11/+89 * | | | | Changed new methods to use ecdsa package for pub prv keysobscuren2014-12-102-26/+35 * | | | | changed to unsigned integersobscuren2014-12-103-20/+32 * | | | | updated testsobscuren2014-12-1014-783/+8344 * | | | | Fixed testsobscuren2014-12-104-175/+4 * | | | | Removed tests because they've become obsoleteobscuren2014-12-101-115/+0 * | | | | Merge branch 'poc8' into developobscuren2014-12-103-147/+145 |\ \ \ \ \ | | |/ / / | |/| | | | * | | | Merge pull request #203 from fjl/rlp-fixesJeffrey Wilcke2014-12-103-147/+145 | |\ \ \ \ | | |/ / / | |/| | | | | * | | rlp: display decoder target type in more error messagesFelix Lange2014-12-102-27/+33 | | * | | rlp: remove dead codeFelix Lange2014-12-091-2/+0 | | * | | rlp: fix panic in decodeList on go 1.4+Felix Lange2014-12-09