Skip to content

Commit 63768e6

Browse files
author
Greg Junge
authored
Merge pull request #800 from edk208/main
Merge commit changes from rebel release v1.0.4
2 parents d5b3934 + 7deb009 commit 63768e6

File tree

5 files changed

+189
-41
lines changed

5 files changed

+189
-41
lines changed

‎app/app.go‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ func init() {
277277
func NewTerraApp(
278278
logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool,
279279
homePath string, invCheckPeriod uint, encodingConfig terraappparams.EncodingConfig, appOpts servertypes.AppOptions,
280-
wasmConfig *wasmconfig.Config, baseAppOptions ...func(*baseapp.BaseApp)) *TerraApp {
281-
280+
wasmConfig *wasmconfig.Config, baseAppOptions ...func(*baseapp.BaseApp),
281+
) *TerraApp {
282282
appCodec := encodingConfig.Marshaler
283283
legacyAmino := encodingConfig.Amino
284284
interfaceRegistry := encodingConfig.InterfaceRegistry
@@ -299,7 +299,7 @@ func NewTerraApp(
299299
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
300300
memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
301301

302-
var app = &TerraApp{
302+
app := &TerraApp{
303303
BaseApp: bApp,
304304
legacyAmino: legacyAmino,
305305
appCodec: appCodec,
@@ -443,7 +443,7 @@ func NewTerraApp(
443443
)
444444

445445
/**** Module Options ****/
446-
var skipGenesisInvariants = cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants))
446+
skipGenesisInvariants := cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants))
447447

448448
// NOTE: Any module instantiated in the module manager that is later modified
449449
// must be passed by reference here.
@@ -587,9 +587,7 @@ func (app *TerraApp) Name() string { return app.BaseApp.Name() }
587587

588588
// BeginBlocker application updates every begin block
589589
func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
590-
591-
if ctx.ChainID() == core.ColumbusChainID && ctx.BlockHeight() == core.SwapDisableForkHeight {
592-
// Make min spread to one to disable swap
590+
if ctx.ChainID() == core.ColumbusChainID && ctx.BlockHeight() == core.SwapDisableForkHeight { // Make min spread to one to disable swap
593591
params := app.MarketKeeper.GetParams(ctx)
594592
params.MinStabilitySpread = sdk.OneDec()
595593
app.MarketKeeper.SetParams(ctx, params)
@@ -610,6 +608,23 @@ func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) a
610608
app.IBCKeeper.ChannelKeeper.SetChannel(ctx, ibctransfertypes.PortID, channelID, channel)
611609
}
612610
}
611+
if ctx.ChainID() == core.ColumbusChainID && ctx.BlockHeight() == core.SwapEnableForkHeight { // Re-enable IBCs
612+
// Enable IBC Channels
613+
channelIDs := []string{
614+
"channel-1", // Osmosis
615+
"channel-49", // Crescent
616+
"channel-20", // Juno
617+
}
618+
for _, channelID := range channelIDs {
619+
channel, found := app.IBCKeeper.ChannelKeeper.GetChannel(ctx, ibctransfertypes.PortID, channelID)
620+
if !found {
621+
panic(fmt.Sprintf("%s not found", channelID))
622+
}
623+
624+
channel.State = ibcchanneltypes.OPEN
625+
app.IBCKeeper.ChannelKeeper.SetChannel(ctx, ibctransfertypes.PortID, channelID, channel)
626+
}
627+
}
613628

614629
return app.mm.BeginBlock(ctx, req)
615630
}

