diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml index 5058ed2dd5..96e9273024 100644 --- a/.github/workflows/nightly-e2e.yml +++ b/.github/workflows/nightly-e2e.yml @@ -36,7 +36,7 @@ jobs: # Run compatibility tests for different consumer (-cv) and provider (-pv) versions. # Combination of all provider versions with consumer versions are tested. # For new versions to be tested add/modify -pc/-cv parameters. - run: go run ./tests/e2e/... --tc compatibility -pv latest -pv v4.3.1-lsm -pv v3.3.3-lsm -cv latest -cv v4.4.0 -cv v3.3.0 + run: go run ./tests/e2e/... --tc compatibility -pv latest -cv latest -cv v5.2.0 -cv v4.4.0 happy-path-test: runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/Makefile b/Makefile index d387e98696..26fb8116d8 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,7 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD) COMMIT := $(shell git log -1 --format='%H') # Fetch tags and get the latest ICS version by filtering tags by vX.Y.Z and vX.Y.Z-lsm # using lazy set to only execute commands when variable is used -# Note: v.5.0.0 is currently excluded from the list as it's a pre-release and will be added back once it's out of pre-release status -LATEST_RELEASE ?= $(shell git fetch; git tag -l --sort -v:refname 'v*.?' 'v*.?'-lsm 'v*.??' 'v*.??'-lsm --no-contains v5.0.0 | head -n 1) +LATEST_RELEASE ?= $(shell git fetch; git tag -l --sort -v:refname 'v*.?' 'v*.?'-lsm 'v*.??' 'v*.??'-lsm | head -n 1) # don't override user values ifeq (,$(VERSION)) @@ -98,9 +97,9 @@ test-e2e-multi-consumer: test-e2e-parallel: go run ./tests/e2e/... --include-multi-consumer --parallel -# run E2E compatibility tests against latest release +# run E2E compatibility tests against consumer running latest release test-e2e-compatibility-tests-latest: - go run ./tests/e2e/... --tc compatibility -pv $(LATEST_RELEASE) + go run ./tests/e2e/... --tc compatibility -cv $(LATEST_RELEASE) # run full E2E tests in sequence (including multiconsumer) using latest tagged gaia test-gaia-e2e: diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index 7cec626ec9..72bdb9b998 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -37,6 +37,11 @@ const ( V300 = "v3.0.0" ) +// type aliases +type ( + AssignConsumerPubKeyAction = e2e.AssignConsumerPubKeyAction +) + type SendTokensAction struct { Chain ChainID From ValidatorID @@ -1971,11 +1976,11 @@ func (tr Chain) relayPacketsHermes( action RelayPacketsAction, verbose bool, ) { - // Because `.app_state.provider.params.blocks_per_epoch` is set to 3 in the E2E tests, we wait 3 blocks + // Because `.app_state.provider.params.blocks_per_epoch` is set to 3 in the E2E tests, we wait 4 blocks // before relaying the packets to guarantee that at least one epoch passes and hence any `VSCPacket`s get // queued and are subsequently relayed. - tr.waitBlocks(action.ChainA, 3, 90*time.Second) - tr.waitBlocks(action.ChainB, 3, 90*time.Second) + tr.waitBlocks(action.ChainA, 4, 90*time.Second) + tr.waitBlocks(action.ChainB, 4, 90*time.Second) // hermes clear packets ibc0 transfer channel-13 cmd := tr.target.ExecCommand("hermes", "clear", "packets", @@ -1992,8 +1997,8 @@ func (tr Chain) relayPacketsHermes( log.Fatal(err, "\n", string(bz)) } - tr.waitBlocks(action.ChainA, 1, 30*time.Second) - tr.waitBlocks(action.ChainB, 1, 30*time.Second) + tr.waitBlocks(action.ChainA, 2, 30*time.Second) + tr.waitBlocks(action.ChainB, 2, 30*time.Second) } type RelayRewardPacketsToProviderAction struct { @@ -2349,7 +2354,7 @@ type UnjailValidatorAction struct { // Sends an unjail transaction to the provider chain func (tr Chain) unjailValidator(action UnjailValidatorAction, verbose bool) { // wait until downtime_jail_duration has elapsed, to make sure the validator can be unjailed - tr.WaitTime(61 * time.Second) + tr.WaitTime(65 * time.Second) cmd := tr.target.ExecCommand( tr.testConfig.chainConfigs[action.Provider].BinaryName, @@ -2611,7 +2616,7 @@ func (tr Chain) invokeDoublesignSlash( if err != nil { log.Fatal(err, "\n", string(bz)) } - tr.waitBlocks("provi", 20, 4*time.Minute) + tr.waitBlocks("provi", 25, 4*time.Minute) } else { // tr.useCometMock validatorPrivateKeyAddress := tr.GetValidatorPrivateKeyAddress(action.Chain, action.Validator) @@ -2701,18 +2706,7 @@ func (tr Chain) lightClientAttack( tr.waitBlocks(chain, 1, 10*time.Second) } -type AssignConsumerPubKeyAction struct { - Chain ChainID - Validator ValidatorID - ConsumerPubkey string - // ReconfigureNode will change keys the node uses and restart - ReconfigureNode bool - // executing the action should raise an error - ExpectError bool - ExpectedError string -} - -func (tr Chain) assignConsumerPubKey(action AssignConsumerPubKeyAction, verbose bool) { +func (tr Chain) assignConsumerPubKey(action e2e.AssignConsumerPubKeyAction, verbose bool) { valCfg := tr.testConfig.validatorConfigs[action.Validator] // Note: to get error response reported back from this command '--gas auto' needs to be set. @@ -2722,28 +2716,12 @@ func (tr Chain) assignConsumerPubKey(action AssignConsumerPubKeyAction, verbose gas = "9000000" } - assignKey := fmt.Sprintf( - `%s tx provider assign-consensus-key %s '%s' --from validator%s --chain-id %s --home %s --node %s --gas %s --keyring-backend test -y -o json`, - tr.testConfig.chainConfigs[ChainID("provi")].BinaryName, - string(tr.testConfig.chainConfigs[action.Chain].ConsumerId), - action.ConsumerPubkey, - action.Validator, - tr.testConfig.chainConfigs[ChainID("provi")].ChainId, + bz, err := tr.target.AssignConsumerPubKey(action, gas, tr.getValidatorHome(ChainID("provi"), action.Validator), tr.getValidatorNode(ChainID("provi"), action.Validator), - gas, + verbose, ) - cmd := tr.target.ExecCommand( - "/bin/bash", "-c", - assignKey, - ) - - if verbose { - fmt.Println("assignConsumerPubKey cmd:", cmd.String()) - } - - bz, err := cmd.CombinedOutput() if err != nil && !action.ExpectError { log.Fatalf("unexpected error during key assignment - output: %s, err: %s", string(bz), err) } @@ -3112,3 +3090,28 @@ func (tr Chain) AdvanceTimeForChain(chain ChainID, duration time.Duration) { // wait for 1 block of the chain to get a block with the advanced timestamp tr.waitBlocks(chain, 1, time.Minute) } + +func (tr Commands) AssignConsumerPubKey(action e2e.AssignConsumerPubKeyAction, gas, home, node string, verbose bool) ([]byte, error) { + assignKey := fmt.Sprintf( + `%s tx provider assign-consensus-key %s '%s' --from validator%s --chain-id %s --home %s --node %s --gas %s --keyring-backend test -y -o json`, + tr.chainConfigs[ChainID("provi")].BinaryName, + string(tr.chainConfigs[action.Chain].ConsumerId), + action.ConsumerPubkey, + action.Validator, + tr.chainConfigs[ChainID("provi")].ChainId, + home, + node, + gas, + ) + + cmd := tr.target.ExecCommand( + "/bin/bash", "-c", + assignKey, + ) + + if verbose { + fmt.Println("assignConsumerPubKey cmd:", cmd.String()) + } + + return cmd.CombinedOutput() +} diff --git a/tests/e2e/state.go b/tests/e2e/state.go index 4ca4a41f09..7617ab5924 100644 --- a/tests/e2e/state.go +++ b/tests/e2e/state.go @@ -43,121 +43,6 @@ type Chain struct { testConfig *TestConfig } -func (tr Chain) GetChainState(chain ChainID, modelState ChainState) ChainState { - chainState := ChainState{} - - if modelState.ValBalances != nil { - valBalances := tr.GetBalances(chain, *modelState.ValBalances) - chainState.ValBalances = &valBalances - } - - if modelState.Proposals != nil { - proposals := tr.GetProposals(chain, *modelState.Proposals) - chainState.Proposals = &proposals - } - - if modelState.ProposedConsumerChains != nil { - proposedConsumerChains := tr.GetProposedConsumerChains(chain) - chainState.ProposedConsumerChains = &proposedConsumerChains - } - - if modelState.ValPowers != nil { - tr.waitBlocks(chain, 1, 10*time.Second) - powers := tr.GetValPowers(chain, *modelState.ValPowers) - chainState.ValPowers = &powers - } - - if modelState.StakedTokens != nil { - representPowers := tr.GetStakedTokens(chain, *modelState.StakedTokens) - chainState.StakedTokens = &representPowers - } - - if modelState.IBCTransferParams != nil { - params := tr.target.GetIBCTransferParams(chain) - chainState.IBCTransferParams = ¶ms - } - - if modelState.Rewards != nil { - rewards := tr.GetRewards(chain, *modelState.Rewards) - chainState.Rewards = &rewards - } - - if modelState.ConsumerChains != nil { - chains := tr.target.GetConsumerChains(chain) - chainState.ConsumerChains = &chains - } - - if modelState.AssignedKeys != nil { - assignedKeys := tr.GetConsumerAddresses(chain, *modelState.AssignedKeys) - chainState.AssignedKeys = &assignedKeys - } - - if modelState.ProviderKeys != nil { - providerKeys := tr.GetProviderAddresses(chain, *modelState.ProviderKeys) - chainState.ProviderKeys = &providerKeys - } - - if modelState.RegisteredConsumerRewardDenoms != nil { - registeredConsumerRewardDenoms := tr.target.GetRegisteredConsumerRewardDenoms(chain) - chainState.RegisteredConsumerRewardDenoms = ®isteredConsumerRewardDenoms - } - - if modelState.ClientsFrozenHeights != nil { - chainClientsFrozenHeights := map[string]clienttypes.Height{} - for id := range *modelState.ClientsFrozenHeights { - chainClientsFrozenHeights[id] = tr.GetClientFrozenHeight(chain, id) - } - chainState.ClientsFrozenHeights = &chainClientsFrozenHeights - } - - if modelState.HasToValidate != nil { - hasToValidate := map[ValidatorID][]ChainID{} - for validatorId := range *modelState.HasToValidate { - hasToValidate[validatorId] = tr.target.GetHasToValidate(validatorId) - } - chainState.HasToValidate = &hasToValidate - } - - if modelState.InflationRateChange != nil { - // get the inflation rate now - inflationRateNow := tr.target.GetInflationRate(chain) - - // wait a block - tr.waitBlocks(chain, 1, 10*time.Second) - - // get the new inflation rate - inflationRateAfter := tr.target.GetInflationRate(chain) - - // calculate the change - inflationRateChange := inflationRateAfter - inflationRateNow - var inflationRateChangeDirection int - if inflationRateChange > 0 { - inflationRateChangeDirection = 1 - } else if inflationRateChange < 0 { - inflationRateChangeDirection = -1 - } else { - inflationRateChangeDirection = 0 - } - chainState.InflationRateChange = &inflationRateChangeDirection - } - - if modelState.ConsumerCommissionRates != nil { - consumerCommissionRates := tr.GetConsumerCommissionRates(chain, *modelState.ConsumerCommissionRates) - chainState.ConsumerCommissionRates = &consumerCommissionRates - } - - if modelState.ConsumerPendingPacketQueueSize != nil { - pendingPacketQueueSize := tr.target.GetPendingPacketQueueSize(chain) - chainState.ConsumerPendingPacketQueueSize = &pendingPacketQueueSize - } - - if *verbose { - log.Println("Done getting chain state:\n" + pretty.Sprint(chainState)) - } - - return chainState -} - func (tr Chain) waitBlocks(chain ChainID, blocks uint, timeout time.Duration) { if tr.testConfig.useCometmock { // call advance_blocks method on cometmock diff --git a/tests/e2e/test_driver.go b/tests/e2e/test_driver.go index 95550daa18..87cc66647c 100644 --- a/tests/e2e/test_driver.go +++ b/tests/e2e/test_driver.go @@ -4,10 +4,13 @@ import ( "fmt" "log" "reflect" + "time" "github.com/kylelemons/godebug/pretty" "golang.org/x/mod/semver" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + e2e "github.com/cosmos/interchain-security/v6/tests/e2e/testlib" v4 "github.com/cosmos/interchain-security/v6/tests/e2e/v4" ) @@ -112,36 +115,158 @@ func (td *DefaultDriver) getTargetDriver(chainID ChainID) Chain { func (td *DefaultDriver) getState(modelState State) State { systemState := State{} for chainID, modelState := range modelState { - target := td.getTargetDriver(chainID) - if td.verbose { fmt.Println("Getting model state for chain: ", chainID) } - systemState[chainID] = target.GetChainState(chainID, modelState) + systemState[chainID] = td.GetChainState(chainID, modelState) } return systemState } +func (td *DefaultDriver) GetChainState(chain ChainID, modelState ChainState) e2e.ChainState { + chainState := ChainState{} + chainDriver := td.getTargetDriver(chain) + // providerDriver is the target driver for the provider chain + providerDriver := td.getTargetDriver("provi") + + if modelState.ValBalances != nil { + valBalances := chainDriver.GetBalances(chain, *modelState.ValBalances) + chainState.ValBalances = &valBalances + } + + if modelState.Proposals != nil { + proposals := chainDriver.GetProposals(chain, *modelState.Proposals) + chainState.Proposals = &proposals + } + + if modelState.ProposedConsumerChains != nil { + proposedConsumerChains := chainDriver.GetProposedConsumerChains(chain) + chainState.ProposedConsumerChains = &proposedConsumerChains + } + + if modelState.ValPowers != nil { + chainDriver.waitBlocks(chain, 1, 10*time.Second) + powers := chainDriver.GetValPowers(chain, *modelState.ValPowers) + chainState.ValPowers = &powers + } + + if modelState.StakedTokens != nil { + representPowers := chainDriver.GetStakedTokens(chain, *modelState.StakedTokens) + chainState.StakedTokens = &representPowers + } + + if modelState.IBCTransferParams != nil { + params := chainDriver.target.GetIBCTransferParams(chain) + chainState.IBCTransferParams = ¶ms + } + + if modelState.Rewards != nil { + rewards := chainDriver.GetRewards(chain, *modelState.Rewards) + chainState.Rewards = &rewards + } + + if modelState.ConsumerChains != nil { + chains := chainDriver.target.GetConsumerChains(chain) + chainState.ConsumerChains = &chains + } + + if modelState.AssignedKeys != nil { + assignedKeys := providerDriver.GetConsumerAddresses(chain, *modelState.AssignedKeys) + chainState.AssignedKeys = &assignedKeys + } + + if modelState.ProviderKeys != nil { + providerKeys := providerDriver.GetProviderAddresses(chain, *modelState.ProviderKeys) + chainState.ProviderKeys = &providerKeys + } + + if modelState.RegisteredConsumerRewardDenoms != nil { + registeredConsumerRewardDenoms := chainDriver.target.GetRegisteredConsumerRewardDenoms(chain) + chainState.RegisteredConsumerRewardDenoms = ®isteredConsumerRewardDenoms + } + + if modelState.ClientsFrozenHeights != nil { + chainClientsFrozenHeights := map[string]clienttypes.Height{} + for id := range *modelState.ClientsFrozenHeights { + chainClientsFrozenHeights[id] = providerDriver.GetClientFrozenHeight(chain, id) + } + chainState.ClientsFrozenHeights = &chainClientsFrozenHeights + } + + if modelState.HasToValidate != nil { + hasToValidate := map[ValidatorID][]ChainID{} + for validatorId := range *modelState.HasToValidate { + hasToValidate[validatorId] = providerDriver.target.GetHasToValidate(validatorId) + } + chainState.HasToValidate = &hasToValidate + } + + if modelState.InflationRateChange != nil { + // get the inflation rate now + inflationRateNow := chainDriver.target.GetInflationRate(chain) + + // wait a block + chainDriver.waitBlocks(chain, 1, 10*time.Second) + + // get the new inflation rate + inflationRateAfter := chainDriver.target.GetInflationRate(chain) + + // calculate the change + inflationRateChange := inflationRateAfter - inflationRateNow + var inflationRateChangeDirection int + if inflationRateChange > 0 { + inflationRateChangeDirection = 1 + } else if inflationRateChange < 0 { + inflationRateChangeDirection = -1 + } else { + inflationRateChangeDirection = 0 + } + chainState.InflationRateChange = &inflationRateChangeDirection + } + + if modelState.ConsumerCommissionRates != nil { + consumerCommissionRates := providerDriver.GetConsumerCommissionRates(chain, *modelState.ConsumerCommissionRates) + chainState.ConsumerCommissionRates = &consumerCommissionRates + } + + if modelState.ConsumerPendingPacketQueueSize != nil { + pendingPacketQueueSize := chainDriver.target.GetPendingPacketQueueSize(chain) + chainState.ConsumerPendingPacketQueueSize = &pendingPacketQueueSize + } + + if *verbose { + log.Println("Done getting chain state:\n" + pretty.Sprint(chainState)) + } + + return chainState +} + func (td *DefaultDriver) runAction(action interface{}) error { - target := td.getTargetDriver("") switch action := action.(type) { case StartChainAction: + target := td.getTargetDriver(action.Chain) target.startChain(action, td.verbose) case StartSovereignChainAction: + target := td.getTargetDriver(action.Chain) target.startSovereignChain(action, td.verbose) case UpgradeProposalAction: + target := td.getTargetDriver(ChainID("sover")) target.submitUpgradeProposal(action, td.verbose) case WaitUntilBlockAction: + target := td.getTargetDriver(action.Chain) target.waitUntilBlockOnChain(action) case ChangeoverChainAction: + target := td.getTargetDriver("") target.changeoverChain(action, td.verbose) case SendTokensAction: + target := td.getTargetDriver(action.Chain) target.sendTokens(action, td.verbose) case SubmitTextProposalAction: + target := td.getTargetDriver(action.Chain) target.submitTextProposal(action, td.verbose) case SubmitConsumerAdditionProposalAction: - target = td.getTargetDriver(action.Chain) + target := td.getTargetDriver(action.Chain) version := target.testConfig.providerVersion if semver.IsValid(version) && semver.Compare(semver.Major(version), "v5") < 0 { target.submitConsumerAdditionLegacyProposal(action, td.verbose) @@ -149,6 +274,7 @@ func (td *DefaultDriver) runAction(action interface{}) error { target.submitConsumerAdditionProposal(action, td.verbose) } case SubmitConsumerRemovalProposalAction: + target := td.getTargetDriver(action.Chain) version := target.testConfig.providerVersion target = td.getTargetDriver(action.Chain) if semver.IsValid(version) && semver.Compare(semver.Major(version), "v5") < 0 { @@ -157,9 +283,10 @@ func (td *DefaultDriver) runAction(action interface{}) error { target.submitConsumerRemovalProposal(action, td.verbose) } case SubmitEnableTransfersProposalAction: + target := td.getTargetDriver(action.Chain) target.submitEnableTransfersProposalAction(action, td.verbose) case SubmitConsumerModificationProposalAction: - target = td.getTargetDriver(action.Chain) + target := td.getTargetDriver(action.Chain) version := target.testConfig.providerVersion if semver.IsValid(version) && semver.Compare(semver.Major(version), "v5") < 0 { target.submitConsumerModificationLegacyProposal(action, td.verbose) @@ -167,61 +294,94 @@ func (td *DefaultDriver) runAction(action interface{}) error { target.submitConsumerModificationProposal(action, td.verbose) } case VoteGovProposalAction: + target := td.getTargetDriver(action.Chain) target.voteGovProposal(action, td.verbose) case StartConsumerChainAction: + target := td.getTargetDriver(action.ProviderChain) target.startConsumerChain(action, td.verbose) case AddChainToRelayerAction: + target := td.getTargetDriver(action.Chain) target.addChainToRelayer(action, td.verbose) case CreateIbcClientsAction: + // use default for hermes actions + target := td.getTargetDriver("") target.createIbcClientsHermes(action, td.verbose) case AddIbcConnectionAction: + // use default for hermes actions + target := td.getTargetDriver("") target.addIbcConnection(action, td.verbose) case AddIbcChannelAction: + // use default for hermes actions + target := td.getTargetDriver("") target.addIbcChannel(action, td.verbose) case TransferChannelCompleteAction: + // use default for hermes actions + target := td.getTargetDriver("") target.transferChannelComplete(action, td.verbose) case RelayPacketsAction: + // use default for hermes actions + target := td.getTargetDriver("") target.relayPackets(action, td.verbose) case RelayRewardPacketsToProviderAction: + // use default for hermes actions + target := td.getTargetDriver("") target.relayRewardPacketsToProvider(action, td.verbose) case DelegateTokensAction: + target := td.getTargetDriver(action.Chain) target.delegateTokens(action, td.verbose) case UnbondTokensAction: + target := td.getTargetDriver(action.Chain) target.unbondTokens(action, td.verbose) case CancelUnbondTokensAction: + target := td.getTargetDriver(action.Chain) target.cancelUnbondTokens(action, td.verbose) case RedelegateTokensAction: + target := td.getTargetDriver(action.Chain) target.redelegateTokens(action, td.verbose) case DowntimeSlashAction: + target := td.getTargetDriver(action.Chain) target.invokeDowntimeSlash(action, td.verbose) case UnjailValidatorAction: + target := td.getTargetDriver(action.Provider) target.unjailValidator(action, td.verbose) case DoublesignSlashAction: + target := td.getTargetDriver(action.Chain) target.invokeDoublesignSlash(action, td.verbose) case LightClientAmnesiaAttackAction: + target := td.getTargetDriver(action.Chain) target.lightClientAmnesiaAttack(action, td.verbose) case LightClientEquivocationAttackAction: + target := td.getTargetDriver(action.Chain) target.lightClientEquivocationAttack(action, td.verbose) case LightClientLunaticAttackAction: + target := td.getTargetDriver(action.Chain) target.lightClientLunaticAttack(action, td.verbose) case RegisterRepresentativeAction: + target := td.getTargetDriver(action.Chain) target.registerRepresentative(action, td.verbose) - case AssignConsumerPubKeyAction: + case e2e.AssignConsumerPubKeyAction: + target := td.getTargetDriver(ChainID("provi")) target.assignConsumerPubKey(action, td.verbose) case SlashMeterReplenishmentAction: + target := td.getTargetDriver(ChainID("provi")) target.waitForSlashMeterReplenishment(action, td.verbose) case WaitTimeAction: + target := td.getTargetDriver("") target.waitForTime(action, td.verbose) case StartRelayerAction: + target := td.getTargetDriver("") target.startRelayer(action, td.verbose) case ForkConsumerChainAction: + target := td.getTargetDriver("") target.forkConsumerChain(action, td.verbose) case UpdateLightClientAction: + target := td.getTargetDriver("") target.updateLightClient(action, td.verbose) case StartConsumerEvidenceDetectorAction: + target := td.getTargetDriver("") target.startConsumerEvidenceDetector(action, td.verbose) case SubmitChangeRewardDenomsProposalAction: - target = td.getTargetDriver(action.Chain) + target := td.getTargetDriver(action.Chain) version := target.testConfig.providerVersion if semver.IsValid(version) && semver.Compare(semver.Major(version), "v5") < 0 { target.submitChangeRewardDenomsLegacyProposal(action, td.verbose) @@ -229,14 +389,19 @@ func (td *DefaultDriver) runAction(action interface{}) error { target.submitChangeRewardDenomsProposal(action, td.verbose) } case CreateConsumerChainAction: + target := td.getTargetDriver(action.Chain) target.createConsumerChain(action, td.verbose) case UpdateConsumerChainAction: + target := td.getTargetDriver(action.Chain) target.updateConsumerChain(action, td.verbose) case OptInAction: + target := td.getTargetDriver("provider") target.optIn(action, td.verbose) case OptOutAction: + target := td.getTargetDriver("provider") target.optOut(action, td.verbose) case SetConsumerCommissionRateAction: + target := td.getTargetDriver("provider") target.setConsumerCommissionRate(action, td.verbose) default: log.Fatalf("unknown action in testRun %s: %#v", td.testCfg.name, action) diff --git a/tests/e2e/testlib/types.go b/tests/e2e/testlib/types.go index 0c10d8578d..844611b796 100644 --- a/tests/e2e/testlib/types.go +++ b/tests/e2e/testlib/types.go @@ -16,6 +16,17 @@ type ( ValidatorID string ) +type AssignConsumerPubKeyAction struct { + Chain ChainID + Validator ValidatorID + ConsumerPubkey string + // ReconfigureNode will change keys the node uses and restart + ReconfigureNode bool + // executing the action should raise an error + ExpectError bool + ExpectedError string +} + type ChainCommands interface { GetBlockHeight(chain ChainID) uint GetBalance(chain ChainID, validator ValidatorID) uint @@ -40,6 +51,8 @@ type ChainCommands interface { GetQueryNodeIP(chain ChainID) string GetInflationRate(chain ChainID) float64 GetConsumerCommissionRate(chain ChainID, validator ValidatorID) float64 + // Action commands + AssignConsumerPubKey(action AssignConsumerPubKeyAction, gas, home, node string, verbose bool) ([]byte, error) } // TODO: replace ExecutionTarget with new TargetDriver interface diff --git a/tests/e2e/v4/actions.go b/tests/e2e/v4/actions.go new file mode 100644 index 0000000000..6348b3d4c4 --- /dev/null +++ b/tests/e2e/v4/actions.go @@ -0,0 +1,33 @@ +package v4 + +import ( + "fmt" + + e2e "github.com/cosmos/interchain-security/v6/tests/e2e/testlib" +) + +func (tr Commands) AssignConsumerPubKey(action e2e.AssignConsumerPubKeyAction, gas, home, node string, verbose bool) ([]byte, error) { + + assignKey := fmt.Sprintf( + `%s tx provider assign-consensus-key %s '%s' --from validator%s --chain-id %s --home %s --node %s --gas %s --keyring-backend test -y -o json`, + tr.ChainConfigs[ChainID("provi")].BinaryName, + string(tr.ChainConfigs[action.Chain].ChainId), + action.ConsumerPubkey, + action.Validator, + tr.ChainConfigs[ChainID("provi")].ChainId, + home, + node, + gas, + ) + + cmd := tr.ExecCommand( + "/bin/bash", "-c", + assignKey, + ) + + if verbose { + fmt.Println("assignConsumerPubKey cmd:", cmd.String()) + } + + return cmd.CombinedOutput() +}