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.

Sign up for GitHub

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

feat!: deprecate soft opt-out #1964

Merged
merged 13 commits into from
Jun 25, 2024
Merged

feat!: deprecate soft opt-out #1964

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
69fff54
first commit
insumity Jun 13, 2024
fdcca88
Set soft_opt_out_threshold to 0 instead of empty
insumity Jun 13, 2024
621e112
added changelog
insumity Jun 13, 2024
3cb17be
Update docs/docs/adrs/adr-009-soft-opt-out.md
insumity Jun 17, 2024
dee262c
Update proto/interchain_security/ccv/v1/shared_consumer.proto
insumity Jun 17, 2024
e22d3a3
Update .changelog/unreleased/improvements/consumer/1964-deprecate-sof…
insumity Jun 19, 2024
9d2f0b6
fixed changelogs
insumity Jun 19, 2024
e37808a
added changelogs
insumity Jun 19, 2024
a423de0
nit fix
insumity Jun 19, 2024
1aed85f
added changelog in ADR
insumity Jun 19, 2024
a4ef241
took into account comments.
insumity Jun 19, 2024
59e46f9
small fix
insumity Jun 19, 2024
82f5763
fixed small issue
insumity Jun 24, 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
18 changes: 8 additions & 10 deletions tests/e2e/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,14 +606,13 @@ func (tr *TestConfig) startConsumerChain(
) {
fmt.Println("Starting consumer chain ", action.ConsumerChain)

// Note that Soft Opt-Out has been deprecated. Nevertheless, the parameter still exists and is expected to be set
// because the SDK requires that all params are set to valid values in the genesis file.
action.GenesisChanges = action.GenesisChanges + ".app_state.ccvconsumer.params.soft_opt_out_threshold = \"0\""

consumerGenesis := ".app_state.ccvconsumer = " + tr.getConsumerGenesis(action.ProviderChain, action.ConsumerChain, target)
consumerGenesisChanges := tr.chainConfigs[action.ConsumerChain].GenesisChanges
if consumerGenesisChanges != "" {
consumerGenesis = consumerGenesis + " | " + consumerGenesisChanges + " | " + action.GenesisChanges
consumerGenesis = consumerGenesis + " | " + consumerGenesisChanges
}
if action.GenesisChanges != "" {
consumerGenesis = consumerGenesis + " | " + action.GenesisChanges
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was added here and in changeoverChain because If action.GenesisChanges was the empty string, consumerGenesis would end with | and as a result the jq transformation here would fail.

}

tr.startChain(StartChainAction{
Expand Down Expand Up @@ -842,14 +841,13 @@ func (tr TestConfig) changeoverChain(
log.Fatal(err, "\n", string(bz))
}

// Note that Soft Opt-Out has been deprecated. Nevertheless, the parameter still exists and is expected to be set
// because the SDK requires that all params are set to valid values in the genesis file.
action.GenesisChanges = action.GenesisChanges + ".app_state.ccvconsumer.params.soft_opt_out_threshold = \"0\""

consumerGenesis := ".app_state.ccvconsumer = " + string(bz)
consumerGenesisChanges := tr.chainConfigs[action.SovereignChain].GenesisChanges
if consumerGenesisChanges != "" {
consumerGenesis = consumerGenesis + " | " + consumerGenesisChanges + " | " + action.GenesisChanges
consumerGenesis = consumerGenesis + " | " + consumerGenesisChanges
}
if action.GenesisChanges != "" {
consumerGenesis = consumerGenesis + " | " + action.GenesisChanges
}

tr.startChangeover(ChangeoverChainAction{
Expand Down
Loading