Skip to content

Commit

Permalink
Bump dependencies (#526)
Browse files Browse the repository at this point in the history
* update changelog

* bump cosmwasm to v0.16.0-rc5 && cosmos-sdk to v0.43.0-rc2

* check reply error

* update test_contract for simulation

* bump cosmwasm to v0.16.0 & cosmos-sdk to v0.43.0-rc3

* add analysis for wasm contract for debugging purpose

* update ibc-go v1.0.0-rc4

* charge contract registering cost

* Update Dockerfile to use CosmWasm 0.16

* add changelog

Co-authored-by: Paul Kim <paul@terra.money>
  • Loading branch information
2 people authored and yun-yeo committed Aug 11, 2021
1 parent 83b1599 commit f49fc4e
Show file tree
Hide file tree
Showing 18 changed files with 69 additions and 80 deletions.
17 changes: 11 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
## [Unreleased]

* (cosmwasm) Bump CosmWasm version to [v0.15.0](https://github.com/CosmWasm/cosmwasm/release/tag/v0.15.0).
* (tendermint) Bump Tendermint version to [v0.34.10](https://github.com/tendermint/tendermint/releases/tag/v0.34.10).
* (cosmos-sdk) Bump Cosmos SDK version to [v0.43.0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0).
* (cosmwasm) Bump CosmWasm version to [v0.14.0](https://github.com/CosmWasm/cosmwasm/release/tag/v0.14.0).
* (golang) Bump golang prerequisite from 1.15 to 1.16.
- [\#523](https://github.com/terra-money/core/pull/526) Bump CosmosSDK [v0.43.0-rc3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-rc3) and CosmWasm [v0.16.0](https://github.com/CosmWasm/cosmwasm/release/tag/v0.16.0)
- [\#520](https://github.com/terra-money/core/pull/520) Implement ContractInfo wasm query interface for the contracts
- [\#518](https://github.com/terra-money/core/pull/518) Rollback market base pool split
- [\#507](https://github.com/terra-money/core/pull/507) Bump SDK to [v0.43.0-rc0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-rc0).
- [\#507](https://github.com/terra-money/core/pull/507) Bump Tendermint to [v0.34.11](https://github.com/tendermint/tendermint/releases/tag/v0.34.11).
- [\#509](https://github.com/terra-money/core/pull/509) Bump cosmwasm to [v0.15.1](https://github.com/CosmWasm/cosmwasm/release/tag/v0.15.1).
- [\#467](https://github.com/terra-money/core/pull/467) Split market base pool into mint & burn base pool
- [\#465](https://github.com/terra-money/core/pull/465) [\#472](https://github.com/terra-money/core/pull/472) Bump cosmwasm to [v0.14.0](https://github.com/CosmWasm/cosmwasm/release/tag/v0.14.0).
- [\#477](https://github.com/terra-money/core/pull/477) Burn `reward_weight` ratio of seigniorage instead of redirecting to oracle rewards
- [260b41a](https://github.com/terra-money/core/blob/471cd878b11b21f10511e272621b850a690eb6f3/x/market/keeper/msg_server.go#L121-L127) Redirect swap fees to oracle rewards (distributed over 3 years)
- Bump golang prerequisite from 1.15 to 1.16.

## 0.4.5
This release is a hotfix for two high-severity issues.
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ WORKDIR /code
COPY . /code/

# See https://github.com/CosmWasm/wasmvm/releases
ADD https://github.com/CosmWasm/wasmvm/releases/download/v0.15.1/libwasmvm_muslc.a /lib/libwasmvm_muslc.a
RUN sha256sum /lib/libwasmvm_muslc.a | grep 379c61d2e53f87f63639eaa8ba8bbe687e5833158bb10e0dc0523c3377248d01
ADD https://github.com/CosmWasm/wasmvm/releases/download/v0.16.0/libwasmvm_muslc.a /lib/libwasmvm_muslc.a
RUN sha256sum /lib/libwasmvm_muslc.a | grep ef294a7a53c8d0aa6a8da4b10e94fb9f053f9decf160540d6c7594734bc35cd6

# force it to use static lib (from above) not standard libgo_cosmwasm.so file
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc make build
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ endif

build-linux:
mkdir -p $(BUILDDIR)
docker build --tag terramoney/core ./
docker build --no-cache --tag terramoney/core ./
docker create --name temp terramoney/core:latest
docker cp temp:/usr/local/bin/terrad $(BUILDDIR)/
docker rm temp
Expand Down
23 changes: 8 additions & 15 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
tmjson "github.com/tendermint/tendermint/libs/json"
"github.com/tendermint/tendermint/libs/log"
tmos "github.com/tendermint/tendermint/libs/os"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
dbm "github.com/tendermint/tm-db"

transfer "github.com/cosmos/ibc-go/modules/apps/transfer"
Expand Down Expand Up @@ -318,6 +317,10 @@ func NewTerraApp(
scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName)
scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)

// Applications that wish to enforce statically created ScopedKeepers should call `Seal` after creating
// their scoped modules in `NewApp` with `ScopeToModule`
app.CapabilityKeeper.Seal()

// add keepers
app.AccountKeeper = authkeeper.NewAccountKeeper(
appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms,
Expand Down Expand Up @@ -479,10 +482,10 @@ func NewTerraApp(
// CanWithdrawInvariant invariant.
// NOTE: staking module is required if HistoricalEntries param > 0
app.mm.SetOrderBeginBlockers(
upgradetypes.ModuleName, minttypes.ModuleName,
distrtypes.ModuleName, slashingtypes.ModuleName,
evidencetypes.ModuleName, stakingtypes.ModuleName,
ibchost.ModuleName,
upgradetypes.ModuleName, capabilitytypes.ModuleName,
minttypes.ModuleName, distrtypes.ModuleName,
slashingtypes.ModuleName, evidencetypes.ModuleName,
stakingtypes.ModuleName, ibchost.ModuleName,
)
app.mm.SetOrderEndBlockers(
crisistypes.ModuleName, govtypes.ModuleName,
Expand Down Expand Up @@ -574,16 +577,6 @@ func NewTerraApp(
if err := app.LoadLatestVersion(); err != nil {
tmos.Exit(err.Error())
}

// Initialize and seal the capability keeper so all persistent capabilities
// are loaded in-memory and prevent any further modules from creating scoped
// sub-keepers.
// This must be done during creation of baseapp rather than in InitChain so
// that in-memory capabilities get regenerated on app restart.
// Note that since this reads from the store, we can only perform it when
// `loadLatest` is set to true.
ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{})
app.CapabilityKeeper.InitializeAndSeal(ctx)
}
app.ScopedIBCKeeper = scopedIBCKeeper
app.ScopedTransferKeeper = scopedTransferKeeper
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ go 1.16
module github.com/terra-money/core

require (
github.com/CosmWasm/wasmvm v0.15.1
github.com/cosmos/cosmos-sdk v0.43.0-rc1
github.com/cosmos/ibc-go v1.0.0-alpha2
github.com/CosmWasm/wasmvm v0.16.0
github.com/cosmos/cosmos-sdk v0.43.0-rc3
github.com/cosmos/ibc-go v1.0.0-rc4
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
github.com/gorilla/mux v1.8.0
Expand Down
Loading

0 comments on commit f49fc4e

Please sign in to comment.