Skip to content

Commit

Permalink
Merge rebels cosmos sdk (#786)
Browse files Browse the repository at this point in the history
* update cosmos-sdk to latest release/v0.44.x
* update CHANGELOG
* fix errors from golangci-lint

Co-authored-by: Paul Kim <[email protected]>
  • Loading branch information
hanjukim and Paul Kim authored Aug 17, 2022
1 parent b602d3e commit d5b3934
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 15 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## v0.5.22
* Move validator voting restrictions from Msg handler to Keeper by @edk208 in https://github.com/terra-money/cosmos-sdk/pull/104

## v0.5.21
* Fix typo by @BrodaNoel in https://github.com/terra-money/classic-core/pull/758
* feat: Burn Tax via utilization of existing Stability Tax code by @edk208 in https://github.com/terra-money/classic-core/pull/784

## v0.5.20
* Make min spread to 100% to disable swap by @YunSuk-Yeo in https://github.com/terra-money/core/pull/760
* Close three channel
* "channel-1", // Osmosis
* "channel-49", // Crescent
* "channel-20", // Juno

## v0.5.19
Disable staking power change for protecting the network

## v0.5.18
This release contains a wasmer version bump from v2.0.0 to v2.2.1. The wasm caches of these two versions are not compatible, thus rebuilding is required.
To avoid possible sync delays due to the runtime rebuilding overhead, it is highly recommended that node operators rebuild their wasm cache with the [cosmwasm-cache-rebuilder](https://github.com/terra-money/cosmwasm-cache-rebuilder) before replacing terrad runtime to v0.5.18.
Expand Down
4 changes: 2 additions & 2 deletions custom/bank/simulation/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

// Simulation operation weights constants
const (
OpWeightMsgSend = "op_weight_msg_send"
OpWeightMsgMultiSend = "op_weight_msg_multisend"
OpWeightMsgSend = "op_weight_msg_send" //#nosec
OpWeightMsgMultiSend = "op_weight_msg_multisend" //#nosec
)

// WeightedOperations returns all the operations from the module with their respective weights
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ require (

replace (
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
github.com/cosmos/cosmos-sdk => github.com/terra-rebels/cosmos-sdk v0.44.6-0.20220803190831-231b4e89cdb7
github.com/cosmos/cosmos-sdk => github.com/terra-money/cosmos-sdk v0.44.6-0.20220817064826-f77977ff2d1b
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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -800,12 +800,12 @@ github.com/tendermint/tm-db v0.5.1/go.mod h1:g92zWjHpCYlEvQXvy9M168Su8V1IBEeawpX
github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw=
github.com/tendermint/tm-db v0.6.6 h1:EzhaOfR0bdKyATqcd5PNeyeq8r+V4bRPHBfyFdD9kGM=
github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI=
github.com/terra-money/cosmos-sdk v0.44.6-0.20220817064826-f77977ff2d1b h1:/rZuyp8o9A5VEjwhApjG2NKXc/R6dAsqnOV52vGVuuA=
github.com/terra-money/cosmos-sdk v0.44.6-0.20220817064826-f77977ff2d1b/go.mod h1:/tqCMnVCrX7F7iL2ALCsGdYmhx0jfgFG/50gP8jt6bI=
github.com/terra-money/ledger-terra-go v0.11.2 h1:BVXZl+OhJOri6vFNjjVaTabRLApw9MuG7mxWL4V718c=
github.com/terra-money/ledger-terra-go v0.11.2/go.mod h1:ClJ2XMj1ptcnONzKH+GhVPi7Y8pXIT+UzJ0TNt0tfZE=
github.com/terra-money/tendermint v0.34.14-terra.2 h1:UYDDCI001ZNhs+aX09HjKVldUcz084q3RwLHUOSSZQU=
github.com/terra-money/tendermint v0.34.14-terra.2/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0=
github.com/terra-rebels/cosmos-sdk v0.44.6-0.20220803190831-231b4e89cdb7 h1:RAuz6onHukywAmatpD66SyVfHEJTHjFI5HSc4kn4BF0=
github.com/terra-rebels/cosmos-sdk v0.44.6-0.20220803190831-231b4e89cdb7/go.mod h1:/tqCMnVCrX7F7iL2ALCsGdYmhx0jfgFG/50gP8jt6bI=
github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
Expand Down
2 changes: 1 addition & 1 deletion x/market/simulation/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

// Simulation operation weights constants
const (
OpWeightMsgSwap = "op_weight_msg_swap"
OpWeightMsgSwap = "op_weight_msg_swap" //#nosec
)

// WeightedOperations returns all the operations from the module with their respective weights
Expand Down
6 changes: 3 additions & 3 deletions x/oracle/simulation/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

// Simulation operation weights constants
const (
OpWeightMsgAggregateExchangeRatePrevote = "op_weight_msg_exchange_rate_aggregate_prevote"
OpWeightMsgAggregateExchangeRateVote = "op_weight_msg_exchange_rate_aggregate_vote"
OpWeightMsgDelegateFeedConsent = "op_weight_msg_exchange_feed_consent"
OpWeightMsgAggregateExchangeRatePrevote = "op_weight_msg_exchange_rate_aggregate_prevote" //#nosec
OpWeightMsgAggregateExchangeRateVote = "op_weight_msg_exchange_rate_aggregate_vote" //#nosec
OpWeightMsgDelegateFeedConsent = "op_weight_msg_exchange_feed_consent" //#nosec

salt = "1234"
)
Expand Down
12 changes: 6 additions & 6 deletions x/wasm/simulation/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
)

const (
OpWeightMsgStoreCode = "op_weight_msg_store_code"
OpWeightMsgInstantiateContract = "op_weight_msg_instantiate_contract"
OpWeightMsgExecuteContract = "op_weight_msg_execute_contract"
OpWeightMsgMigrateContract = "op_weight_msg_migrate_contract"
OpWeightMsgUpdateContractAdmin = "op_weight_msg_update_contract_admin"
OpWeightMsgClearContractAdmin = "op_weight_msg_update_contract_admin"
OpWeightMsgStoreCode = "op_weight_msg_store_code" //#nosec
OpWeightMsgInstantiateContract = "op_weight_msg_instantiate_contract" //#nosec
OpWeightMsgExecuteContract = "op_weight_msg_execute_contract" //#nosec
OpWeightMsgMigrateContract = "op_weight_msg_migrate_contract" //#nosec
OpWeightMsgUpdateContractAdmin = "op_weight_msg_update_contract_admin" //#nosec
OpWeightMsgClearContractAdmin = "op_weight_msg_update_contract_admin" //#nosec
)

// WeightedOperations returns all the operations from the module with their respective weights
Expand Down

0 comments on commit d5b3934

Please sign in to comment.