updated wasmd/wasmvm and cosmos dependencies

addd iterator feature to supported by wasmvm
desmos-labs · Oct 29, 2021 · 2ab1be1 · 2ab1be1
1 parent 2da0994
commit 2ab1be1
Show file tree

Hide file tree

Showing 7 changed files with 406 additions and 56 deletions.
diff --git a/app/app.go b/app/app.go
@@ -459,7 +459,7 @@ func NewDesmosApp(
 		Custom: parser.ParseCustom,
 	}
 
-	supportedFeatures := "staking,stargate"
+	supportedFeatures := "iterator,staking,stargate"
 	wasmOpts = append(wasmOpts, wasmkeeper.WithQueryPlugins(queryPlugins))
 	wasmOpts = append(wasmOpts, wasmkeeper.WithMessageEncoders(customMsgEncoders))
 

diff --git a/app/desmos/cmd/testnet.go b/app/desmos/cmd/testnet.go
@@ -10,8 +10,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/desmos-labs/desmos/app"
-
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/spf13/cobra"
 	tmconfig "github.com/tendermint/tendermint/config"
@@ -184,7 +182,7 @@ func InitTestnet(
 			return err
 		}
 
-		addr, secret, err := server.GenerateSaveCoinKeyFromPath(kb, nodeDirName, true, algo, app.FullFundraiserPath)
+		addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, true, algo)
 		if err != nil {
 			_ = os.RemoveAll(outputDir)
 			return err

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/CosmWasm/wasmd v0.20.0
 	github.com/CosmWasm/wasmvm v1.0.0-beta
 	github.com/armon/go-metrics v0.3.8
-	github.com/cosmos/cosmos-sdk v0.42.5
+	github.com/cosmos/cosmos-sdk v0.42.10
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/desmos-labs/Go-Emoji-Utils v1.1.1
 	github.com/ghodss/yaml v1.0.0
@@ -18,19 +18,19 @@ require (
 	github.com/mr-tron/base58 v1.2.0
 	github.com/rakyll/statik v0.1.7
 	github.com/regen-network/cosmos-proto v0.3.1
-	github.com/spf13/cast v1.3.1
+	github.com/spf13/cast v1.4.1
 	github.com/spf13/cobra v1.1.3
 	github.com/stretchr/testify v1.7.0
-	github.com/tendermint/tendermint v0.34.11
+	github.com/tendermint/tendermint v0.34.13
 	github.com/tendermint/tm-db v0.6.4
-	google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a
-	google.golang.org/grpc v1.37.0
-	google.golang.org/protobuf v1.26.0
+	google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71
+	google.golang.org/grpc v1.40.0
+	google.golang.org/protobuf v1.27.1
 )
 
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
-replace github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.42.5-0.20210826081936-864fc99bab62
+// replace github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.42.5-0.20210826081936-864fc99bab62
 
 replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
 

diff --git a/go.sum b/go.sum
diff --git a/x/profiles/keeper/grpc_query.go b/x/profiles/keeper/grpc_query.go
@@ -233,7 +233,7 @@ func (k Keeper) ApplicationLinkByClientID(ctx context.Context, request *types.Qu
 
 	link, err := k.GetApplicationLinkByClientID(sdkCtx, request.ClientId)
 	if err != nil {
-		if sdkerrors.ErrNotFound.Is(err) {
+		if sdkerrors.ErrInvalidRequest.Is(err) {
 			return nil, status.Errorf(codes.NotFound, "link for client id %s not found", request.ClientId)
 		}
 

diff --git a/x/profiles/keeper/keeper_app_links.go b/x/profiles/keeper/keeper_app_links.go
@@ -68,7 +68,7 @@ func (k Keeper) GetApplicationLinkByClientID(ctx sdk.Context, clientID string) (
 	clientIDKey := types.ApplicationLinkClientIDKey(clientID)
 	if !store.Has(clientIDKey) {
 		return types.ApplicationLink{},
-			sdkerrors.Wrapf(sdkerrors.ErrNotFound, "link for client id %s not found", clientID)
+			sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "link for client id %s not found", clientID)
 	}
 
 	// Get the link key
@@ -94,7 +94,7 @@ func (k Keeper) DeleteApplicationLink(ctx sdk.Context, user string, application,
 	}
 
 	if !found {
-		return sdkerrors.Wrap(sdkerrors.ErrNotFound, "application link not found")
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "application link not found")
 	}
 
 	if link.User != user {

diff --git a/x/subspaces/keeper/grpc_query.go b/x/subspaces/keeper/grpc_query.go
@@ -23,7 +23,7 @@ func (k Keeper) Subspace(ctx context.Context, request *types.QuerySubspaceReques
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	subspace, found := k.GetSubspace(sdkCtx, request.SubspaceId)
 	if !found {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrNotFound, "subspace with id %s not found", request.SubspaceId)
+		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "subspace with id %s not found", request.SubspaceId)
 	}
 
 	return &types.QuerySubspaceResponse{Subspace: subspace}, nil
@@ -133,7 +133,7 @@ func (k Keeper) Tokenomics(goCtx context.Context, request *types.QueryTokenomics
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	tokenomics, found := k.GetTokenomics(ctx, request.SubspaceId)
 	if !found {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrNotFound, "tokenomics associated with id %s not found",
+		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "tokenomics associated with id %s not found",
 			request.SubspaceId)
 	}