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

lotus-provider without rpc endpoint

Browse Source
This commit is contained in:
Andrew Jackson (Ajax) 2023-08-30 15:57:20 -05:00
parent 5c00f8d66e
commit 13b50ce6c8
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -66,7 +66,7 @@ CLEAN+=build/.update-modules
deps: $(BUILD_DEPS) deps: $(BUILD_DEPS)
.PHONY: deps .PHONY: deps
build-devnets: build lotus-seed lotus-shed build-devnets: build lotus-seed lotus-shed lotus-provider
.PHONY: build-devnets .PHONY: build-devnets
debug: GOFLAGS+=-tags=debug debug: GOFLAGS+=-tags=debug

28
cmd/lotus-provider/run.go
View File

@ -83,7 +83,7 @@ var runCmd = &cli.Command{
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: FlagProviderRepo, Name: FlagProviderRepo,
Value: "~/lotus", Value: "~/lotusminer",
}, },
}, },
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
@ -119,6 +119,7 @@ var runCmd = &cli.Command{
// Open repo // Open repo
repoPath := cctx.String(FlagProviderRepo) repoPath := cctx.String(FlagProviderRepo)
fmt.Println("repopath", repoPath)
r, err := repo.NewFS(repoPath) r, err := repo.NewFS(repoPath)
if err != nil { if err != nil {
return err return err
@ -235,20 +236,21 @@ var runCmd = &cli.Command{
} }
// Serve the RPC. // Serve the RPC.
endpoint, err := r.APIEndpoint() /*
if err != nil { endpoint, err := r.APIEndpoint()
return fmt.Errorf("getting API endpoint: %w", err) fmt.Println("Endpoint: ", endpoint)
} if err != nil {
rpcStopper, err := node.ServeRPC(handler, "lotus-provider", endpoint) return fmt.Errorf("getting API endpoint: %w", err)
if err != nil { }
return fmt.Errorf("failed to start json-rpc endpoint: %s", err) rpcStopper, err := node.ServeRPC(handler, "lotus-provider", endpoint)
} if err != nil {
return fmt.Errorf("failed to start json-rpc endpoint: %s", err)
}
*/
// Monitor for shutdown. // Monitor for shutdown.
finishCh := node.MonitorShutdown(shutdownChan, finishCh := node.MonitorShutdown(shutdownChan) //node.ShutdownHandler{Component: "rpc server", StopFunc: rpcStopper},
node.ShutdownHandler{Component: "rpc server", StopFunc: rpcStopper}, //node.ShutdownHandler{Component: "provider", StopFunc: stop},
//node.ShutdownHandler{Component: "provider", StopFunc: stop},
)
<-finishCh <-finishCh
return nil return nil

2
lib/harmony/resources/resources.go
View File

@ -67,7 +67,7 @@ func Register(db *harmonydb.DB, hostnameAndPort string) (*Reg, error) {
} else { } else {
reg.MachineID = ownerID[0] reg.MachineID = ownerID[0]
_, err := db.Exec(ctx, `UPDATE harmony_machines SET _, err := db.Exec(ctx, `UPDATE harmony_machines SET
cpu=$1, ram=$2, gpu=$3, gpuram=$4 WHERE id=$6`, cpu=$1, ram=$2, gpu=$3, gpuram=$4 WHERE id=$5`,
reg.Cpu, reg.Ram, reg.Gpu, gpuram, reg.Resources.MachineID) reg.Cpu, reg.Ram, reg.Gpu, gpuram, reg.Resources.MachineID)
if err != nil { if err != nil {
return nil, err return nil, err