Feat/wasm upgrade

Dockerfile

@@ -3,8 +3,8 @@
 FROM golang:1.17.8-alpine3.15 AS go-builder
 
 # See https://github.com/CosmWasm/wasmvm/releases
-ENV LIBWASMVM_VERSION=0.16.6
-ENV LIBWASMVM_SHA256=fe63ff6bb75cad9116948d96344391d6786b6009d28e7016a85e1a268033d8f8
+ENV LIBWASMVM_VERSION=1.0.0
+ENV LIBWASMVM_SHA256=f6282df732a13dec836cda1f399dd874b1e3163504dbd9607c6af915b2740479
 
 # this comes from standard alpine nightly file
 # https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile

app/app.go

@@ -277,8 +277,8 @@ func init() {
 func NewTerraApp(
  logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool,
  homePath string, invCheckPeriod uint, encodingConfig terraappparams.EncodingConfig, appOpts servertypes.AppOptions,
- wasmConfig *wasmconfig.Config, baseAppOptions ...func(*baseapp.BaseApp)) *TerraApp {
-
+ wasmConfig *wasmconfig.Config, baseAppOptions ...func(*baseapp.BaseApp),
+) *TerraApp {
  appCodec := encodingConfig.Marshaler
  legacyAmino := encodingConfig.Amino
  interfaceRegistry := encodingConfig.InterfaceRegistry
@@ -299,7 +299,7 @@ func NewTerraApp(
  tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
  memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
 
- var app = &TerraApp{
+ app := &TerraApp{
  BaseApp: bApp,
  legacyAmino: legacyAmino,
  appCodec: appCodec,
@@ -443,7 +443,7 @@ func NewTerraApp(
  )
 
  /**** Module Options ****/
- var skipGenesisInvariants = cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants))
+ skipGenesisInvariants := cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants))
 
  // NOTE: Any module instantiated in the module manager that is later modified
  // must be passed by reference here.
@@ -587,9 +587,7 @@ func (app *TerraApp) Name() string { return app.BaseApp.Name() }
 
 // BeginBlocker application updates every begin block
 func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
-
- if ctx.ChainID() == core.ColumbusChainID && ctx.BlockHeight() == core.SwapDisableForkHeight {
- // Make min spread to one to disable swap
+ if ctx.ChainID() == core.ColumbusChainID && ctx.BlockHeight() == core.SwapDisableForkHeight { // Make min spread to one to disable swap
  params := app.MarketKeeper.GetParams(ctx)
  params.MinStabilitySpread = sdk.OneDec()
  app.MarketKeeper.SetParams(ctx, params)
@@ -610,6 +608,23 @@ func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) a
  app.IBCKeeper.ChannelKeeper.SetChannel(ctx, ibctransfertypes.PortID, channelID, channel)
  }
  }
+ if ctx.ChainID() == core.ColumbusChainID && ctx.BlockHeight() == core.SwapEnableForkHeight { // Re-enable IBCs
+ // Enable IBC Channels
+ channelIDs := []string{
+ "channel-1", // Osmosis
+ "channel-49", // Crescent
+ "channel-20", // Juno
+ }
+ for _, channelID := range channelIDs {
+ channel, found := app.IBCKeeper.ChannelKeeper.GetChannel(ctx, ibctransfertypes.PortID, channelID)
+ if !found {
+ panic(fmt.Sprintf("%s not found", channelID))
+ }
+
+ channel.State = ibcchanneltypes.OPEN
+ app.IBCKeeper.ChannelKeeper.SetChannel(ctx, ibctransfertypes.PortID, channelID, channel)
+ }
+ }
 
  return app.mm.BeginBlock(ctx, req)
 }

go.mod

