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

v50 upgrade #958

Merged
merged 52 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
06f67bd
ibump versions and update app.go
jhernandezb Jan 14, 2024
518b5e4
remove unused
jhernandezb Jan 21, 2024
b07144d
add service annotations
jhernandezb Jan 24, 2024
9a52e6d
fix build update buf dependencies
jhernandezb Jan 24, 2024
fa64ff9
fix root command
jhernandezb Jan 27, 2024
a724aa9
autocli options
jhernandezb Jan 27, 2024
a1d7df6
fix query cmd
jhernandezb Jan 27, 2024
a73cdca
fix init generation due to viper issue
jhernandezb Jan 27, 2024
a119fbe
support for legacy proposals
jhernandezb Jan 31, 2024
1710200
implement interface
jhernandezb Jan 31, 2024
f016f2e
generate swagger docs (#970)
jhernandezb Jan 31, 2024
1aef818
check error
jhernandezb Jan 30, 2024
c7f13bb
remove duplicate message event emit
jhernandezb Jan 31, 2024
62df804
update deps for swagger
jhernandezb Feb 1, 2024
c054a51
Merge pull request #971 from public-awesome/feature/sdk-v050-cherry-p…
jhernandezb Feb 1, 2024
b3b289e
adding ibc wasm client
spoo-bar Feb 9, 2024
3685faa
Merge branch 'feature/sdk-v050' of github.com:public-awesome/stargaze…
jhernandezb Feb 13, 2024
2335f67
Merge pull request #973 from public-awesome/spoorthi/integrate-ibc-wa…
jhernandezb Feb 13, 2024
00ea0ae
fix missing store key, fix creating module account for tokenfactory
jhernandezb Feb 13, 2024
2f4915b
Merge branch 'feature/sdk-v050' of github.com:public-awesome/stargaze…
jhernandezb Feb 13, 2024
2113ae8
bump version
jhernandezb Feb 20, 2024
f48c0d1
fix simapp
jhernandezb Feb 20, 2024
b643b76
fix blocktime
jhernandezb Feb 20, 2024
0c1f77f
fix test setup
jhernandezb Feb 20, 2024
ab20c6f
fix linter
jhernandezb Feb 20, 2024
c9d20af
fixing linting
spoo-bar Feb 23, 2024
9fd15e1
more linting
spoo-bar Feb 23, 2024
35cf82e
more linting
spoo-bar Feb 23, 2024
8584034
more linting
spoo-bar Feb 23, 2024
fb99286
also run interchain test on feature branch PRs
spoo-bar Mar 8, 2024
8235f9c
upgrading interchaintest to ibc-go v8
spoo-bar Mar 8, 2024
e69c1da
use wasmvm 1.5.2 instead of wasmvm 1.5.0
spoo-bar Mar 8, 2024
d036fed
adding wasmd and tokenfactory conformance
spoo-bar Mar 15, 2024
a387399
adding wasm conformance to chain upgrade test
spoo-bar Mar 15, 2024
536f481
adding sg conformance test
spoo-bar Mar 15, 2024
c1ba784
updating gaia and osmosis versions in conformance
spoo-bar Mar 15, 2024
2a8a384
include cron test contract
spoo-bar Mar 15, 2024
7185a12
fix drone sig
jhernandezb Mar 17, 2024
e066717
Merge pull request #980 from public-awesome/spoorthi/linting-
jhernandezb Mar 20, 2024
490b45f
add ica controller
jhernandezb Mar 20, 2024
6c8f154
fix conflicts
jhernandezb Mar 20, 2024
ea19573
Merge pull request #992 from public-awesome/jhernandezb/sdk-v50
jhernandezb Mar 20, 2024
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
5ce52d6
Merge pull request #993 from public-awesome/bump-v14
jhernandezb Mar 20, 2024
dacb205
generate docs for all packages
jhernandezb Mar 20, 2024
7cf08fc
buf format
jhernandezb Mar 21, 2024
4900228
buf format remaining
jhernandezb Mar 21, 2024
1c33a86
remove pfm replace to specific version
jhernandezb Mar 21, 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
10 changes: 9 additions & 1 deletion .github/workflows/interchaintest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- main
- feature/*

release:
types: published
Expand Down Expand Up @@ -101,10 +102,17 @@ jobs:
with:
test-cmd: 'test-chain-upgrade'

run_chain_conformance:
name: conformance 🤝
needs: [build_sg_image]
uses: ./.github/workflows/interchaintest_custom_runner.yml
with:
test-cmd: 'test-chain-conformance'


cleanup:
name: Delete artifacts 🗑️
needs: [run_gaia_interchaintest,run_osmosis_interchaintest,run_pfm_interchaintest,run_chain_upgrade_interchaintest,run_ica_interchaintest]
needs: [run_gaia_interchaintest,run_osmosis_interchaintest,run_pfm_interchaintest,run_chain_upgrade_interchaintest,run_ica_interchaintest,run_chain_conformance]
runs-on: ubuntu-latest

steps:
Expand Down
7 changes: 5 additions & 2 deletions Makefile
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 All @@ -138,6 +138,9 @@ test-chain-upgrade:
test-ica:
cd e2e && go test -v -race -run TestInterchainAccounts .

test-chain-conformance:
cd e2e && go test -v -race -run TestStargazeConformance .

.PHONY: test test-e2e build-linux docker-test lint build install format

format:
Expand Down Expand Up @@ -178,7 +181,7 @@ proto-swagger-gen:
@$(protoImage) sh ./scripts/protoc-swagger-gen.sh

proto-format:
@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;
@$(protoImage) buf format --write proto/

proto-lint:
@$(protoImage) buf lint --error-format=json
33 changes: 18 additions & 15 deletions app/ante.go
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
package app

import (
corestoretypes "cosmossdk.io/core/store"
errorsmod "cosmossdk.io/errors"

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/codec"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"

govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
globalfeeante "github.com/public-awesome/stargaze/v13/x/globalfee/ante"
globalfeekeeper "github.com/public-awesome/stargaze/v13/x/globalfee/keeper"
ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
ibcore "github.com/cosmos/ibc-go/v8/modules/core/keeper"

sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
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
// channel keeper.
type HandlerOptions struct {
ante.HandlerOptions
keeper *ibckeeper.Keeper
govKeeper govkeeper.Keeper
globalfeeKeeper globalfeekeeper.Keeper
stakingKeeper *stakingkeeper.Keeper
WasmConfig *wasmTypes.WasmConfig
TXCounterStoreKey storetypes.StoreKey
Codec codec.BinaryCodec
keeper *ibcore.Keeper
govKeeper govkeeper.Keeper
globalfeeKeeper globalfeekeeper.Keeper
stakingKeeper *stakingkeeper.Keeper
WasmConfig *wasmTypes.WasmConfig
TXCounterStoreService corestoretypes.KVStoreService
Codec codec.BinaryCodec
}

// NewAnteHandler returns an AnteHandler that checks and increments sequence
Expand All @@ -50,7 +53,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
}

if options.TXCounterStoreKey == nil {
if options.TXCounterStoreService == nil {
return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder")
}

Expand All @@ -64,7 +67,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
// limit simulation gas
wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit),
globalfeeante.NewFeeDecorator(options.Codec, options.globalfeeKeeper, options.stakingKeeper),
wasmkeeper.NewCountTXDecorator(options.TXCounterStoreKey),
wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
ante.NewValidateBasicDecorator(),
ante.NewTxTimeoutHeightDecorator(),
Expand Down
Loading
Loading