Skip to content

Commit

Permalink
Merge branch 'main' into spike_error_ack
Browse files Browse the repository at this point in the history
* main:
  Bump bufbuild/buf-setup-action from 1.15.1 to 1.16.0
  Use gov v1 instead of v1beta1 for new proposals (#1269)
  Update OnRecvPacket method to panic when an error is returned (#1298)
  Bump actions/checkout from 3.4.0 to 3.5.0
  Add source for Wasm magic number
  • Loading branch information
alpe committed Mar 31, 2023
2 parents 610c677 + 341b7fc commit fcd0040
Show file tree
Hide file tree
Showing 27 changed files with 5,475 additions and 2,449 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/proto-buf-publisher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
push:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: bufbuild/buf-setup-action@v1.15.1
- uses: actions/checkout@v3.5.0
- uses: bufbuild/buf-setup-action@v1.16.0

# lint checks
- uses: bufbuild/buf-lint-action@v1
Expand Down
7 changes: 3 additions & 4 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ import (
"github.com/spf13/cast"

"github.com/CosmWasm/wasmd/x/wasm"
wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
)

const appName = "WasmApp"
Expand Down Expand Up @@ -194,14 +194,13 @@ var (
mint.AppModuleBasic{},
distr.AppModuleBasic{},
gov.NewAppModuleBasic(
append(
wasmclient.ProposalHandlers,
[]govclient.ProposalHandler{
paramsclient.ProposalHandler,
upgradeclient.LegacyProposalHandler,
upgradeclient.LegacyCancelProposalHandler,
ibcclientclient.UpdateClientProposalHandler,
ibcclientclient.UpgradeProposalHandler,
),
},
),
params.AppModuleBasic{},
crisis.AppModuleBasic{},
Expand Down
Loading

0 comments on commit fcd0040

Please sign in to comment.