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

simplify naming #925

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2e3c17f
simplify naming
faddat May 7, 2023
a065680
more simplification
faddat May 8, 2023
6c23de4
Merge branch 'main' into short-name-less-typing
faddat May 9, 2023
ee13d11
Merge branch 'main' into short-name-less-typing
faddat May 11, 2023
e63fdad
complete the renaming
faddat May 11, 2023
d33a660
consumer-democracy => democracy, interchain-security-cd => consumer
faddat May 11, 2023
264b151
little more renaming
faddat May 11, 2023
4ce51ff
lint markdown
faddat May 11, 2023
ea2df13
update Makefile
faddat May 13, 2023
c16d0ce
rename consumerdemocracy => democracy
faddat May 13, 2023
e8cf68a
complete renaming consumerdemocracy
faddat May 13, 2023
e54ce99
naming
faddat May 13, 2023
eb59920
naming
faddat May 13, 2023
da12dad
iprovider -> provider
faddat May 13, 2023
b888529
Merge remote-tracking branch 'origin/main' into short-name-less-typing
faddat Jun 18, 2023
be276b5
Merge branch 'main' into short-name-less-typing
faddat Jun 19, 2023
44ed531
Merge remote-tracking branch 'origin/main' into short-name-less-typing
faddat Jun 23, 2023
02932a8
Merge branch 'main' into short-name-less-typing
faddat Jun 25, 2023
9252a61
change binary names
faddat Jun 25, 2023
b42a452
correct the import paths
faddat Jun 25, 2023
fc31f8a
correct naming issues
faddat Jun 25, 2023
f17cde6
Revert "correct naming issues"
faddat Jun 25, 2023
3857757
change binaryNames
faddat Jun 25, 2023
f548031
change two more names
faddat Jun 25, 2023
4234534
Merge branch 'main' into short-name-less-typing
faddat Jul 3, 2023
4ff94d0
Merge remote-tracking branch 'origin/main' into short-name-less-typing
faddat Jul 6, 2023
6a9b0f3
Update README.md
faddat Jul 6, 2023
4751d0b
Update README.md
faddat Jul 6, 2023
a322178
Update app/democracy/app.go
faddat Jul 6, 2023
3de445f
Merge branch 'main' into short-name-less-typing
faddat Jul 6, 2023
492f4bf
Update key-assignment.md
faddat Jul 6, 2023
0a26b28
Merge branch 'short-name-less-typing' of https://github.com/notional-…
faddat Aug 13, 2023
14b95bc
Merge remote-tracking branch 'origin/main' into short-name-less-typing
faddat Aug 13, 2023
c84191a
Merge remote-tracking branch 'origin/main' into short-name-less-typing
faddat Aug 20, 2023
59471df
Merge remote-tracking branch 'origin/main' into short-name-less-typing
faddat Sep 16, 2023
b1a20b9
fix naming issues
faddat Sep 16, 2023
b378536
Merge remote-tracking branch 'origin/main' into short-name-less-typing
faddat Jan 1, 2024
838fb50
complete merge
faddat Jan 1, 2024
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
11 changes: 7 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@ COPY --from=hermes-builder /usr/bin/hermes /usr/local/bin/
COPY --from=cometmock-builder /usr/local/bin/cometmock /usr/local/bin/cometmock
COPY --from=gorelayer-builder /bin/rly /usr/local/bin/

COPY --from=is-builder /go/bin/interchain-security-pd /usr/local/bin/interchain-security-pd
COPY --from=is-builder /go/bin/interchain-security-cd /usr/local/bin/interchain-security-cd
COPY --from=is-builder /go/bin/interchain-security-cdd /usr/local/bin/interchain-security-cdd
COPY --from=is-builder /go/bin/interchain-security-sd /usr/local/bin/interchain-security-sd
COPY --from=is-builder /go/bin/providerd /usr/local/bin/providerd
COPY --from=is-builder /go/bin/consumerd /usr/local/bin/consumerd
COPY --from=is-builder /go/bin/democracyd /usr/local/bin/democracyd
COPY --from=is-builder /go/bin/sovereignd /usr/local/bin/sovereignd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also change sovereign to standalone? Calling a non-ICS chain sovereign, entails that consumer chains don't have sovereignty, which is not true.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I'm good with this change sir





