diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-11 03:28:20 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-11 03:28:20 +0800 |
| commit | ce595b9266d658a5eae626d78aec7f47c04222ca (patch) | |
| tree | aca528b9e907b97d5da56aeef7a4788fabf54b17 | |
| parent | 35841e51901149a496645b3c3c6be4ec7a58e6c6 (diff) | |
| download | dexon-ce595b9266d658a5eae626d78aec7f47c04222ca.tar dexon-ce595b9266d658a5eae626d78aec7f47c04222ca.tar.gz dexon-ce595b9266d658a5eae626d78aec7f47c04222ca.tar.bz2 dexon-ce595b9266d658a5eae626d78aec7f47c04222ca.tar.lz dexon-ce595b9266d658a5eae626d78aec7f47c04222ca.tar.xz dexon-ce595b9266d658a5eae626d78aec7f47c04222ca.tar.zst dexon-ce595b9266d658a5eae626d78aec7f47c04222ca.zip | |
fallback
| -rw-r--r-- | cmd/mist/assets/examples/coin.html | 2 | ||||
| -rw-r--r-- | core/chain_manager.go | 2 | ||||
| -rw-r--r-- | rpc/api.go | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index b6bab682f..96f2299a5 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -72,7 +72,7 @@ // deploy if not exist if (address == null) { var code = "0x60056013565b61014f8061003a6000396000f35b620f42406000600033600160a060020a0316815260200190815260200160002081905550560060e060020a600035048063d0679d3414610020578063e3d670d71461003457005b61002e600435602435610049565b60006000f35b61003f600435610129565b8060005260206000f35b806000600033600160a060020a03168152602001908152602001600020541061007157610076565b610125565b806000600033600160a060020a03168152602001908152602001600020908154039081905550806000600084600160a060020a031681526020019081526020016000209081540190819055508033600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660006000a38082600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660006000a35b5050565b60006000600083600160a060020a0316815260200190815260200160002054905091905056"; - address = web3.eth.transact({data: code}); + address = web3.eth.transact({from: eth.coinbase, data: code}); localStorage.setItem("address", address); } document.querySelector("#contract_addr").innerHTML = address; diff --git a/core/chain_manager.go b/core/chain_manager.go index 9dc41f421..97c61395e 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -440,12 +440,14 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { self.setTotalDifficulty(td) self.insert(block) + /* XXX crashes jsonlogger.LogJson(&logger.EthChainNewHead{ BlockHash: ethutil.Bytes2Hex(block.Hash()), BlockNumber: block.Number(), ChainHeadHash: ethutil.Bytes2Hex(cblock.Hash()), BlockPrevHash: ethutil.Bytes2Hex(block.ParentHash()), }) + */ self.setTransState(state.New(block.Root(), self.stateDb)) queue[i] = ChainEvent{block} diff --git a/rpc/api.go b/rpc/api.go index 511b819c1..38f02a473 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -556,7 +556,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error return err } return p.GetData(args, reply) - case "eth_sendTransaction": + case "eth_sendTransaction", "eth_transact": args := new(NewTxArgs) if err := json.Unmarshal(req.Params, &args); err != nil { return err |