From cb9867e800f8b4231a1cff78074772304f90198f Mon Sep 17 00:00:00 2001 From: peterlimg Date: Fri, 5 Aug 2022 21:55:35 +1000 Subject: [PATCH 1/2] Update gosdk --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ae2b3106..d841b624 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/0chain/zwalletcli require ( - github.com/0chain/gosdk v1.8.6-0.20220722014622-5fd187945353 + github.com/0chain/gosdk v1.8.7-0.20220805113530-c4d618ccb86a github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.5.0 diff --git a/go.sum b/go.sum index ba9aaad3..6775782b 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,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.8.6-0.20220722014622-5fd187945353 h1:l9YQTXlo74Vwhq2VepNz5i3OLojlDyKR/M7Hz4gQsAI= github.com/0chain/gosdk v1.8.6-0.20220722014622-5fd187945353/go.mod h1:JeaXA7gbncHoYbKixUnM58+7S2E9z7IKYY+fV0IQJ/o= +github.com/0chain/gosdk v1.8.7-0.20220805113530-c4d618ccb86a h1:9bnOADnu0bAi0XJVkTY9YxNh9WLzldOjX/fi+xaL9Wc= +github.com/0chain/gosdk v1.8.7-0.20220805113530-c4d618ccb86a/go.mod h1:ZdbSM2r3G9wekID5HHqJFiP2bYrzyheLRWz9DDzmFYw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= 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= From a329ce0744882a640eca0f4fc14e85cac52ff9b0 Mon Sep 17 00:00:00 2001 From: peterlimg Date: Fri, 5 Aug 2022 22:29:36 +1000 Subject: [PATCH 2/2] Fix system tests --- cmd/vesting.go | 6 +++--- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/vesting.go b/cmd/vesting.go index 4522f691..3cd9dd17 100644 --- a/cmd/vesting.go +++ b/cmd/vesting.go @@ -136,7 +136,7 @@ func vestingDests(dd []string) (vds []*zcncore.VestingDest, err error) { return nil, fmt.Errorf("negative amount: %f", amount) } vds = append(vds, &zcncore.VestingDest{ - ID: common.Key(id), + ID: id, Amount: common.Balance(zcncore.ConvertToValue(amount)), }) } @@ -367,8 +367,8 @@ var vestingPoolStopCmd = &cobra.Command{ } var sr zcncore.VestingStopRequest - sr.PoolID = common.Key(poolID) - sr.Destination = common.Key(dest) + sr.PoolID = poolID + sr.Destination = dest statusBar.Begin() if err = txn.VestingStop(&sr); err != nil { diff --git a/go.mod b/go.mod index d841b624..f4d260df 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/0chain/zwalletcli require ( - github.com/0chain/gosdk v1.8.7-0.20220805113530-c4d618ccb86a + github.com/0chain/gosdk v1.8.7-0.20220805122508-49532082b8e5 github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.5.0 diff --git a/go.sum b/go.sum index 6775782b..0a51d7ad 100644 --- a/go.sum +++ b/go.sum @@ -42,6 +42,8 @@ github.com/0chain/gosdk v1.8.6-0.20220722014622-5fd187945353 h1:l9YQTXlo74Vwhq2V github.com/0chain/gosdk v1.8.6-0.20220722014622-5fd187945353/go.mod h1:JeaXA7gbncHoYbKixUnM58+7S2E9z7IKYY+fV0IQJ/o= github.com/0chain/gosdk v1.8.7-0.20220805113530-c4d618ccb86a h1:9bnOADnu0bAi0XJVkTY9YxNh9WLzldOjX/fi+xaL9Wc= github.com/0chain/gosdk v1.8.7-0.20220805113530-c4d618ccb86a/go.mod h1:ZdbSM2r3G9wekID5HHqJFiP2bYrzyheLRWz9DDzmFYw= +github.com/0chain/gosdk v1.8.7-0.20220805122508-49532082b8e5 h1:s905aGZ4vOmpFZOM8r0rSFSb2xasM3p5QboMZJ4ZPyM= +github.com/0chain/gosdk v1.8.7-0.20220805122508-49532082b8e5/go.mod h1:ZdbSM2r3G9wekID5HHqJFiP2bYrzyheLRWz9DDzmFYw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= 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=