Skip to content

Commit 783df1e

Browse files
codchencodchen
authored
Merge pull request #4 from sei-protocol/tony-chen-add-back-deleted-files
Add legacy types and functions
2 parents cbbc07d + 462f8ac commit 783df1e

36 files changed

+6555
-874
lines changed

‎abci/types/types.pb.go

+3,564-793
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crypto/hash.go

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package crypto
2+
3+
import (
4+
"crypto/sha256"
5+
)
6+
7+
func Sha256(bytes []byte) []byte {
8+
hasher := sha256.New()
9+
hasher.Write(bytes)
10+
return hasher.Sum(nil)
11+
}

‎crypto/random.go

+11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package crypto
22

33
import (
44
"crypto/rand"
5+
"encoding/hex"
6+
"io"
57
)
68

79
// This only uses the OS's randomness
@@ -13,3 +15,12 @@ func CRandBytes(numBytes int) []byte {
1315
}
1416
return b
1517
}
18+
19+
func CRandHex(numDigits int) string {
20+
return hex.EncodeToString(CRandBytes(numDigits / 2))
21+
}
22+
23+
// Returns a crand.Reader.
24+
func CReader() io.Reader {
25+
return rand.Reader
26+
}

‎crypto/tmhash/hash.go

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package tmhash
2+
3+
import (
4+
"crypto/sha256"
5+
"hash"
6+
)
7+
8+
const (
9+
Size = sha256.Size
10+
BlockSize = sha256.BlockSize
11+
)
12+
13+
// New returns a new hash.Hash.
14+
func New() hash.Hash {
15+
return sha256.New()
16+
}
17+
18+
// Sum returns the SHA256 of the bz.
19+
func Sum(bz []byte) []byte {
20+
h := sha256.Sum256(bz)
21+
return h[:]
22+
}
23+
24+
//-------------------------------------------------------------
25+
26+
const (
27+
TruncatedSize = 20
28+
)
29+
30+
type sha256trunc struct {
31+
sha256 hash.Hash
32+
}
33+
34+
func (h sha256trunc) Write(p []byte) (n int, err error) {
35+
return h.sha256.Write(p)
36+
}
37+
func (h sha256trunc) Sum(b []byte) []byte {
38+
shasum := h.sha256.Sum(b)
39+
return shasum[:TruncatedSize]
40+
}
41+
42+
func (h sha256trunc) Reset() {
43+
h.sha256.Reset()
44+
}
45+
46+
func (h sha256trunc) Size() int {
47+
return TruncatedSize
48+
}
49+
50+
func (h sha256trunc) BlockSize() int {
51+
return h.sha256.BlockSize()
52+
}
53+
54+
// NewTruncated returns a new hash.Hash.
55+
func NewTruncated() hash.Hash {
56+
return sha256trunc{
57+
sha256: sha256.New(),
58+
}
59+
}
60+
61+
// SumTruncated returns the first 20 bytes of SHA256 of the bz.
62+
func SumTruncated(bz []byte) []byte {
63+
hash := sha256.Sum256(bz)
64+
return hash[:TruncatedSize]
65+
}

