From 118c3b3cfebb9512fb3fd195d644a8620026586a Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 22 Oct 2021 13:31:44 +0300 Subject: [PATCH] [#940] neofs-adm: print contract version in `dump-hashes` ``` nns (unknown): 7061fbd31562664b58f422c3dee4acfd70dba8af alphabet 0 (v0.12.1): 2392438eb31100857c0f161c66791872b249aa13 alphabet 1 (v0.12.1): 83ef4226d5d6519ca9c99a5de13b1b5ca223a6ad alphabet 2 (v0.12.1): 6250927beaa9aa5a00171379dcb7187b0c91d17d alphabet 3 (v0.12.1): 1d6a2519ba41a139b2ced1bfd5013938271a7578 alphabet 4 (v0.12.1): b65fc7a3c31cf57a90d7eb1c0e9909e4ca69133c alphabet 5 (v0.12.1): f95b6ff8cd3b027c9911c18115518ad8c5d2f591 alphabet 6 (v0.12.1): 5b17c579bf56884fd68af152432b3b5aee7aee76 audit (v0.12.1): 85fe181f4aa3cbdc94023d97c69001ece0730398 balance (v0.12.1): dc1ec98d9d0c5f9dfade16144defe08cffc5ca55 container (v0.12.1): 1b6e68d299b570e1cb7e86eadfdc06aa2e8e0cc5 neofsid (v0.12.1): 0a64ce753653cc97c0467e1334d9d3678ca8c682 netmap (v0.12.1): 7c5bdb23e36cc7cce95bf42f3ab9e452c2501df1 reputation (v0.12.1): 7ad824fd1eeb1565be2cee3889214b9aa605d2fc ``` Signed-off-by: Evgenii Stratonikov --- cmd/neofs-adm/internal/modules/morph/dump.go | 68 ++++++++++++++++---- 1 file changed, 57 insertions(+), 11 deletions(-) diff --git a/cmd/neofs-adm/internal/modules/morph/dump.go b/cmd/neofs-adm/internal/modules/morph/dump.go index a132ac852..9743506c7 100644 --- a/cmd/neofs-adm/internal/modules/morph/dump.go +++ b/cmd/neofs-adm/internal/modules/morph/dump.go @@ -13,6 +13,7 @@ import ( "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/smartcontract" "github.com/nspcc-dev/neo-go/pkg/smartcontract/callflag" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" @@ -22,6 +23,12 @@ import ( const lastGlagoliticLetter = 41 +type contractDumpInfo struct { + hash util.Uint160 + name string + version string +} + func dumpContractHashes(cmd *cobra.Command, _ []string) error { c, err := getN3Client(viper.GetViper()) if err != nil { @@ -33,6 +40,8 @@ func dumpContractHashes(cmd *cobra.Command, _ []string) error { return err } + infos := []contractDumpInfo{{name: nnsContract, hash: cs.Hash}} + bw := io.NewBufBinWriter() for _, ctrName := range contractList { emit.AppCall(bw.BinWriter, cs.Hash, "resolve", callflag.ReadOnly, @@ -59,9 +68,6 @@ func dumpContractHashes(cmd *cobra.Command, _ []string) error { } buf := bytes.NewBuffer(nil) - tw := tabwriter.NewWriter(buf, 0, 2, 2, ' ', 0) - - _, _ = tw.Write([]byte(fmt.Sprintf("%s:\t%s\n", nnsContract, cs.Hash.StringLE()))) if irSize != 0 { bw.Reset() @@ -77,30 +83,70 @@ func dumpContractHashes(cmd *cobra.Command, _ []string) error { } for i := 0; i < irSize; i++ { - ctrHash := "hash is invalid" + info := contractDumpInfo{name: fmt.Sprintf("alphabet %d", i)} if h, err := parseNNSResolveResult(alphaRes.Stack[i]); err == nil { - ctrHash = h.StringLE() + info.hash = h } - - _, _ = tw.Write([]byte(fmt.Sprintf("alphabet %d:\t%s\n", i, ctrHash))) + infos = append(infos, info) } } for i := range contractList { - ctrHash := "hash is invalid" + info := contractDumpInfo{name: contractList[i]} if h, err := parseNNSResolveResult(res.Stack[i]); err == nil { - ctrHash = h.StringLE() + info.hash = h } - - _, _ = tw.Write([]byte(fmt.Sprintf("%s:\t%s\n", contractList[i], ctrHash))) + infos = append(infos, info) } + bw.Reset() + for i := range infos { + if i == 0 || infos[i].hash.Equals(util.Uint160{}) { // current NNS contract has no Version method + emit.Int(bw.BinWriter, 0) + } else { + emit.AppCall(bw.BinWriter, infos[i].hash, "version", callflag.NoneFlag) + } + } + + res, err = c.InvokeScript(bw.Bytes(), nil) + if err != nil { + return fmt.Errorf("can't fetch info from NNS: %w", err) + } + + if res.State == vm.HaltState.String() { + for i := range res.Stack { + infos[i].version = parseContractVersion(res.Stack[i]) + } + } + + tw := tabwriter.NewWriter(buf, 0, 2, 2, ' ', 0) + for _, info := range infos { + if info.version == "" { + info.version = "unknown" + } + _, _ = tw.Write([]byte(fmt.Sprintf("%s\t(%s):\t%s\n", + info.name, info.version, info.hash.StringLE()))) + } _ = tw.Flush() + cmd.Print(buf.String()) return nil } +func parseContractVersion(item stackitem.Item) string { + bi, err := item.TryInteger() + if err != nil || bi.Sign() == 0 || !bi.IsInt64() { + return "unknown" + } + + v := bi.Int64() + major := v / 1_000_000 + minor := (v % 1_000_000) / 1000 + patch := v % 1_000 + return fmt.Sprintf("v%d.%d.%d", major, minor, patch) +} + func dumpNetworkConfig(cmd *cobra.Command, _ []string) error { c, err := getN3Client(viper.GetViper()) if err != nil {