# Copy in the shell scripts that run the testnet
ADD ./tests/e2e/testnet-scripts /testnet-scripts
Expand Down
12 changes: 7 additions & 5 deletions Dockerfile.gaia
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,13 @@ USER root

COPY --from=hermes-builder /usr/bin/hermes /usr/local/bin/

# swap interchain-security-pd binary with gaia binary but keep the name
COPY --from=gaia-builder /go/gaia/build/gaiad /usr/local/bin/interchain-security-pd
COPY --from=is-builder /go/bin/interchain-security-cd /usr/local/bin/interchain-security-cd
COPY --from=is-builder /go/bin/interchain-security-cdd /usr/local/bin/interchain-security-cdd
COPY --from=is-builder /go/bin/interchain-security-sd /usr/local/bin/interchain-security-sd
# swap provider binary with gaia binary but keep the name
COPY --from=gaia-builder /go/gaia/build/gaiad /usr/local/bin/providerd
COPY --from=is-builder /go/bin/consumerd /usr/local/bin/consumerd
COPY --from=is-builder /go/bin/democracyd /usr/local/bin/democracyd
COPY --from=is-builder /go/bin/sovereignd /usr/local/bin/sovereignd



# Copy in the shell scripts that run the testnet
ADD ./tests/e2e/testnet-scripts /testnet-scripts
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ install: go.sum
export GOFLAGS='-buildmode=pie'
export CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2"
export CGO_LDFLAGS="-Wl,-z,relro,-z,now -fstack-protector"
go install $(BUILD_FLAGS) ./cmd/interchain-security-pd
go install $(BUILD_FLAGS) ./cmd/interchain-security-cd
go install $(BUILD_FLAGS) ./cmd/interchain-security-cdd
go install $(BUILD_FLAGS) ./cmd/interchain-security-sd
go install $(BUILD_FLAGS) ./cmd/providerd
go install $(BUILD_FLAGS) ./cmd/consumerd
go install $(BUILD_FLAGS) ./cmd/democracyd
go install $(BUILD_FLAGS) ./cmd/sovereignd



# run all tests: unit, integration, diff, and E2E
test: test-unit test-integration test-mbt test-e2e
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ For a list of **major ICS features** available in the currently active releases,

## Instructions

**Prerequisites**
### Prerequisites

```bash
## For OSX or Linux
Expand All @@ -30,15 +30,15 @@ brew install jq

```

**Installing and running binaries**
### Installing and running binaries

