Skip to content

Commit 7562580

Browse files
obscurenobscuren
committed
fixed merge
2 parents ea9a549 + a59cd94 commit 7562580

File tree

6 files changed

+130
-9
lines changed

6 files changed

+130
-9
lines changed

‎core/chain_manager.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,9 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
396396
self.mu.Unlock()
397397

398398
if chain {
399-
//self.setTransState(state.New(block.Root(), self.db))
400-
//self.eventMux.Post(ChainEvent{block, td})
399+
fmt.Println("POST START")
400+
self.eventMux.Post(ChainEvent{block, td})
401+
fmt.Println("POST END")
401402
}
402403

403404
if split {
@@ -413,7 +414,3 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
413414
func (self *ChainManager) GetAccount(addr []byte) *state.StateObject {
414415
return self.State().GetAccount(addr)
415416
}
416-
417-
func (self *ChainManager) TransMut() *sync.RWMutex {
418-
return &self.tsmu
419-
}

‎event/filter/eth_filter.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package filter
33
// TODO make use of the generic filtering system
44

55
import (
6+
"fmt"
67
"sync"
78

89
"github.com/ethereum/go-ethereum/core"
@@ -37,17 +38,18 @@ func (self *FilterManager) Stop() {
3738

3839
func (self *FilterManager) InstallFilter(filter *core.Filter) (id int) {
3940
self.filterMu.Lock()
41+
defer self.filterMu.Unlock()
4042
id = self.filterId
4143
self.filters[id] = filter
4244
self.filterId++
43-
self.filterMu.Unlock()
45+
4446
return id
4547
}
4648

4749
func (self *FilterManager) UninstallFilter(id int) {
4850
self.filterMu.Lock()
51+
defer self.filterMu.Unlock()
4952
delete(self.filters, id)
50-
self.filterMu.Unlock()
5153
}
5254

5355
// GetFilter retrieves a filter installed using InstallFilter.
@@ -62,7 +64,7 @@ func (self *FilterManager) filterLoop() {
6264
// Subscribe to events
6365
events := self.eventMux.Subscribe(
6466
core.PendingBlockEvent{},
65-
core.ChainEvent{},
67+
//core.ChainEvent{},
6668
state.Logs(nil))
6769

6870
out:
@@ -73,13 +75,15 @@ out:
7375
case event := <-events.Chan():
7476
switch event := event.(type) {
7577
case core.ChainEvent:
78+
fmt.Println("filter start")
7679
self.filterMu.RLock()
7780
for _, filter := range self.filters {
7881
if filter.BlockCallback != nil {
7982
filter.BlockCallback(event.Block)
8083
}
8184
}
8285
self.filterMu.RUnlock()
86+
fmt.Println("filter stop")
8387

8488
case core.PendingBlockEvent:
8589
self.filterMu.RLock()

‎miner/worker.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,11 @@ out:
117117
case event := <-events.Chan():
118118
switch ev := event.(type) {
119119
case core.ChainEvent:
120+
println("miner start")
120121
if self.current.block != ev.Block {
121122
self.commitNewWork()
122123
}
124+
println("miner end")
123125
case core.NewMinedBlockEvent:
124126
self.commitNewWork()
125127
}

‎rpc/message.go‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,36 @@ func (req *RpcRequest) ToGetCodeAtArgs() (*GetCodeAtArgs, error) {
201201
return args, nil
202202
}
203203

204+
func (req *RpcRequest) ToBoolArgs() (bool, error) {
205+
if len(req.Params) < 1 {
206+
return false, NewErrorResponse(ErrorArguments)
207+
}
208+
209+
var args bool
210+
err := json.Unmarshal(req.Params[0], &args)
211+
if err != nil {
212+
return false, NewErrorResponse(ErrorDecodeArgs)
213+
}
214+
215+
rpclogger.DebugDetailf("%T %v", args, args)
216+
return args, nil
217+
}
218+
219+
func (req *RpcRequest) ToCompileArgs() (string, error) {
220+
if len(req.Params) < 1 {
221+
return "", NewErrorResponse(ErrorArguments)
222+
}
223+
224+
var args string
225+
err := json.Unmarshal(req.Params[0], &args)
226+
if err != nil {
227+
return "", NewErrorResponse(ErrorDecodeArgs)
228+
}
229+
230+
rpclogger.DebugDetailf("%T %v", args, args)
231+
return args, nil
232+
}
233+
204234
func (req *RpcRequest) ToFilterArgs() (*FilterOptions, error) {
205235
if len(req.Params) < 1 {
206236
return nil, NewErrorResponse(ErrorArguments)
@@ -231,6 +261,36 @@ func (req *RpcRequest) ToFilterStringArgs() (string, error) {
231261
return args, nil
232262
}
233263

264+
func (req *RpcRequest) ToUninstallFilterArgs() (int, error) {
265+
if len(req.Params) < 1 {
266+
return 0, NewErrorResponse(ErrorArguments)
267+
}
268+
269+
var args int
270+
err := json.Unmarshal(req.Params[0], &args)
271+
if err != nil {
272+
return 0, NewErrorResponse(ErrorDecodeArgs)
273+
}
274+
275+
rpclogger.DebugDetailf("%T %v", args, args)
276+
return args, nil
277+
}
278+
279+
func (req *RpcRequest) ToFilterChangedArgs() (int, error) {
280+
if len(req.Params) < 1 {
281+
return 0, NewErrorResponse(ErrorArguments)
282+
}
283+
284+
var id int
285+
r := bytes.NewReader(req.Params[0])
286+
err := json.NewDecoder(r).Decode(&id)
287+
if err != nil {
288+
return 0, NewErrorResponse(ErrorDecodeArgs)
289+
}
290+
rpclogger.DebugDetailf("%T %v", id, id)
291+
return id, nil
292+
}
293+
234294
func (req *RpcRequest) ToDbPutArgs() (*DbArgs, error) {
235295
if len(req.Params) < 3 {
236296
return nil, NewErrorResponse(ErrorArguments)

‎rpc/packages.go‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,13 @@ func (self *EthereumApi) NewFilter(args *FilterOptions, reply *interface{}) erro
113113
return nil
114114
}
115115

116+
func (self *EthereumApi) UninstallFilter(id int, reply *interface{}) error {
117+
delete(self.logs, id)
118+
self.filterManager.UninstallFilter(id)
119+
*reply = true
120+
return nil
121+
}
122+
116123
func (self *EthereumApi) NewFilterString(args string, reply *interface{}) error {
117124
var id int
118125
filter := core.NewFilter(self.xeth.Backend())
@@ -273,6 +280,11 @@ func (p *EthereumApi) GetIsMining(reply *interface{}) error {
273280
return nil
274281
}
275282

283+
func (p *EthereumApi) SetMining(shouldmine bool, reply *interface{}) error {
284+
*reply = p.xeth.SetMining(shouldmine)
285+
return nil
286+
}
287+
276288
func (p *EthereumApi) BlockNumber(reply *interface{}) error {
277289
*reply = p.xeth.Backend().ChainManager().CurrentBlock().Number()
278290
return nil
@@ -306,6 +318,21 @@ func (p *EthereumApi) GetCodeAt(args *GetCodeAtArgs, reply *interface{}) error {
306318
return nil
307319
}
308320

321+
func (p *EthereumApi) GetCompilers(reply *interface{}) error {
322+
c := []string{"serpent"}
323+
*reply = c
324+
return nil
325+
}
326+
327+
func (p *EthereumApi) CompileSerpent(script string, reply *interface{}) error {
328+
res, err := ethutil.Compile(script, false)
329+
if err != nil {
330+
return err
331+
}
332+
*reply = res
333+
return nil
334+
}
335+
309336
func (p *EthereumApi) Sha3(args *Sha3Args, reply *interface{}) error {
310337
*reply = toHex(crypto.Sha3(fromHex(args.Data)))
311338
return nil
@@ -394,6 +421,12 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
394421
return p.GetIsListening(reply)
395422
case "eth_mining":
396423
return p.GetIsMining(reply)
424+
case "eth_setMining":
425+
args, err := req.ToBoolArgs()
426+
if err != nil {
427+
return err
428+
}
429+
return p.SetMining(args, reply)
397430
case "eth_peerCount":
398431
return p.GetPeerCount(reply)
399432
case "eth_number":
@@ -460,6 +493,12 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
460493
return err
461494
}
462495
return p.NewFilterString(args, reply)
496+
case "eth_uninstallFilter":
497+
args, err := req.ToUninstallFilterArgs()
498+
if err != nil {
499+
return err
500+
}
501+
return p.UninstallFilter(args, reply)
463502
case "eth_changed":
464503
args, err := req.ToIdArgs()
465504
if err != nil {
@@ -493,6 +532,14 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
493532
return err
494533
}
495534
return p.WatchTx(args, reply)
535+
case "eth_compilers":
536+
return p.GetCompilers(reply)
537+
case "eth_serpent":
538+
args, err := req.ToCompileArgs()
539+
if err != nil {
540+
return err
541+
}
542+
return p.CompileSerpent(args, reply)
496543
case "web3_sha3":
497544
args, err := req.ToSha3Args()
498545
if err != nil {

‎xeth/xeth.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,17 @@ func (self *XEth) IsMining() bool {
103103
return self.miner.Mining()
104104
}
105105

106+
func (self *XEth) SetMining(shouldmine bool) bool {
107+
ismining := self.miner.Mining()
108+
if shouldmine && !ismining {
109+
self.miner.Start()
110+
}
111+
if ismining && !shouldmine {
112+
self.miner.Stop()
113+
}
114+
return self.miner.Mining()
115+
}
116+
106117
func (self *XEth) IsListening() bool {
107118
return self.eth.IsListening()
108119
}

0 commit comments

Comments
 (0)