poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reversed back

This commit is contained in:
obscuren 2014-02-10 13:59:05 +01:00
parent 1d26ae2dea
commit 8ab6c53231
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethereum.go
View File

@ -58,8 +58,8 @@ type Ethereum struct {
} }
func New(caps Caps, usePnp bool) (*Ethereum, error) { func New(caps Caps, usePnp bool) (*Ethereum, error) {
db, err := ethdb.NewLDBDatabase() //db, err := ethdb.NewLDBDatabase()
//db, err := ethdb.NewMemDatabase() db, err := ethdb.NewMemDatabase()
if err != nil { if err != nil {
return nil, err return nil, err
} }

25
peer.go
View File

@ -1,7 +1,7 @@
package eth package eth
import ( import (
"bytes" _ "bytes"
"fmt" "fmt"
"github.com/ethereum/ethchain-go" "github.com/ethereum/ethchain-go"
"github.com/ethereum/ethutil-go" "github.com/ethereum/ethutil-go"
@ -139,8 +139,6 @@ func NewPeer(conn net.Conn, ethereum *Ethereum, inbound bool) *Peer {
} }
func NewOutboundPeer(addr string, ethereum *Ethereum, caps Caps) *Peer { func NewOutboundPeer(addr string, ethereum *Ethereum, caps Caps) *Peer {
data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
pubkey := ethutil.NewValueFromBytes(data).Get(2).Bytes()
p := &Peer{ p := &Peer{
outputQueue: make(chan *ethwire.Msg, outputBufferSize), outputQueue: make(chan *ethwire.Msg, outputBufferSize),
@ -150,7 +148,6 @@ func NewOutboundPeer(addr string, ethereum *Ethereum, caps Caps) *Peer {
connected: 0, connected: 0,
disconnect: 0, disconnect: 0,
caps: caps, caps: caps,
pubkey: pubkey,
} }
// Set up the connection in another goroutine so we don't block the main thread // Set up the connection in another goroutine so we don't block the main thread
@ -283,7 +280,6 @@ func (p *Peer) HandleInbound() {
msg.Data = msg.Data msg.Data = msg.Data
var block *ethchain.Block var block *ethchain.Block
for i := msg.Data.Length() - 1; i >= 0; i-- { for i := msg.Data.Length() - 1; i >= 0; i-- {
// FIXME
block = ethchain.NewBlockFromRlpValue(ethutil.NewValue(msg.Data.Get(i).AsRaw())) block = ethchain.NewBlockFromRlpValue(ethutil.NewValue(msg.Data.Get(i).AsRaw()))
err := p.ethereum.BlockManager.ProcessBlock(block) err := p.ethereum.BlockManager.ProcessBlock(block)
@ -440,9 +436,12 @@ func (p *Peer) Stop() {
} }
func (p *Peer) pushHandshake() error { func (p *Peer) pushHandshake() error {
data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
pubkey := ethutil.NewValueFromBytes(data).Get(2).Bytes()
clientId := fmt.Sprintf("/Ethereum(G) v%s/%s", ethutil.Config.Ver, runtime.GOOS) clientId := fmt.Sprintf("/Ethereum(G) v%s/%s", ethutil.Config.Ver, runtime.GOOS)
msg := ethwire.NewMessage(ethwire.MsgHandshakeTy, []interface{}{ msg := ethwire.NewMessage(ethwire.MsgHandshakeTy, []interface{}{
uint32(3), uint32(0), clientId, byte(p.caps), p.port, p.pubkey, uint32(3), uint32(0), clientId, byte(p.caps), p.port, pubkey,
}) })
p.QueueMessage(msg) p.QueueMessage(msg)
@ -485,13 +484,15 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
p.port = uint16(c.Get(4).AsUint()) p.port = uint16(c.Get(4).AsUint())
// Self connect detection // Self connect detection
data, _ := ethutil.Config.Db.Get([]byte("KeyRing")) /*
pubkey := ethutil.NewValueFromBytes(data).Get(2).Bytes() data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
if bytes.Compare(pubkey, p.pubkey) == 0 { pubkey := ethutil.NewValueFromBytes(data).Get(2).Bytes()
p.Stop() if bytes.Compare(pubkey, p.pubkey) == 0 {
p.Stop()
return return
} }
*/
istr = "inbound" istr = "inbound"
} else { } else {