update node api (#102)

Author: 0g-peterzhb

.github/workflows/tests.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.21'
+        go-version: '1.22'
 
     - name: Build
       run: go build 

gateway/local_apis.go

@@ -83,7 +83,7 @@ func getFileStatus(c *gin.Context) (interface{}, error) {
 	var notFinalized bool
 
 	for _, client := range allClients {
-		info, err := client.GetFileInfo(context.Background(), root)
+		info, err := client.GetFileInfo(context.Background(), root, false)
 		if err != nil {
 			return nil, err
 		}

indexer/api.go

@@ -66,7 +66,7 @@ func (api *IndexerApi) GetFileLocations(ctx context.Context, root string) (locat
 	var txSeq uint64
 	found := false
 	for _, client := range trustedClients {
-		info, err := client.GetFileInfo(ctx, hash)
+		info, err := client.GetFileInfo(ctx, hash, true)
 		if err != nil || info == nil {
 			continue
 		}

indexer/gateway/controller.go

@@ -51,7 +51,7 @@ func (ctrl *RestController) getAvailableFileLocations(ctx context.Context, cid C
 	// find corresponding tx sequence
 	hash := eth_common.HexToHash(cid.Root)
 	for _, client := range ctrl.nodeManager.TrustedClients() {
-		info, err := client.GetFileInfo(ctx, hash)
+		info, err := client.GetFileInfo(ctx, hash, true)
 		if err == nil && info != nil {
 			return ctrl.fileLocationCache.GetFileLocations(ctx, info.Tx.Seq)
 		}
@@ -130,7 +130,7 @@ func getOverallFileInfo(ctx context.Context, clients []*node.ZgsClient, cid Cid)
 		if cid.TxSeq != nil {
 			info, err = client.GetFileInfoByTxSeq(ctx, *cid.TxSeq)
 		} else {
-			info, err = client.GetFileInfo(ctx, rootHash)
+			info, err = client.GetFileInfo(ctx, rootHash, true)
 		}
 
 		if err != nil {

node/client_zgs.go

@@ -58,8 +58,8 @@ func (c *ZgsClient) CheckFileFinalized(ctx context.Context, txSeqOrRoot TxSeqOrR
 }
 
 // GetFileInfo Call zgs_getFileInfo RPC to get the information of a file by file data root from the node.
-func (c *ZgsClient) GetFileInfo(ctx context.Context, root common.Hash) (*FileInfo, error) {
-	return providers.CallContext[*FileInfo](c, ctx, "zgs_getFileInfo", root)
+func (c *ZgsClient) GetFileInfo(ctx context.Context, root common.Hash, needAvailable bool) (*FileInfo, error) {
+	return providers.CallContext[*FileInfo](c, ctx, "zgs_getFileInfo", root, needAvailable)
 }
 
 // GetFileInfoByTxSeq Call zgs_getFileInfoByTxSeq RPC to get the information of a file by file sequence id from the node.

tests/go_tests/indexer_test/main.go

@@ -89,7 +89,7 @@ func runTest() error {
 
 	client0 := node.MustNewZgsClient(zgsNodeUrls[0])
 	for {
-		info, err := client0.GetFileInfo(ctx, root)
+		info, err := client0.GetFileInfo(ctx, root, true)
 		if err != nil {
 			return errors.WithMessage(err, "failed to get file info")
 		}

tests/go_tests/segment_upload_test/main.go

@@ -115,7 +115,7 @@ waitLoop:
 	for tryN, maxTries := 0, 15; tryN < maxTries; tryN++ {
 		time.Sleep(time.Second)
 		for _, client := range zgsClients {
-			info, err = client.GetFileInfo(ctx, tree.Root())
+			info, err = client.GetFileInfo(ctx, tree.Root(), true)
 			if err != nil {
 				return errors.WithMessage(err, "failed to get file info")
 			}
@@ -145,7 +145,7 @@ checkLoop:
 	for tryN, maxTries := 0, 15; tryN < maxTries; tryN++ {
 		time.Sleep(time.Second)
 		for _, client := range zgsClients {
-			info, err = client.GetFileInfo(ctx, tree.Root())
+			info, err = client.GetFileInfo(ctx, tree.Root(), true)
 			if err != nil {
 				return errors.WithMessage(err, "failed to get file info")
 			}

tests/test_framework/zgs_node.py

@@ -97,7 +97,7 @@ def zgs_download_segment_decoded(self, data_root: str, start_chunk_index: int, e
         return None if encodedSegment is None else base64.b64decode(encodedSegment)
 
     def zgs_get_file_info(self, data_root):
-        return self.rpc.zgs_getFileInfo([data_root])
+        return self.rpc.zgs_getFileInfo([data_root, True])
 
     def zgs_get_file_info_by_tx_seq(self, tx_seq):
         return self.rpc.zgs_getFileInfoByTxSeq([tx_seq])

tests/utility/build_binary.py

@@ -90,7 +90,6 @@ def build_cli(dir: str) -> BuildBinaryResult:
         dir=dir,
         binary_name=CLIENT_BINARY,
         github_url="https://github.com/0glabs/0g-storage-client.git",
-        git_rev=CLI_GIT_REV,
         build_cmd="go build",
         compiled_relative_path=[],
     )

transfer/downloader.go

@@ -117,7 +117,7 @@ func (downloader *Downloader) Download(ctx context.Context, root, filename strin
 func (downloader *Downloader) queryFile(ctx context.Context, root common.Hash) (info *node.FileInfo, err error) {
 	// do not require file finalized
 	for _, v := range downloader.clients {
-		info, err = v.GetFileInfo(ctx, root)
+		info, err = v.GetFileInfo(ctx, root, true)
 		if err != nil {
 			return nil, err
 		}