Skip to content

Commit

Permalink
Resolved conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
kirdatatjana committed Sep 11, 2024
2 parents 281e226 + 0600f7f commit 72a263b
Show file tree
Hide file tree
Showing 263 changed files with 18,198 additions and 11,930 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
- Add the Permissionless ICS feature on the provider (as per
[ADR-019](https://cosmos.github.io/interchain-security/adrs/adr-019-permissionless-ics)),
which entails the following api-breaking changes on the provider.
([\#2171](https://github.com/cosmos/interchain-security/pull/2171))

- Deprecate the `chain-id` parameter in favour of `consumer-id` for all transactions and queries targeting a unique consumer chain. Below is a list highlighting the changes in the CLI commands. All commands assume the prefix `interchain-security-pd tx|q provider`.
- **Transactions:**
- `assign-consensus-key [consumer-id] [consumer-pubkey]`
-- submit a [MsgAssignConsensusKey](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L46)
- `opt-in [consumer-id] [consumer-pubkey]`
-- submit a [MsgOptIn](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L256)
- `opt-out [consumer-id]`
-- submit a [MsgOptOut](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L277)
- `set-consumer-commission-rate [consumer-id] [commission-rate]`
-- submit a [MsgSetConsumerCommissionRate](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L295)

- **Queries:**
- `consumer-genesis [consumer-id]` -- query for consumer chain genesis state by consumer id.
- REST:`/interchain_security/ccv/provider/consumer_genesis/{consumer_id}`

- `validator-consumer-key [consumer-id] [provider-validator-address]` -- query assigned validator consensus public key for a consumer chain.
- REST: `/interchain_security/ccv/provider/validator_consumer_addr/{consumer_id}/{provider_address}`

- `validator-provider-key [consumer-id] [consumer-validator-address]` -- query assigned validator consensus public key for the provider chain.
- REST: `/interchain_security/ccv/provider/validator_provider_addr/{consumer_id}/{consumer_address}`

- `consumer-opted-in-validators [consumer-id]` -- query opted-in validators for a given consumer chain.
- REST: `/interchain_security/ccv/provider/opted_in_validators/{consumer_id}`

- `consumer-validators [consumer-id]` -- query the last set consumer-validator set for a given consumer chain.
- REST: `/interchain_security/ccv/provider/consumer_validators/{consumer_id}`

- `validator-consumer-commission-rate [consumer-id]` -- query the consumer commission rate a validator charges on a consumer chain.
- REST: `/interchain_security/ccv/provider/consumer_commission_rate/{consumer_id}/{provider_address}`

- `all-pairs-valconsensus-address [consumer-id]` -- query all pairs of valconsensus address by consumer id.
- REST: `/interchain_security/ccv/provider/address_pairs/{consumer_id}`

- Deprecate the following queries, proposals and all legacy governance proposals:

- **Queries:**
- `list-start-proposals` -- query consumer chains start proposals on provider chain.
- REST: `/interchain_security/ccv/provider/consumer_chain_start_proposals`

- `list-stop-proposals` -- consumer chains stop proposals on provider chain.
- REST: `/interchain_security/ccv/provider/consumer_chain_stop_proposals`

- `list-proposed-consumer-chains` -- query chain ids in consumer addition proposal before voting finishes.
- REST: `/interchain_security/ccv/provider/proposed_consumer_chains`

- **Proposals:**
- [MsgConsumerAddition](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L121) -- deprecated in favor of [MsgCreateConsumer](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L360)
- [MsgConsumerRemoval](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L206) -- deprecated in favor of [MsgRemoveConsumer](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L225)
- [MsgConsumerModification](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L321) -- deprecated in favor of [MsgUpdateConsumer](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L383)

- **Legacy Proposals:**
- [ConsumerAdditionProposal](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/provider.proto#L31)
- [ConsumerModificationProposal](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/provider.proto#L140)
- [ConsumerRemovalProposal](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/provider.proto#L122)
- [ChangeRewardDenomsProposal](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/provider.proto#L192)
3 changes: 0 additions & 3 deletions .changelog/unreleased/dependencies/2113-bump-ibc.md

This file was deleted.

3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/2200-bump-comet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [CometBFT](https://github.com/cometbft/cometbft) to
[v0.38.11](https://github.com/cometbft/cometbft/releases/tag/v0.38.11).
([\#2200](https://github.com/cosmos/interchain-security/pull/2200))
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/2200-bump-ibc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v8.5.0](https://github.com/cosmos/ibc-go/releases/tag/v8.5.0).
([\#2200](https://github.com/cosmos/interchain-security/pull/2200))
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/2200-bump-sdk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.50.9](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.9)
([\#2200](https://github.com/cosmos/interchain-security/pull/2200))
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- Add the Permissionless ICS feature on the provider (as per
[ADR-019](https://cosmos.github.io/interchain-security/adrs/adr-019-permissionless-ics)),
which entails the following CLI and API enhancements on the provider.
([\#2171](https://github.com/cosmos/interchain-security/pull/2171))

- Introduce new CLI commands and gRPC endpoints to manage consumer chains. All commands listed below assume the prefix `interchain-security-pd tx|q provider`.

- **Transactions:**
- `create-consumer [consumer-parameters]`
-- submit a [MsgCreateConsumer](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L360)
-- replace [ConsumerAdditionProposal](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/provider.proto#L31)

- `update-consumer [consumer-parameters]`
-- submit a [MsgUpdateConsumer](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L383)
-- replace [ConsumerModificationProposal](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/provider.proto#L140)

- `remove-consumer [consumer-id]`
-- submit a [MsgRemoveConsumer](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/tx.proto#L225)
-- replace [ConsumerRemovalProposal](https://github.com/cosmos/interchain-security/blob/a17a3851b5eb3cec515b711dceae0afe9c14c3f0/proto/interchain_security/ccv/provider/v1/provider.proto#L122)

> These new TX commands should be used instead of their corresponding deprecated proposals. To update consumer chains owned by the governance module, a proposal containing a `MsgUpdateConsumer` message must be submitted.
- **Queries:**
- `consumer-chain [consumer-id]`-- query details of a consumer chain associated with the consumer id.
- REST: `interchain-security/ccv/provider/consumer_chain/{consumer_id}`
- `consumer-id-from-client-id [client-id]` -- get the consumer id of a chain from a client id.
- REST: `interchain-security/ccv/provider/consumer_id/{client_id}`
- `blocks-until-next-epoch` -- query number of blocks remaining until the next epoch begins.
- REST: `interchain-security/ccv/provider/blocks_until_next_epoch`

- Improve the `list-consumer-chains` query to accept optional parameters `[phase]` and `[limit]`:
- `[phase]`: Filters returned consumer chains by their phase.
- `[limit]`: Limits the number of consumer chains returned.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Remove provider migrations to consensus versions lower than 7.
To migrate the provider module from consensus version 3, 4, or 5 to consensus version 7 or higher,
users should use v4.3.x in production to migrate to consensus version 6.
([\#2211](https://github.com/cosmos/interchain-security/pull/2211))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Improve provider message validation.
([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Improve provider message validation.
([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))
1 change: 1 addition & 0 deletions .changelog/v5.2.0/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*September 4, 2024*
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run: |
sudo apt-get install codespell -y
codespell -w --skip="*.pb.go,*.pb.gw.go,*.json,*.git,*.js" --ignore-words=.github/.codespellignore
- uses: peter-evans/create-pull-request@v6
- uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.PRBOT_PAT }}
commit-message: "chore: spelling errors fixes"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
./build_deploy.sh
- name: Deploy 🚀
uses: JamesIves/[email protected].3
uses: JamesIves/[email protected].4
with:
branch: gh-pages
folder: ~/output
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gosec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jobs:
- name: Run Gosec Security Scanner
uses: securego/gosec@master
with:
args: -exclude-dir=tests -exclude-dir=app -exclude-generated ./...
args: "-exclude=G115 -exclude-dir=tests -exclude-dir=testutil -exclude-dir=app -exclude-generated ./..."
2 changes: 1 addition & 1 deletion .github/workflows/nightly-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Notify Slack on failure
uses: slackapi/slack-github-action@v1.26.0
uses: slackapi/slack-github-action@v1.27.0
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.38.0
- uses: bufbuild/buf-setup-action@v1.40.1
- uses: bufbuild/buf-push-action@v1
with:
input: "proto"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.38.0
- uses: bufbuild/buf-setup-action@v1.40.1
- uses: bufbuild/buf-breaking-action@v1
with:
input: "proto"
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# CHANGELOG

## v5.2.0

*September 4, 2024*

### BUG FIXES

- [Provider](x/ccv/provider)
- Improve provider message validation.
([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))

### STATE BREAKING

- [Provider](x/ccv/provider)
- Improve provider message validation.
([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))

## v5.1.1

*July 26, 2024*
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN go mod tidy
RUN make install

# Get Hermes build
FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.0 AS hermes-builder
FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.2 AS hermes-builder

# Get CometMock
FROM ghcr.io/informalsystems/cometmock:v0.38.x as cometmock-builder
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.combined
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FROM --platform=linux/amd64 ${PROVIDER_IMAGE} AS provider
FROM --platform=linux/amd64 ${CONSUMER_IMAGE} AS consumer

# Get Hermes build
FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.0 AS hermes-builder
FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.2 AS hermes-builder


# Get GoRelayer
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.gaia
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ WORKDIR /interchain-security
RUN make install

# Get Hermes build
FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.0 AS hermes-builder
FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.2 AS hermes-builder

FROM --platform=linux/amd64 fedora:39
RUN dnf update -y
Expand Down
32 changes: 16 additions & 16 deletions FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

The following table indicates the major ICS features available in the [currently active releases](./RELEASES.md#version-matrix):

| Feature | `v4.0.0` | `v4.3.1` | `v4.3.1-lsm` | `v4.4.0` | `v5.0.0` |
|---------|---------:|---------:|-------------:|---------:|---------:|
| [Channel initialization: new chains](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#channel-initialization-new-chains) ||||||
| [Validator set update](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#validator-set-update) ||||||
| [Completion of unbonding operations](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#completion-of-unbonding-operations) ||||||
| [Consumer initiated slashing](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#consumer-initiated-slashing) ||||||
| [Reward distribution](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#reward-distribution) ||||||
| [Consumer chain removal](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/methods.md#consumer-chain-removal) ||||||
| [Key assignment](https://github.com/cosmos/interchain-security/issues/26) ||||||
| [Jail throttling](https://github.com/cosmos/interchain-security/issues/404) ||||||
| [Soft opt-out](https://github.com/cosmos/interchain-security/issues/851) ||||||
| [Channel initialization: existing chains](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#channel-initialization-existing-chains) (aka [Standalone to consumer changeover](https://github.com/cosmos/interchain-security/issues/756)) ||||||
| [Cryptographic verification of equivocation](https://github.com/cosmos/interchain-security/issues/732) ||||||
| [Jail throttling with retries](https://github.com/cosmos/interchain-security/issues/713) ||||||
| [ICS epochs](https://cosmos.github.io/interchain-security/adrs/adr-014-epochs) ||||||
| [Partial Set Security](https://cosmos.github.io/interchain-security/adrs/adr-015-partial-set-security) ||||||
| Feature | `v4.0.0` | `v4.3.1` | `v4.3.1-lsm` | `v4.4.0` | `v5.0.0` | `v5.2.0` |
|---------|---------:|---------:|-------------:|---------:|---------:|---------:|
| [Channel initialization: new chains](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#channel-initialization-new-chains) |||||||
| [Validator set update](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#validator-set-update) |||||||
| [Completion of unbonding operations](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#completion-of-unbonding-operations) |||||||
| [Consumer initiated slashing](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#consumer-initiated-slashing) |||||||
| [Reward distribution](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#reward-distribution) |||||||
| [Consumer chain removal](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/methods.md#consumer-chain-removal) |||||||
| [Key assignment](https://github.com/cosmos/interchain-security/issues/26) |||||||
| [Jail throttling](https://github.com/cosmos/interchain-security/issues/404) |||||||
| [Soft opt-out](https://github.com/cosmos/interchain-security/issues/851) |||||||
| [Channel initialization: existing chains](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#channel-initialization-existing-chains) (aka [Standalone to consumer changeover](https://github.com/cosmos/interchain-security/issues/756)) |||||||
| [Cryptographic verification of equivocation](https://github.com/cosmos/interchain-security/issues/732) |||||||
| [Jail throttling with retries](https://github.com/cosmos/interchain-security/issues/713) |||||||
| [ICS epochs](https://cosmos.github.io/interchain-security/adrs/adr-014-epochs) |||||||
| [Partial Set Security](https://cosmos.github.io/interchain-security/adrs/adr-015-partial-set-security) |||||||
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ install: go.sum
go install -ldflags "$(democracyFlags)" ./cmd/interchain-security-cdd
go install -ldflags "$(standaloneFlags)" ./cmd/interchain-security-sd

# run all tests: unit, integration, diff, and E2E
test: test-unit test-integration test-mbt test-e2e
# run all tests: unit, integration, and E2E
test: test-unit test-integration test-e2e

# shortcut for local development
test-dev: test-unit test-integration test-mbt
Expand Down Expand Up @@ -163,7 +163,7 @@ sim-full-no-inactive-vals:
### Linting ###
###############################################################################
golangci_lint_cmd=golangci-lint
golangci_version=v1.54.1
golangci_version=v1.60.1

lint:
@echo "--> Running linter"
Expand Down Expand Up @@ -274,4 +274,4 @@ testing-docs:
###############################################################################

e2e-traces:
cd tests/e2e; go test -timeout 30s -run ^TestWriteExamples -v
cd tests/e2e; go test -timeout 30s -run ^TestWriteExamples -v
Loading

0 comments on commit 72a263b

Please sign in to comment.