aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-15 20:54:07 +0800
committerobscuren <geffobscura@gmail.com>2014-05-15 20:54:07 +0800
commitf95993e326567555d0a2e1f96974c34e7b3a214f (patch)
tree02a857bcd4d4cde7b2f2d491062d56782736107b /ethchain
parent7bf2ae0b116fff0fede5b1455c5fda20caf98252 (diff)
downloadgo-tangerine-f95993e326567555d0a2e1f96974c34e7b3a214f.tar
go-tangerine-f95993e326567555d0a2e1f96974c34e7b3a214f.tar.gz
go-tangerine-f95993e326567555d0a2e1f96974c34e7b3a214f.tar.bz2
go-tangerine-f95993e326567555d0a2e1f96974c34e7b3a214f.tar.lz
go-tangerine-f95993e326567555d0a2e1f96974c34e7b3a214f.tar.xz
go-tangerine-f95993e326567555d0a2e1f96974c34e7b3a214f.tar.zst
go-tangerine-f95993e326567555d0a2e1f96974c34e7b3a214f.zip
M
Diffstat (limited to 'ethchain')
-rw-r--r--ethchain/block_chain.go2
-rw-r--r--ethchain/state_manager.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/ethchain/block_chain.go b/ethchain/block_chain.go
index 11fbc7795..1848b9ddb 100644
--- a/ethchain/block_chain.go
+++ b/ethchain/block_chain.go
@@ -260,7 +260,7 @@ func AddTestNetFunds(block *Block) {
"e6716f9544a56c530d868e4bfbacb172315bdead", // Jeffrey
"1e12515ce3e0f817a4ddef9ca55788a1d66bd2df", // Vit
"1a26338f0d905e295fccb71fa9ea849ffa12aaf4", // Alex
- //"2ef47100e0787b915105fd5e3f4ff6752079d5cb", // Maran
+ "2ef47100e0787b915105fd5e3f4ff6752079d5cb", // Maran
} {
//log.Println("2^200 Wei to", addr)
codedAddr := ethutil.FromHex(addr)
diff --git a/ethchain/state_manager.go b/ethchain/state_manager.go
index 57d56469b..143d9d647 100644
--- a/ethchain/state_manager.go
+++ b/ethchain/state_manager.go
@@ -193,11 +193,11 @@ func (sm *StateManager) ProcessBlock(block *Block, dontReact bool) error {
if dontReact == false {
sm.Ethereum.Reactor().Post("newBlock", block)
- sm.notifyChanges()
-
sm.procState.manifest.Reset()
}
+ sm.notifyChanges()
+
sm.Ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
sm.Ethereum.TxPool().RemoveInvalid(sm.procState)