Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/spacemeshos/go-spacemesh from 1.6.2 to 1.7.8 #192

Merged
merged 3 commits into from
Dec 12, 2024
Merged

Bump github.com/spacemeshos/go-spacemesh from 1.6.2 to 1.7.8 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e91fce2
Bump github.com/spacemeshos/go-spacemesh from 1.6.2 to 1.7.8
dependabot[bot] Dec 12, 2024
03604d1
Fix use of sql.Database
fasmat Dec 12, 2024
16bf34a
Update address
fasmat Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type Api struct {
Echo *echo.Echo
}

func Init(db *sql.Database, dbClient storage.DatabaseClient, allowedOrigins []string,
func Init(db sql.StateDatabase, dbClient storage.DatabaseClient, allowedOrigins []string,
debug bool, layersPerEpoch int64, marshaler *marshaler.Marshaler, routes func(e *echo.Echo),
) *Api {
e := echo.New()
Expand Down
2 changes: 1 addition & 1 deletion api/handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

type ApiContext struct {
echo.Context
Storage *sql.Database
Storage sql.StateDatabase
StorageClient storage.DatabaseClient
LayersPerEpoch int64
Cache *marshaler.Marshaler
Expand Down
4 changes: 2 additions & 2 deletions api/storage/accounts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spacemeshos/go-spacemesh/sql/transactions"
)

func (c *Client) GetAccountsCount(db *sql.Database) (uint64, error) {
func (c *Client) GetAccountsCount(db sql.Executor) (uint64, error) {
var total uint64
_, err := db.Exec(`SELECT COUNT(DISTINCT address) FROM accounts`,
func(stmt *sql.Statement) {
Expand All @@ -28,7 +28,7 @@ type AccountStats struct {
RewardsSum uint64 `json:"rewards_sum"`
}

func (c *Client) GetAccountsStats(db *sql.Database, addr types.Address) (*AccountStats, error) {
func (c *Client) GetAccountsStats(db sql.Executor, addr types.Address) (*AccountStats, error) {
stats := &AccountStats{
Account: addr.String(),
Received: 0,
Expand Down
2 changes: 1 addition & 1 deletion api/storage/activations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package storage

import "github.com/spacemeshos/go-spacemesh/sql"

func (c *Client) GetTotalNumUnits(db *sql.Database) (count uint64, err error) {
func (c *Client) GetTotalNumUnits(db sql.Executor) (count uint64, err error) {
_, err = db.Exec(`SELECT SUM(effective_num_units) FROM atxs;`,
func(stmt *sql.Statement) {
},
Expand Down
2 changes: 1 addition & 1 deletion api/storage/circulation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type Circulation struct {
Circulation uint64 `json:"circulation"`
}

func (c *Client) GetCirculation(db *sql.Database) (*Circulation, error) {
func (c *Client) GetCirculation(db sql.Executor) (*Circulation, error) {
circulation := &Circulation{
Circulation: 0,
}
Expand Down
4 changes: 2 additions & 2 deletions api/storage/epoch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type EpochStats struct {
AccountsCount uint64 `json:"accounts_count,omitempty"`
}

func (c *Client) GetEpochStats(db *sql.Database, epoch, layersPerEpoch int64) (*EpochStats, error) {
func (c *Client) GetEpochStats(db sql.Executor, epoch, layersPerEpoch int64) (*EpochStats, error) {
stats := &EpochStats{
TransactionsCount: 0,
ActivationsCount: 0,
Expand Down Expand Up @@ -139,7 +139,7 @@ FROM (
return stats, err
}

func (c *Client) GetEpochDecentralRatio(db *sql.Database, epoch int64) (*EpochStats, error) {
func (c *Client) GetEpochDecentralRatio(db sql.Executor, epoch int64) (*EpochStats, error) {
stats := &EpochStats{
Decentral: 0,
}
Expand Down
4 changes: 2 additions & 2 deletions api/storage/layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type LayerStats struct {
RewardsSum uint64 `json:"rewards_sum"`
}

func (c *Client) GetLayerStats(db *sql.Database, lid int64) (*LayerStats, error) {
func (c *Client) GetLayerStats(db sql.Executor, lid int64) (*LayerStats, error) {
stats := &LayerStats{
TransactionsCount: 0,
TransactionsSum: 0,
Expand Down Expand Up @@ -65,7 +65,7 @@ func (c *Client) GetLayerStats(db *sql.Database, lid int64) (*LayerStats, error)
return stats, err
}

func (c *Client) GetLayersCount(db *sql.Database) (count uint64, err error) {
func (c *Client) GetLayersCount(db sql.Executor) (count uint64, err error) {
_, err = db.Exec(`SELECT COUNT(*) FROM layers`,
func(stmt *sql.Statement) {
},
Expand Down
2 changes: 1 addition & 1 deletion api/storage/overview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type Overview struct {
NumUnits uint64 `json:"num_units"`
}

func (c *Client) Overview(db *sql.Database) (*Overview, error) {
func (c *Client) Overview(db sql.Executor) (*Overview, error) {
overview := &Overview{}
accountsCount, err := c.GetAccountsCount(db)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions api/storage/rewards.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/spacemeshos/go-spacemesh/sql"
)

func (c *Client) GetRewardsSum(db *sql.Database) (sum, count uint64, err error) {
func (c *Client) GetRewardsSum(db sql.Executor) (sum, count uint64, err error) {
_, err = db.Exec(`SELECT COUNT(*), SUM(total_reward) FROM rewards`,
func(stmt *sql.Statement) {
},
Expand All @@ -17,7 +17,7 @@ func (c *Client) GetRewardsSum(db *sql.Database) (sum, count uint64, err error)
return
}

func (c *Client) GetRewardsSumByAddress(db *sql.Database, addr types.Address) (sum, count uint64, err error) {
func (c *Client) GetRewardsSumByAddress(db sql.Executor, addr types.Address) (sum, count uint64, err error) {
_, err = db.Exec(`SELECT COUNT(*), SUM(total_reward) FROM rewards WHERE coinbase = ?1`,
func(stmt *sql.Statement) {
stmt.BindBytes(1, addr.Bytes())
Expand Down
10 changes: 5 additions & 5 deletions api/storage/smesher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type Smesher struct {
RewardsSum uint64 `json:"rewards_sum,omitempty"`
}

func (c *Client) GetSmeshers(db *sql.Database, limit, offset uint64) (*SmesherList, error) {
func (c *Client) GetSmeshers(db sql.Executor, limit, offset uint64) (*SmesherList, error) {
smesherList := &SmesherList{
Smeshers: []Smesher{},
}
Expand All @@ -45,7 +45,7 @@ func (c *Client) GetSmeshers(db *sql.Database, limit, offset uint64) (*SmesherLi
return smesherList, err
}

func (c *Client) GetSmeshersByEpoch(db *sql.Database, limit, offset, epoch uint64) (*SmesherList, error) {
func (c *Client) GetSmeshersByEpoch(db sql.Executor, limit, offset, epoch uint64) (*SmesherList, error) {
smesherList := &SmesherList{
Smeshers: []Smesher{},
}
Expand All @@ -72,7 +72,7 @@ func (c *Client) GetSmeshersByEpoch(db *sql.Database, limit, offset, epoch uint6
return smesherList, err
}

func (c *Client) GetSmeshersCount(db *sql.Database) (count uint64, err error) {
func (c *Client) GetSmeshersCount(db sql.Executor) (count uint64, err error) {
_, err = db.Exec(`SELECT COUNT(*) FROM (SELECT DISTINCT pubkey FROM atxs)`,
func(stmt *sql.Statement) {
},
Expand All @@ -83,7 +83,7 @@ func (c *Client) GetSmeshersCount(db *sql.Database) (count uint64, err error) {
return
}

func (c *Client) GetSmeshersByEpochCount(db *sql.Database, epoch uint64) (count uint64, err error) {
func (c *Client) GetSmeshersByEpochCount(db sql.Executor, epoch uint64) (count uint64, err error) {
_, err = db.Exec(`SELECT COUNT(*) FROM (SELECT DISTINCT pubkey FROM atxs WHERE epoch = ?1)`,
func(stmt *sql.Statement) {
stmt.BindInt64(1, int64(epoch-1))
Expand All @@ -95,7 +95,7 @@ func (c *Client) GetSmeshersByEpochCount(db *sql.Database, epoch uint64) (count
return
}

func (c *Client) GetSmesher(db *sql.Database, pubkey []byte) (smesher *Smesher, err error) {
func (c *Client) GetSmesher(db sql.Executor, pubkey []byte) (smesher *Smesher, err error) {
_, err = db.Exec(`SELECT pubkey, coinbase, effective_num_units, COUNT(*) as atxs FROM atxs
WHERE pubkey = ?1 GROUP BY pubkey
ORDER BY epoch DESC LIMIT 1;`,
Expand Down
41 changes: 20 additions & 21 deletions api/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,36 @@ import (

"github.com/spacemeshos/go-spacemesh/common/types"
"github.com/spacemeshos/go-spacemesh/sql"
"github.com/spacemeshos/go-spacemesh/sql/statesql"
"github.com/spacemeshos/go-spacemesh/timesync"
)

type DatabaseClient interface {
Overview(db *sql.Database) (*Overview, error)
Overview(db sql.Executor) (*Overview, error)

GetLayerStats(db *sql.Database, lid int64) (*LayerStats, error)
GetLayersCount(db *sql.Database) (uint64, error)
GetLayerStats(db sql.Executor, lid int64) (*LayerStats, error)
GetLayersCount(db sql.Executor) (uint64, error)

GetEpochStats(db *sql.Database, epoch, layersPerEpoch int64) (*EpochStats, error)
GetEpochDecentralRatio(db *sql.Database, epoch int64) (*EpochStats, error)
GetEpochStats(db sql.Executor, epoch, layersPerEpoch int64) (*EpochStats, error)
GetEpochDecentralRatio(db sql.Executor, epoch int64) (*EpochStats, error)

GetSmeshers(db *sql.Database, limit, offset uint64) (*SmesherList, error)
GetSmeshersByEpoch(db *sql.Database, limit, offset, epoch uint64) (*SmesherList, error)
GetSmesher(db *sql.Database, pubkey []byte) (*Smesher, error)
GetSmeshers(db sql.Executor, limit, offset uint64) (*SmesherList, error)
GetSmeshersByEpoch(db sql.Executor, limit, offset, epoch uint64) (*SmesherList, error)
GetSmesher(db sql.Executor, pubkey []byte) (*Smesher, error)

GetAccountsCount(db *sql.Database) (uint64, error)
GetAccountsStats(db *sql.Database, addr types.Address) (*AccountStats, error)
GetAccountsCount(db sql.Executor) (uint64, error)
GetAccountsStats(db sql.Executor, addr types.Address) (*AccountStats, error)

GetSmeshersCount(db *sql.Database) (uint64, error)
GetSmeshersByEpochCount(db *sql.Database, epoch uint64) (uint64, error)
GetSmeshersCount(db sql.Executor) (uint64, error)
GetSmeshersByEpochCount(db sql.Executor, epoch uint64) (uint64, error)

GetRewardsSum(db *sql.Database) (uint64, uint64, error)
GetRewardsSumByAddress(db *sql.Database, addr types.Address) (sum, count uint64, err error)
GetRewardsSum(db sql.Executor) (uint64, uint64, error)
GetRewardsSumByAddress(db sql.Executor, addr types.Address) (sum, count uint64, err error)

GetTransactionsCount(db *sql.Database) (uint64, error)
GetTotalNumUnits(db *sql.Database) (uint64, error)
GetTransactionsCount(db sql.Executor) (uint64, error)
GetTotalNumUnits(db sql.Executor) (uint64, error)

GetCirculation(db *sql.Database) (*Circulation, error)
GetCirculation(db sql.Executor) (*Circulation, error)
}

type Client struct {
Expand All @@ -43,8 +44,6 @@ type Client struct {
BitsPerLabel uint64
}

func Setup(path string) (db *sql.Database, err error) {
db, err = sql.Open(fmt.Sprintf("file:%s?mode=ro", path),
sql.WithConnections(16), sql.WithMigrations(nil))
return
func Setup(path string) (db sql.StateDatabase, err error) {
return statesql.Open(fmt.Sprintf("file:%s?mode=ro", path), sql.WithConnections(16))
}
2 changes: 1 addition & 1 deletion api/storage/transactions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/spacemeshos/go-spacemesh/sql"
)

func (c *Client) GetTransactionsCount(db *sql.Database) (count uint64, err error) {
func (c *Client) GetTransactionsCount(db sql.Executor) (count uint64, err error) {
_, err = db.Exec(`SELECT COUNT(*)
FROM (
SELECT distinct id
Expand Down
2 changes: 1 addition & 1 deletion cmd/api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ func main() {
metrics := echo.New()
metrics.GET("/metrics", echoprometheus.NewHandler())
if err := metrics.Start(metricsPortFlag); err != nil && !errors.Is(err, http.ErrServerClosed) {
log.Fatal("%v", err)
log.Panic("%v", err)
}
}()

Expand Down
35 changes: 18 additions & 17 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ require (
github.com/labstack/echo-contrib v0.17.1
github.com/labstack/echo/v4 v4.13.2
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_golang v1.20.5
github.com/redis/go-redis/v9 v9.7.0
github.com/spacemeshos/address v0.0.0-20220829090052-44ab32617871
github.com/spacemeshos/address v1.1.0
github.com/spacemeshos/api/release/go v1.57.0
github.com/spacemeshos/economics v0.1.3
github.com/spacemeshos/go-scale v1.2.0
github.com/spacemeshos/go-spacemesh v1.6.2
github.com/spacemeshos/economics v0.1.4
github.com/spacemeshos/go-scale v1.2.1
github.com/spacemeshos/go-spacemesh v1.7.8
github.com/urfave/cli/v2 v2.27.5
go.uber.org/zap v1.27.0
)
Expand All @@ -31,46 +31,47 @@ require (
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/go-llsqlite/crawshaw v0.5.3 // indirect
github.com/go-llsqlite/crawshaw v0.5.5 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/huandu/xstrings v1.2.0 // indirect
github.com/jonboulle/clockwork v0.4.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spacemeshos/merkle-tree v0.2.3 // indirect
github.com/spacemeshos/poet v0.10.3 // indirect
github.com/spacemeshos/post v0.12.7 // indirect
github.com/spacemeshos/merkle-tree v0.2.6 // indirect
github.com/spacemeshos/poet v0.10.10 // indirect
github.com/spacemeshos/post v0.12.10 // indirect
github.com/spacemeshos/sha256-simd v0.1.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
go.uber.org/mock v0.4.0 // indirect
github.com/zeebo/blake3 v0.2.4 // indirect
go.uber.org/mock v0.5.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/grpc v1.68.0 // indirect
google.golang.org/protobuf v1.35.2 // indirect
)
Loading
Loading