@@ -3,7 +3,7 @@ go 1.17
 module github.com/terra-money/core
 
 require (
- github.com/CosmWasm/wasmvm v0.16.6
+ github.com/CosmWasm/wasmvm v1.0.0
  github.com/cosmos/cosmos-sdk v0.44.5
  github.com/cosmos/ibc-go v1.1.5
  github.com/gogo/protobuf v1.3.3
@@ -13,14 +13,14 @@ require (
  github.com/grpc-ecosystem/grpc-gateway v1.16.0
  github.com/pkg/errors v0.9.1
  github.com/rakyll/statik v0.1.7
- github.com/spf13/cast v1.3.1
+ github.com/spf13/cast v1.4.1
  github.com/spf13/cobra v1.2.1
  github.com/spf13/pflag v1.0.5
- github.com/stretchr/testify v1.7.0
+ github.com/stretchr/testify v1.8.0
  github.com/tendermint/tendermint v0.34.14
- github.com/tendermint/tm-db v0.6.6
- google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71
- google.golang.org/grpc v1.42.0
+ github.com/tendermint/tm-db v0.6.7
+ google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
+ google.golang.org/grpc v1.44.0
  gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -30,16 +30,17 @@ require (
  github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
  github.com/DataDog/zstd v1.4.5 // indirect
  github.com/Workiva/go-datastructures v1.0.52 // indirect
- github.com/armon/go-metrics v0.3.9 // indirect
+ github.com/armon/go-metrics v0.3.10 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bgentry/speakeasy v0.1.0 // indirect
  github.com/btcsuite/btcd v0.22.0-beta // indirect
  github.com/cespare/xxhash v1.1.0 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
  github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect
  github.com/confio/ics23/go v0.6.6 // indirect
  github.com/cosmos/btcutil v1.0.4 // indirect
  github.com/cosmos/go-bip39 v1.0.0 // indirect
+ github.com/cosmos/gorocksdb v1.2.0 // indirect
  github.com/cosmos/iavl v0.17.3 // indirect
  github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
  github.com/cosmos/ledger-go v0.9.2 // indirect
@@ -66,7 +67,7 @@ require (
  github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
  github.com/gtank/merlin v0.1.1 // indirect
  github.com/gtank/ristretto255 v0.1.2 // indirect
- github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
+ github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
  github.com/hashicorp/golang-lru v0.5.4 // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect
@@ -82,7 +83,7 @@ require (
  github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
  github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
  github.com/minio/highwayhash v1.0.1 // indirect
- github.com/mitchellh/mapstructure v1.4.2 // indirect
+ github.com/mitchellh/mapstructure v1.4.3 // indirect
  github.com/mtibben/percent v0.2.1 // indirect
  github.com/opencontainers/image-spec v1.0.2 // indirect
  github.com/opencontainers/runc v1.0.3 // indirect
@@ -100,32 +101,31 @@ require (
  github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
  github.com/spf13/afero v1.6.0 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
- github.com/spf13/viper v1.8.1 // indirect
+ github.com/spf13/viper v1.10.1 // indirect
  github.com/subosito/gotenv v1.2.0 // indirect
  github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
- github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
  github.com/tendermint/btcd v0.1.1 // indirect
  github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
  github.com/tendermint/go-amino v0.16.0 // indirect
  github.com/zondax/hid v0.9.0 // indirect
  go.etcd.io/bbolt v1.3.6 // indirect
  golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
  golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
- golang.org/x/sys v0.0.0-20210903071746-97244b99971b // indirect
+ golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
  golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
- golang.org/x/text v0.3.6 // indirect
+ golang.org/x/text v0.3.7 // indirect
  google.golang.org/protobuf v1.27.1 // indirect
- gopkg.in/ini.v1 v1.63.2 // indirect
- gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ gopkg.in/ini.v1 v1.66.2 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
  nhooyr.io/websocket v1.8.6 // indirect
 )
 
 replace (
  github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
- github.com/cosmos/cosmos-sdk => github.com/terra-money/cosmos-sdk v0.44.6-0.20220817064826-f77977ff2d1b
+ github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
+ github.com/cosmos/cosmos-sdk => github.com/terra-rebels/cosmos-sdk v0.44.6-0.20221016182956-c5c6f52d0a59
  github.com/cosmos/ledger-cosmos-go => github.com/terra-money/ledger-terra-go v0.11.2
  github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
- github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.2.0
  github.com/tendermint/tendermint => github.com/terra-money/tendermint v0.34.14-terra.2
  google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )