e2e: ictest-clock

.github/workflows/interchaintest-E2E.yml

@@ -69,6 +69,7 @@ jobs:
           - "ictest-unity-gov"
           - "ictest-pob"
           - "ictest-drip"
+          - "ictest-clock"
       fail-fast: false
 
     steps:

Makefile

@@ -160,6 +160,9 @@ ictest-pob: rm-testcache
 ictest-drip: rm-testcache
 	cd interchaintest &&  go test -race -v -run TestJunoDrip .
 
+ictest-clock: rm-testcache
+	cd interchaintest &&  go test -race -v -run TestJunoClock .
+
 rm-testcache:
 	go clean -testcache
 

interchaintest/helpers/query_helpers.go

@@ -26,6 +26,13 @@ func GetUnityContractWithdrawalReadyTime(t *testing.T, ctx context.Context, chai
 	return res
 }
 
+func GetClockContractValue(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, contract string) ClockContractResponse {
+	var res ClockContractResponse
+	err := chain.QueryContract(ctx, contract, QueryMsg{GetConfig: &struct{}{}}, &res)
+	require.NoError(t, err)
+	return res
+}
+
 // From stakingtypes.Validator
 type Vals struct {
 	Validators []struct {

interchaintest/helpers/types.go

@@ -76,3 +76,10 @@ type GetCountResponse struct {
 type GetCountObj struct {
 	Count int64 `json:"count"`
 }
+
+type ClockContractResponse struct {
+	Data *ClockContractObj `json:"data"`
+}
+type ClockContractObj struct {
+	Val uint32 `json:"val"`
+}

interchaintest/module_clock_test.go

@@ -1,10 +1,17 @@
 package interchaintest
 
 import (
+	"context"
+	"fmt"
 	"testing"
 
+	clocktypes "github.com/CosmosContracts/juno/v17/x/clock/types"
+	cosmosproto "github.com/cosmos/gogoproto/proto"
 	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v7/ibc"
+	"github.com/strangelove-ventures/interchaintest/v7/testutil"
+	"github.com/stretchr/testify/require"
 
 	helpers "github.com/CosmosContracts/juno/tests/interchaintest/helpers"
 )
@@ -14,8 +21,6 @@ func TestJunoClock(t *testing.T) {
 	t.Parallel()
 
 	cfg := junoConfig
-	// set allowed address by default to the contract creator
-	// cfg.ModifyGenesis = cosmos.ModifyGenesis(append(defaultGenesisKV, []cosmos.GenesisKV{
 
 	// Base setup
 	chains := CreateChainWithCustomConfig(t, 1, 0, cfg)
@@ -25,21 +30,56 @@ func TestJunoClock(t *testing.T) {
 	juno := chains[0].(*cosmos.CosmosChain)
 
 	// Users
-	users := interchaintest.GetAndFundTestUsers(t, ctx, "default", int64(10_000_000), juno, juno)
+	users := interchaintest.GetAndFundTestUsers(t, ctx, "default", int64(10_000_000_000), juno, juno)
 	user := users[0]
 
 	// Upload & init contract payment to another address
-	_, _ = helpers.SetupContract(t, ctx, juno, user.KeyName(), "contracts/clock_example.wasm", `{}`)
+	_, contractAddr := helpers.SetupContract(t, ctx, juno, user.KeyName(), "contracts/clock_example.wasm", `{}`)
 
-	// wait 1 block
-	// query the contractAddress config & see if it increased.
-	// pub struct Config {
-	// 	pub val: u32,
-	// }
+	// Ensure config is 0
+	res := helpers.GetClockContractValue(t, ctx, juno, contractAddr)
+	fmt.Printf("- res: %v\n", res.Data.Val)
+	require.Equal(t, uint32(0), res.Data.Val)
 
-	// TODO: param proposal to add the contract address to the allowed list? or remove it and see if it still increments.
+	// Submit the proposal to add it to the allowed contracts list
+	SubmitParamChangeProp(t, ctx, juno, user, []string{contractAddr})
+
+	// Wait 1 block
+	_ = testutil.WaitForBlocks(ctx, 1, juno)
+
+	// Validate the contract is now auto incrementing from the end blocker
+	res = helpers.GetClockContractValue(t, ctx, juno, contractAddr)
+	fmt.Printf("- res: %v\n", res.Data.Val)
+	require.GreaterOrEqual(t, res.Data.Val, uint32(1))
 
 	t.Cleanup(func() {
 		_ = ic.Close()
 	})
 }
+
+func SubmitParamChangeProp(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, contracts []string) string {
+	govAcc := "juno10d07y265gmmuvt4z0w9aw880jnsr700jvss730"
+	updateParams := []cosmosproto.Message{
+		&clocktypes.MsgUpdateParams{
+			Authority: govAcc,
+			Params:    clocktypes.NewParams(contracts),
+		},
+	}
+
+	proposal, err := chain.BuildProposal(updateParams, "Params Add Contract", "params", "ipfs://CID", fmt.Sprintf(`500000000%s`, chain.Config().Denom))
+	require.NoError(t, err, "error building proposal")
+
+	txProp, err := chain.SubmitProposal(ctx, user.KeyName(), proposal)
+	t.Log("txProp", txProp)
+	require.NoError(t, err, "error submitting proposal")
+
+	height, _ := chain.Height(ctx)
+
+	err = chain.VoteOnProposalAllValidators(ctx, txProp.ProposalID, cosmos.ProposalVoteYes)
+	require.NoError(t, err, "failed to submit votes")
+
+	_, err = cosmos.PollForProposalStatus(ctx, chain, height, height+haltHeightDelta, txProp.ProposalID, cosmos.ProposalStatusPassed)
+	require.NoError(t, err, "proposal status did not change to passed in expected number of blocks")
+
+	return txProp.ProposalID
+}

interchaintest/setup.go

@@ -18,6 +18,7 @@ import (
 	testutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	ibclocalhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost"
 
+	clocktypes "github.com/CosmosContracts/juno/v17/x/clock/types"
 	feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types"
 	tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types"
 )
@@ -93,6 +94,7 @@ func junoEncoding() *testutil.TestEncodingConfig {
 	wasmtypes.RegisterInterfaces(cfg.InterfaceRegistry)
 	feesharetypes.RegisterInterfaces(cfg.InterfaceRegistry)
 	tokenfactorytypes.RegisterInterfaces(cfg.InterfaceRegistry)
+	clocktypes.RegisterInterfaces(cfg.InterfaceRegistry)
 
 	return &cfg
 }

x/clock/types/msgs.go

@@ -3,8 +3,9 @@ package types
 import (
 	"cosmossdk.io/errors"
 
-	"github.com/CosmosContracts/juno/v17/x/drip/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/CosmosContracts/juno/v17/x/drip/types"
 )
 
 // Sudo Message called on the contracts