Merge pull request #63 from JackalLabs/marston/backport-api

Back-porting API

.github/workflows/build.yml

@@ -13,6 +13,6 @@ jobs:
       - uses: actions/[email protected]
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.21.0 # The Go version to download (if necessary) and use.
+          go-version: 1.22.2 # The Go version to download (if necessary) and use.
       - name: Build CLI
         run: go install

.github/workflows/cov.yml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/[email protected]
     - uses: actions/setup-go@v5
       with:
-        go-version: 1.21.0 # The Go version to download (if necessary) and use.
+        go-version: 1.22.0 # The Go version to download (if necessary) and use.
     - name: Get Coverage
       run: |
         go test ./... -timeout=30m -cover -coverprofile coverage.out

.github/workflows/golangci.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.21.0
+          go-version: 1.22.2
       - uses: actions/[email protected]
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/[email protected]
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.20.2 # The Go version to download (if necessary) and use.
+          go-version: 1.22.2 # The Go version to download (if necessary) and use.
       - name: Build CLI
         shell: bash
         run: |

.github/workflows/test-unit.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/[email protected]
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.20.2 # The Go version to download (if necessary) and use.
+          go-version: 1.22.2 # The Go version to download (if necessary) and use.
       - name: Test
         shell: bash
         run: make test-unit

api/client.go

@@ -0,0 +1,70 @@
+package api
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/JackalLabs/sequoia/api/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/desmos-labs/cosmos-go-wallet/client"
+	storageTypes "github.com/jackalLabs/canine-chain/v4/x/storage/types"
+	"github.com/rs/zerolog/log"
+)
+
+func SpaceHandler(c *client.Client, address string) func(http.ResponseWriter, *http.Request) {
+	return func(w http.ResponseWriter, req *http.Request) {
+		queryClient := storageTypes.NewQueryClient(c.GRPCConn)
+
+		params := &storageTypes.QueryProvider{
+			Address: address,
+		}
+		res, err := queryClient.Provider(context.Background(), params)
+		if err != nil {
+			v := types.ErrorResponse{
+				Error: err.Error(),
+			}
+			w.WriteHeader(http.StatusInternalServerError)
+			err = json.NewEncoder(w).Encode(v)
+			if err != nil {
+				log.Error().Err(err)
+			}
+			return
+		}
+
+		totalSpace := res.Provider.Totalspace
+
+		fsparams := &storageTypes.QueryFreeSpace{
+			Address: address,
+		}
+		fsres, err := queryClient.FreeSpace(context.Background(), fsparams)
+		if err != nil {
+			v := types.ErrorResponse{
+				Error: err.Error(),
+			}
+			w.WriteHeader(http.StatusInternalServerError)
+			err = json.NewEncoder(w).Encode(v)
+			if err != nil {
+				log.Error().Err(err)
+			}
+			return
+		}
+
+		freeSpace := fsres.Space
+
+		ttint, ok := sdk.NewIntFromString(totalSpace)
+		if !ok {
+			return
+		}
+
+		v := types.SpaceResponse{
+			Total: ttint.Int64(),
+			Free:  freeSpace,
+			Used:  ttint.Int64() - freeSpace,
+		}
+
+		err = json.NewEncoder(w).Encode(v)
+		if err != nil {
+			log.Error().Err(err)
+		}
+	}
+}

api/server.go

@@ -48,7 +48,9 @@ func (a *API) Serve(f *file_system.FileSystem, p *proofs.Prover, wallet *wallet.
 	r.HandleFunc("/download/{merkle}", DownloadFileHandler(f))
 
 	r.HandleFunc("/list", ListFilesHandler(f))
+	r.HandleFunc("/api/client/list", ListFilesHandler(f))
 	r.HandleFunc("/api/data/fids", LegacyListFilesHandler(f))
+	r.HandleFunc("/api/client/space", SpaceHandler(wallet.Client, wallet.AccAddress()))
 
 	r.HandleFunc("/ipfs/peers", IPFSListPeers(f))
 	r.HandleFunc("/ipfs/hosts", IPFSListHosts(f))

api/types/responses.go

@@ -22,6 +22,12 @@ type VersionResponse struct {
 	ChainID string `json:"chain-id"`
 }
 
+type SpaceResponse struct {
+	Total int64 `json:"total_space"`
+	Used  int64 `json:"used_space"`
+	Free  int64 `json:"free_space"`
+}
+
 type NetworkResponse struct {
 	GRPCStatus string                  `json:"grpc-status"`
 	RPCStatus  *coretypes.ResultStatus `json:"rpc-status"`