‎go.mod

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ require (
99
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
1010
github.com/fortytw2/leaktest v1.3.0
1111
github.com/go-kit/kit v0.12.0
12+
github.com/go-kit/log v0.2.0
13+
github.com/go-logfmt/logfmt v0.5.1
1214
github.com/gogo/protobuf v1.3.2
1315
github.com/golang/protobuf v1.5.2
1416
github.com/google/orderedcode v0.0.1
@@ -170,9 +172,9 @@ require (
170172
github.com/opencontainers/runc v1.0.3 // indirect
171173
github.com/pelletier/go-toml v1.9.5 // indirect
172174
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
175+
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
173176
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
174177
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
175-
github.com/pkg/errors v0.9.1 // indirect
176178
github.com/pkg/profile v1.6.0 // indirect
177179
github.com/pmezard/go-difflib v1.0.0 // indirect
178180
github.com/polyfloyd/go-errorlint v0.0.0-20211125173453-6d6d39c5bb8b // indirect
@@ -239,7 +241,9 @@ require (
239241

240242
require (
241243
github.com/creachadair/tomledit v0.0.22
244+
github.com/pkg/errors v0.9.1
242245
github.com/prometheus/client_model v0.2.0
243246
github.com/prometheus/common v0.34.0
247+
github.com/sasha-s/go-deadlock v0.3.1
244248
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
245249
)

‎go.sum

+6
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,12 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
339339
github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
340340
github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs=
341341
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
342+
github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
342343
github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
343344
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
344345
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
345346
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
347+
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
346348
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
347349
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
348350
github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
@@ -877,6 +879,8 @@ github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV
877879
github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
878880
github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM=
879881
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
882+
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
883+
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
880884
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA=
881885
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw=
882886
github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
@@ -983,6 +987,8 @@ github.com/sagikazarmark/crypt v0.5.0/go.mod h1:l+nzl7KWh51rpzp2h7t4MZWyiEWdhNpO
983987
github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8=
984988
github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA=
985989
github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
990+
github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
991+
github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
986992
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
987993
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
988994
github.com/securego/gosec/v2 v2.11.0 h1:+PDkpzR41OI2jrw1q6AdXZCbsNGNGT7pQjal0H0cArI=

‎libs/cli/flags/log_level.go

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
package flags
2+
3+
import (
4+
"errors"
5+
"fmt"
6+
"strings"
7+
8+
"github.com/tendermint/tendermint/libs/log"
9+
)
10+
11+
const (
12+
defaultLogLevelKey = "*"
13+
)
14+
15+
// ParseLogLevel parses complex log level - comma-separated
16+
// list of module:level pairs with an optional *:level pair (* means
17+
// all other modules).
18+
//
19+
// Example:
20+
//
21+
// ParseLogLevel("consensus:debug,mempool:debug,*:error", log.NewTMLogger(os.Stdout), "info")
22+
func ParseLogLevel(lvl string, logger log.Logger, defaultLogLevelValue string) (log.Logger, error) {
23+
if lvl == "" {
24+
return nil, errors.New("empty log level")
25+
}
26+
27+
l := lvl
28+
29+
// prefix simple one word levels (e.g. "info") with "*"
30+
if !strings.Contains(l, ":") {
31+
l = defaultLogLevelKey + ":" + l
32+
}
33+
34+
options := make([]log.Option, 0)
35+
36+
isDefaultLogLevelSet := false
37+
var option log.Option
38+
var err error
39+
40+
list := strings.Split(l, ",")
41+
for _, item := range list {
42+
moduleAndLevel := strings.Split(item, ":")
43+
44+
if len(moduleAndLevel) != 2 {
45+
return nil, fmt.Errorf("expected list in a form of \"module:level\" pairs, given pair %s, list %s", item, list)
46+
}
47+
48+
module := moduleAndLevel[0]
49+
level := moduleAndLevel[1]
50+
51+
if module == defaultLogLevelKey {
52+
option, err = log.AllowLevel(level)
53+
if err != nil {
54+
return nil, fmt.Errorf("failed to parse default log level (pair %s, list %s): %w", item, l, err)
55+
}
56+
options = append(options, option)
57+
isDefaultLogLevelSet = true
58+
} else {
59+
switch level {
60+
case "debug":
61+
option = log.AllowDebugWith("module", module)
62+
case "info":
63+
option = log.AllowInfoWith("module", module)
64+
case "error":
65+
option = log.AllowErrorWith("module", module)
66+
case "none":
67+
option = log.AllowNoneWith("module", module)
68+
default:
69+
return nil,
70+
fmt.Errorf("expected either \"info\", \"debug\", \"error\" or \"none\" log level, given %s (pair %s, list %s)",
71+
level,
72+
item,
73+
list)
74+
}
75+
options = append(options, option)
76+
77+
}
78+
}
79+
80+
// if "*" is not provided, set default global level
81+
if !isDefaultLogLevelSet {
82+
option, err = log.AllowLevel(defaultLogLevelValue)
83+
if err != nil {
84+
return nil, err
85+
}
86+
options = append(options, option)
87+
}
88+
89+
return log.NewFilter(logger, options...), nil
90+
}

‎libs/cli/helper.go

+52
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package cli
33
import (
44
"context"
55
"fmt"
6+
"io/ioutil"
67
"os"
8+
"path/filepath"
79
"runtime"
810

911
"github.com/spf13/cobra"
@@ -58,3 +60,53 @@ func RunWithTrace(ctx context.Context, cmd *cobra.Command) error {
5860
}
5961
return nil
6062
}
63+
64+
// WriteConfigVals writes a toml file with the given values.
65+
// It returns an error if writing was impossible.
66+
func WriteConfigVals(dir string, vals map[string]string) error {
67+
data := ""
68+
for k, v := range vals {
69+
data += fmt.Sprintf("%s = \"%s\"\n", k, v)
70+
}
71+
cfile := filepath.Join(dir, "config.toml")
72+
return ioutil.WriteFile(cfile, []byte(data), 0600)
73+
}
74+
75+
// NewCompletionCmd returns a cobra.Command that generates bash and zsh
76+
// completion scripts for the given root command. If hidden is true, the
77+
// command will not show up in the root command's list of available commands.
78+
func NewCompletionCmd(rootCmd *cobra.Command, hidden bool) *cobra.Command {
79+
flagZsh := "zsh"
80+
cmd := &cobra.Command{
81+
Use: "completion",
82+
Short: "Generate shell completion scripts",
83+
Long: fmt.Sprintf(`Generate Bash and Zsh completion scripts and print them to STDOUT.
84+
85+
Once saved to file, a completion script can be loaded in the shell's
86+
current session as shown:
87+
88+
$ . <(%s completion)
89+
90+
To configure your bash shell to load completions for each session add to
91+
your $HOME/.bashrc or $HOME/.profile the following instruction:
92+
93+
. <(%s completion)
94+
`, rootCmd.Use, rootCmd.Use),
95+
RunE: func(cmd *cobra.Command, _ []string) error {
96+
zsh, err := cmd.Flags().GetBool(flagZsh)
97+
if err != nil {
98+
return err
99+
}
100+
if zsh {
101+
return rootCmd.GenZshCompletion(cmd.OutOrStdout())
102+
}
103+
return rootCmd.GenBashCompletion(cmd.OutOrStdout())
104+
},
105+
Hidden: hidden,
106+
Args: cobra.NoArgs,
107+
}
108+
109+
cmd.Flags().Bool(flagZsh, false, "Generate Zsh completion script")
110+
111+
return cmd
112+
}

0 commit comments

Comments
 (0)