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.

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

Move quarantine module into the provenance repo (from our fork) #1754

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0a74d46
[1752]: Copy the quarantine proto and module dir from our on our for…
SpicyLemon Nov 17, 2023
0af665b
[1752]: Update the protos to be in a provenance package and be v1 ins…
SpicyLemon Nov 17, 2023
eabf184
[1752]: Copy the x/bank/client/testutil/cli_helpers.go file over sinc…
SpicyLemon Nov 17, 2023
210b22a
[1752]: Replace all imports of the SDK x/quarantine stuff with prov s…
SpicyLemon Nov 17, 2023
889381d
[1752]: Lint fixes.
SpicyLemon Nov 17, 2023
71c0b6d
[1752]: Switch the sdk to a version that uses a different namespace f…
SpicyLemon Nov 17, 2023
75a019e
[1752]: Get rid of RegisterLegacyAminoCodec since it's not needed but…
SpicyLemon Nov 17, 2023
28f2d31
[1752]: Fix the broken cli unit tests to create the right network. Fi…
SpicyLemon Nov 17, 2023
de7e161
[1752]: Fix spec docs: remove order comments, fix event type strings,…
SpicyLemon Nov 18, 2023
723debe
[1752]: Fix some lint issues in the protos.
SpicyLemon Nov 18, 2023
738cbe9
[1759]: Update spec links since the protos changed slightly.
SpicyLemon Nov 18, 2023
9503c36
Merge branch 'main' into dwedul/1752-copy-quarantine-in
SpicyLemon Nov 20, 2023
7d1bebe
[1752]: Go back to importing our full SDK version and just make a not…
SpicyLemon Nov 20, 2023
0c2ac07
[1752]: Add some changelog entries.
SpicyLemon Nov 20, 2023
77e8535
[1752]: Clean up codec.go by getting rid of the amino codec stuff and…
SpicyLemon Nov 20, 2023
4bbb95d
[1752]: Fix client spec docs to use provenanced (instead of simd).
SpicyLemon Nov 20, 2023
72e8560
[1752]: Delete accidentally added empty line from messages spec.
SpicyLemon Nov 20, 2023
ef13852
[1752]: Fix typo in comment at the top of testutil/bank/cli_helpers.go.
SpicyLemon Nov 20, 2023
98f452a
Merge branch 'main' into dwedul/1752-copy-quarantine-in
SpicyLemon Nov 21, 2023
333614a
Merge branch 'main' into dwedul/1752-copy-quarantine-in
SpicyLemon Nov 28, 2023
39530f6
[1752]: Bring the quarantine spec docs in line with the others.
SpicyLemon Nov 28, 2023
056e2de
Merge branch 'main' into dwedul/1752-copy-quarantine-in
SpicyLemon Nov 28, 2023
aafd441
[1752]: Put back period in changelog.
SpicyLemon Nov 28, 2023
331aca2
[1752]: Tag 1760 in the TODO in errors.go.
SpicyLemon Nov 28, 2023
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
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ Types of changes (Stanzas):

"Features" for new features.
"Improvements" for changes in existing functionality.
"Deprecated" for soon-to-be removed features.
"Bug Fixes" for any bug fixes.
"Deprecated" for soon-to-be removed features.
"Client Breaking" for breaking CLI commands and REST routes used by end-users.
"API Breaking" for breaking exported APIs used by developers building on SDK.
"State Machine Breaking" for any changes that result in a different AppState given same genesisState and txList.
"Dependencies" lists version bumps and is mostly managed automatically in dependabot PRs.
Ref: https://keepachangelog.com/en/1.0.0/
-->

Expand All @@ -48,6 +49,20 @@ Ref: https://keepachangelog.com/en/1.0.0/
* Add upgrade handler for 1.18 [#1756](https://github.com/provenance-io/provenance/pull/1756).
* Updated documentation for each module to work with docusaurus [PR 1763](https://github.com/provenance-io/provenance/pull/1763).
* Create a default market in `make run`, `localnet`, `devnet` and the `provenanced testnet` command [#1757](https://github.com/provenance-io/provenance/issues/1757).
* Move the quarantine module into this repo (from our fork of the SDK) [#1752](https://github.com/provenance-io/provenance/issues/1752).

### Deprecated

* The `cosmos.quarantine.v1beta1` protos have been fully deprecated and are replaced with those in `provenance.quarantine.v1` [#1752](https://github.com/provenance-io/provenance/issues/1752).

### Client Breaking

* The REST query endpoints under `/cosmos/quarantine/v1beta1/` have been moved to `/provenance/quarantine/v1/` [#1752](https://github.com/provenance-io/provenance/issues/1752).

### API Breaking

* The quarantine proto messages have moved to `provenance.quarantine.v1` (from `cosmos.quarantine.v1beta1`) [#1752](https://github.com/provenance-io/provenance/issues/1752).
* The `QueryQuarantinedFundsResponse.quarantinedFunds` field has been renamed to `quarantined_funds` [#1752](https://github.com/provenance-io/provenance/issues/1752).

### Dependencies

Expand Down
6 changes: 3 additions & 3 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ import (
paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
"github.com/cosmos/cosmos-sdk/x/quarantine"
quarantinekeeper "github.com/cosmos/cosmos-sdk/x/quarantine/keeper"
quarantinemodule "github.com/cosmos/cosmos-sdk/x/quarantine/module"
"github.com/cosmos/cosmos-sdk/x/sanction"
sanctionkeeper "github.com/cosmos/cosmos-sdk/x/sanction/keeper"
sanctionmodule "github.com/cosmos/cosmos-sdk/x/sanction/module"
Expand Down Expand Up @@ -162,6 +159,9 @@ import (
oraclekeeper "github.com/provenance-io/provenance/x/oracle/keeper"
oraclemodule "github.com/provenance-io/provenance/x/oracle/module"
oracletypes "github.com/provenance-io/provenance/x/oracle/types"
"github.com/provenance-io/provenance/x/quarantine"
quarantinekeeper "github.com/provenance-io/provenance/x/quarantine/keeper"
quarantinemodule "github.com/provenance-io/provenance/x/quarantine/module"
rewardkeeper "github.com/provenance-io/provenance/x/reward/keeper"
rewardmodule "github.com/provenance-io/provenance/x/reward/module"
rewardtypes "github.com/provenance-io/provenance/x/reward/types"
Expand Down
5 changes: 3 additions & 2 deletions app/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ import (
"testing"
"time"

icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v6/types"
"github.com/stretchr/testify/require"

icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v6/types"

abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
Expand All @@ -39,7 +40,6 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
"github.com/cosmos/cosmos-sdk/x/quarantine"
"github.com/cosmos/cosmos-sdk/x/sanction"
"github.com/cosmos/cosmos-sdk/x/simulation"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
Expand All @@ -55,6 +55,7 @@ import (
metadatatypes "github.com/provenance-io/provenance/x/metadata/types"
msgfeetype "github.com/provenance-io/provenance/x/msgfees/types"
nametypes "github.com/provenance-io/provenance/x/name/types"
"github.com/provenance-io/provenance/x/quarantine"
triggertypes "github.com/provenance-io/provenance/x/trigger/types"
)

Expand Down
Loading
Loading