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

Jump to bottom

chore: integrate wasmd and bump dependencies (cosmos-sdk and ibc-go) #129

Closed
wants to merge 18 commits into from
Closed

chore: integrate wasmd and bump dependencies (cosmos-sdk and ibc-go) #129

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6f1d830
feat: adding wasm integration requires to upgrade ibc-go
queencre Nov 15, 2022
a369749
chore: bump ibc-go (fork) v3.3.1 and wiring relevant modules
queencre Nov 16, 2022
babc5ac
build: remove ibc-go/v2
queencre Nov 21, 2022
47e33a0
chore: bump cosmos-sdk and ibc-go, adding wasm module
queencre Nov 28, 2022
ca8c87e
test: resolve TestSimAppExportAndBlockedAddrs test
queencre Nov 28, 2022
4655205
Merge branch 'main' into wasm-integration
queencre Nov 29, 2022
c8a5c18
test: debugging failing test cases
queencre Nov 29, 2022
c0ae4e0
chore: upgrade wamsd to 0.29.2 and resolve failed tests by reordering…
queencre Dec 6, 2022
3a714b5
test: comment out the failing cases
queencre Dec 7, 2022
d66c0fd
Merge branch 'main' into wasm-integration
queencre Dec 7, 2022
d53684b
chore: resolve lint issues and fix failing test
queencre Dec 7, 2022
fc2b84d
Merge branch 'release/v3.0.x' into wasm-integration
queencre Dec 7, 2022
d38f2ea
env: add build.yml for build workflow action and do not test arm64 ar…
queencre Dec 9, 2022
e2186a5
test: test failing test cases
queencre Dec 9, 2022
8fdd40c
test: add CGO_ENABLED when make build
queencre Dec 9, 2022
0c3bff6
env: remove linux with arm64 arch
queencre Dec 12, 2022
12388b0
feat: working on v4 upgrade migration code
queencre Dec 13, 2022
855fc67
Merge branch 'wasm-integration' of https://github.com/queencre/cresce…
queencre Dec 13, 2022
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
Prev Previous commit
Next Next commit
build: remove ibc-go/v2
  • Loading branch information
@queencre
queencre committed Nov 21, 2022
commit babc5acce3100a303988fd5b8f973da4ba95ab1d
4 changes: 2 additions & 2 deletions app/ante_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
channelkeeper "github.com/cosmos/ibc-go/v2/modules/core/04-channel/keeper"
ibcante "github.com/cosmos/ibc-go/v2/modules/core/ante"
channelkeeper "github.com/cosmos/ibc-go/v3/modules/core/04-channel/keeper"
ibcante "github.com/cosmos/ibc-go/v3/modules/core/ante"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
2 changes: 1 addition & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ var (
// If set to non-empty string it must be comma-separated list of values that are all a subset
// of "EnableAllProposals" (takes precedence over ProposalsEnabled)
// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
EnableSpecificProposals = ""
EnableSpecificProposals = "" // TODO: determine which proposal do we need
)

// GetEnabledProposals parses the ProposalsEnabled / EnableSpecificProposals values to
Expand Down
4 changes: 2 additions & 2 deletions app/app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/slashing"
"github.com/cosmos/cosmos-sdk/x/staking"
"github.com/cosmos/cosmos-sdk/x/upgrade"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer"
ibc "github.com/cosmos/ibc-go/v2/modules/core"
"github.com/cosmos/ibc-go/v3/modules/apps/transfer"
ibc "github.com/cosmos/ibc-go/v3/modules/core"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
"github.com/tendermint/budget/x/budget"
Expand Down
4 changes: 2 additions & 2 deletions app/sim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/simulation"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
ibctransfertypes "github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
ibchost "github.com/cosmos/ibc-go/v2/modules/core/24-host"
ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
"github.com/stretchr/testify/require"
budgettypes "github.com/tendermint/budget/x/budget/types"
abci "github.com/tendermint/tendermint/abci/types"
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.18
require (
github.com/CosmWasm/wasmd v0.29.1
github.com/cosmos/cosmos-sdk v0.45.10
github.com/cosmos/ibc-go/v2 v2.5.0
github.com/cosmos/ibc-go/v3 v3.3.1
github.com/gogo/protobuf v1.3.3
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.2
Expand Down Expand Up @@ -69,7 +69,6 @@ require (
github.com/cosmos/gogoproto v1.4.2 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/cosmos/iavl v0.19.3 // indirect
github.com/cosmos/ibc-go/v3 v3.3.1 // indirect
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
github.com/cosmos/ledger-go v0.9.2 // indirect
github.com/creachadair/taskgroup v0.3.2 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4
github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg=
github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
github.com/cosmos/ibc-go/v2 v2.5.0 h1:D+F55reOY9XI2Xtok8GNzBp0mGWuJEwkL5PmozUeKZY=
github.com/cosmos/ibc-go/v2 v2.5.0/go.mod h1:JWurfHQt603xw3p6fzH7XEG1XHbcQOlyOfxrjIbm8VU=
github.com/cosmos/interchain-accounts v0.1.0 h1:QmuwNsf1Hxl3P5GSGt7Z+JeuHPiZw4Z34R/038P5T6s=
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
Expand Down