BTFS-2419

cmd/btfs/daemon.go

@@ -557,7 +557,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
 		return err
 	}
 	spin.Analytics(api, cctx.ConfigRoot, node, version.CurrentVersionNumber, hValue)
-	spin.Hosts(node, env)
+	spin.Hosts(node, req, re, env)
 	spin.Contracts(node, req, env, nodepb.ContractStat_HOST.String())
 	if params, err := helper.ExtractContextParams(req, env); err == nil {
 		spin.NewWalletWrap(params).UpdateStatus()

core/commands/storage/challenge/challenge.go

@@ -41,49 +41,12 @@ still store a piece of file (usually a shard) as agreed in storage contract.`,
 	}, StorageChallengeResponseCmd.Arguments...), // append pass-through arguments
 	RunTimeout: 20 * time.Second,
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
-		cfg, err := cmdenv.GetConfig(env)
+		scr, err := ReqChallengeStorage(req, res, env, req.Arguments[0], req.Arguments[2], req.Arguments[3], req.Arguments[4], req.Arguments[5]) //(*StorageChallengeRes, error) {
 		if err != nil {
 			return err
 		}
-		if !cfg.Experimental.StorageClientEnabled {
-			return fmt.Errorf("storage client api not enabled")
-		}
-		res.RecordEvent("GetConfig")
-
-		n, err := cmdenv.GetNode(env)
-		if err != nil {
-			return err
-		}
-
-		res.RecordEvent("GetNode")
-
-		api, err := cmdenv.GetApi(env, req)
-		if err != nil {
-			return err
-		}
-		res.RecordEvent("GetApi")
-		// Check if peer is reachable
-		pi, err := remote.FindPeer(req.Context, n, req.Arguments[0])
-		if err != nil {
-			return err
-		}
-		res.RecordEvent("FindPeer")
-		// Pass arguments through to host response endpoint
-		resp, err := remote.P2PCallStrings(req.Context, n, api, pi.ID, "/storage/challenge/response",
-			req.Arguments[1:]...)
-		if err != nil {
-			return err
-		}
-
-		res.RecordEvent("P2PCall")
-		var scr StorageChallengeRes
-		err = json.Unmarshal(resp, &scr)
-		if err != nil {
-			return err
-		}
-		res.RecordEvent("Unmarshall")
-		scr.TimeEvaluate = append(scr.TimeEvaluate, res.ShowEventReport())
 		return cmds.EmitOnce(res, &scr)
+
 	},
 	Type: StorageChallengeRes{},
 }
@@ -109,58 +72,114 @@ the challenge request back to the caller.`,
 	},
 	RunTimeout: 1 * time.Minute,
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
-		cfg, err := cmdenv.GetConfig(env)
+		scr, err := respChallengeStorage(req, res, env, req.Arguments[1], req.Arguments[2], req.Arguments[3], req.Arguments[4])
 		if err != nil {
 			return err
 		}
-		if !cfg.Experimental.StorageHostEnabled {
-			return fmt.Errorf("storage host api not enabled")
-		}
-		res.RecordEvent("HGetConfig")
-
-		n, err := cmdenv.GetNode(env)
-		if err != nil {
-			return err
-		}
-		res.RecordEvent("HGetNode")
-		api, err := cmdenv.GetApi(env, req)
-		if err != nil {
-			return err
-		}
-		res.RecordEvent("HGetApi")
-		fileHash, err := cidlib.Parse(req.Arguments[1])
-		if err != nil {
-			return err
-		}
-		res.RecordEvent("HParseFileCid")
+		return cmds.EmitOnce(res, &scr)
+	},
+	Type: StorageChallengeRes{},
+}
 
-		sh := req.Arguments[2]
-		shardHash, err := cidlib.Parse(sh)
+func ReqChallengeStorage(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment, peerId string, fileHash string, shardHash string, chunkIndex string, nonce string) (*StorageChallengeRes, error) {
+	cfg, err := cmdenv.GetConfig(env)
+	if err != nil {
+		return nil, err
+	}
+	if !cfg.Experimental.StorageClientEnabled {
+		return nil, fmt.Errorf("storage client api not enabled")
+	}
+	res.RecordEvent("GetConfig")
+	n, err := cmdenv.GetNode(env)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("GetNode")
+	api, err := cmdenv.GetApi(env, req)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("GetApi")
+	// Check if peer is reachable
+	pi, err := remote.FindPeer(req.Context, n, peerId)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("FindPeer")
+
+	var scr *StorageChallengeRes
+	if peerId == n.Identity.Pretty() {
+		scr, err = respChallengeStorage(req, res, env, fileHash, shardHash, chunkIndex, nonce)
 		if err != nil {
-			return err
+			return nil, err
 		}
-		res.RecordEvent("HParseShardCid")
-		chunkIndex, err := strconv.Atoi(req.Arguments[3])
+	} else {
+		resp, err := remote.P2PCallStrings(req.Context, n, api, pi.ID, "/storage/challenge/response",
+			req.Arguments[1:]...)
 		if err != nil {
-			return err
+			return nil, err
 		}
-		nonce := req.Arguments[4]
-		// Get (cached) challenge response object and solve challenge
-		sc, err := NewStorageChallengeResponse(req.Context, n, api, fileHash, shardHash, "", false, 0)
+		res.RecordEvent("P2PCall")
+		err = json.Unmarshal(resp, &scr)
 		if err != nil {
-			return err
+			return nil, err
 		}
-		res.RecordEvent("HNewResponse")
+		res.RecordEvent("Unmarshall")
+	}
+	scr.TimeEvaluate = append(scr.TimeEvaluate, res.ShowEventReport())
+	return scr, nil
+}
 
-		err = sc.SolveChallenge(chunkIndex, nonce)
-		if err != nil {
-			return err
-		}
-		res.RecordEvent("HSolveChallenge")
-		return cmds.EmitOnce(res, &StorageChallengeRes{
-			Answer:       sc.Hash,
-			TimeEvaluate: []string{res.ShowEventReport()},
-		})
-	},
-	Type: StorageChallengeRes{},
+func respChallengeStorage(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment, fileHashStr string, shardHashStr string, chunkIndexStr string, nonce string) (*StorageChallengeRes, error) {
+	cfg, err := cmdenv.GetConfig(env)
+	if err != nil {
+		return nil, err
+	}
+	if !cfg.Experimental.StorageHostEnabled {
+		return nil, fmt.Errorf("storage host api not enabled")
+	}
+	res.RecordEvent("HGetConfig")
+
+	n, err := cmdenv.GetNode(env)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("HGetNode")
+	api, err := cmdenv.GetApi(env, req)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("HGetApi")
+	fileHash, err := cidlib.Parse(fileHashStr)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("HParseFileCid")
+	shardHash, err := cidlib.Parse(shardHashStr)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("HParseShardCid")
+	chunkIndex, err := strconv.Atoi(chunkIndexStr)
+	if err != nil {
+		return nil, err
+	}
+	// Get (cached) challenge response object and solve challenge
+	sc, err := NewStorageChallengeResponse(req.Context, n, api, fileHash, shardHash, "", false, 0)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("HNewResponse")
+
+	err = sc.SolveChallenge(chunkIndex, nonce)
+	if err != nil {
+		return nil, err
+	}
+	res.RecordEvent("HSolveChallenge")
+
+	scr := &StorageChallengeRes{
+		Answer:       sc.Hash,
+		TimeEvaluate: []string{res.ShowEventReport()},
+	}
+	return scr, nil
 }