```bash
# install interchain-security-pd and interchain-security-cd binaries
# install provider and consumer binaries
make install
# run provider
interchain-security-pd
providerd
# run consumer
interchain-security-cd
consumerd
# (if the above fail, ensure ~/go/bin on $PATH)
export PATH=$PATH:$(go env GOPATH)/bin
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
"github.com/cosmos/cosmos-sdk/x/params/types/proposal"

app "github.com/cosmos/interchain-security/v3/app/consumer-democracy"
"github.com/cosmos/interchain-security/v3/app/consumer-democracy/ante"
app "github.com/cosmos/interchain-security/v3/app/democracy"
"github.com/cosmos/interchain-security/v3/app/democracy/ante"
)

// in SDKv47 parameter updates full params object is required
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"

democracyante "github.com/cosmos/interchain-security/v3/app/consumer-democracy/ante"
consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante"
democracyante "github.com/cosmos/interchain-security/v3/app/democracy/ante"
ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
)

Expand Down
2 changes: 1 addition & 1 deletion app/consumer-democracy/app.go → app/democracy/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ import (
)

const (
AppName = "interchain-security-cd"
AppName = "democracyd"
upgradeName = "sovereign-changeover" // arbitrary name, define your own appropriately named upgrade
AccountAddressPrefix = "cosmos"
)
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
ibctesting "github.com/cosmos/ibc-go/v7/testing"
"github.com/stretchr/testify/require"

appConsumer "github.com/cosmos/interchain-security/v3/app/consumer-democracy"
appConsumer "github.com/cosmos/interchain-security/v3/app/democracy"
icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing"
testutil "github.com/cosmos/interchain-security/v3/testutil/integration"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v3/app/consumer"
"github.com/cosmos/interchain-security/v3/cmd/interchain-security-cd/cmd"
"github.com/cosmos/interchain-security/v3/cmd/consumerd/cmd"
)

func main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
tmcfg "github.com/cometbft/cometbft/config"
"github.com/cometbft/cometbft/libs/log"

cdd "github.com/cosmos/interchain-security/v3/app/consumer-democracy"
cdd "github.com/cosmos/interchain-security/v3/app/democracy"
"github.com/cosmos/interchain-security/v3/app/params"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v3/app/consumer-democracy"
"github.com/cosmos/interchain-security/v3/cmd/interchain-security-cdd/cmd"
app "github.com/cosmos/interchain-security/v3/app/democracy"
"github.com/cosmos/interchain-security/v3/cmd/democracyd/cmd"
)

func main() {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v3/app/provider"
"github.com/cosmos/interchain-security/v3/cmd/interchain-security-pd/cmd"
"github.com/cosmos/interchain-security/v3/cmd/providerd/cmd"
)

func main() {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

app "github.com/cosmos/interchain-security/v3/app/sovereign"
"github.com/cosmos/interchain-security/v3/cmd/interchain-security-sd/cmd"
"github.com/cosmos/interchain-security/v3/cmd/sovereignd/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/consumer-development/app-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ You should not need to manage or override any code from the `x/consumer` module.

## Democracy consumer chain

The source code for the example app can be found [here](https://github.com/cosmos/interchain-security/tree/main/app/consumer-democracy).
The source code for the example app can be found [here](https://github.com/cosmos/interchain-security/tree/main/app/democracy).

This type of consumer chain wraps the basic CosmosSDK `x/distribution`, `x/staking` and `x/governance` modules allowing the consumer chain to perform democratic actions such as participating and voting within the chain's governance system.

Expand All @@ -28,5 +28,5 @@ This allows the consumer chain to leverage those modules while also using the `x
With these modules enabled, the consumer chain can mint its own governance tokens, which can then be delegated to prominent community members which are referred to as "representatives" (as opposed to "validators" in standalone chains). The token may have different use cases besides just voting on governance proposals.

## Standalone chain to consumer chain changeover
This feature is being actively worked on. Information will be provided at a later time.

This feature is being actively worked on. Information will be provided at a later time.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The democracy module provides a governance experience identical to what exists o

Using the democracy module on a consumer chain is the exact same experience, except for the fact that it is not the actual validator set of the chain (since it is a consumer chain, these are the Cosmos Hub validators) acting as representatives. Instead, there is a separate representative role who token holders can delegate to and who can perform the functions that validators do in Cosmos governance, without participating in proof of stake consensus.

For an example, see the [Democracy Consumer](https://github.com/cosmos/interchain-security/tree/main/app/consumer-democracy)
For an example, see [Democracy](https://github.com/cosmos/interchain-security/tree/main/app/democracy)

## CosmWasm

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/features/key-assignment.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ OR
gaiad query provider validator-provider-key <consumer-chain-id> consumervalcons1e....123asdnoaisdao
```

You must use a `valcons` address. You can obtain it by querying your node on the consumer `consumerd tendermint show-address`
You must use a `valcons` address. You can obtain it by querying your node on the consumer `consumer tendermint show-address`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be consumerd.


## Changing a key

Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/cosmos/interchain-security/v3

go 1.20
go 1.21.1

toolchain go1.21.5

require (
cosmossdk.io/errors v1.0.0
Expand Down
Loading
Loading