‎go.mod‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ require (
1313
github.com/grpc-ecosystem/grpc-gateway v1.16.0
1414
github.com/pkg/errors v0.9.1
1515
github.com/rakyll/statik v0.1.7
16-
github.com/spf13/cast v1.3.1
16+
github.com/spf13/cast v1.4.1
1717
github.com/spf13/cobra v1.2.1
1818
github.com/spf13/pflag v1.0.5
19-
github.com/stretchr/testify v1.7.0
19+
github.com/stretchr/testify v1.8.0
2020
github.com/tendermint/tendermint v0.34.14
2121
github.com/tendermint/tm-db v0.6.6
22-
google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71
23-
google.golang.org/grpc v1.42.0
22+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
23+
google.golang.org/grpc v1.43.0
2424
gopkg.in/yaml.v2 v2.4.0
2525
)
2626

@@ -30,12 +30,12 @@ require (
3030
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
3131
github.com/DataDog/zstd v1.4.5 // indirect
3232
github.com/Workiva/go-datastructures v1.0.52 // indirect
33-
github.com/armon/go-metrics v0.3.9 // indirect
33+
github.com/armon/go-metrics v0.3.10 // indirect
3434
github.com/beorn7/perks v1.0.1 // indirect
3535
github.com/bgentry/speakeasy v0.1.0 // indirect
3636
github.com/btcsuite/btcd v0.22.0-beta // indirect
3737
github.com/cespare/xxhash v1.1.0 // indirect
38-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
38+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3939
github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect
4040
github.com/confio/ics23/go v0.6.6 // indirect
4141
github.com/cosmos/btcutil v1.0.4 // indirect
@@ -66,7 +66,7 @@ require (
6666
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
6767
github.com/gtank/merlin v0.1.1 // indirect
6868
github.com/gtank/ristretto255 v0.1.2 // indirect
69-
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
69+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
7070
github.com/hashicorp/golang-lru v0.5.4 // indirect
7171
github.com/hashicorp/hcl v1.0.0 // indirect
7272
github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect
@@ -82,7 +82,7 @@ require (
8282
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
8383
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
8484
github.com/minio/highwayhash v1.0.1 // indirect
85-
github.com/mitchellh/mapstructure v1.4.2 // indirect
85+
github.com/mitchellh/mapstructure v1.4.3 // indirect
8686
github.com/mtibben/percent v0.2.1 // indirect
8787
github.com/opencontainers/image-spec v1.0.2 // indirect
8888
github.com/opencontainers/runc v1.0.3 // indirect
@@ -100,7 +100,7 @@ require (
100100
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
101101
github.com/spf13/afero v1.6.0 // indirect
102102
github.com/spf13/jwalterweatherman v1.1.0 // indirect
103-
github.com/spf13/viper v1.8.1 // indirect
103+
github.com/spf13/viper v1.10.1 // indirect
104104
github.com/subosito/gotenv v1.2.0 // indirect
105105
github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
106106
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
@@ -111,18 +111,19 @@ require (
111111
go.etcd.io/bbolt v1.3.6 // indirect
112112
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
113113
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
114-
golang.org/x/sys v0.0.0-20210903071746-97244b99971b // indirect
114+
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
115115
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
116-
golang.org/x/text v0.3.6 // indirect
116+
golang.org/x/text v0.3.7 // indirect
117117
google.golang.org/protobuf v1.27.1 // indirect
118-
gopkg.in/ini.v1 v1.63.2 // indirect
119-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
118+
gopkg.in/ini.v1 v1.66.2 // indirect
119+
gopkg.in/yaml.v3 v3.0.1 // indirect
120120
nhooyr.io/websocket v1.8.6 // indirect
121121
)
122122

123123
replace (
124124
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
125-
github.com/cosmos/cosmos-sdk => github.com/terra-money/cosmos-sdk v0.44.6-0.20220817064826-f77977ff2d1b
125+
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
126+
github.com/cosmos/cosmos-sdk => github.com/terra-rebels/cosmos-sdk v0.44.6-0.20221016182956-c5c6f52d0a59
126127
github.com/cosmos/ledger-cosmos-go => github.com/terra-money/ledger-terra-go v0.11.2
127128
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
128129
github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.2.0

0 commit comments

Comments
 (0)