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.

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

Upgraded to sdk 38.5 and tm 33.6 #531

Merged
merged 1 commit into from Jul 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/cyberd/replay.go
Expand Up @@ -187,7 +187,7 @@ func replayTxs(rootDir string) error {

t2 := time.Now()

state, err = blockExec.ApplyBlock(state, blockmeta.BlockID, block)
state, _, err = blockExec.ApplyBlock(state, blockmeta.BlockID, block)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/cyberd/rpc/account.go
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
bw "github.com/cybercongress/go-cyber/x/bandwidth"
"github.com/tendermint/tendermint/rpc/lib/types"
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

type ResultAccount struct {
Expand Down
4 changes: 3 additions & 1 deletion cmd/cyberd/rpc/bandwidth.go
@@ -1,6 +1,8 @@
package rpc

import "github.com/tendermint/tendermint/rpc/lib/types"
import (
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

type ResultBandwidthPrice struct {
Price float64 `amino:"unsafe" json:"price"`
Expand Down
2 changes: 1 addition & 1 deletion cmd/cyberd/rpc/link.go
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
"github.com/cybercongress/go-cyber/x/link"
"github.com/tendermint/tendermint/rpc/lib/types"
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

func IsLinkExist(ctx *rpctypes.Context, from string, to string, address string) (bool, error) {
Expand Down
4 changes: 3 additions & 1 deletion cmd/cyberd/rpc/load.go
@@ -1,6 +1,8 @@
package rpc

import "github.com/tendermint/tendermint/rpc/lib/types"
import (
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

type ResultNetworkLoad struct {
Load float64 `amino:"unsafe" json:"load"`
Expand Down
4 changes: 3 additions & 1 deletion cmd/cyberd/rpc/network.go
@@ -1,6 +1,8 @@
package rpc

import "github.com/tendermint/tendermint/rpc/lib/types"
import (
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

type ResultIndexStats struct {
Height uint64 `json:"height"`
Expand Down
2 changes: 1 addition & 1 deletion cmd/cyberd/rpc/routes.go
Expand Up @@ -3,7 +3,7 @@ package rpc
import (
"github.com/cybercongress/go-cyber/app"
"github.com/tendermint/tendermint/rpc/core"
"github.com/tendermint/tendermint/rpc/lib/server"
rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
)

var cyberdApp *app.CyberdApp
Expand Down
2 changes: 1 addition & 1 deletion cmd/cyberd/rpc/search.go
Expand Up @@ -2,7 +2,7 @@ package rpc

import (
"github.com/cybercongress/go-cyber/app"
"github.com/tendermint/tendermint/rpc/lib/types"
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

type ResultSearch struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/cyberd/rpc/signed_msg.go
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/tendermint/tendermint/crypto/secp256k1"
"github.com/tendermint/tendermint/rpc/core"
ctypes "github.com/tendermint/tendermint/rpc/core/types"
rpctypes "github.com/tendermint/tendermint/rpc/lib/types"
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

type Signature struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/cyberd/rpc/staking.go
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/staking"
sdk "github.com/cosmos/cosmos-sdk/x/staking/types"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/rpc/lib/types"
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

func StakingValidators(ctx *rpctypes.Context, page, limit int, status string) ([]sdk.Validator, error) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/cyberd/rpc/top.go
@@ -1,7 +1,7 @@
package rpc

import (
"github.com/tendermint/tendermint/rpc/lib/types"
rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
)

func Top(ctx *rpctypes.Context, page, perPage int) (*ResultSearch, error) {
Expand Down
13 changes: 7 additions & 6 deletions go.mod
@@ -1,19 +1,20 @@
module github.com/cybercongress/go-cyber

go 1.13
go 1.14

require (
github.com/cosmos/cosmos-sdk v0.38.3
github.com/cosmos/cosmos-sdk v0.38.5
github.com/cosmwasm/wasmd v0.7.1
github.com/gorilla/mux v1.7.3
github.com/ipfs/go-cid v0.0.3
github.com/otiai10/copy v1.0.2
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v0.0.6
github.com/spf13/viper v1.6.2
github.com/rakyll/statik v0.1.6
github.com/spf13/cobra v1.0.0
github.com/spf13/viper v1.6.3
github.com/stretchr/testify v1.5.1
github.com/tendermint/btcd v0.1.1
github.com/tendermint/go-amino v0.15.1
github.com/tendermint/tendermint v0.33.3
github.com/tendermint/tm-db v0.5.0
github.com/tendermint/tendermint v0.33.6
github.com/tendermint/tm-db v0.5.1
)
56 changes: 56 additions & 0 deletions go.sum

Large diffs are not rendered by default.