From d179229a0879e088f242a62c14cfcffd9870ff0e Mon Sep 17 00:00:00 2001 From: Kacper Sawicki Date: Thu, 3 Aug 2023 19:06:37 +0200 Subject: [PATCH] Bump go-spacemesh to 1.0.8 --- collector/global.go | 7 ++- collector/mesh.go | 21 +++---- collector/node.go | 5 +- go.mod | 33 ++++++----- go.sum | 70 ++++++++++++------------ internal/api/api.go | 5 +- internal/api/handler/blocks.go | 3 +- internal/api/handler/network_info.go | 4 +- internal/api/handler/smeshers.go | 4 +- internal/service/account.go | 2 +- internal/service/service.go | 2 +- internal/storage/storagereader/layers.go | 2 +- model/layer.go | 3 +- storage/storage.go | 43 ++++++++------- 14 files changed, 104 insertions(+), 100 deletions(-) diff --git a/collector/global.go b/collector/global.go index ca6bff9..2602a1a 100644 --- a/collector/global.go +++ b/collector/global.go @@ -3,6 +3,7 @@ package collector import ( "context" "errors" + "fmt" "io" "time" @@ -19,7 +20,7 @@ func (c *Collector) GetAccountState(address string) (uint64, uint64, error) { res, err := c.globalClient.Account(ctx, req) if err != nil { - log.Error("cannot get account info: %v", err) + log.Err(fmt.Errorf("cannot get account info: %v", err)) return 0, 0, err } @@ -45,7 +46,7 @@ func (c *Collector) globalStatePump() error { stream, err := c.globalClient.GlobalStateStream(context.Background(), &req) if err != nil { - log.Error("cannot get global state account stream: %v", err) + log.Err(fmt.Errorf("cannot get global state account stream: %v", err)) return err } @@ -55,7 +56,7 @@ func (c *Collector) globalStatePump() error { return err } if err != nil { - log.Error("cannot receive Global state data: %v", err) + log.Err(fmt.Errorf("cannot receive Global state data: %v", err)) return err } item := response.GetDatum() diff --git a/collector/mesh.go b/collector/mesh.go index 2e3f9b6..709f322 100644 --- a/collector/mesh.go +++ b/collector/mesh.go @@ -2,6 +2,7 @@ package collector import ( "context" + "fmt" "github.com/spacemeshos/explorer-backend/utils" "io" "time" @@ -18,42 +19,42 @@ func (c *Collector) getNetworkInfo() error { genesisTime, err := c.meshClient.GenesisTime(ctx, &pb.GenesisTimeRequest{}) if err != nil { - log.Error("cannot get GenesisTime: %v", err) + log.Err(fmt.Errorf("cannot get GenesisTime: %v", err)) return err } genesisId, err := c.meshClient.GenesisID(ctx, &pb.GenesisIDRequest{}) if err != nil { - log.Error("cannot get NetId: %v", err) + log.Err(fmt.Errorf("cannot get NetId: %v", err)) } epochNumLayers, err := c.meshClient.EpochNumLayers(ctx, &pb.EpochNumLayersRequest{}) if err != nil { - log.Error("cannot get EpochNumLayers: %v", err) + log.Err(fmt.Errorf("cannot get EpochNumLayers: %v", err)) return err } maxTransactionsPerSecond, err := c.meshClient.MaxTransactionsPerSecond(ctx, &pb.MaxTransactionsPerSecondRequest{}) if err != nil { - log.Error("cannot get MaxTransactionsPerSecond: %v", err) + log.Err(fmt.Errorf("cannot get MaxTransactionsPerSecond: %v", err)) return err } layerDuration, err := c.meshClient.LayerDuration(ctx, &pb.LayerDurationRequest{}) if err != nil { - log.Error("cannot get LayerDuration: %v", err) + log.Err(fmt.Errorf("cannot get LayerDuration: %v", err)) return err } accounts, err := c.debugClient.Accounts(ctx, &pb.AccountsRequest{}) if err != nil { - log.Error("cannot get accounts: %v", err) + log.Err(fmt.Errorf("cannot get accounts: %v", err)) return err } res, err := c.smesherClient.PostConfig(ctx, &empty.Empty{}) if err != nil { - log.Error("cannot get POST config: %v", err) + log.Err(fmt.Errorf("cannot get POST config: %v", err)) return err } @@ -86,7 +87,7 @@ func (c *Collector) layersPump() error { stream, err := c.meshClient.LayerStream(context.Background(), &req) if err != nil { - log.Error("cannot get layer stream: %v", err) + log.Err(fmt.Errorf("cannot get layer stream: %v", err)) return err } @@ -96,7 +97,7 @@ func (c *Collector) layersPump() error { return err } if err != nil { - log.Error("cannot receive layer: %v", err) + log.Err(fmt.Errorf("cannot receive layer: %v", err)) return err } layer := response.GetLayer() @@ -107,7 +108,7 @@ func (c *Collector) layersPump() error { func (c *Collector) syncMissingLayers() error { status, err := c.nodeClient.Status(context.Background(), &pb.StatusRequest{}) if err != nil { - log.Error("cannot receive node status: %v", err) + log.Err(fmt.Errorf("cannot receive node status: %v", err)) return err } syncedLayerNum := status.Status.SyncedLayer.Number diff --git a/collector/node.go b/collector/node.go index cfa3f35..8bd51dc 100644 --- a/collector/node.go +++ b/collector/node.go @@ -2,6 +2,7 @@ package collector import ( "context" + "fmt" pb "github.com/spacemeshos/api/release/go/spacemesh/v1" "io" @@ -21,7 +22,7 @@ func (c *Collector) syncStatusPump() error { stream, err := c.nodeClient.StatusStream(context.Background(), &req) if err != nil { - log.Error("cannot get sync status stream: %v", err) + log.Err(fmt.Errorf("cannot get sync status stream: %v", err)) return err } @@ -32,7 +33,7 @@ func (c *Collector) syncStatusPump() error { return err } if err != nil { - log.Error("cannot receive sync status: %v", err) + log.Err(fmt.Errorf("cannot receive sync status: %v", err)) return err } diff --git a/go.mod b/go.mod index 780bd89..9f11eb5 100644 --- a/go.mod +++ b/go.mod @@ -9,15 +9,15 @@ require ( github.com/labstack/echo/v4 v4.9.1 github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/spacemeshos/address v0.0.0-20220829090052-44ab32617871 - github.com/spacemeshos/api/release/go v1.16.0 + github.com/spacemeshos/api/release/go v1.17.0 github.com/spacemeshos/go-scale v1.1.10 - github.com/spacemeshos/go-spacemesh v0.3.12-beta.0 + github.com/spacemeshos/go-spacemesh v1.0.8 github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.23.7 go.mongodb.org/mongo-driver v1.10.1 - golang.org/x/net v0.10.0 + golang.org/x/net v0.12.0 golang.org/x/sync v0.3.0 - google.golang.org/grpc v1.56.2 + google.golang.org/grpc v1.57.0 ) require ( @@ -34,12 +34,12 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect - github.com/klauspost/compress v1.16.4 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect + github.com/klauspost/compress v1.16.5 // indirect + github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/labstack/gommon v0.4.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/minio/sha256-simd v1.0.1 // indirect @@ -57,8 +57,8 @@ require ( github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect github.com/spacemeshos/merkle-tree v0.2.2 // indirect - github.com/spacemeshos/poet v0.8.6 // indirect - github.com/spacemeshos/post v0.8.4 // indirect + github.com/spacemeshos/poet v0.8.7 // indirect + github.com/spacemeshos/post v0.8.11 // indirect github.com/spacemeshos/sha256-simd v0.1.0 // indirect github.com/tinylib/msgp v1.1.8 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect @@ -71,16 +71,15 @@ require ( github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect github.com/zeebo/blake3 v0.2.3 // indirect - go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.9.0 // indirect + go.uber.org/zap v1.25.0 // indirect + golang.org/x/crypto v0.11.0 // indirect golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect - golang.org/x/sys v0.9.0 // indirect - golang.org/x/text v0.10.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect golang.org/x/time v0.3.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 8cf7cd3..151bcb2 100644 --- a/go.sum +++ b/go.sum @@ -41,15 +41,15 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 h1:dygLcbEBA+t/P7ck6a8AkXv6juQ4cK0RHBoh32jxhHM= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2/go.mod h1:Ap9RLCIJVtgQg1/BBgVEfypOAySvvlcpcVQkSzJCH4Y= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU= -github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= +github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= -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/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -64,8 +64,8 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= @@ -105,18 +105,18 @@ github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1Avp github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g= github.com/spacemeshos/address v0.0.0-20220829090052-44ab32617871 h1:7cFCSnK/XIbyFPNprR0BZWOpcF/6Ja7JSfJxfEczXeE= github.com/spacemeshos/address v0.0.0-20220829090052-44ab32617871/go.mod h1:99pkrI1qHZje8hwQphmzRi6FQrJwgM1HvWVRC5GE1Fo= -github.com/spacemeshos/api/release/go v1.16.0 h1:DcRjnD+UBU4nx5TljxcPairHlI/wrbFX2VPUmWTarTs= -github.com/spacemeshos/api/release/go v1.16.0/go.mod h1:aSK7c2PUsle+EpC9VPAsPnsjKWDbo+NzT7kZgmzIZeM= +github.com/spacemeshos/api/release/go v1.17.0 h1:GZT2foJ619pYLYbNGWkat8QSFJnH1u2eOWw8AwSlz/g= +github.com/spacemeshos/api/release/go v1.17.0/go.mod h1:aSK7c2PUsle+EpC9VPAsPnsjKWDbo+NzT7kZgmzIZeM= github.com/spacemeshos/go-scale v1.1.10 h1:wOfUR6l2KzAu+m/KU0JE7iopTrczvFgI21ZNpIET3Dw= github.com/spacemeshos/go-scale v1.1.10/go.mod h1:TmYTorvilrhSZpqp51V6HWYtQPnWvBqOaF+GCWdnsgs= -github.com/spacemeshos/go-spacemesh v0.3.12-beta.0 h1:L2p1RaJcrA0nBg4rVfK1JYoMv9Tjm+UtsMTPNeRkquQ= -github.com/spacemeshos/go-spacemesh v0.3.12-beta.0/go.mod h1:MIm8FA/yv1FaHGDfarv42gS//6tKddpiaiYxXxbNleM= +github.com/spacemeshos/go-spacemesh v1.0.8 h1:0vdC3FFk/7uYebXSpsjOLAVtOGljtSepAry9NIyPKeM= +github.com/spacemeshos/go-spacemesh v1.0.8/go.mod h1:wvbVycLk2gaJMHPV5kN7QZVtWYrxXEslpjFpawVUvfs= github.com/spacemeshos/merkle-tree v0.2.2 h1:+zF+17CwVebq9UzShunUBXv16rEVKIJHh2CTDIyFf9g= github.com/spacemeshos/merkle-tree v0.2.2/go.mod h1:0Q/z4S5Kt9qz/c3qWa7hKA1yT7n7odyysbPIUTRu/xo= -github.com/spacemeshos/poet v0.8.6 h1:jMQ9HkJeCRqUMRTIk0HEP/5kvVdAH+OAkzOKQ0XlhJU= -github.com/spacemeshos/poet v0.8.6/go.mod h1:Ut/aR/1Sks6/I/+GDFLqCinXW6OIIS8z9uL/zjFTTP8= -github.com/spacemeshos/post v0.8.4 h1:CHpYQVLCUe73L14EYFwDYW15e7t527qp+imzqU/4RgE= -github.com/spacemeshos/post v0.8.4/go.mod h1:LDj6XQht1ZvTZurBJ+LZNf17t92qIQymWgU2sY6V2Zs= +github.com/spacemeshos/poet v0.8.7 h1:Q85SDIlV0Asn7AJ9TaIbE1upimcXSUixYVeSY2bFqXI= +github.com/spacemeshos/poet v0.8.7/go.mod h1:eRT87JENlVfItdJvKtnFCnSFcceeYTRrsXfF5u5sE8k= +github.com/spacemeshos/post v0.8.11 h1:uZo8n5wF0fGOxRzXHabU/Buu9aLyPT4YWi6ZFms9mWg= +github.com/spacemeshos/post v0.8.11/go.mod h1:LDj6XQht1ZvTZurBJ+LZNf17t92qIQymWgU2sY6V2Zs= github.com/spacemeshos/sha256-simd v0.1.0 h1:G7Mfu5RYdQiuE+wu4ZyJ7I0TI74uqLhFnKblEnSpjYI= github.com/spacemeshos/sha256-simd v0.1.0/go.mod h1:O8CClVIilId7RtuCMV2+YzMj6qjVn75JsxOxaE8vcfM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -160,20 +160,18 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4= go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8= -go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= -go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= +go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -188,8 +186,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -210,13 +208,13 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= @@ -225,8 +223,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -239,13 +237,13 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= +google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw= +google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e h1:S83+ibolgyZ0bqz7KEsUOPErxcv4VzlszxY+31OfB/E= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/internal/api/api.go b/internal/api/api.go index 6d6c1dd..b967dec 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -2,6 +2,7 @@ package api import ( "context" + "fmt" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" "github.com/spacemeshos/explorer-backend/internal/api/handler" @@ -70,7 +71,7 @@ func Init(appService service.AppService, allowedOrigins []string, debug bool) *A func (a *Api) Run(address string) { log.Info("server is running. For exit ") if err := a.Echo.Start(address); err != nil { - log.Error("server stopped: %s", err) + log.Err(fmt.Errorf("server stopped: %s", err)) } sysSignal := make(chan os.Signal, 1) @@ -79,7 +80,7 @@ func (a *Api) Run(address string) { s := <-sysSignal log.Info("exiting, got signal %v", s) if err := a.Shutdown(); err != nil { - log.Error("error on shutdown: %v", err) + log.Err(fmt.Errorf("error on shutdown: %v", err)) } } diff --git a/internal/api/handler/blocks.go b/internal/api/handler/blocks.go index f8013c4..60f2daf 100644 --- a/internal/api/handler/blocks.go +++ b/internal/api/handler/blocks.go @@ -2,6 +2,7 @@ package handler import ( "context" + "fmt" "github.com/labstack/echo/v4" "github.com/spacemeshos/go-spacemesh/log" "net/http" @@ -13,7 +14,7 @@ func Block(c echo.Context) error { cc := c.(*ApiContext) block, err := cc.Service.GetBlock(context.TODO(), c.Param("id")) if err != nil { - log.Error("failed to get block `%s` info: %s", block, err) + log.Err(fmt.Errorf("failed to get block `%v` info: %s", block, err)) return err } return c.JSON(http.StatusOK, DataResponse{Data: []*model.Block{block}}) diff --git a/internal/api/handler/network_info.go b/internal/api/handler/network_info.go index 1895db6..217f24b 100644 --- a/internal/api/handler/network_info.go +++ b/internal/api/handler/network_info.go @@ -53,7 +53,7 @@ func NetworkInfo(c echo.Context) error { func NetworkInfoWS(c echo.Context) error { ws, err := Upgrader.Upgrade(c.Response(), c.Request(), nil) if err != nil { - log.Error("NetworkInfoWS: upgrade error: %w\n", err) + log.Err(fmt.Errorf("NetworkInfoWS: upgrade error: %w\n", err)) return nil } defer ws.Close() @@ -64,7 +64,7 @@ func NetworkInfoWS(c echo.Context) error { for ; true; <-ticker.C { if err := serveNetworkInfo(c, ws); err != nil { if !errors.Is(err, syscall.EPIPE) { - log.Error("NetworkInfoWS: serve network info: %s", err) + log.Err(fmt.Errorf("NetworkInfoWS: serve network info: %s", err)) return nil } } diff --git a/internal/api/handler/smeshers.go b/internal/api/handler/smeshers.go index dfafe31..299274b 100644 --- a/internal/api/handler/smeshers.go +++ b/internal/api/handler/smeshers.go @@ -17,7 +17,7 @@ func Smeshers(c echo.Context) error { pageNum, pageSize := GetPagination(c) smeshersList, total, err := cc.Service.GetSmeshers(context.TODO(), pageNum, pageSize) if err != nil { - log.Error("failed to get smeshers list: %s", err) + log.Err(fmt.Errorf("failed to get smeshers list: %s", err)) return err } @@ -54,7 +54,7 @@ func SmesherDetails(c echo.Context) error { return fiber.NewError(fiber.StatusNotFound, "entity not found") } if err != nil { - log.Error("failed to get smesher entity `%s` details: %s", c.Param("entity"), err) + log.Err(fmt.Errorf("failed to get smesher entity `%s` details: %s", c.Param("entity"), err)) return err } diff --git a/internal/service/account.go b/internal/service/account.go index de71d76..493ef8b 100644 --- a/internal/service/account.go +++ b/internal/service/account.go @@ -16,7 +16,7 @@ import ( func (e *Service) GetAccount(ctx context.Context, accountID string) (*model.Account, error) { addr, err := address.StringToAddress(accountID) if err != nil { - log.Error("GetAccount error: %v", err) + log.Err(fmt.Errorf("GetAccount error: %v", err)) return nil, ErrNotFound } diff --git a/internal/service/service.go b/internal/service/service.go index aeb4742..4cfc8a0 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -43,7 +43,7 @@ func NewService(reader storagereader.StorageReader, cacheTTL time.Duration) *Ser } if _, err := service.GetNetworkInfo(context.Background()); err != nil { - log.Error("error load network info: %w", err) + log.Err(fmt.Errorf("error load network info: %w", err)) } return service } diff --git a/internal/storage/storagereader/layers.go b/internal/storage/storagereader/layers.go index a18b3a2..83d8e7e 100644 --- a/internal/storage/storagereader/layers.go +++ b/internal/storage/storagereader/layers.go @@ -53,7 +53,7 @@ func (s *Reader) GetLayer(ctx context.Context, layerNumber int) (*model.Layer, e func (s *Reader) GetLayerTimestamp(layer uint32) uint32 { networkInfo, err := s.GetNetworkInfo(context.TODO()) if err != nil { - log.Error("getLayerTimestamp: %w", err) + log.Err(fmt.Errorf("getLayerTimestamp: %w", err)) return 0 } diff --git a/model/layer.go b/model/layer.go index c798489..96e1e9e 100644 --- a/model/layer.go +++ b/model/layer.go @@ -2,6 +2,7 @@ package model import ( "context" + "fmt" pb "github.com/spacemeshos/api/release/go/spacemesh/v1" "github.com/spacemeshos/go-spacemesh/log" @@ -67,7 +68,7 @@ func NewLayer(in *pb.Layer, networkInfo *NetworkInfo) (*Layer, []*Block, []*Acti for j, t := range b.Transactions { tx, err := NewTransaction(t, layer.Number, blocks[i].Id, layer.Start, uint32(j)) if err != nil { - log.Error("cannot create transaction: %v", err) + log.Err(fmt.Errorf("cannot create transaction: %v", err)) continue } txs[tx.Id] = tx diff --git a/storage/storage.go b/storage/storage.go index 609fd78..1a8d91d 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -4,6 +4,7 @@ import ( "container/list" "context" "errors" + "fmt" "github.com/spacemeshos/explorer-backend/utils" "sync" "time" @@ -118,7 +119,7 @@ func (s *Storage) Close() { s.db = nil err := s.client.Disconnect(ctx) if err != nil { - log.Error("error while disconnecting from database: %v", err) + log.Err(fmt.Errorf("error while disconnecting from database: %v", err)) } } } @@ -134,7 +135,7 @@ func (s *Storage) OnNetworkInfo(genesisId string, genesisTime uint64, epochNumLa err := s.SaveOrUpdateNetworkInfo(context.Background(), &s.NetworkInfo) //TODO: better error handling if err != nil { - log.Error("OnNetworkInfo: error %v", err) + log.Err(fmt.Errorf("OnNetworkInfo: error %v", err)) } log.Info("Network Info: id: %s, genesis: %v, epoch layers: %v, max tx: %v, duration: %v", @@ -156,7 +157,7 @@ func (s *Storage) OnNodeStatus(connectedPeers uint64, isSynced bool, syncedLayer err := s.SaveOrUpdateNetworkInfo(context.Background(), &s.NetworkInfo) //TODO: better error handling if err != nil { - log.Error("OnNodeStatus: error %v", err) + log.Err(fmt.Errorf("OnNodeStatus: error %v", err)) } } @@ -186,7 +187,7 @@ func (s *Storage) OnAccount(in *pb.Account) { err := s.UpdateAccount(context.Background(), account.Address, account.Balance, account.Counter) //TODO: better error handling if err != nil { - log.Error("OnAccount: error %v", err) + log.Err(fmt.Errorf("OnAccount: error %v", err)) } } @@ -206,20 +207,20 @@ func (s *Storage) OnReward(in *pb.Reward) { err = s.SaveReward(context.Background(), reward) //TODO: better error handling if err != nil { - log.Error("OnReward save: error %v", err) + log.Err(fmt.Errorf("OnReward save: error %v", err)) } err = s.AddAccount(context.Background(), reward.Layer, reward.Coinbase, 0) //TODO: better error handling if err != nil { - log.Error("OnReward add account: error %v", err) + log.Err(fmt.Errorf("OnReward add account: error %v", err)) } // s.AddAccountReward(context.Background(), reward.Layer, reward.Coinbase, reward.LayerReward, reward.Total - reward.LayerReward) err = s.AddAccountReward(context.Background(), reward.Layer, reward.Coinbase, reward.Total, reward.LayerReward) //TODO: better error handling if err != nil { - log.Error("OnReward add account reward: error %v", err) + log.Err(fmt.Errorf("OnReward add account reward: error %v", err)) } s.requestBalanceUpdate(reward.Layer, reward.Coinbase) @@ -232,7 +233,7 @@ func (s *Storage) OnTransactionReceipt(in *pb.TransactionReceipt) { err := s.UpdateTransaction(context.Background(), model.NewTransactionReceipt(in)) //TODO: better error handling if err != nil { - log.Error("OnTransactionReceipt: error %v", err) + log.Err(fmt.Errorf("OnTransactionReceipt: error %v", err)) } } @@ -311,7 +312,7 @@ func (s *Storage) updateLayer(in *pb.Layer) { err := s.SaveOrUpdateBlocks(context.Background(), blocks) //TODO: better error handling if err != nil { - log.Error("updateLayer: error %v", err) + log.Err(fmt.Errorf("updateLayer: error %v", err)) } s.updateActivations(layer, atxs) @@ -321,7 +322,7 @@ func (s *Storage) updateLayer(in *pb.Layer) { err = s.SaveOrUpdateLayer(context.Background(), layer) //TODO: better error handling if err != nil { - log.Error("updateLayer: error %v", err) + log.Err(fmt.Errorf("updateLayer: error %v", err)) } s.setChangedEpoch(layer.Number) @@ -341,7 +342,7 @@ func (s *Storage) updateNetworkStatus(layer *model.Layer) { err := s.SaveOrUpdateNetworkInfo(context.Background(), &s.NetworkInfo) //TODO: better error handling if err != nil { - log.Error("updateNetworkStatus: error %v", err) + log.Err(fmt.Errorf("updateNetworkStatus: error %v", err)) } } @@ -350,26 +351,26 @@ func (s *Storage) updateActivations(layer *model.Layer, atxs []*model.Activation err := s.SaveOrUpdateActivations(context.Background(), atxs) //TODO: better error handling if err != nil { - log.Error("updateActivations: error %v", err) + log.Err(fmt.Errorf("updateActivations: error %v", err)) } for _, atx := range atxs { err := s.SaveSmesher(context.Background(), atx.GetSmesher(s.postUnitSize)) //TODO: better error handling if err != nil { - log.Error("updateActivations: error %v", err) + log.Err(fmt.Errorf("updateActivations: error %v", err)) } err = s.UpdateSmesher(context.Background(), atx.SmesherId, atx.Coinbase, uint64(atx.NumUnits)*s.postUnitSize, s.getLayerTimestamp(atx.Layer)) //TODO: better error handling if err != nil { - log.Error("updateActivations: error %v", err) + log.Err(fmt.Errorf("updateActivations: error %v", err)) } err = s.AddAccount(context.Background(), layer.Number, atx.Coinbase, 0) //TODO: better error handling if err != nil { - log.Error("updateActivations: error %v", err) + log.Err(fmt.Errorf("updateActivations: error %v", err)) } } } @@ -386,13 +387,13 @@ func (s *Storage) updateTransactions(layer *model.Layer, txs map[string]*model.T err := s.AddAccount(context.Background(), layer.Number, tx.Sender, 0) //TODO: better error handling if err != nil { - log.Error("updateTransactions: error %v", err) + log.Err(fmt.Errorf("updateTransactions: error %v", err)) } err = s.AddAccountSent(context.Background(), layer.Number, tx.Sender, tx.Amount) //TODO: better error handling if err != nil { - log.Error("updateTransactions: error %v", err) + log.Err(fmt.Errorf("updateTransactions: error %v", err)) } s.requestBalanceUpdate(layer.Number, tx.Sender) @@ -401,13 +402,13 @@ func (s *Storage) updateTransactions(layer *model.Layer, txs map[string]*model.T err := s.AddAccount(context.Background(), layer.Number, tx.Receiver, 0) //TODO: better error handling if err != nil { - log.Error("updateTransactions: error %v", err) + log.Err(fmt.Errorf("updateTransactions: error %v", err)) } err = s.AddAccountReceived(context.Background(), layer.Number, tx.Receiver, tx.Amount) //TODO: better error handling if err != nil { - log.Error("updateTransactions: error %v", err) + log.Err(fmt.Errorf("updateTransactions: error %v", err)) } s.requestBalanceUpdate(layer.Number, tx.Receiver) } @@ -444,7 +445,7 @@ func (s *Storage) updateEpoch(epochNumber int32, prev *model.Epoch) *model.Epoch err := s.SaveOrUpdateEpoch(context.Background(), epoch) //TODO: better error handling if err != nil { - log.Error("updateEpoch: error %v", err) + log.Err(fmt.Errorf("updateEpoch: error %v", err)) } return epoch @@ -473,7 +474,7 @@ func (s *Storage) updateAccount(address string) { err = s.UpdateAccount(context.Background(), address, balance, counter) //TODO: better error handling if err != nil { - log.Error("updateEpoch: error %v", err) + log.Err(fmt.Errorf("updateEpoch: error %v", err)) } }