From 3791e1810281f37044004e08f49506ec383fb3f2 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Tue, 21 Jan 2025 20:58:55 +0530 Subject: [PATCH 01/18] updated changes --- cmd/add.go | 8 ++++---- cmd/copy.go | 2 +- cmd/createdir.go | 2 +- cmd/delete.go | 2 +- cmd/download.go | 2 +- cmd/download_m3u8.go | 2 +- cmd/fileRefs.go | 10 +++++----- cmd/filemeta.go | 2 +- cmd/get_download_cost.go | 4 ++-- cmd/get_upload_cost.go | 2 +- cmd/getallocation.go | 8 ++++---- cmd/getmpt.go | 8 ++++---- cmd/list.go | 2 +- cmd/listallocations.go | 2 +- cmd/move.go | 2 +- cmd/newallocation.go | 2 +- cmd/rename.go | 4 ++-- cmd/repair.go | 6 +++--- cmd/rolllback.go | 8 ++++---- cmd/root.go | 10 +++++----- cmd/share.go | 6 +++--- cmd/stakepool.go | 2 +- cmd/storage.go | 6 +++--- cmd/stream.go | 8 ++++---- cmd/sync.go | 6 +++--- cmd/updateallocation.go | 2 +- cmd/upload.go | 4 ++-- cmd/validator.go | 2 +- cmd/walletinfo.go | 6 +++--- cmd/writepool.go | 2 +- go.mod | 7 ++++--- go.sum | 2 ++ 32 files changed, 72 insertions(+), 69 deletions(-) diff --git a/cmd/add.go b/cmd/add.go index 917d1e55..a7b16fe9 100644 --- a/cmd/add.go +++ b/cmd/add.go @@ -8,10 +8,10 @@ import ( ) var addCmd = &cobra.Command{ - Use: "add", - Short: "Adds free storage assigner", - Long: "Adds free storage assigner", - Args: cobra.MinimumNArgs(0), + Use: "add", + Short: "Adds free storage assigner", + Long: "Adds free storage assigner", + Args: cobra.MinimumNArgs(0), Hidden: true, Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/copy.go b/cmd/copy.go index 045d3098..6ee77697 100644 --- a/cmd/copy.go +++ b/cmd/copy.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/0chain/gosdk/constants" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/constants" "github.com/spf13/cobra" ) diff --git a/cmd/createdir.go b/cmd/createdir.go index 12b0ec0d..7398ed3b 100644 --- a/cmd/createdir.go +++ b/cmd/createdir.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/0chain/gosdk/constants" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/constants" "github.com/spf13/cobra" ) diff --git a/cmd/delete.go b/cmd/delete.go index ced6e257..a4c6d279 100644 --- a/cmd/delete.go +++ b/cmd/delete.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/0chain/gosdk/constants" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/constants" "github.com/spf13/cobra" ) diff --git a/cmd/download.go b/cmd/download.go index 29772825..9cfd8086 100644 --- a/cmd/download.go +++ b/cmd/download.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/0chain/gosdk/zboxcore/fileref" + "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/0chain/zboxcli/util" "github.com/0chain/gosdk/zboxcore/sdk" diff --git a/cmd/download_m3u8.go b/cmd/download_m3u8.go index c2a61339..6be5bf64 100644 --- a/cmd/download_m3u8.go +++ b/cmd/download_m3u8.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/0chain/gosdk/zboxcore/logger" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/logger" ) // M3u8Downloader download files from blobber's dir, and build them into a local m3u8 playlist diff --git a/cmd/fileRefs.go b/cmd/fileRefs.go index d63b19f0..72a425c7 100644 --- a/cmd/fileRefs.go +++ b/cmd/fileRefs.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/0chain/gosdk/zboxcore/fileref" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) @@ -25,10 +25,10 @@ func checkError(err error) { } var fileRefsCmd = &cobra.Command{ - Use: "recent-refs", - Short: "get list of recently added refs", - Long: `get list of recently added refs`, - Args: cobra.MinimumNArgs(0), + Use: "recent-refs", + Short: "get list of recently added refs", + Long: `get list of recently added refs`, + Args: cobra.MinimumNArgs(0), Hidden: true, Run: func(cmd *cobra.Command, args []string) { page, err := cmd.Flags().GetUint("page") diff --git a/cmd/filemeta.go b/cmd/filemeta.go index ff6324db..7188e96e 100644 --- a/cmd/filemeta.go +++ b/cmd/filemeta.go @@ -4,8 +4,8 @@ import ( "os" "strconv" - "github.com/0chain/gosdk/zboxcore/fileref" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) diff --git a/cmd/get_download_cost.go b/cmd/get_download_cost.go index 2ea0f9dd..1dfc8447 100644 --- a/cmd/get_download_cost.go +++ b/cmd/get_download_cost.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/0chain/gosdk/core/common" - "github.com/0chain/gosdk/zboxcore/fileref" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/core/common" + "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/spf13/cobra" ) diff --git a/cmd/get_upload_cost.go b/cmd/get_upload_cost.go index 2be1f9a0..93724486 100644 --- a/cmd/get_upload_cost.go +++ b/cmd/get_upload_cost.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/0chain/gosdk/core/common" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/core/common" "github.com/spf13/cobra" ) diff --git a/cmd/getallocation.go b/cmd/getallocation.go index 2431b665..b2439abe 100644 --- a/cmd/getallocation.go +++ b/cmd/getallocation.go @@ -5,11 +5,11 @@ import ( "log" "os" - "github.com/0chain/gosdk/core/common" - "github.com/0chain/gosdk/zboxcore/blockchain" - "github.com/0chain/gosdk/zboxcore/fileref" - "github.com/0chain/gosdk/zboxcore/logger" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/core/common" + "github.com/0chain/gosdk_common/zboxcore/blockchain" + "github.com/0chain/gosdk_common/zboxcore/fileref" + "github.com/0chain/gosdk_common/zboxcore/logger" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" diff --git a/cmd/getmpt.go b/cmd/getmpt.go index 1799e442..33171810 100644 --- a/cmd/getmpt.go +++ b/cmd/getmpt.go @@ -12,10 +12,10 @@ import ( ) var getMptKeyCommand = &cobra.Command{ - Use: "get-mpt", - Short: "Directly view blockchain data", - Long: `Directly view blockchain data from MPT key`, - Args: cobra.MinimumNArgs(0), + Use: "get-mpt", + Short: "Directly view blockchain data", + Long: `Directly view blockchain data from MPT key`, + Args: cobra.MinimumNArgs(0), Hidden: true, Run: func(cmd *cobra.Command, args []string) { if cmd.Flags().Changed("key") == false { diff --git a/cmd/list.go b/cmd/list.go index 948a12bf..ba6ea305 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/0chain/gosdk/zboxcore/fileref" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) diff --git a/cmd/listallocations.go b/cmd/listallocations.go index 78615be2..300e2204 100644 --- a/cmd/listallocations.go +++ b/cmd/listallocations.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/0chain/gosdk/core/common" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/core/common" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" diff --git a/cmd/move.go b/cmd/move.go index d3909727..550e2eea 100644 --- a/cmd/move.go +++ b/cmd/move.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/0chain/gosdk/constants" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/constants" "github.com/spf13/cobra" ) diff --git a/cmd/newallocation.go b/cmd/newallocation.go index e94899a8..dc86cf97 100755 --- a/cmd/newallocation.go +++ b/cmd/newallocation.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/pflag" "github.com/0chain/gosdk/zboxcore/sdk" - "github.com/0chain/gosdk/zcncore" + "github.com/0chain/gosdk_common/zcncore" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) diff --git a/cmd/rename.go b/cmd/rename.go index 3822a4af..68255f49 100644 --- a/cmd/rename.go +++ b/cmd/rename.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/0chain/gosdk/constants" - "github.com/0chain/gosdk/core/pathutil" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/constants" + "github.com/0chain/gosdk_common/core/pathutil" "github.com/spf13/cobra" ) diff --git a/cmd/repair.go b/cmd/repair.go index 1bc09731..e0aafb5a 100644 --- a/cmd/repair.go +++ b/cmd/repair.go @@ -63,10 +63,10 @@ var repairSize = &cobra.Command{ Long: `gets only size to repair file to blobbers`, Args: cobra.MinimumNArgs(0), Run: func(cmd *cobra.Command, args []string) { - fflags := cmd.Flags() - if !fflags.Changed("allocation") { + fflags := cmd.Flags() + if !fflags.Changed("allocation") { PrintError("Error: allocation flag is missing") - os.Exit(1) + os.Exit(1) } repairPath := "/" diff --git a/cmd/rolllback.go b/cmd/rolllback.go index b620757b..cd17f802 100644 --- a/cmd/rolllback.go +++ b/cmd/rolllback.go @@ -10,10 +10,10 @@ import ( // NOTE: This is for testing purpose only. var rollbackCmd = &cobra.Command{ - Use: "rollback", - Short: "rollback file to previous version", - Long: `rollback file to previous version`, - Args: cobra.MinimumNArgs(0), + Use: "rollback", + Short: "rollback file to previous version", + Long: `rollback file to previous version`, + Args: cobra.MinimumNArgs(0), Hidden: true, Run: func(cmd *cobra.Command, args []string) { fflags := cmd.Flags() diff --git a/cmd/root.go b/cmd/root.go index 07836d20..7380f002 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -8,18 +8,18 @@ import ( "os" "path/filepath" - "github.com/0chain/gosdk/core/conf" - "github.com/0chain/gosdk/core/logger" + "github.com/0chain/gosdk_common/core/conf" + "github.com/0chain/gosdk_common/core/logger" "github.com/spf13/cobra" - "github.com/0chain/gosdk/core/client" + "github.com/0chain/gosdk_common/core/client" "github.com/0chain/zboxcli/util" - "github.com/0chain/gosdk/core/zcncrypto" + "github.com/0chain/gosdk_common/core/zcncrypto" "github.com/0chain/gosdk/zboxcore/sdk" - "github.com/0chain/gosdk/zcncore" + "github.com/0chain/gosdk_common/zcncore" ) var cfgFile string diff --git a/cmd/share.go b/cmd/share.go index a4f6f279..187fa6d2 100644 --- a/cmd/share.go +++ b/cmd/share.go @@ -5,10 +5,10 @@ import ( "os" "time" - "github.com/0chain/gosdk/core/common" - "github.com/0chain/gosdk/core/pathutil" - "github.com/0chain/gosdk/zboxcore/fileref" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/core/common" + "github.com/0chain/gosdk_common/core/pathutil" + "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/spf13/cobra" ) diff --git a/cmd/stakepool.go b/cmd/stakepool.go index a6558364..d8e73521 100644 --- a/cmd/stakepool.go +++ b/cmd/stakepool.go @@ -5,7 +5,7 @@ import ( "log" "github.com/0chain/gosdk/zboxcore/sdk" - "github.com/0chain/gosdk/zcncore" + "github.com/0chain/gosdk_common/zcncore" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) diff --git a/cmd/storage.go b/cmd/storage.go index 99944270..1a8b1aeb 100644 --- a/cmd/storage.go +++ b/cmd/storage.go @@ -5,12 +5,12 @@ import ( "log" "time" - "github.com/0chain/gosdk/core/transaction" + "github.com/0chain/gosdk_common/core/transaction" - "github.com/0chain/gosdk/zboxcore/blockchain" + "github.com/0chain/gosdk_common/zboxcore/blockchain" - "github.com/0chain/gosdk/core/common" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/core/common" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" diff --git a/cmd/stream.go b/cmd/stream.go index 2212d74f..11dc0fe5 100644 --- a/cmd/stream.go +++ b/cmd/stream.go @@ -12,10 +12,10 @@ import ( // streamCmd represents upload command with --live flag var streamCmd = &cobra.Command{ - Use: "stream", - Short: "capture video and audio streaming form local devices, and upload", - Long: "capture video and audio streaming form local devices, and upload", - Args: cobra.MinimumNArgs(0), + Use: "stream", + Short: "capture video and audio streaming form local devices, and upload", + Long: "capture video and audio streaming form local devices, and upload", + Args: cobra.MinimumNArgs(0), Hidden: true, Run: func(cmd *cobra.Command, args []string) { fflags := cmd.Flags() // fflags is a *flag.FlagSet diff --git a/cmd/sync.go b/cmd/sync.go index 03f069e7..8439deac 100644 --- a/cmd/sync.go +++ b/cmd/sync.go @@ -9,10 +9,10 @@ import ( "sync" "github.com/0chain/errors" - "github.com/0chain/gosdk/constants" - "github.com/0chain/gosdk/zboxcore/logger" "github.com/0chain/gosdk/zboxcore/sdk" - "github.com/0chain/gosdk/zboxcore/zboxutil" + "github.com/0chain/gosdk_common/constants" + "github.com/0chain/gosdk_common/zboxcore/logger" + "github.com/0chain/gosdk_common/zboxcore/zboxutil" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) diff --git a/cmd/updateallocation.go b/cmd/updateallocation.go index f8a41073..6d7d81ab 100755 --- a/cmd/updateallocation.go +++ b/cmd/updateallocation.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/0chain/gosdk/zboxcore/sdk" - "github.com/0chain/gosdk/zcncore" + "github.com/0chain/gosdk_common/zcncore" "github.com/spf13/cobra" ) diff --git a/cmd/upload.go b/cmd/upload.go index febf6824..dbc813c1 100644 --- a/cmd/upload.go +++ b/cmd/upload.go @@ -7,9 +7,9 @@ import ( "sync" thrown "github.com/0chain/errors" - "github.com/0chain/gosdk/core/pathutil" "github.com/0chain/gosdk/zboxcore/sdk" - "github.com/0chain/gosdk/zboxcore/zboxutil" + "github.com/0chain/gosdk_common/core/pathutil" + "github.com/0chain/gosdk_common/zboxcore/zboxutil" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" diff --git a/cmd/validator.go b/cmd/validator.go index 167ed389..a79298c7 100644 --- a/cmd/validator.go +++ b/cmd/validator.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/0chain/gosdk/core/common" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/core/common" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" diff --git a/cmd/walletinfo.go b/cmd/walletinfo.go index 16aba871..848af4b8 100644 --- a/cmd/walletinfo.go +++ b/cmd/walletinfo.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/0chain/gosdk/core/client" - "github.com/0chain/gosdk/core/encryption" - "github.com/0chain/gosdk/zcncore" + "github.com/0chain/gosdk_common/core/client" + "github.com/0chain/gosdk_common/core/encryption" + "github.com/0chain/gosdk_common/zcncore" "github.com/0chain/zboxcli/util" "github.com/0chain/gosdk/zboxcore/sdk" diff --git a/cmd/writepool.go b/cmd/writepool.go index 2346bcfc..12fc30d1 100644 --- a/cmd/writepool.go +++ b/cmd/writepool.go @@ -5,7 +5,7 @@ import ( "log" "github.com/0chain/gosdk/zboxcore/sdk" - "github.com/0chain/gosdk/zcncore" + "github.com/0chain/gosdk_common/zcncore" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index ed99ec3e..1aff4816 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/0chain/zboxcli -go 1.22.0 +go 1.22.5 -toolchain go1.22.5 +toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 @@ -16,6 +16,7 @@ require ( require ( github.com/0chain/common v1.18.3 // indirect + github.com/0chain/gosdk_common v0.0.0-20250117135422-7c4f2f249631 // indirect github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/btcsuite/btcd v0.23.4 // indirect @@ -86,4 +87,4 @@ require ( ) // temporary, for development -//replace github.com/0chain/gosdk => ../gosdk +replace github.com/0chain/gosdk => ../egosdk diff --git a/go.sum b/go.sum index d00b6c09..4aa7ce41 100644 --- a/go.sum +++ b/go.sum @@ -42,6 +42,8 @@ github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= github.com/0chain/gosdk v1.19.8/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw= +github.com/0chain/gosdk_common v0.0.0-20250117135422-7c4f2f249631 h1:UGvlsDCcYL8G+GNweLzmWKPcpLG7F1VKQwORugtbTNw= +github.com/0chain/gosdk_common v0.0.0-20250117135422-7c4f2f249631/go.mod h1:5MtnciUdibSOd2nDEWw346eWXmvpZZAywwrgFm/qmKM= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= From 897cfd3ffce83e7a8bb2e05918554b5334615ccb Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Tue, 21 Jan 2025 21:23:43 +0530 Subject: [PATCH 02/18] common sdk integration --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1aff4816..2f3600c2 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 github.com/0chain/gosdk v1.19.8 + github.com/0chain/gosdk_common v0.0.0-20250121151838-b0477651681e github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 @@ -16,7 +17,6 @@ require ( require ( github.com/0chain/common v1.18.3 // indirect - github.com/0chain/gosdk_common v0.0.0-20250117135422-7c4f2f249631 // indirect github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/btcsuite/btcd v0.23.4 // indirect diff --git a/go.sum b/go.sum index 4aa7ce41..be8f3d8b 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,8 @@ github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= github.com/0chain/gosdk v1.19.8/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw= -github.com/0chain/gosdk_common v0.0.0-20250117135422-7c4f2f249631 h1:UGvlsDCcYL8G+GNweLzmWKPcpLG7F1VKQwORugtbTNw= -github.com/0chain/gosdk_common v0.0.0-20250117135422-7c4f2f249631/go.mod h1:5MtnciUdibSOd2nDEWw346eWXmvpZZAywwrgFm/qmKM= +github.com/0chain/gosdk_common v0.0.0-20250121151838-b0477651681e h1:TskvG+KrEWp4obrELJk1QRX3tjnsr1mlBapeb1fV2cU= +github.com/0chain/gosdk_common v0.0.0-20250121151838-b0477651681e/go.mod h1:5MtnciUdibSOd2nDEWw346eWXmvpZZAywwrgFm/qmKM= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= From 0338081d972badf86844f36e4a69542e9272d34f Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Wed, 22 Jan 2025 16:24:38 +0530 Subject: [PATCH 03/18] integrated egosdk --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2f3600c2..865338b3 100644 --- a/go.mod +++ b/go.mod @@ -87,4 +87,4 @@ require ( ) // temporary, for development -replace github.com/0chain/gosdk => ../egosdk +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250121155252-7775b2fa5706 diff --git a/go.sum b/go.sum index be8f3d8b..4fc19ea0 100644 --- a/go.sum +++ b/go.sum @@ -38,6 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= +github.com/0chain/egosdk v1.18.6-0.20250121155252-7775b2fa5706 h1:9X0zJPe5XA2zphvDqi1Kcpqt1Im90Fis0Z25BcKIW2o= +github.com/0chain/egosdk v1.18.6-0.20250121155252-7775b2fa5706/go.mod h1:ED9EVC7t9plx2W5Q6rp1hcVdO0eZwDdWm5f9c+ubAhI= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= From 6c9a5699f4564ce363c4bfb318b016c17d7b5a1b Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Thu, 23 Jan 2025 17:42:12 +0530 Subject: [PATCH 04/18] updated gomod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 865338b3..98342a6c 100644 --- a/go.mod +++ b/go.mod @@ -87,4 +87,4 @@ require ( ) // temporary, for development -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250121155252-7775b2fa5706 +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250122110353-acb0596beb40 diff --git a/go.sum b/go.sum index 4fc19ea0..b1639eff 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.18.6-0.20250121155252-7775b2fa5706 h1:9X0zJPe5XA2zphvDqi1Kcpqt1Im90Fis0Z25BcKIW2o= -github.com/0chain/egosdk v1.18.6-0.20250121155252-7775b2fa5706/go.mod h1:ED9EVC7t9plx2W5Q6rp1hcVdO0eZwDdWm5f9c+ubAhI= +github.com/0chain/egosdk v1.18.6-0.20250122110353-acb0596beb40 h1:FZM0Z+xSjB5gEngi7LtdSvSB1xvJLAZqvF9xc/3xUr4= +github.com/0chain/egosdk v1.18.6-0.20250122110353-acb0596beb40/go.mod h1:ED9EVC7t9plx2W5Q6rp1hcVdO0eZwDdWm5f9c+ubAhI= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= From 9108c0f3a470a1e9377e460916dd270081473254 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Fri, 24 Jan 2025 13:27:19 +0530 Subject: [PATCH 05/18] go mod updates --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 98342a6c..d7605f59 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 github.com/0chain/gosdk v1.19.8 - github.com/0chain/gosdk_common v0.0.0-20250121151838-b0477651681e + github.com/0chain/gosdk_common v0.0.0-20250124074147-1da9c7e420af github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 @@ -87,4 +87,4 @@ require ( ) // temporary, for development -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250122110353-acb0596beb40 +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250124075303-29a8e71af584 diff --git a/go.sum b/go.sum index b1639eff..8ace742c 100644 --- a/go.sum +++ b/go.sum @@ -38,14 +38,14 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.18.6-0.20250122110353-acb0596beb40 h1:FZM0Z+xSjB5gEngi7LtdSvSB1xvJLAZqvF9xc/3xUr4= -github.com/0chain/egosdk v1.18.6-0.20250122110353-acb0596beb40/go.mod h1:ED9EVC7t9plx2W5Q6rp1hcVdO0eZwDdWm5f9c+ubAhI= +github.com/0chain/egosdk v1.18.6-0.20250124075303-29a8e71af584 h1:aqGS5iyBNO7vlhv3Q5TK+8nq4IyTjMqoLX2lXiOJI3A= +github.com/0chain/egosdk v1.18.6-0.20250124075303-29a8e71af584/go.mod h1:HooAQLByqUhkmsFN5ZErNHEiWQ8qgVh8pAs7uFCIeFk= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= github.com/0chain/gosdk v1.19.8/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw= -github.com/0chain/gosdk_common v0.0.0-20250121151838-b0477651681e h1:TskvG+KrEWp4obrELJk1QRX3tjnsr1mlBapeb1fV2cU= -github.com/0chain/gosdk_common v0.0.0-20250121151838-b0477651681e/go.mod h1:5MtnciUdibSOd2nDEWw346eWXmvpZZAywwrgFm/qmKM= +github.com/0chain/gosdk_common v0.0.0-20250124074147-1da9c7e420af h1:H5TTXcjIVOZC26/uQ493eUROx1sR1hg7JshsUmEVbuw= +github.com/0chain/gosdk_common v0.0.0-20250124074147-1da9c7e420af/go.mod h1:5MtnciUdibSOd2nDEWw346eWXmvpZZAywwrgFm/qmKM= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= From aeddf0fb03d82823c2ae2097ac1f55116696df13 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Sat, 1 Feb 2025 19:04:44 +0530 Subject: [PATCH 06/18] egosdk update --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d7605f59..e8753cb7 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( ) require ( - github.com/0chain/common v1.18.3 // indirect + github.com/0chain/common v1.18.3 // indirect; indirecnewallocationt github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/btcsuite/btcd v0.23.4 // indirect @@ -87,4 +87,4 @@ require ( ) // temporary, for development -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250124075303-29a8e71af584 +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250201132858-9445d47d0b26 diff --git a/go.sum b/go.sum index 8ace742c..f30ac174 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.18.6-0.20250124075303-29a8e71af584 h1:aqGS5iyBNO7vlhv3Q5TK+8nq4IyTjMqoLX2lXiOJI3A= -github.com/0chain/egosdk v1.18.6-0.20250124075303-29a8e71af584/go.mod h1:HooAQLByqUhkmsFN5ZErNHEiWQ8qgVh8pAs7uFCIeFk= +github.com/0chain/egosdk v1.18.6-0.20250201132858-9445d47d0b26 h1:Ysx8h0eO17kFky4Mqn2tAnUp4YUP8DI8zIJbt2rQFpQ= +github.com/0chain/egosdk v1.18.6-0.20250201132858-9445d47d0b26/go.mod h1:HooAQLByqUhkmsFN5ZErNHEiWQ8qgVh8pAs7uFCIeFk= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= From 56b2187acf9de787b48ff347f63621e32094c125 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Sun, 2 Feb 2025 04:28:36 +0530 Subject: [PATCH 07/18] egosdk update --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e8753cb7..80f91d10 100644 --- a/go.mod +++ b/go.mod @@ -87,4 +87,4 @@ require ( ) // temporary, for development -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250201132858-9445d47d0b26 +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250201225505-de1ffc876e86 diff --git a/go.sum b/go.sum index f30ac174..011e2971 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.18.6-0.20250201132858-9445d47d0b26 h1:Ysx8h0eO17kFky4Mqn2tAnUp4YUP8DI8zIJbt2rQFpQ= -github.com/0chain/egosdk v1.18.6-0.20250201132858-9445d47d0b26/go.mod h1:HooAQLByqUhkmsFN5ZErNHEiWQ8qgVh8pAs7uFCIeFk= +github.com/0chain/egosdk v1.18.6-0.20250201225505-de1ffc876e86 h1:IeaP7H2PFA5AgGw/ZI1vDDScJpuW5ny9W2VVbSyT/PQ= +github.com/0chain/egosdk v1.18.6-0.20250201225505-de1ffc876e86/go.mod h1:HooAQLByqUhkmsFN5ZErNHEiWQ8qgVh8pAs7uFCIeFk= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= From 143207b358b501a6569cf51f4c6a321954adf73a Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Tue, 4 Feb 2025 13:25:45 +0530 Subject: [PATCH 08/18] refactor --- cmd/add.go | 4 ++-- cmd/challengepool.go | 8 +++---- cmd/collect_reward.go | 6 ++--- cmd/download.go | 2 +- cmd/finalizeallocation.go | 5 +++-- cmd/getallocation.go | 3 ++- cmd/getmpt.go | 4 ++-- cmd/kill_blobber.go | 5 ++--- cmd/kill_validator.go | 4 ++-- cmd/newallocation.go | 24 ++++++++++---------- cmd/root.go | 9 ++++---- cmd/shutdown_blobber.go | 4 ++-- cmd/shutdown_validator.go | 4 ++-- cmd/stakepool.go | 46 +++++++++++++++++++-------------------- cmd/storage.go | 30 ++++++++++++------------- cmd/updateallocation.go | 3 ++- cmd/validator.go | 18 +++++++-------- cmd/version.go | 2 +- cmd/walletinfo.go | 4 ++-- cmd/writepool.go | 6 ++--- go.mod | 4 ++-- go.sum | 8 +++---- 22 files changed, 103 insertions(+), 100 deletions(-) diff --git a/cmd/add.go b/cmd/add.go index a7b16fe9..685ed3fc 100644 --- a/cmd/add.go +++ b/cmd/add.go @@ -3,7 +3,7 @@ package cmd import ( "log" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" ) @@ -34,7 +34,7 @@ var addCmd = &cobra.Command{ log.Fatal("invalid 'max' flag: ", err) } - _, _, err = sdk.AddFreeStorageAssigner(name, key, limit, max) + _, _, err = commonsdk.AddFreeStorageAssigner(name, key, limit, max) if err != nil { log.Fatal("Error adding free storage assigner:", err) } diff --git a/cmd/challengepool.go b/cmd/challengepool.go index 18e8643e..8de813a6 100644 --- a/cmd/challengepool.go +++ b/cmd/challengepool.go @@ -5,12 +5,12 @@ import ( "log" "os" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) -func printChallengePoolInfo(info *sdk.ChallengePoolInfo) { +func printChallengePoolInfo(info *commonsdk.ChallengePoolInfo) { var header = []string{ "BALANCE", "START", "EXPIRE", "FINIALIZED", } @@ -49,8 +49,8 @@ var cpInfo = &cobra.Command{ log.Fatalf("can't get 'allocation' flag: %v", err) } - var info *sdk.ChallengePoolInfo - if info, err = sdk.GetChallengePoolInfo(allocID); err != nil { + var info *commonsdk.ChallengePoolInfo + if info, err = commonsdk.GetChallengePoolInfo(allocID); err != nil { log.Fatalf("Failed to get challenge pool info: %v", err) } if doJSON { diff --git a/cmd/collect_reward.go b/cmd/collect_reward.go index bd2398c6..effc3e1c 100644 --- a/cmd/collect_reward.go +++ b/cmd/collect_reward.go @@ -3,7 +3,7 @@ package cmd import ( "log" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" ) @@ -36,9 +36,9 @@ var collectRewards = &cobra.Command{ switch providerName { case "blobber": - _, _, err = sdk.CollectRewards(providerId, sdk.ProviderBlobber) + _, _, err = commonsdk.CollectRewards(providerId, commonsdk.ProviderBlobber) case "validator": - _, _, err = sdk.CollectRewards(providerId, sdk.ProviderValidator) + _, _, err = commonsdk.CollectRewards(providerId, commonsdk.ProviderValidator) default: log.Fatal("provider type must be blobber or validator") } diff --git a/cmd/download.go b/cmd/download.go index 9cfd8086..768c55a9 100644 --- a/cmd/download.go +++ b/cmd/download.go @@ -6,10 +6,10 @@ import ( "strings" "sync" + "github.com/0chain/gosdk/zboxcore/sdk" "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/0chain/zboxcli/util" - "github.com/0chain/gosdk/zboxcore/sdk" "github.com/spf13/cobra" ) diff --git a/cmd/finalizeallocation.go b/cmd/finalizeallocation.go index fe34b0fd..526e5e8d 100644 --- a/cmd/finalizeallocation.go +++ b/cmd/finalizeallocation.go @@ -5,6 +5,7 @@ import ( "log" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" ) @@ -49,7 +50,7 @@ and empties write pool moving left tokens to client.`, // check out allocation first allocShouldNotBeFinalized(allocID) - txnHash, _, err := sdk.FinalizeAllocation(allocID) + txnHash, _, err := commonsdk.FinalizeAllocation(allocID) if err != nil { // check again, a blobber can finalize it allocShouldNotBeFinalized(allocID) @@ -83,7 +84,7 @@ allocation flow.`, log.Fatal("invalid 'allocation' flag: ", err) } - txnHash, _, err := sdk.CancelAllocation(allocID) + txnHash, _, err := commonsdk.CancelAllocation(allocID) if err != nil { log.Fatal("Error canceling allocation:", err) } diff --git a/cmd/getallocation.go b/cmd/getallocation.go index b2439abe..eef478ce 100644 --- a/cmd/getallocation.go +++ b/cmd/getallocation.go @@ -8,6 +8,7 @@ import ( "github.com/0chain/gosdk/zboxcore/sdk" "github.com/0chain/gosdk_common/core/common" "github.com/0chain/gosdk_common/zboxcore/blockchain" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/0chain/gosdk_common/zboxcore/logger" "github.com/0chain/zboxcli/util" @@ -47,7 +48,7 @@ var getallocationCmd = &cobra.Command{ return "(not found)" } - var priceRangeString = func(pr sdk.PriceRange) string { + var priceRangeString = func(pr commonsdk.PriceRange) string { return fmt.Sprintf("%s-%s", common.Balance(pr.Min), common.Balance(pr.Max)) } diff --git a/cmd/getmpt.go b/cmd/getmpt.go index 33171810..70f40d55 100644 --- a/cmd/getmpt.go +++ b/cmd/getmpt.go @@ -7,7 +7,7 @@ import ( "log" "strings" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" ) @@ -22,7 +22,7 @@ var getMptKeyCommand = &cobra.Command{ log.Fatal("Required Mpt key missing\n") } key := cmd.Flag("key").Value.String() - jsonBytes, err := sdk.GetMptData(key) + jsonBytes, err := commonsdk.GetMptData(key) if err != nil { log.Fatalf("Failed to get Mpt key: %v\n", err) } diff --git a/cmd/kill_blobber.go b/cmd/kill_blobber.go index 8cdd79c0..883ff705 100644 --- a/cmd/kill_blobber.go +++ b/cmd/kill_blobber.go @@ -3,8 +3,7 @@ package cmd import ( "log" - "github.com/0chain/gosdk/zboxcore/sdk" - + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" ) @@ -23,7 +22,7 @@ var killBlobberCmd = &cobra.Command{ if err != nil { log.Fatal("invalid 'blobber id flag: ", err) } - _, _, err = sdk.KillProvider(blobberId, sdk.ProviderBlobber) + _, _, err = commonsdk.KillProvider(blobberId, commonsdk.ProviderBlobber) if err != nil { log.Fatal("failed to kill blobber "+blobberId, err) } diff --git a/cmd/kill_validator.go b/cmd/kill_validator.go index dc4b1b51..80de6948 100644 --- a/cmd/kill_validator.go +++ b/cmd/kill_validator.go @@ -3,7 +3,7 @@ package cmd import ( "log" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" ) @@ -23,7 +23,7 @@ var killValidatorCmd = &cobra.Command{ log.Fatal("invalid 'validator id flag: ", err) } - _, _, err = sdk.KillProvider(validatorId, sdk.ProviderValidator) + _, _, err = commonsdk.KillProvider(validatorId, commonsdk.ProviderValidator) if err != nil { log.Fatal("failed to kill validator, id: "+validatorId, err) } diff --git a/cmd/newallocation.go b/cmd/newallocation.go index dc86cf97..c41ffc13 100755 --- a/cmd/newallocation.go +++ b/cmd/newallocation.go @@ -13,6 +13,7 @@ import ( "github.com/spf13/pflag" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/gosdk_common/zcncore" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" @@ -26,7 +27,7 @@ var ( blobber_auth_tickets []string ) -func getPriceRange(val string) (pr sdk.PriceRange, err error) { +func getPriceRange(val string) (pr commonsdk.PriceRange, err error) { var ss = strings.Split(val, "-") if len(ss) != 2 { err = fmt.Errorf("invalid price range format: %q", val) @@ -64,7 +65,7 @@ var newallocationCmd = &cobra.Command{ log.Fatal("Only positive values are allowed for --lock") } - allocationID, _, err := sdk.CreateFreeAllocation(freeStorageMarker, lock) + allocationID, _, err := commonsdk.CreateFreeAllocation(freeStorageMarker, lock) if err != nil { log.Fatal("Error creating free allocation: ", err) } @@ -105,8 +106,8 @@ var newallocationCmd = &cobra.Command{ const maxPrice = math.MaxUint64 / 100 var ( - readPrice = sdk.PriceRange{Min: 0, Max: maxPrice} - writePrice = sdk.PriceRange{Min: 0, Max: maxPrice} + readPrice = commonsdk.PriceRange{Min: 0, Max: maxPrice} + writePrice = commonsdk.PriceRange{Min: 0, Max: maxPrice} ) if flags.Changed("preferred_blobbers") { @@ -166,12 +167,11 @@ var newallocationCmd = &cobra.Command{ } if costOnly { - minCost, err := sdk.GetAllocationMinLock(*datashards, *parityshards, *size, writePrice) + minCost, err := commonsdk.GetAllocationMinLock(*datashards, *parityshards, *size, writePrice) if err != nil { log.Fatal("Error fetching cost: ", err) } log.Print("Cost for the given allocation: ", zcncore.ConvertToToken(minCost), " ZCN") - return } @@ -187,7 +187,7 @@ var newallocationCmd = &cobra.Command{ force, _ := flags.GetBool("force") // Read the file options flags - var fileOptionParams sdk.FileOptionsParameters + var fileOptionParams commonsdk.FileOptionsParameters if flags.Changed("forbid_upload") { forbidUpload, err := flags.GetBool("forbid_upload") if err != nil { @@ -255,15 +255,15 @@ var newallocationCmd = &cobra.Command{ var allocationID string if len(owner) == 0 { - options := sdk.CreateAllocationOptions{ + options := commonsdk.CreateAllocationOptions{ DataShards: *datashards, ParityShards: *parityshards, Size: *size, - ReadPrice: sdk.PriceRange{ + ReadPrice: commonsdk.PriceRange{ Min: readPrice.Min, Max: readPrice.Max, }, - WritePrice: sdk.PriceRange{ + WritePrice: commonsdk.PriceRange{ Min: writePrice.Min, Max: writePrice.Max, }, @@ -277,7 +277,7 @@ var newallocationCmd = &cobra.Command{ StorageVersion: int(storageVersion), AuthRoundExpiry: authRoundExpiry, } - allocationID, _, _, err = sdk.CreateAllocationWith(options) + allocationID, _, _, err = commonsdk.CreateAllocationWith(options) if err != nil { log.Fatal("Error creating allocation: ", err) } @@ -292,7 +292,7 @@ var newallocationCmd = &cobra.Command{ } } - allocationID, _, _, err = sdk.CreateAllocationForOwner(owner, ownerPublicKey, "", *datashards, *parityshards, + allocationID, _, _, err = commonsdk.CreateAllocationForOwner(owner, ownerPublicKey, *datashards, *parityshards, *size, readPrice, writePrice, lock, preferred_blobbers, blobber_auth_tickets, thirdPartyExtendable, isEnterprise, force, &fileOptionParams, authRoundExpiry) if err != nil { log.Fatal("Error creating allocation: ", err) diff --git a/cmd/root.go b/cmd/root.go index 7380f002..55fc9127 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -8,8 +8,10 @@ import ( "os" "path/filepath" + "github.com/0chain/gosdk/zboxcore/sdk" "github.com/0chain/gosdk_common/core/conf" "github.com/0chain/gosdk_common/core/logger" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" @@ -18,7 +20,6 @@ import ( "github.com/0chain/gosdk_common/core/zcncrypto" - "github.com/0chain/gosdk/zboxcore/sdk" "github.com/0chain/gosdk_common/zcncore" ) @@ -88,16 +89,16 @@ func initConfig() { } // syncing loggers - logger.SyncLoggers([]*logger.Logger{zcncore.GetLogger(), sdk.GetLogger()}) + logger.SyncLoggers([]*logger.Logger{zcncore.GetLogger(), commonsdk.GetLogger()}) // set the log file logPath := "cmdlog.log" zcncore.SetLogFile(logPath, !bSilent) - sdk.SetLogFile(logPath, !bSilent) + commonsdk.SetLogFile(logPath, !bSilent) err = client.Init(context.Background(), cfg) if err != nil { - fmt.Println("Error initializing core SDK.", err) + fmt.Println("Error initializing core sdk.", err) os.Exit(1) } diff --git a/cmd/shutdown_blobber.go b/cmd/shutdown_blobber.go index 2175e0d8..fc24f3b8 100644 --- a/cmd/shutdown_blobber.go +++ b/cmd/shutdown_blobber.go @@ -4,7 +4,7 @@ import ( "log" "os" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" ) @@ -20,7 +20,7 @@ var shutDownBlobberCmd = &cobra.Command{ os.Exit(1) } blobberID := cmd.Flag("id").Value.String() - _, _, err := sdk.ShutdownProvider(sdk.ProviderBlobber, blobberID) + _, _, err := commonsdk.ShutdownProvider(commonsdk.ProviderBlobber, blobberID) if err != nil { log.Fatal("failed to shut down blobber", err) } diff --git a/cmd/shutdown_validator.go b/cmd/shutdown_validator.go index e8f6cebd..750c8b4b 100644 --- a/cmd/shutdown_validator.go +++ b/cmd/shutdown_validator.go @@ -4,7 +4,7 @@ import ( "log" "os" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/spf13/cobra" ) @@ -20,7 +20,7 @@ var shutDownValidatorCmd = &cobra.Command{ os.Exit(1) } validatorID := cmd.Flag("id").Value.String() - _, _, err := sdk.ShutdownProvider(sdk.ProviderValidator, validatorID) + _, _, err := commonsdk.ShutdownProvider(commonsdk.ProviderValidator, validatorID) if err != nil { log.Fatal("failed to shut down validator", err) } diff --git a/cmd/stakepool.go b/cmd/stakepool.go index d8e73521..6f1c0b8e 100644 --- a/cmd/stakepool.go +++ b/cmd/stakepool.go @@ -4,13 +4,13 @@ import ( "fmt" "log" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/gosdk_common/zcncore" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) -func printStakePoolInfo(info *sdk.StakePoolInfo) { +func printStakePoolInfo(info *commonsdk.StakePoolInfo) { fmt.Println("pool id: ", info.ID) fmt.Println("balance: ", info.Balance) fmt.Println("total stake: ", info.StakeTotal) @@ -41,7 +41,7 @@ func printStakePoolInfo(info *sdk.StakePoolInfo) { fmt.Println(" num_delegates: ", info.Settings.NumDelegates) } -func printStakePoolUserInfo(info *sdk.StakePoolUserInfo) { +func printStakePoolUserInfo(info *commonsdk.StakePoolUserInfo) { if len(info.Pools) == 0 { fmt.Print("no delegate pools") return @@ -74,7 +74,7 @@ var spInfo = &cobra.Command{ flags = cmd.Flags() err error providerID string - providerType sdk.ProviderType + providerType commonsdk.ProviderType ) doJSON, _ := cmd.Flags().GetBool("json") @@ -83,19 +83,19 @@ var spInfo = &cobra.Command{ if providerID, err = flags.GetString("blobber_id"); err != nil { log.Fatalf("Error: cannot get the value of blobber_id") } else { - providerType = sdk.ProviderBlobber + providerType = commonsdk.ProviderBlobber } } else if flags.Changed("validator_id") { if providerID, err = flags.GetString("validator_id"); err != nil { log.Fatalf("Error: cannot get the value of validator_id") } else { - providerType = sdk.ProviderValidator + providerType = commonsdk.ProviderValidator } } else if flags.Changed("authorizer_id") { if providerID, err = flags.GetString("authorizer_id"); err != nil { log.Fatalf("Error: cannot get the value of authorizer_id") } else { - providerType = sdk.ProviderAuthorizer + providerType = commonsdk.ProviderAuthorizer } } @@ -103,8 +103,8 @@ var spInfo = &cobra.Command{ log.Fatal("Error: missing flag: one of 'blobber_id','validator_id' or authorizer_id is required") } - var info *sdk.StakePoolInfo - if info, err = sdk.GetStakePoolInfo(providerType, providerID); err != nil { + var info *commonsdk.StakePoolInfo + if info, err = commonsdk.GetStakePoolInfo(providerType, providerID); err != nil { log.Fatalf("Failed to get stake pool info: %v", err) } if doJSON { @@ -178,9 +178,9 @@ var spUserInfo = &cobra.Command{ } func getAndPrintStakePool(clientID string, doJSON bool, offset, limit int) (int, error) { - var info *sdk.StakePoolUserInfo + var info *commonsdk.StakePoolUserInfo var err error - if info, err = sdk.GetStakePoolUserInfo(clientID, offset, limit); err != nil { + if info, err = commonsdk.GetStakePoolUserInfo(clientID, offset, limit); err != nil { return 0, err } if doJSON { @@ -202,7 +202,7 @@ var spLock = &cobra.Command{ var ( flags = cmd.Flags() providerID string - providerType sdk.ProviderType + providerType commonsdk.ProviderType tokens float64 fee float64 err error @@ -212,31 +212,31 @@ var spLock = &cobra.Command{ if providerID, err = flags.GetString("miner_id"); err != nil { log.Fatalf("invalid 'miner_id' flag: %v", err) } else { - providerType = sdk.ProviderMiner + providerType = commonsdk.ProviderMiner } } else if flags.Changed("sharder_id") { if providerID, err = flags.GetString("sharder_id"); err != nil { log.Fatalf("invalid 'sharder_id' flag: %v", err) } else { - providerType = sdk.ProviderSharder + providerType = commonsdk.ProviderSharder } } else if flags.Changed("blobber_id") { if providerID, err = flags.GetString("blobber_id"); err != nil { log.Fatalf("invalid 'blobber_id' flag: %v", err) } else { - providerType = sdk.ProviderBlobber + providerType = commonsdk.ProviderBlobber } } else if flags.Changed("validator_id") { if providerID, err = flags.GetString("validator_id"); err != nil { log.Fatalf("invalid 'validator_id' flag: %v", err) } else { - providerType = sdk.ProviderValidator + providerType = commonsdk.ProviderValidator } } else if flags.Changed("authorizer_id") { if providerID, err = flags.GetString("authorizer_id"); err != nil { log.Fatalf("invalid 'authorizer_id' flag: %v", err) } else { - providerType = sdk.ProviderAuthorizer + providerType = commonsdk.ProviderAuthorizer } } else if providerType == 0 || providerID == "" { log.Fatal("missing flag: one of 'miner_id', 'sharder_id', 'blobber_id', 'validator_id', 'authorizer_id' is required") @@ -261,7 +261,7 @@ var spLock = &cobra.Command{ } var hash string - hash, _, err = sdk.StakePoolLock(providerType, providerID, + hash, _, err = commonsdk.StakePoolLock(providerType, providerID, zcncore.ConvertToValue(tokens), zcncore.ConvertToValue(fee)) if err != nil { log.Fatalf("Failed to lock tokens in stake pool: %v", err) @@ -281,7 +281,7 @@ var spUnlock = &cobra.Command{ var ( flags = cmd.Flags() providerID string - providerType sdk.ProviderType + providerType commonsdk.ProviderType fee float64 err error ) @@ -290,19 +290,19 @@ var spUnlock = &cobra.Command{ if providerID, err = flags.GetString("blobber_id"); err != nil { log.Fatalf("invalid 'blobber_id' flag: %v", err) } else { - providerType = sdk.ProviderBlobber + providerType = commonsdk.ProviderBlobber } } else if flags.Changed("validator_id") { if providerID, err = flags.GetString("validator_id"); err != nil { log.Fatalf("invalid 'validator_id' flag: %v", err) } else { - providerType = sdk.ProviderValidator + providerType = commonsdk.ProviderValidator } } else if flags.Changed("authorizer_id") { if providerID, err = flags.GetString("authorizer_id"); err != nil { log.Fatalf("invalid 'authorizer_id' flag: %v", err) } else { - providerType = sdk.ProviderAuthorizer + providerType = commonsdk.ProviderAuthorizer } } @@ -316,7 +316,7 @@ var spUnlock = &cobra.Command{ } } - unlocked, _, err := sdk.StakePoolUnlock(providerType, providerID, clientWallet.ClientID, zcncore.ConvertToValue(fee)) + unlocked, _, err := commonsdk.StakePoolUnlock(providerType, providerID, clientWallet.ClientID, zcncore.ConvertToValue(fee)) if err != nil { log.Fatalf("Failed to unlock tokens in stake pool: %v", err) } diff --git a/cmd/storage.go b/cmd/storage.go index 1a8b1aeb..dfb6aadb 100644 --- a/cmd/storage.go +++ b/cmd/storage.go @@ -8,8 +8,8 @@ import ( "github.com/0chain/gosdk_common/core/transaction" "github.com/0chain/gosdk_common/zboxcore/blockchain" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" - "github.com/0chain/gosdk/zboxcore/sdk" "github.com/0chain/gosdk_common/core/common" "github.com/0chain/zboxcli/util" @@ -37,7 +37,7 @@ var scConfig = &cobra.Command{ }, } -func printBlobbers(nodes []*sdk.Blobber, isActive bool) { +func printBlobbers(nodes []*commonsdk.Blobber, isActive bool) { if len(nodes) == 0 { if isActive { fmt.Println("no active blobbers") @@ -77,7 +77,7 @@ var lsBlobers = &cobra.Command{ if doAll { isActive = false } - list, err := sdk.GetBlobbers(isActive, isStakable) + list, err := commonsdk.GetBlobbers(isActive, isStakable) if err != nil { log.Fatalf("Failed to get blobbers: %v", err) } @@ -119,8 +119,8 @@ var blobberInfoCmd = &cobra.Command{ log.Fatal("error in 'blobber_id' flag: ", err) } - var blob *sdk.Blobber - if blob, err = sdk.GetBlobber(blobberID); err != nil { + var blob *commonsdk.Blobber + if blob, err = commonsdk.GetBlobber(blobberID); err != nil { log.Fatal(err) } @@ -173,11 +173,11 @@ var blobberUpdateCmd = &cobra.Command{ log.Fatal("error in 'blobber_id' flag: ", err) } - if _, err = sdk.GetBlobber(blobberID); err != nil { + if _, err = commonsdk.GetBlobber(blobberID); err != nil { log.Fatal(err) } - updateBlobber := new(sdk.UpdateBlobber) + updateBlobber := new(commonsdk.UpdateBlobber) updateBlobber.ID = common.Key(blobberID) if flags.Changed("capacity") { var capacity int64 @@ -205,7 +205,7 @@ var blobberUpdateCmd = &cobra.Command{ updateBlobber.StorageVersion = &storageVersion } - terms := &sdk.UpdateTerms{} + terms := &commonsdk.UpdateTerms{} var termsChanged bool if flags.Changed("read_price") { var rp float64 @@ -317,7 +317,7 @@ var blobberUpdateCmd = &cobra.Command{ updateBlobber.StakePoolSettings = stakePoolSettings } - if _, _, err = sdk.UpdateBlobberSettings(updateBlobber); err != nil { + if _, _, err = commonsdk.UpdateBlobberSettings(updateBlobber); err != nil { log.Fatal(err) } fmt.Println("blobber settings updated successfully") @@ -377,7 +377,7 @@ var resetBlobberStatsCmd = &cobra.Command{ log.Fatal("error in 'new_saved_data' flag: ", err) } - resetBlobberStatsDto := &sdk.ResetBlobberStatsDto{ + resetBlobberStatsDto := &commonsdk.ResetBlobberStatsDto{ BlobberID: blobberID, PrevAllocated: prevAllocated, PrevSavedData: prevSavedData, @@ -386,7 +386,7 @@ var resetBlobberStatsCmd = &cobra.Command{ } fmt.Println(*resetBlobberStatsDto) - _, _, err = sdk.ResetBlobberStats(resetBlobberStatsDto) + _, _, err = commonsdk.ResetBlobberStats(resetBlobberStatsDto) if err != nil { log.Fatal(err) } @@ -414,11 +414,11 @@ var resetVersionCmd = &cobra.Command{ log.Fatal("error in 'blobber_id' flag: ", err) } - snv := sdk.StorageNodeIdField{ + snv := commonsdk.StorageNodeIdField{ Id: blobberID, } - _, _, err = sdk.ResetBlobberVersion(&snv) + _, _, err = commonsdk.ResetBlobberVersion(&snv) if err != nil { log.Fatal(err) } @@ -446,11 +446,11 @@ var insertKilledProviderId = &cobra.Command{ log.Fatal("error in 'id' flag: ", err) } - snv := sdk.StorageNodeIdField{ + snv := commonsdk.StorageNodeIdField{ Id: blobberID, } - _, _, err = sdk.InsertKilledProviderID(&snv) + _, _, err = commonsdk.InsertKilledProviderID(&snv) if err != nil { log.Fatal(err) } diff --git a/cmd/updateallocation.go b/cmd/updateallocation.go index 6d7d81ab..340b8abe 100755 --- a/cmd/updateallocation.go +++ b/cmd/updateallocation.go @@ -6,6 +6,7 @@ import ( "sync" "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/gosdk_common/zcncore" "github.com/spf13/cobra" ) @@ -69,7 +70,7 @@ var updateAllocationCmd = &cobra.Command{ setThirdPartyExtendable, _ := cmd.Flags().GetBool("set_third_party_extendable") // Read the file options flags - var fileOptionParams sdk.FileOptionsParameters + var fileOptionParams commonsdk.FileOptionsParameters if flags.Changed("forbid_upload") { forbidUpload, err := flags.GetBool("forbid_upload") if err != nil { diff --git a/cmd/validator.go b/cmd/validator.go index a79298c7..9d7ce2c0 100644 --- a/cmd/validator.go +++ b/cmd/validator.go @@ -4,14 +4,14 @@ import ( "fmt" "log" - "github.com/0chain/gosdk/zboxcore/sdk" "github.com/0chain/gosdk_common/core/common" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/zboxcli/util" "github.com/spf13/cobra" ) -func printValidators(nodes []*sdk.Validator) { +func printValidators(nodes []*commonsdk.Validator) { if len(nodes) == 0 { fmt.Println("no validators registered yet") return @@ -45,7 +45,7 @@ var lsValidators = &cobra.Command{ log.Fatalf("error parsing stakable flag: %v", err) } - list, err := sdk.GetValidators(stakable) + list, err := commonsdk.GetValidators(stakable) if err != nil { log.Fatalf("Failed to get storage SC configurations: %v", err) } @@ -87,15 +87,15 @@ var validatorInfoCmd = &cobra.Command{ log.Fatal("error in 'validator_id' flag: ", err) } - var validator *sdk.Validator - if validator, err = sdk.GetValidator(validatorID); err != nil { + var validator *commonsdk.Validator + if validator, err = commonsdk.GetValidator(validatorID); err != nil { log.Fatal(err) } if json { util.PrintJSON(validator) } else { - printValidators([]*sdk.Validator{validator}) + printValidators([]*commonsdk.Validator{validator}) } }, @@ -123,11 +123,11 @@ var validatorUpdateCmd = &cobra.Command{ } // If validator with ID does not exist, throw. - if _, err = sdk.GetValidator(validatorID); err != nil { + if _, err = commonsdk.GetValidator(validatorID); err != nil { log.Fatal(err) } - updateValidator := new(sdk.UpdateValidator) + updateValidator := new(commonsdk.UpdateValidator) updateValidator.ID = common.Key(validatorID) if flags.Changed("min_stake") { var minStake float64 @@ -177,7 +177,7 @@ var validatorUpdateCmd = &cobra.Command{ updateValidator.BaseURL = &baseURL } - if _, _, err = sdk.UpdateValidatorSettings(updateValidator); err != nil { + if _, _, err = commonsdk.UpdateValidatorSettings(updateValidator); err != nil { log.Fatal(err) } diff --git a/cmd/version.go b/cmd/version.go index 0ebb3b8f..ad542450 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -28,7 +28,7 @@ var versionCmd = &cobra.Command{ fmt.Println("Version info:") fmt.Println("\tzbox....: ", VersionStr) - fmt.Println("\tgosdk...: ", getVersion("github.com/0chain/gosdk")) + fmt.Println("\tgocommonsdk...: ", getVersion("github.com/0chain/gosdk")) }, } diff --git a/cmd/walletinfo.go b/cmd/walletinfo.go index 848af4b8..20aa06fb 100644 --- a/cmd/walletinfo.go +++ b/cmd/walletinfo.go @@ -6,10 +6,10 @@ import ( "github.com/0chain/gosdk_common/core/client" "github.com/0chain/gosdk_common/core/encryption" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/gosdk_common/zcncore" "github.com/0chain/zboxcli/util" - "github.com/0chain/gosdk/zboxcore/sdk" "github.com/spf13/cobra" ) @@ -43,7 +43,7 @@ var walletinfoCmd = &cobra.Command{ header := []string{"Public Key", "ClientID", "Encryption Public Key"} data := make([][]string, 1) - encPubKey, err := sdk.GetClientEncryptedPublicKey() + encPubKey, err := commonsdk.GetClientEncryptedPublicKey() if err != nil { fmt.Println("Error getting the public key for encryption. ", err.Error()) return diff --git a/cmd/writepool.go b/cmd/writepool.go index 12fc30d1..7f94c4b5 100644 --- a/cmd/writepool.go +++ b/cmd/writepool.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/0chain/gosdk/zboxcore/sdk" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/gosdk_common/zcncore" "github.com/spf13/cobra" ) @@ -51,7 +51,7 @@ var wpLock = &cobra.Command{ } } - _, _, err = sdk.WritePoolLock(allocID, zcncore.ConvertToValue(tokens), zcncore.ConvertToValue(fee)) + _, _, err = commonsdk.WritePoolLock(allocID, zcncore.ConvertToValue(tokens), zcncore.ConvertToValue(fee)) if err != nil { log.Fatalf("Failed to lock tokens in write pool: %v", err) } @@ -87,7 +87,7 @@ var wpUnlock = &cobra.Command{ } } - _, _, err = sdk.WritePoolUnlock(allocID, zcncore.ConvertToValue(fee)) + _, _, err = commonsdk.WritePoolUnlock(allocID, zcncore.ConvertToValue(fee)) if err != nil { log.Fatalf("Failed to unlock tokens in write pool: %v", err) } diff --git a/go.mod b/go.mod index 80f91d10..2c70c6c5 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 github.com/0chain/gosdk v1.19.8 - github.com/0chain/gosdk_common v0.0.0-20250124074147-1da9c7e420af + github.com/0chain/gosdk_common v0.0.0-20250204070817-3c82b7ad6a9f github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 @@ -87,4 +87,4 @@ require ( ) // temporary, for development -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250201225505-de1ffc876e86 +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250204071300-93191f4aa124 diff --git a/go.sum b/go.sum index 011e2971..e0eb0425 100644 --- a/go.sum +++ b/go.sum @@ -38,14 +38,14 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.18.6-0.20250201225505-de1ffc876e86 h1:IeaP7H2PFA5AgGw/ZI1vDDScJpuW5ny9W2VVbSyT/PQ= -github.com/0chain/egosdk v1.18.6-0.20250201225505-de1ffc876e86/go.mod h1:HooAQLByqUhkmsFN5ZErNHEiWQ8qgVh8pAs7uFCIeFk= +github.com/0chain/egosdk v1.18.6-0.20250204071300-93191f4aa124 h1:H+dxWGFAcGi3U3jY0sPF2dGWL/MuIBP/rhFgv8arcNA= +github.com/0chain/egosdk v1.18.6-0.20250204071300-93191f4aa124/go.mod h1:zrecpMj8awiacQTBJMNJFC+DE9H0Kwrx7h5xa0/djy8= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= github.com/0chain/gosdk v1.19.8/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw= -github.com/0chain/gosdk_common v0.0.0-20250124074147-1da9c7e420af h1:H5TTXcjIVOZC26/uQ493eUROx1sR1hg7JshsUmEVbuw= -github.com/0chain/gosdk_common v0.0.0-20250124074147-1da9c7e420af/go.mod h1:5MtnciUdibSOd2nDEWw346eWXmvpZZAywwrgFm/qmKM= +github.com/0chain/gosdk_common v0.0.0-20250204070817-3c82b7ad6a9f h1:H3Edk0y4Q8GEsPAbIsmn+WKiTC/uA4L/YuX0x/3Adz0= +github.com/0chain/gosdk_common v0.0.0-20250204070817-3c82b7ad6a9f/go.mod h1:aGBabvKYk/B6G6bEBI8j1cBaWY2is9sCii88Ly6VeCU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= From 3aea76d9f2635f7c9da3c088cb8deec61b90e614 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Sun, 2 Mar 2025 02:10:31 +0530 Subject: [PATCH 09/18] go mod update --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2c70c6c5..f161daad 100644 --- a/go.mod +++ b/go.mod @@ -87,4 +87,4 @@ require ( ) // temporary, for development -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.18.6-0.20250204071300-93191f4aa124 +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250228101537-fea75d59d7d9 diff --git a/go.sum b/go.sum index e0eb0425..272ba91a 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.18.6-0.20250204071300-93191f4aa124 h1:H+dxWGFAcGi3U3jY0sPF2dGWL/MuIBP/rhFgv8arcNA= -github.com/0chain/egosdk v1.18.6-0.20250204071300-93191f4aa124/go.mod h1:zrecpMj8awiacQTBJMNJFC+DE9H0Kwrx7h5xa0/djy8= +github.com/0chain/egosdk v1.19.1-0.20250228101537-fea75d59d7d9 h1:zXWrbjwIeRDKQfsnic3bTPikHouAs2ouAesGpDULUbI= +github.com/0chain/egosdk v1.19.1-0.20250228101537-fea75d59d7d9/go.mod h1:zrecpMj8awiacQTBJMNJFC+DE9H0Kwrx7h5xa0/djy8= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= From a4d902296e7626165490d3aefb019faa6d6331a6 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Fri, 7 Mar 2025 01:22:25 +0530 Subject: [PATCH 10/18] fix --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f161daad..04d804bf 100644 --- a/go.mod +++ b/go.mod @@ -87,4 +87,4 @@ require ( ) // temporary, for development -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250228101537-fea75d59d7d9 +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250306194945-23dfbea21496 diff --git a/go.sum b/go.sum index 272ba91a..5c64e09b 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.19.1-0.20250228101537-fea75d59d7d9 h1:zXWrbjwIeRDKQfsnic3bTPikHouAs2ouAesGpDULUbI= -github.com/0chain/egosdk v1.19.1-0.20250228101537-fea75d59d7d9/go.mod h1:zrecpMj8awiacQTBJMNJFC+DE9H0Kwrx7h5xa0/djy8= +github.com/0chain/egosdk v1.19.1-0.20250306194945-23dfbea21496 h1:RH8yp1q/ruE8GpvcjbxfRiCFpyROfZtT9hMzipV9Ea8= +github.com/0chain/egosdk v1.19.1-0.20250306194945-23dfbea21496/go.mod h1:zrecpMj8awiacQTBJMNJFC+DE9H0Kwrx7h5xa0/djy8= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= From 47e4db39ed8e2f264e11f555c406e481137d05fe Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Tue, 18 Mar 2025 18:21:58 +0530 Subject: [PATCH 11/18] go mod update --- go.mod | 6 +++--- go.sum | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 04d804bf..c44587f5 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 github.com/0chain/gosdk v1.19.8 - github.com/0chain/gosdk_common v0.0.0-20250204070817-3c82b7ad6a9f + github.com/0chain/gosdk_common v0.0.0-20250318121140-c82820c54dea github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 @@ -86,5 +86,5 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// temporary, for development -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250306194945-23dfbea21496 +// temporary, for development and egosdk testing +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318121802-ba628432aced diff --git a/go.sum b/go.sum index 5c64e09b..5d88c3bd 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.19.1-0.20250306194945-23dfbea21496 h1:RH8yp1q/ruE8GpvcjbxfRiCFpyROfZtT9hMzipV9Ea8= -github.com/0chain/egosdk v1.19.1-0.20250306194945-23dfbea21496/go.mod h1:zrecpMj8awiacQTBJMNJFC+DE9H0Kwrx7h5xa0/djy8= +github.com/0chain/egosdk v1.19.1-0.20250318121802-ba628432aced h1:k0/HQ7fai5yY/DozfhZonovMmd/jvazGwfqynX8NHGo= +github.com/0chain/egosdk v1.19.1-0.20250318121802-ba628432aced/go.mod h1:Amew68knko9m3z7IUbz68WvH9SXKklg6Vf2d9hwbZYY= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= @@ -754,9 +754,8 @@ google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGm google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= From 6ed4aa115ba7b239d53b4b90dd0ab3a6e3a35a4c Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Tue, 18 Mar 2025 18:27:42 +0530 Subject: [PATCH 12/18] go mod update --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index c44587f5..2f293a75 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 - github.com/0chain/gosdk v1.19.8 + github.com/0chain/gosdk v1.19.11-0.20250318122237-b783aadb36b1 github.com/0chain/gosdk_common v0.0.0-20250318121140-c82820c54dea github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 diff --git a/go.sum b/go.sum index 5d88c3bd..d9a6586c 100644 --- a/go.sum +++ b/go.sum @@ -42,10 +42,8 @@ github.com/0chain/egosdk v1.19.1-0.20250318121802-ba628432aced h1:k0/HQ7fai5yY/D github.com/0chain/egosdk v1.19.1-0.20250318121802-ba628432aced/go.mod h1:Amew68knko9m3z7IUbz68WvH9SXKklg6Vf2d9hwbZYY= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= -github.com/0chain/gosdk v1.19.8 h1:xjC0WA90hd8ytPfdp7zzSe2sP/Cp8ZgSNqKMPeZD06E= -github.com/0chain/gosdk v1.19.8/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw= -github.com/0chain/gosdk_common v0.0.0-20250204070817-3c82b7ad6a9f h1:H3Edk0y4Q8GEsPAbIsmn+WKiTC/uA4L/YuX0x/3Adz0= -github.com/0chain/gosdk_common v0.0.0-20250204070817-3c82b7ad6a9f/go.mod h1:aGBabvKYk/B6G6bEBI8j1cBaWY2is9sCii88Ly6VeCU= +github.com/0chain/gosdk_common v0.0.0-20250318121140-c82820c54dea h1:wHD0sD4TvrR4oEmDOwPmHpco9e+vigl3850MrQpBo50= +github.com/0chain/gosdk_common v0.0.0-20250318121140-c82820c54dea/go.mod h1:+FBmkG4JocGmD+8gyE4kyst15p+3xm3Nf+nrg4cu5V4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= From 5d8c26349c145b2495adbad118505d3c4d8f3861 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Tue, 18 Mar 2025 19:14:30 +0530 Subject: [PATCH 13/18] go mod update --- cmd/get_download_cost.go | 5 +++-- cmd/sync.go | 3 ++- go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/get_download_cost.go b/cmd/get_download_cost.go index 1dfc8447..f4317fec 100644 --- a/cmd/get_download_cost.go +++ b/cmd/get_download_cost.go @@ -6,6 +6,7 @@ import ( "github.com/0chain/gosdk/zboxcore/sdk" "github.com/0chain/gosdk_common/core/common" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/gosdk_common/zboxcore/fileref" "github.com/spf13/cobra" ) @@ -31,7 +32,7 @@ func calculateDownloadCost(alloc *sdk.Allocation, fileSize int64, numBlocks int6 return balance } -func downloadCost(alloc *sdk.Allocation, meta *sdk.ConsolidatedFileMeta, blocksPerMarker int) { +func downloadCost(alloc *sdk.Allocation, meta *commonsdk.ConsolidatedFileMeta, blocksPerMarker int) { if meta.Type != fileref.FILE { log.Fatal("not a file") } @@ -105,7 +106,7 @@ var getDownloadCostCmd = &cobra.Command{ var ( alloc *sdk.Allocation - meta *sdk.ConsolidatedFileMeta + meta *commonsdk.ConsolidatedFileMeta ) if remotePath != "" { diff --git a/cmd/sync.go b/cmd/sync.go index 8439deac..4815a72d 100644 --- a/cmd/sync.go +++ b/cmd/sync.go @@ -11,6 +11,7 @@ import ( "github.com/0chain/errors" "github.com/0chain/gosdk/zboxcore/sdk" "github.com/0chain/gosdk_common/constants" + "github.com/0chain/gosdk_common/zboxcore/commonsdk" "github.com/0chain/gosdk_common/zboxcore/logger" "github.com/0chain/gosdk_common/zboxcore/zboxutil" "github.com/0chain/zboxcli/util" @@ -224,7 +225,7 @@ var syncCmd = &cobra.Command{ os.Exit(1) } - fileMetas := make(map[string]*sdk.ConsolidatedFileMeta) + fileMetas := make(map[string]*commonsdk.ConsolidatedFileMeta) wg := &sync.WaitGroup{} // Create filter filter := []string{".DS_Store", ".git"} diff --git a/go.mod b/go.mod index 2f293a75..4d81aaf2 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 github.com/0chain/gosdk v1.19.11-0.20250318122237-b783aadb36b1 - github.com/0chain/gosdk_common v0.0.0-20250318121140-c82820c54dea + github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102 github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 @@ -87,4 +87,4 @@ require ( ) // temporary, for development and egosdk testing -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318121802-ba628432aced +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 diff --git a/go.sum b/go.sum index d9a6586c..3d3e8b6b 100644 --- a/go.sum +++ b/go.sum @@ -38,12 +38,12 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.19.1-0.20250318121802-ba628432aced h1:k0/HQ7fai5yY/DozfhZonovMmd/jvazGwfqynX8NHGo= -github.com/0chain/egosdk v1.19.1-0.20250318121802-ba628432aced/go.mod h1:Amew68knko9m3z7IUbz68WvH9SXKklg6Vf2d9hwbZYY= +github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 h1:igxYG064JQ/eFcFyQ9rTp4gNtYgN+uzINZFNtI6SncA= +github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0/go.mod h1:QeTmIqfoxuQ6TRlcxMknPRRDr35l+U9uzLCRyenrIqs= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= -github.com/0chain/gosdk_common v0.0.0-20250318121140-c82820c54dea h1:wHD0sD4TvrR4oEmDOwPmHpco9e+vigl3850MrQpBo50= -github.com/0chain/gosdk_common v0.0.0-20250318121140-c82820c54dea/go.mod h1:+FBmkG4JocGmD+8gyE4kyst15p+3xm3Nf+nrg4cu5V4= +github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102 h1:CKVvICaxGCK25rbOFLtjtO9GZKSpsiorXwudlVkH03Y= +github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102/go.mod h1:+FBmkG4JocGmD+8gyE4kyst15p+3xm3Nf+nrg4cu5V4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= From 7b6e8d0b1443be7dd2efec245f7b47a2cc84f624 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Thu, 20 Mar 2025 18:09:46 +0530 Subject: [PATCH 14/18] fix --- cmd/newallocation.go | 2 +- go.mod | 12 +++++++++--- go.sum | 8 ++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cmd/newallocation.go b/cmd/newallocation.go index c41ffc13..4fa41e13 100755 --- a/cmd/newallocation.go +++ b/cmd/newallocation.go @@ -292,7 +292,7 @@ var newallocationCmd = &cobra.Command{ } } - allocationID, _, _, err = commonsdk.CreateAllocationForOwner(owner, ownerPublicKey, *datashards, *parityshards, + allocationID, _, _, err = commonsdk.CreateAllocationForOwner(owner, ownerPublicKey,"", *datashards, *parityshards, *size, readPrice, writePrice, lock, preferred_blobbers, blobber_auth_tickets, thirdPartyExtendable, isEnterprise, force, &fileOptionParams, authRoundExpiry) if err != nil { log.Fatal("Error creating allocation: ", err) diff --git a/go.mod b/go.mod index 4d81aaf2..027c8859 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 github.com/0chain/gosdk v1.19.11-0.20250318122237-b783aadb36b1 - github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102 + github.com/0chain/gosdk_common v0.0.0-20250318142402-b7bd1ebd4f66 github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 @@ -41,7 +41,7 @@ require ( github.com/herumi/bls-go-binary v1.31.0 // indirect github.com/hitenjain14/fasthttp v0.0.0-20240916135632-f9303a91736c // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect - github.com/klauspost/compress v1.17.0 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/klauspost/reedsolomon v1.11.8 // indirect github.com/lithammer/shortuuid/v3 v3.0.7 // indirect @@ -87,4 +87,10 @@ require ( ) // temporary, for development and egosdk testing -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 +// replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 + +replace github.com/0chain/gosdk => ../egosdk + +replace github.com/0chain/gosdk_common => ../gosdk_common + +// github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102 diff --git a/go.sum b/go.sum index 3d3e8b6b..5ec43ee6 100644 --- a/go.sum +++ b/go.sum @@ -38,12 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 h1:igxYG064JQ/eFcFyQ9rTp4gNtYgN+uzINZFNtI6SncA= -github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0/go.mod h1:QeTmIqfoxuQ6TRlcxMknPRRDr35l+U9uzLCRyenrIqs= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= -github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102 h1:CKVvICaxGCK25rbOFLtjtO9GZKSpsiorXwudlVkH03Y= -github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102/go.mod h1:+FBmkG4JocGmD+8gyE4kyst15p+3xm3Nf+nrg4cu5V4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= @@ -270,8 +266,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= -github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= -github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/klauspost/reedsolomon v1.11.8 h1:s8RpUW5TK4hjr+djiOpbZJB4ksx+TdYbRH7vHQpwPOY= From 94130526cd03627e184f844313124a1e5de4ac98 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Thu, 20 Mar 2025 18:25:28 +0530 Subject: [PATCH 15/18] fix go update --- go.mod | 6 +++--- go.sum | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 027c8859..c8f21961 100644 --- a/go.mod +++ b/go.mod @@ -87,10 +87,10 @@ require ( ) // temporary, for development and egosdk testing -// replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 +replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 -replace github.com/0chain/gosdk => ../egosdk +// replace github.com/0chain/gosdk => ../egosdk -replace github.com/0chain/gosdk_common => ../gosdk_common +// replace github.com/0chain/gosdk_common => ../gosdk_common // github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102 diff --git a/go.sum b/go.sum index 5ec43ee6..8c3d0b67 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,12 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= +github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 h1:igxYG064JQ/eFcFyQ9rTp4gNtYgN+uzINZFNtI6SncA= +github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0/go.mod h1:QeTmIqfoxuQ6TRlcxMknPRRDr35l+U9uzLCRyenrIqs= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= +github.com/0chain/gosdk_common v0.0.0-20250318142402-b7bd1ebd4f66 h1:lDzI8ZW/mdqfT0ySRnNke2c5KoqVh+FNXY8536yn0DA= +github.com/0chain/gosdk_common v0.0.0-20250318142402-b7bd1ebd4f66/go.mod h1:+FBmkG4JocGmD+8gyE4kyst15p+3xm3Nf+nrg4cu5V4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= From 40ca4b00d2534434cd905bb0dc27fd5c78cba558 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Fri, 21 Mar 2025 02:15:03 +0530 Subject: [PATCH 16/18] extra comment remoevd --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index c8f21961..e75e1540 100644 --- a/go.mod +++ b/go.mod @@ -92,5 +92,3 @@ replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.2025031813 // replace github.com/0chain/gosdk => ../egosdk // replace github.com/0chain/gosdk_common => ../gosdk_common - -// github.com/0chain/gosdk_common v0.0.0-20250318134004-c9cbffc71102 From 8b843ea40a6f54cedbaeac50065f2c61275a6eb1 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Sun, 23 Mar 2025 02:39:17 +0530 Subject: [PATCH 17/18] go mod update --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index e75e1540..f99d6305 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/0chain/errors v1.0.3 - github.com/0chain/gosdk v1.19.11-0.20250318122237-b783aadb36b1 + github.com/0chain/gosdk v1.19.11-0.20250318142516-45e2eb64f374 github.com/0chain/gosdk_common v0.0.0-20250318142402-b7bd1ebd4f66 github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 @@ -87,7 +87,7 @@ require ( ) // temporary, for development and egosdk testing -replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 +// replace github.com/0chain/gosdk => github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 // replace github.com/0chain/gosdk => ../egosdk diff --git a/go.sum b/go.sum index 8c3d0b67..390569ef 100644 --- a/go.sum +++ b/go.sum @@ -38,10 +38,10 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI= github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0 h1:igxYG064JQ/eFcFyQ9rTp4gNtYgN+uzINZFNtI6SncA= -github.com/0chain/egosdk v1.19.1-0.20250318134101-026d9c8701a0/go.mod h1:QeTmIqfoxuQ6TRlcxMknPRRDr35l+U9uzLCRyenrIqs= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= +github.com/0chain/gosdk v1.19.11-0.20250318142516-45e2eb64f374 h1:go5Xz5hh7eQMUM1wCDNT0QNwIHHmOvcUU/egJDn4nsw= +github.com/0chain/gosdk v1.19.11-0.20250318142516-45e2eb64f374/go.mod h1:0U6M/kkniAGyeZB6NsAofCmPwUWh7qdBeVgQ0csTRMw= github.com/0chain/gosdk_common v0.0.0-20250318142402-b7bd1ebd4f66 h1:lDzI8ZW/mdqfT0ySRnNke2c5KoqVh+FNXY8536yn0DA= github.com/0chain/gosdk_common v0.0.0-20250318142402-b7bd1ebd4f66/go.mod h1:+FBmkG4JocGmD+8gyE4kyst15p+3xm3Nf+nrg4cu5V4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= From 130cdda162495c6d169a13bdace415bc19782ee4 Mon Sep 17 00:00:00 2001 From: smaulik13 Date: Sun, 23 Mar 2025 21:51:38 +0530 Subject: [PATCH 18/18] removed extra changes --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f99d6305..76111ea9 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( ) require ( - github.com/0chain/common v1.18.3 // indirect; indirecnewallocationt + github.com/0chain/common v1.18.3 // indirect github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/btcsuite/btcd v0.23.4 // indirect