Skip to content

Eth protocol integration to p2p (don't merge, to be reviewed) #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 49 commits into from
Closed

Eth protocol integration to p2p (don't merge, to be reviewed) #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
47793b6
initial commit for eth-p2p integration
zelig Dec 5, 2014
31a9fdc
no logging in error (to be refactored into p2p)
zelig Dec 9, 2014
e74f9f2
eth protocol changes
zelig Dec 9, 2014
3e38f8a
initial commit for eth blockpool + test
zelig Dec 10, 2014
25cf0c4
Accidentally changed max depth during testing & committed
obscuren Dec 12, 2014
9e1689d
Generic filter interface
obscuren Dec 12, 2014
ed15382
Moved filter to events
obscuren Dec 12, 2014
a17a1f9
Implemented watching using filter package
obscuren Dec 12, 2014
1c7fd62
Moved
obscuren Dec 12, 2014
06e7642
Added length checkes
obscuren Dec 12, 2014
8577e41
Panic for "Vm"
obscuren Dec 12, 2014
bf566a6
Implemented Qt whisper interface
obscuren Dec 12, 2014
aec0c0e
updated tests
obscuren Dec 12, 2014
0122989
Merge branch 'poc8' into develop
obscuren Dec 12, 2014
4c84db8
eth-go packages ended up in whisper
obscuren Dec 12, 2014
f8061fc
fixed tests
obscuren Dec 12, 2014
e5aa38c
initial commit for eth-p2p integration
zelig Dec 5, 2014
eb5cb04
no logging in error (to be refactored into p2p)
zelig Dec 9, 2014
d957dd2
eth protocol changes
zelig Dec 9, 2014
4366fdf
initial commit for eth blockpool + test
zelig Dec 10, 2014
02017ed
initial commit for new backend (eth.Ethereum)
zelig Dec 14, 2014
c44e025
protocol
zelig Dec 14, 2014
3308d82
add protocol error types specific to blockpool
zelig Dec 14, 2014
76070b4
blockpool rewritten , tests broken FIXME
zelig Dec 14, 2014
148de1c
adapt xeth pkg to new backend. FIXME JSPeer peer info
zelig Dec 14, 2014
118862f
adapt miner to new backend. use events to broadcast new mined blocks
zelig Dec 14, 2014
b89ed8e
adapt javascript pkg to new backend, use SuggestPeer
zelig Dec 14, 2014
c2af10d
transaction pool changes
zelig Dec 14, 2014
5022a31
add NewMinedBlockEvent
zelig Dec 14, 2014
39d86a2
adapt to new eth pkg and p2p
zelig Dec 14, 2014
d84810d
add Status to retrieve TD, currentBlock, genesis for easy interface w…
zelig Dec 14, 2014
50e1dcc
import eth pkg
zelig Dec 14, 2014
ae7c1e3
adapt to new backend
zelig Dec 14, 2014
d9b16c1
new cli options
zelig Dec 14, 2014
7d02c4f
remove old ethereum/p2p related top level files
zelig Dec 14, 2014
e847aac
remove wire package
zelig Dec 14, 2014
0add0c4
initial commit for eth-p2p integration
zelig Dec 5, 2014
2dd8f41
eth protocol changes
zelig Dec 9, 2014
5e4d77b
initial commit for eth blockpool + test
zelig Dec 10, 2014
4dfce46
protocol
zelig Dec 14, 2014
01dc1c1
blockpool rewritten , tests broken FIXME
zelig Dec 14, 2014
7b39cc8
adapt chain_manager to eth protocol interface
zelig Dec 14, 2014
e77b720
blockmanager start/stop obsolete
zelig Dec 14, 2014
61940b2
adapt cmd/cli to new backend
zelig Dec 14, 2014
4c89d53
adapt blockpool/backend to use pow/ezp with pow.Block for VerifyPoW func
zelig Dec 14, 2014
72290f6
resolve merge conflict hell
zelig Dec 14, 2014
702801a
Merge branch 'ethp2p' of github.com:ethersphere/go-ethereum into ethp2p
zelig Dec 14, 2014
835bf56
rename logger pkg and logger instance var
zelig Dec 14, 2014
2740588
protocol test: basic status message tests pass
zelig Dec 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
351 changes: 0 additions & 351 deletions block_pool.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/ethereum/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"io/ioutil"
"os"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/cmd/ethereum/repl"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/javascript"
)

Expand Down
6 changes: 4 additions & 2 deletions cmd/ethereum/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ var (
StartRpc bool
StartWebSockets bool
RpcPort int
UseUPnP bool
NatType string
PMPGateway string
OutboundPort string
ShowGenesis bool
AddPeer string
Expand Down Expand Up @@ -84,7 +85,8 @@ func Init() {
flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use")
flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
flag.StringVar(&OutboundPort, "port", "30303", "listening port")
flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP")
flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
Expand Down
4 changes: 2 additions & 2 deletions cmd/ethereum/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ func main() {
// create, import, export keys
utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive)

clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier)
clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier, string(keyManager.PublicKey()))

ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
ethereum := utils.NewEthereum(db, clientIdentity, keyManager, utils.NatType(NatType, PMPGateway), OutboundPort, MaxPeer)

if Dump {
var block *types.Block
Expand Down
Loading