cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +8 -10
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ae15eb1922 - Show all commits

8
cmd/curio/run.go
View File

@ -131,15 +131,15 @@ var runCmd = &cli.Command{
} }
defer taskEngine.GracefullyTerminate() defer taskEngine.GracefullyTerminate()
if err := lmrpc.ServeCurioMarketRPCFromConfig(dependencies.DB, dependencies.Full, dependencies.Cfg); err != nil {
return xerrors.Errorf("starting market RPCs: %w", err)
}
err = rpc.ListenAndServe(ctx, dependencies, shutdownChan) // Monitor for shutdown. err = rpc.ListenAndServe(ctx, dependencies, shutdownChan) // Monitor for shutdown.
if err != nil { if err != nil {
return err return err
} }
if err := lmrpc.ServeCurioMarketRPCFromConfig(dependencies.DB, dependencies.Full, dependencies.Cfg); err != nil {
return xerrors.Errorf("starting market RPCs: %w", err)
}
finishCh := node.MonitorShutdown(shutdownChan) //node.ShutdownHandler{Component: "rpc server", StopFunc: rpcStopper}, finishCh := node.MonitorShutdown(shutdownChan) //node.ShutdownHandler{Component: "rpc server", StopFunc: rpcStopper},
//node.ShutdownHandler{Component: "curio", StopFunc: stop}, //node.ShutdownHandler{Component: "curio", StopFunc: stop},

10
curiosrc/market/lmrpc/lmrpc.go
View File

@ -68,9 +68,8 @@ func MakeTokens(cfg *config.CurioConfig) (map[address.Address]string, error) {
return xerrors.Errorf("net resolve: %w", err) return xerrors.Errorf("net resolve: %w", err)
} }
if len(laddr.IP) == 0 { if len(laddr.IP) == 0 || laddr.IP.IsUnspecified() {
// set localhost return xerrors.Errorf("market rpc server listen address must be a specific address, not %s (probably missing bind IP)", listen)
laddr.IP = net.IPv4(127, 0, 0, 1)
} }
// need minimal provider with just the config // need minimal provider with just the config
@ -171,9 +170,8 @@ func ServeCurioMarketRPC(db *harmonydb.DB, full api.FullNode, maddr address.Addr
return xerrors.Errorf("net resolve: %w", err) return xerrors.Errorf("net resolve: %w", err)
} }
if len(laddr.IP) == 0 { if len(laddr.IP) == 0 || laddr.IP.IsUnspecified() {
// set localhost return xerrors.Errorf("market rpc server listen address must be a specific address, not %s (probably missing bind IP)", listen)
laddr.IP = net.IPv4(127, 0, 0, 1)
} }
rootUrl := url.URL{ rootUrl := url.URL{
Scheme: "http", Scheme: "http",