Skip to content

Commit

Permalink
Merge branch 'master' of github.com:prysmaticlabs/prysm into v0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
prestonvanloon committed Nov 6, 2019
2 parents 45a88bb + db866e6 commit d27bd4e
Show file tree
Hide file tree
Showing 10 changed files with 749 additions and 40 deletions.
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ go_repository(

go_repository(
name = "com_github_prysmaticlabs_go_ssz",
commit = "f9cd0959d8e107241bcb4bad1d4d8e72b3e9f7b4",
commit = "58b2f86b0f02f06e634db06dee0c838ad41849f8",
importpath = "github.com/prysmaticlabs/go-ssz",
)

Expand Down
3 changes: 2 additions & 1 deletion beacon-chain/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ func (b *BeaconNode) registerInitialSyncService(ctx *cli.Context) error {
}

is := initialsync.NewInitialSync(&initialsync.Config{
DB: b.db,
Chain: chainService,
P2P: b.fetchP2P(ctx),
})
Expand Down Expand Up @@ -479,7 +480,7 @@ func (b *BeaconNode) registerGRPCGateway(ctx *cli.Context) error {
gatewayPort := ctx.GlobalInt(flags.GRPCGatewayPort.Name)
if gatewayPort > 0 {
selfAddress := fmt.Sprintf("127.0.0.1:%d", ctx.GlobalInt(flags.RPCPort.Name))
gatewayAddress := fmt.Sprintf("127.0.0.1:%d", gatewayPort)
gatewayAddress := fmt.Sprintf("0.0.0.0:%d", gatewayPort)
return b.services.RegisterService(gateway.New(context.Background(), selfAddress, gatewayAddress, nil /*optional mux*/))
}
return nil
Expand Down
Loading

0 comments on commit d27bd4e

Please sign in to comment.