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 to v14 #993

Merged
merged 5 commits into from
Mar 20, 2024
Merged

bump to v14 #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c772c0f
bump to v14
jhernandezb Mar 20, 2024
358f3c6
re-generate proto files
jhernandezb Mar 20, 2024
3a96815
fix drone build
jhernandezb Mar 20, 2024
0951c59
merge conflicts
jhernandezb Mar 20, 2024
93a7ba8
add service annotation
jhernandezb Mar 20, 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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ docker-test: build-linux


test:
go test -v -race github.com/public-awesome/stargaze/v13/x/...
go test -v -race github.com/public-awesome/stargaze/v14/x/...

test-pfm:
cd e2e && go test -v -race -run TestPacketForwardMiddleware .
Expand Down
4 changes: 2 additions & 2 deletions app/ante.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
ibcore "github.com/cosmos/ibc-go/v8/modules/core/keeper"

sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
globalfeeante "github.com/public-awesome/stargaze/v13/x/globalfee/ante"
globalfeekeeper "github.com/public-awesome/stargaze/v13/x/globalfee/keeper"
globalfeeante "github.com/public-awesome/stargaze/v14/x/globalfee/ante"
globalfeekeeper "github.com/public-awesome/stargaze/v14/x/globalfee/keeper"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
40 changes: 20 additions & 20 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ import (
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"

"github.com/public-awesome/stargaze/v13/x/mint"
mintkeeper "github.com/public-awesome/stargaze/v13/x/mint/keeper"
minttypes "github.com/public-awesome/stargaze/v13/x/mint/types"
"github.com/public-awesome/stargaze/v13/x/tokenfactory"
tokenfactorykeeper "github.com/public-awesome/stargaze/v13/x/tokenfactory/keeper"
tokenfactorytypes "github.com/public-awesome/stargaze/v13/x/tokenfactory/types"
"github.com/public-awesome/stargaze/v14/x/mint"
mintkeeper "github.com/public-awesome/stargaze/v14/x/mint/keeper"
minttypes "github.com/public-awesome/stargaze/v14/x/mint/types"
"github.com/public-awesome/stargaze/v14/x/tokenfactory"
tokenfactorykeeper "github.com/public-awesome/stargaze/v14/x/tokenfactory/keeper"
tokenfactorytypes "github.com/public-awesome/stargaze/v14/x/tokenfactory/types"
"github.com/spf13/cast"

"github.com/cosmos/cosmos-sdk/x/authz"
Expand All @@ -118,20 +118,20 @@ import (
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
wasmvm "github.com/CosmWasm/wasmvm"
vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
"github.com/public-awesome/stargaze/v13/docs"
sgwasm "github.com/public-awesome/stargaze/v13/internal/wasm"
allocmodule "github.com/public-awesome/stargaze/v13/x/alloc"
allocmodulekeeper "github.com/public-awesome/stargaze/v13/x/alloc/keeper"
allocmoduletypes "github.com/public-awesome/stargaze/v13/x/alloc/types"
allocwasm "github.com/public-awesome/stargaze/v13/x/alloc/wasm"
"github.com/public-awesome/stargaze/v14/docs"
sgwasm "github.com/public-awesome/stargaze/v14/internal/wasm"
allocmodule "github.com/public-awesome/stargaze/v14/x/alloc"
allocmodulekeeper "github.com/public-awesome/stargaze/v14/x/alloc/keeper"
allocmoduletypes "github.com/public-awesome/stargaze/v14/x/alloc/types"
allocwasm "github.com/public-awesome/stargaze/v14/x/alloc/wasm"

cronmodule "github.com/public-awesome/stargaze/v13/x/cron"
cronmodulekeeper "github.com/public-awesome/stargaze/v13/x/cron/keeper"
cronmoduletypes "github.com/public-awesome/stargaze/v13/x/cron/types"
cronmodule "github.com/public-awesome/stargaze/v14/x/cron"
cronmodulekeeper "github.com/public-awesome/stargaze/v14/x/cron/keeper"
cronmoduletypes "github.com/public-awesome/stargaze/v14/x/cron/types"

globalfeemodule "github.com/public-awesome/stargaze/v13/x/globalfee"
globalfeemodulekeeper "github.com/public-awesome/stargaze/v13/x/globalfee/keeper"
globalfeemoduletypes "github.com/public-awesome/stargaze/v13/x/globalfee/types"
globalfeemodule "github.com/public-awesome/stargaze/v14/x/globalfee"
globalfeemodulekeeper "github.com/public-awesome/stargaze/v14/x/globalfee/keeper"
globalfeemoduletypes "github.com/public-awesome/stargaze/v14/x/globalfee/types"

ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8"
ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/keeper"
Expand All @@ -150,10 +150,10 @@ import (
icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper"
icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types"
stargazerest "github.com/public-awesome/stargaze/v13/internal/rest"
stargazerest "github.com/public-awesome/stargaze/v14/internal/rest"

sdk "github.com/cosmos/cosmos-sdk/types"
sgstatesync "github.com/public-awesome/stargaze/v13/internal/statesync"
sgstatesync "github.com/public-awesome/stargaze/v14/internal/statesync"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion app/app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app_test
import (
"testing"

"github.com/public-awesome/stargaze/v13/testutil/simapp"
"github.com/public-awesome/stargaze/v14/testutil/simapp"
)

func TestAnteHandler(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package app

import (
"github.com/cosmos/cosmos-sdk/std"
"github.com/public-awesome/stargaze/v13/app/params"
"github.com/public-awesome/stargaze/v14/app/params"
)

// MakeEncodingConfig creates a new EncodingConfig with all modules registered
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ package app

// ibctmmigrations "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint/migrations"

// alloctypes "github.com/public-awesome/stargaze/v13/x/alloc/types"
// globalfeetypes "github.com/public-awesome/stargaze/v13/x/globalfee/types"
// minttypes "github.com/public-awesome/stargaze/v13/x/mint/types"
// tokenfactorytypes "github.com/public-awesome/stargaze/v13/x/tokenfactory/types"
// alloctypes "github.com/public-awesome/stargaze/v14/x/alloc/types"
// globalfeetypes "github.com/public-awesome/stargaze/v14/x/globalfee/types"
// minttypes "github.com/public-awesome/stargaze/v14/x/mint/types"
// tokenfactorytypes "github.com/public-awesome/stargaze/v14/x/tokenfactory/types"
// )

// // next upgrade name
Expand Down
2 changes: 1 addition & 1 deletion app/wasm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
tokenfactorytypes "github.com/public-awesome/stargaze/v13/x/tokenfactory/types"
tokenfactorytypes "github.com/public-awesome/stargaze/v14/x/tokenfactory/types"
)

var wasmCapabilities = []string{
Expand Down
4 changes: 2 additions & 2 deletions cmd/starsd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
"github.com/public-awesome/stargaze/v13/app"
"github.com/public-awesome/stargaze/v13/app/params"
"github.com/public-awesome/stargaze/v14/app"
"github.com/public-awesome/stargaze/v14/app/params"
)

const EnvironmentPrefix = "STARGAZE"
Expand Down
4 changes: 2 additions & 2 deletions cmd/starsd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
"github.com/public-awesome/stargaze/v13/app"
"github.com/public-awesome/stargaze/v13/cmd/starsd/cmd"
"github.com/public-awesome/stargaze/v14/app"
"github.com/public-awesome/stargaze/v14/cmd/starsd/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/public-awesome/stargaze/v13
module github.com/public-awesome/stargaze/v14

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion proto/osmosis/tokenfactory/v1beta1/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package osmosis.tokenfactory.v1beta1;
import "gogoproto/gogo.proto";
import "osmosis/tokenfactory/v1beta1/tokenfactory.proto";

option go_package = "github.com/public-awesome/stargaze/v13/x/tokenfactory/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/tokenfactory/types";

// GenesisState defines the tokenfactory module's genesis state.
message GenesisState {
Expand Down
4 changes: 2 additions & 2 deletions proto/osmosis/tokenfactory/v1beta1/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
syntax = "proto3";
package osmosis.tokenfactory.v1beta1;

import "cosmos/base/query/v1beta1/pagination.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
import "osmosis/tokenfactory/v1beta1/tokenfactory.proto";

option go_package = "github.com/public-awesome/stargaze/v13/x/tokenfactory/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/tokenfactory/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
6 changes: 3 additions & 3 deletions proto/osmosis/tokenfactory/v1beta1/tokenfactory.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
syntax = "proto3";
package osmosis.tokenfactory.v1beta1;

import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/public-awesome/stargaze/v13/x/tokenfactory/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/tokenfactory/types";

// DenomAuthorityMetadata specifies metadata for addresses that have specific
// capabilities over a token factory denom. Right now there is only one Admin
Expand Down
40 changes: 21 additions & 19 deletions proto/osmosis/tokenfactory/v1beta1/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
syntax = "proto3";
package osmosis.tokenfactory.v1beta1;

import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos/bank/v1beta1/bank.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos/msg/v1/msg.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/public-awesome/stargaze/v13/x/tokenfactory/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/tokenfactory/types";

// Msg defines the tokefactory module's gRPC message service.
service Msg {
option (cosmos.msg.v1.service) = true;
// CreateDenom
rpc CreateDenom(MsgCreateDenom) returns (MsgCreateDenomResponse);
// Mint
rpc Mint(MsgMint) returns (MsgMintResponse);
// Burn
rpc Burn(MsgBurn) returns (MsgBurnResponse);
// ChangeAdmin
rpc ChangeAdmin(MsgChangeAdmin) returns (MsgChangeAdminResponse);
rpc SetDenomMetadata(MsgSetDenomMetadata)
returns (MsgSetDenomMetadataResponse);
// SetDenomMetadata
rpc SetDenomMetadata(MsgSetDenomMetadata) returns (MsgSetDenomMetadataResponse);
}

// MsgCreateDenom defines the message structure for the CreateDenom gRPC service
Expand All @@ -29,29 +34,27 @@ service Msg {
// denom does not indicate the current admin.
message MsgCreateDenom {
option (cosmos.msg.v1.signer) = "sender";
string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
// subdenom can be up to 44 "alphanumeric" characters long.
string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ];
string subdenom = 2 [(gogoproto.moretags) = "yaml:\"subdenom\""];
}

// MsgCreateDenomResponse is the return value of MsgCreateDenom
// It returns the full string of the newly created denom
message MsgCreateDenomResponse {
string new_token_denom = 1
[ (gogoproto.moretags) = "yaml:\"new_token_denom\"" ];
string new_token_denom = 1 [(gogoproto.moretags) = "yaml:\"new_token_denom\""];
}

// MsgMint is the sdk.Msg type for allowing an admin account to mint
// more of a token. For now, we only support minting to the sender account
message MsgMint {
option (cosmos.msg.v1.signer) = "sender";
string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
(gogoproto.nullable) = false
];
string mintToAddress = 3
[ (gogoproto.moretags) = "yaml:\"mint_to_address\"" ];
string mintToAddress = 3 [(gogoproto.moretags) = "yaml:\"mint_to_address\""];
}

message MsgMintResponse {}
Expand All @@ -60,13 +63,12 @@ message MsgMintResponse {}
// a token. For now, we only support burning from the sender account.
message MsgBurn {
option (cosmos.msg.v1.signer) = "sender";
string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
(gogoproto.nullable) = false
];
string burnFromAddress = 3
[ (gogoproto.moretags) = "yaml:\"burn_from_address\"" ];
string burnFromAddress = 3 [(gogoproto.moretags) = "yaml:\"burn_from_address\""];
}

message MsgBurnResponse {}
Expand All @@ -75,9 +77,9 @@ message MsgBurnResponse {}
// adminship of a denom to a new account
message MsgChangeAdmin {
option (cosmos.msg.v1.signer) = "sender";
string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
string new_admin = 3 [ (gogoproto.moretags) = "yaml:\"new_admin\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
string denom = 2 [(gogoproto.moretags) = "yaml:\"denom\""];
string new_admin = 3 [(gogoproto.moretags) = "yaml:\"new_admin\""];
}

// MsgChangeAdminResponse defines the response structure for an executed
Expand All @@ -88,7 +90,7 @@ message MsgChangeAdminResponse {}
// the denom's bank metadata
message MsgSetDenomMetadata {
option (cosmos.msg.v1.signer) = "sender";
string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
cosmos.bank.v1beta1.Metadata metadata = 2 [
(gogoproto.moretags) = "yaml:\"metadata\"",
(gogoproto.nullable) = false
Expand Down
2 changes: 1 addition & 1 deletion proto/publicawesome/stargaze/alloc/v1beta1/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
import "publicawesome/stargaze/alloc/v1beta1/params.proto";
// this line is used by starport scaffolding # genesis/proto/import

option go_package = "github.com/public-awesome/stargaze/v13/x/alloc/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/alloc/types";

// GenesisState defines the alloc module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/publicawesome/stargaze/alloc/v1beta1/params.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package publicawesome.stargaze.alloc.v1beta1;

option go_package = "github.com/public-awesome/stargaze/v13/x/alloc/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/alloc/types";

import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";
Expand Down
2 changes: 1 addition & 1 deletion proto/publicawesome/stargaze/alloc/v1beta1/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "google/api/annotations.proto";
import "publicawesome/stargaze/alloc/v1beta1/params.proto";
// this line is used by starport scaffolding # 1

option go_package = "github.com/public-awesome/stargaze/v13/x/alloc/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/alloc/types";

// QueryParamsRequest is the request type for the Query/Params RPC method.
message QueryParamsRequest {}
Expand Down
2 changes: 1 addition & 1 deletion proto/publicawesome/stargaze/alloc/v1beta1/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto";

// this line is used by starport scaffolding # proto/tx/import

option go_package = "github.com/public-awesome/stargaze/v13/x/alloc/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/alloc/types";

// Msg defines the alloc Msg service.
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion proto/publicawesome/stargaze/cron/v1/cron.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package publicawesome.stargaze.cron.v1;

import "gogoproto/gogo.proto";

option go_package = "github.com/public-awesome/stargaze/v13/x/cron/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/cron/types";

// Params holds parameters for the cron module.
message Params {
Expand Down
2 changes: 1 addition & 1 deletion proto/publicawesome/stargaze/cron/v1/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package publicawesome.stargaze.cron.v1;
import "gogoproto/gogo.proto";
import "publicawesome/stargaze/cron/v1/cron.proto";

option go_package = "github.com/public-awesome/stargaze/v13/x/cron/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/cron/types";

// GenesisState defines the cron module's genesis state.
message GenesisState {
Expand Down
14 changes: 7 additions & 7 deletions proto/publicawesome/stargaze/cron/v1/proposal.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "amino/amino.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/public-awesome/stargaze/v13/x/cron/types";
option go_package = "github.com/public-awesome/stargaze/v14/x/cron/types";

// Deprecated: Do not use. To promote a contract, a
// MsgPromoteToPrivilegedContract can be invoked from the x/gov module via a v1
Expand All @@ -16,11 +16,11 @@ message PromoteToPrivilegedContractProposal {
option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";

// Title is a short summary
string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
string title = 1 [ (gogoproto.moretags) = "yaml:\"title\"" ];
// Description is a human readable text
string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
string description = 2 [ (gogoproto.moretags) = "yaml:\"description\"" ];
// Contract is the bech32 address of the smart contract
string contract = 3 [(gogoproto.moretags) = "yaml:\"contract\""];
string contract = 3 [ (gogoproto.moretags) = "yaml:\"contract\"" ];
}

// Deprecated: Do not use. To demote a contract, a
Expand All @@ -32,9 +32,9 @@ message DemotePrivilegedContractProposal {
option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";

// Title is a short summary
string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
string title = 1 [ (gogoproto.moretags) = "yaml:\"title\"" ];
// Description is a human readable text
string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
string description = 2 [ (gogoproto.moretags) = "yaml:\"description\"" ];
// Contract is the bech32 address of the smart contract
string contract = 3 [(gogoproto.moretags) = "yaml:\"contract\""];
string contract = 3 [ (gogoproto.moretags) = "yaml:\"contract\"" ];
}
Loading
Loading