WIP test for consumer proposal migrations

tests/interchain/chainsuite/chain.go

@@ -108,7 +108,8 @@ func (c *Chain) WaitForProposalStatus(ctx context.Context, proposalID string, st
 	if err != nil {
 		return err
 	}
-	maxHeight := chainHeight + UpgradeDelta
+	// At 4s per block, 75 blocks is about 5 minutes.
+	maxHeight := chainHeight + 75
 	_, err = cosmos.PollForProposalStatusV1(ctx, c.CosmosChain, chainHeight, maxHeight, uint64(propID), status)
 	return err
 }

tests/interchain/chainsuite/chain_ics.go

@@ -2,7 +2,9 @@ package chainsuite
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"path"
 	"strconv"
 	"time"
 
@@ -21,6 +23,7 @@ import (
 	sdkmath "cosmossdk.io/math"
 
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
 )
 
 type ConsumerBootstrapCb func(ctx context.Context, consumer *cosmos.CosmosChain)
@@ -101,9 +104,21 @@ func (p *Chain) AddConsumerChain(ctx context.Context, relayer *Relayer, config C
 	spawnTime := time.Now().Add(ChainSpawnWait)
 	chainID := fmt.Sprintf("%s-%d", config.ChainName, len(p.Consumers)+1)
 
-	proposalWaiter, errCh, err := p.SubmitConsumerAdditionProposal(ctx, chainID, config, spawnTime)
-	if err != nil {
-		return nil, err
+	var proposalWaiter *proposalWaiter
+	var errCh chan error
+	if p.GetNode().HasCommand(ctx, "tx", "provider", "create-consumer") {
+		errCh = make(chan error, 1)
+		close(errCh)
+		err := p.CreateConsumerPermissionless(ctx, chainID, config, spawnTime)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		var err error
+		proposalWaiter, errCh, err = p.SubmitConsumerAdditionProposal(ctx, chainID, config, spawnTime)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	if config.spec == nil {
@@ -193,6 +208,113 @@ func (p *Chain) AddConsumerChain(ctx context.Context, relayer *Relayer, config C
 	return consumer, nil
 }
 
+func (p *Chain) CreateConsumerPermissionless(ctx context.Context, chainID string, config ConsumerConfig, spawnTime time.Time) error {
+	initParams := &providertypes.ConsumerInitializationParameters{
+		InitialHeight:                     clienttypes.Height{RevisionNumber: clienttypes.ParseChainID(chainID), RevisionHeight: 1},
+		SpawnTime:                         spawnTime,
+		BlocksPerDistributionTransmission: 1000,
+		CcvTimeoutPeriod:                  2419200000000000,
+		TransferTimeoutPeriod:             3600000000000,
+		ConsumerRedistributionFraction:    "0.75",
+		HistoricalEntries:                 10000,
+		UnbondingPeriod:                   1728000000000000,
+		GenesisHash:                       []byte("Z2VuX2hhc2g="),
+		BinaryHash:                        []byte("YmluX2hhc2g="),
+	}
+	powerShapingParams := &providertypes.PowerShapingParameters{
+		Top_N:              0,
+		ValidatorSetCap:    uint32(config.ValidatorSetCap),
+		ValidatorsPowerCap: uint32(config.ValidatorPowerCap),
+		AllowInactiveVals:  config.AllowInactiveVals,
+		MinStake:           config.MinStake,
+	}
+	params := providertypes.MsgCreateConsumer{
+		ChainId: chainID,
+		Metadata: providertypes.ConsumerMetadata{
+			Name:        config.ChainName,
+			Description: "Consumer chain",
+			Metadata:    "ipfs://",
+		},
+		InitializationParameters: initParams,
+		PowerShapingParameters:   powerShapingParams,
+	}
+
+	paramsBz, err := json.Marshal(params)
+	if err != nil {
+		return err
+	}
+	err = p.GetNode().WriteFile(ctx, paramsBz, "consumer-addition.json")
+	if err != nil {
+		return err
+	}
+	_, err = p.GetNode().ExecTx(ctx, interchaintest.FaucetAccountKeyName, "provider", "create-consumer", path.Join(p.GetNode().HomeDir(), "consumer-addition.json"))
+	if err != nil {
+		return err
+	}
+	if config.TopN >= 0 {
+		govAddress, err := p.GetGovernanceAddress(ctx)
+		if err != nil {
+			return err
+		}
+		consumerID, err := p.QueryJSON(ctx, fmt.Sprintf("chains.#(chain_id=%q).consumer_id", chainID), "provider", "list-consumer-chains")
+		if err != nil {
+			return err
+		}
+		update := &providertypes.MsgUpdateConsumer{
+			ConsumerId:      consumerID.String(),
+			NewOwnerAddress: govAddress,
+			Metadata: &providertypes.ConsumerMetadata{
+				Name:        config.ChainName,
+				Description: "Consumer chain",
+				Metadata:    "ipfs://",
+			},
+			InitializationParameters: initParams,
+			PowerShapingParameters:   powerShapingParams,
+		}
+		updateBz, err := json.Marshal(update)
+		if err != nil {
+			return err
+		}
+		err = p.GetNode().WriteFile(ctx, updateBz, "consumer-update.json")
+		if err != nil {
+			return err
+		}
+		_, err = p.GetNode().ExecTx(ctx, interchaintest.FaucetAccountKeyName, "provider", "update-consumer", path.Join(p.GetNode().HomeDir(), "consumer-update.json"))
+		if err != nil {
+			return err
+		}
+		powerShapingParams.Top_N = uint32(config.TopN)
+		update = &providertypes.MsgUpdateConsumer{
+			Owner:      govAddress,
+			ConsumerId: consumerID.String(),
+			Metadata: &providertypes.ConsumerMetadata{
+				Name:        config.ChainName,
+				Description: "Consumer chain",
+				Metadata:    "ipfs://",
+			},
+			InitializationParameters: initParams,
+			PowerShapingParameters:   powerShapingParams,
+		}
+		prop, err := p.BuildProposal([]cosmos.ProtoMessage{update}, "update consumer", "update consumer", "", GovDepositAmount, "", false)
+		if err != nil {
+			return err
+		}
+		txhash, err := p.GetNode().SubmitProposal(ctx, p.ValidatorWallets[0].Moniker, prop)
+		if err != nil {
+			return err
+		}
+		propID, err := p.GetProposalID(ctx, txhash)
+		if err != nil {
+			return err
+		}
+		if err := p.PassProposal(ctx, propID); err != nil {
+			return err
+		}
+
+	}
+	return nil
+}
+
 func (p *Chain) DefaultConsumerChainSpec(ctx context.Context, chainID string, config ConsumerConfig, spawnTime time.Time, proposalWaiter *proposalWaiter) *interchaintest.ChainSpec {
 	const (
 		strideChain  = "stride"
@@ -281,13 +403,17 @@ func (p *Chain) DefaultConsumerChainSpec(ctx context.Context, chainID string, co
 				if config.DuringDepositPeriod != nil {
 					config.DuringDepositPeriod(ctx, consumer.(*cosmos.CosmosChain))
 				}
-				proposalWaiter.AllowDeposit()
-				proposalWaiter.WaitForVotingPeriod()
+				if proposalWaiter != nil {
+					proposalWaiter.AllowDeposit()
+					proposalWaiter.WaitForVotingPeriod()
+				}
 				if config.DuringVotingPeriod != nil {
 					config.DuringVotingPeriod(ctx, consumer.(*cosmos.CosmosChain))
 				}
-				proposalWaiter.AllowVote()
-				proposalWaiter.WaitForPassed()
+				if proposalWaiter != nil {
+					proposalWaiter.AllowVote()
+					proposalWaiter.WaitForPassed()
+				}
 				tCtx, tCancel := context.WithDeadline(ctx, spawnTime)
 				defer tCancel()
 				if config.BeforeSpawnTime != nil {
@@ -397,6 +523,42 @@ func connectProviderConsumer(ctx context.Context, provider *Chain, consumer *Cha
 
 func (p *Chain) SubmitConsumerAdditionProposal(ctx context.Context, chainID string, config ConsumerConfig, spawnTime time.Time) (*proposalWaiter, chan error, error) {
 	propWaiter := newProposalWaiter()
+	prop := p.buildConsumerAdditionJSON(chainID, config, spawnTime)
+	propTx, err := p.ConsumerAdditionProposal(ctx, interchaintest.FaucetAccountKeyName, prop)
+	if err != nil {
+		return nil, nil, err
+	}
+	errCh := make(chan error, 1)
+	go func() {
+		defer close(errCh)
+		if err := p.WaitForProposalStatus(ctx, propTx.ProposalID, govv1.StatusDepositPeriod); err != nil {
+			errCh <- err
+			panic(err)
+		}
+		propWaiter.waitForDepositAllowed()
+
+		if _, err := p.GetNode().ExecTx(ctx, interchaintest.FaucetAccountKeyName, "gov", "deposit", propTx.ProposalID, prop.Deposit); err != nil {
+			errCh <- err
+			panic(err)
+		}
+
+		if err := p.WaitForProposalStatus(ctx, propTx.ProposalID, govv1.StatusVotingPeriod); err != nil {
+			errCh <- err
+			panic(err)
+		}
+		propWaiter.startVotingPeriod()
+		propWaiter.waitForVoteAllowed()
+
+		if err := p.PassProposal(ctx, propTx.ProposalID); err != nil {
+			errCh <- err
+			panic(err)
+		}
+		propWaiter.pass()
+	}()
+	return propWaiter, errCh, nil
+}
+
+func (p *Chain) buildConsumerAdditionJSON(chainID string, config ConsumerConfig, spawnTime time.Time) ccvclient.ConsumerAdditionProposalJSON {
 	prop := ccvclient.ConsumerAdditionProposalJSON{
 		Title:         fmt.Sprintf("Addition of %s consumer chain", chainID),
 		Summary:       "Proposal to add new consumer chain",
@@ -429,38 +591,7 @@ func (p *Chain) SubmitConsumerAdditionProposal(ctx context.Context, chainID stri
 	if config.MinStake > 0 {
 		prop.MinStake = config.MinStake
 	}
-	propTx, err := p.ConsumerAdditionProposal(ctx, interchaintest.FaucetAccountKeyName, prop)
-	if err != nil {
-		return nil, nil, err
-	}
-	errCh := make(chan error, 1)
-	go func() {
-		defer close(errCh)
-		if err := p.WaitForProposalStatus(ctx, propTx.ProposalID, govv1.StatusDepositPeriod); err != nil {
-			errCh <- err
-			return
-		}
-		propWaiter.waitForDepositAllowed()
-
-		if _, err := p.GetNode().ExecTx(ctx, interchaintest.FaucetAccountKeyName, "gov", "deposit", propTx.ProposalID, prop.Deposit); err != nil {
-			errCh <- err
-			return
-		}
-
-		if err := p.WaitForProposalStatus(ctx, propTx.ProposalID, govv1.StatusVotingPeriod); err != nil {
-			errCh <- err
-			return
-		}
-		propWaiter.startVotingPeriod()
-		propWaiter.waitForVoteAllowed()
-
-		if err := p.PassProposal(ctx, propTx.ProposalID); err != nil {
-			errCh <- err
-			return
-		}
-		propWaiter.pass()
-	}()
-	return propWaiter, errCh, nil
+	return prop
 }
 
 func (p *Chain) CheckCCV(ctx context.Context, consumer *Chain, relayer *Relayer, amount, valIdx, blocksPerEpoch int) error {

tests/interchain/chainsuite/config.go

@@ -16,10 +16,18 @@ import (
 	"github.com/cosmos/cosmos-sdk/types"
 )
 
+type ChainScope int
+
+const (
+	ChainScopeSuite ChainScope = iota
+	ChainScopeTest  ChainScope = iota
+)
+
 type SuiteConfig struct {
 	ChainSpec      *interchaintest.ChainSpec
 	UpgradeOnSetup bool
 	CreateRelayer  bool
+	Scope          ChainScope
 }
 
 const (
@@ -68,6 +76,7 @@ func (c SuiteConfig) Merge(other SuiteConfig) SuiteConfig {
 	}
 	c.UpgradeOnSetup = other.UpgradeOnSetup
 	c.CreateRelayer = other.CreateRelayer
+	c.Scope = other.Scope
 	return c
 }
 

tests/interchain/chainsuite/relayer.go

@@ -20,7 +20,7 @@ func NewRelayer(ctx context.Context, testName interchaintest.TestName) (*Relayer
 	rly := interchaintest.NewBuiltinRelayerFactory(
 		ibc.Hermes,
 		GetLogger(ctx),
-		relayer.CustomDockerImage("ghcr.io/informalsystems/hermes", "1.10.1", "2000:2000"),
+		relayer.CustomDockerImage("ghcr.io/informalsystems/hermes", "1.10.3", "2000:2000"),
 	).Build(testName, dockerClient, dockerNetwork)
 	return &Relayer{Relayer: rly}, nil
 }

tests/interchain/chainsuite/suite.go

@@ -23,7 +23,7 @@ func NewSuite(config SuiteConfig) *Suite {
 	return &Suite{Config: newCfg, Env: env}
 }
 
-func (s *Suite) SetupSuite() {
+func (s *Suite) createChain() {
 	ctx, err := NewSuiteContext(&s.Suite)
 	s.Require().NoError(err)
 	s.ctx = ctx
@@ -40,6 +40,18 @@ func (s *Suite) SetupSuite() {
 	}
 }
 
+func (s *Suite) SetupTest() {
+	if s.Config.Scope == ChainScopeTest {
+		s.createChain()
+	}
+}
+
+func (s *Suite) SetupSuite() {
+	if s.Config.Scope == ChainScopeSuite {
+		s.createChain()
+	}
+}
+
 func (s *Suite) GetContext() context.Context {
 	s.Require().NotNil(s.ctx, "Tried to GetContext before it was set. SetupSuite must run first")
 	return s.ctx

tests/interchain/consensus_test.go

@@ -146,10 +146,14 @@ func (s *ConsensusSuite) TestConsumerJailing() {
 }
 
 func (s *ConsensusSuite) TestOptInInactive() {
-	_, err := s.Chain.Validators[4].ExecTx(s.GetContext(), s.Chain.ValidatorWallets[4].Moniker, "provider", "opt-in", s.Consumer.Config().ChainID)
+	consumerIDJSON, err := s.Chain.QueryJSON(s.GetContext(), fmt.Sprintf("chains.#(chain_id=%q).consumer_id", s.Consumer.Config().ChainID), "provider", "list-consumer-chains")
+	s.Require().NoError(err)
+	consumerID := consumerIDJSON.String()
+
+	_, err = s.Chain.Validators[4].ExecTx(s.GetContext(), s.Chain.ValidatorWallets[4].Moniker, "provider", "opt-in", consumerID)
 	s.Require().NoError(err)
 	defer func() {
-		_, err := s.Chain.Validators[4].ExecTx(s.GetContext(), s.Chain.ValidatorWallets[4].Moniker, "provider", "opt-out", s.Consumer.Config().ChainID)
+		_, err := s.Chain.Validators[4].ExecTx(s.GetContext(), s.Chain.ValidatorWallets[4].Moniker, "provider", "opt-out", consumerID)
 		s.Require().NoError(err)
 		s.Relayer.ClearCCVChannel(s.GetContext(), s.Chain, s.Consumer)
 		s.Require().EventuallyWithT(func(c *assert.CollectT) {
@@ -171,7 +175,7 @@ func (s *ConsensusSuite) TestOptInInactive() {
 	s.Require().NoError(err)
 	s.Assert().True(jailed, "validator 4 should be jailed")
 
-	_, err = s.Chain.Validators[5].ExecTx(s.GetContext(), s.Chain.ValidatorWallets[5].Moniker, "provider", "opt-in", s.Consumer.Config().ChainID)
+	_, err = s.Chain.Validators[5].ExecTx(s.GetContext(), s.Chain.ValidatorWallets[5].Moniker, "provider", "opt-in", consumerID)
 	s.Require().NoError(err)
 	s.Require().NoError(s.Relayer.ClearCCVChannel(s.GetContext(), s.Chain, s.Consumer))
 	vals, err := s.Consumer.QueryJSON(s.GetContext(), "validators", "comet-validator-set")

tests/interchain/go.mod

@@ -11,7 +11,7 @@ replace (
 	github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2 // 2.3.4 breaks api
 	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.9-lsm
 	github.com/cosmos/iavl => github.com/cosmos/iavl v1.1.2
-	github.com/cosmos/interchain-security/v5 => github.com/cosmos/interchain-security/v5 v5.0.0-20240806104629-29327696b8e6
+	github.com/cosmos/interchain-security/v5 => github.com/cosmos/interchain-security/v5 v5.0.0-20240905162918-300530f18130
 	github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible
 	github.com/docker/docker => github.com/docker/docker v24.0.9+incompatible
 	github.com/ethereum/go-ethereum => github.com/ethereum/go-ethereum v1.14.5 // indirect
@@ -23,7 +23,7 @@ require (
 	cosmossdk.io/math v1.3.0
 	github.com/cometbft/cometbft v0.38.11
 	github.com/cosmos/cosmos-sdk v0.50.9
-	github.com/cosmos/ibc-go/v8 v8.4.0
+	github.com/cosmos/ibc-go/v8 v8.5.0
 	github.com/cosmos/interchain-security/v5 v5.1.1
 	github.com/docker/docker v27.1.2+incompatible
 	github.com/google/go-github/v62 v62.0.0
@@ -98,7 +98,7 @@ require (
 	github.com/cosmos/gogoproto v1.7.0 // indirect
 	github.com/cosmos/iavl v1.3.0 // indirect
 	github.com/cosmos/ibc-go/modules/capability v1.0.1 // indirect
-	github.com/cosmos/ics23/go v0.10.0 // indirect
+	github.com/cosmos/ics23/go v0.11.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
 	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
 	github.com/danieljoos/wincred v1.2.2 // indirect
@@ -292,4 +292,4 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/strangelove-ventures/interchaintest/v8 => github.com/hyphacoop/interchaintest/v8 v8.2.1-0.20240827183230-b4c212b9721e
+replace github.com/strangelove-ventures/interchaintest/v8 => github.com/hyphacoop/interchaintest/v8 v8.2.1-0.20240904201357-3a54d751e08d