feat: ICS v6 + new metrics

QuokkaStake · Sep 25, 2024 · 26f73ca · 26f73ca
1 parent dce4f73
commit 26f73ca
Show file tree

Hide file tree

Showing 21 changed files with 190 additions and 132 deletions.
diff --git a/assets/config-valid.toml b/assets/config-valid.toml
@@ -29,7 +29,7 @@ denoms = [
 [[chains.consumers]]
 name = "neutron"
 lcd-endpoint = "https://api.neutron.quokkastake.io"
-chain-id = "neutron-1"
+consumer-id = "0"
 base-denom = "untrn"
 bech-wallet-prefix = "neutron"
 bech-validator-prefix = "neutronvaloper"

diff --git a/assets/consumer-info.json b/assets/consumer-info.json
@@ -8,7 +8,9 @@
       "validators_power_cap": 0,
       "validator_set_cap": 0,
       "allowlist": [],
-      "denylist": []
+      "denylist": [],
+      "consumer_id": "0",
+      "phase": "CONSUMER_PHASE_LAUNCHED"
     }
   ]
 }
diff --git a/assets/validator-consumers.json b/assets/validator-consumers.json
@@ -1 +1 @@
-{"consumer_chain_ids":["neutron-1","stride-1"]}
+{"consumer_ids":["0", "1"]}
diff --git a/config.example.toml b/config.example.toml
@@ -118,8 +118,8 @@ node-info = true
 name = "neutron"
 # LCD endpoint of a consumer chain. Required.
 lcd-endpoint = "https://api.neutron.quokkastake.io"
-# Consumer chain's chain-id. Required.
-chain-id = "neutron-1"
+# Consumer chain's consumer-id. Required.
+consumer-id = "0"
 # Base denom, same as in provider config.
 base-denom = "untrn"
 # Bech32 prefix of a wallet on this consumer chain. Required for getting validators' wallet balance.

diff --git a/pkg/config/consumer_chain.go b/pkg/config/consumer_chain.go
@@ -10,7 +10,7 @@ type ConsumerChain struct {
 	LCDEndpoint         string     `toml:"lcd-endpoint"`
 	BaseDenom           string     `toml:"base-denom"`
 	Denoms              DenomInfos `toml:"denoms"`
-	ChainID             string     `toml:"chain-id"`
+	ConsumerID          string     `toml:"consumer-id"`
 	BechWalletPrefix    string     `toml:"bech-wallet-prefix"`
 	BechValidatorPrefix string     `toml:"bech-validator-prefix"`
 	BechConsensusPrefix string     `toml:"bech-consensus-prefix"`
@@ -38,8 +38,8 @@ func (c *ConsumerChain) Validate() error {
 		return errors.New("no LCD endpoint provided")
 	}
 
-	if c.ChainID == "" {
-		return errors.New("no chain-id provided")
+	if c.ConsumerID == "" {
+		return errors.New("no consumer-id provided")
 	}
 
 	if c.BaseDenom == "" {

diff --git a/pkg/config/consumer_chain_test.go b/pkg/config/consumer_chain_test.go
@@ -48,7 +48,7 @@ func TestConsumerChainValidateNoChainId(t *testing.T) {
 func TestConsumerChainValidateNoBaseDenom(t *testing.T) {
 	t.Parallel()
 
-	chain := ConsumerChain{Name: "test", LCDEndpoint: "test", ChainID: "test"}
+	chain := ConsumerChain{Name: "test", LCDEndpoint: "test", ConsumerID: "0"}
 	err := chain.Validate()
 	require.Error(t, err)
 }
@@ -59,7 +59,7 @@ func TestConsumerChainValidateInvalidDenom(t *testing.T) {
 	chain := ConsumerChain{
 		Name:        "test",
 		LCDEndpoint: "test",
-		ChainID:     "test",
+		ConsumerID:  "0",
 		BaseDenom:   "denom",
 		Denoms:      DenomInfos{{}},
 	}
@@ -73,7 +73,7 @@ func TestConsumerChainValidateValid(t *testing.T) {
 	chain := ConsumerChain{
 		Name:        "test",
 		LCDEndpoint: "test",
-		ChainID:     "test",
+		ConsumerID:  "0",
 		BaseDenom:   "denom",
 		Denoms:      DenomInfos{{Denom: "ustake", DisplayDenom: "stake"}},
 	}

diff --git a/pkg/fetchers/consumer_commission.go b/pkg/fetchers/consumer_commission.go
@@ -87,7 +87,7 @@ func (f *ConsumerCommissionFetcher) processChain(
 ) {
 	defer f.wg.Done()
 
-	commission, queryInfo, err := rpc.GetConsumerCommission(ctx, validator.ConsensusAddress, chain.ChainID)
+	commission, queryInfo, err := rpc.GetConsumerCommission(ctx, validator.ConsensusAddress, chain.ConsumerID)
 
 	f.mutex.Lock()
 	defer f.mutex.Unlock()

diff --git a/pkg/fetchers/consumer_commission_test.go b/pkg/fetchers/consumer_commission_test.go
@@ -60,8 +60,8 @@ func TestConsumerCommissionFetcherNoConsensusAddress(t *testing.T) {
 		}},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}
@@ -104,8 +104,8 @@ func TestConsumerCommissionFetcherQueryDisabled(t *testing.T) {
 		Queries: map[string]bool{"consumer-commission": false},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}
@@ -141,7 +141,7 @@ func TestConsumerCommissionFetcherQueryError(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_commission_rate/consumer/cosmosvalcons1rt4g447zhv6jcqwdl447y88guwm0eevnrelgzc",
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_commission_rate/0/cosmosvalcons1rt4g447zhv6jcqwdl447y88guwm0eevnrelgzc",
 		httpmock.NewErrorResponder(errors.New("error")),
 	)
 
@@ -155,8 +155,8 @@ func TestConsumerCommissionFetcherQueryError(t *testing.T) {
 		}},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}
@@ -193,7 +193,7 @@ func TestConsumerCommissionFetcherNodeError(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_commission_rate/consumer/cosmosvalcons1rt4g447zhv6jcqwdl447y88guwm0eevnrelgzc",
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_commission_rate/0/cosmosvalcons1rt4g447zhv6jcqwdl447y88guwm0eevnrelgzc",
 		httpmock.NewBytesResponder(200, assets.GetBytesOrPanic("error.json")),
 	)
 
@@ -207,8 +207,8 @@ func TestConsumerCommissionFetcherNodeError(t *testing.T) {
 		}},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}
@@ -245,7 +245,7 @@ func TestConsumerCommissionFetcherQuerySuccess(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_commission_rate/consumer/cosmosvalcons1rt4g447zhv6jcqwdl447y88guwm0eevnrelgzc",
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_commission_rate/0/cosmosvalcons1rt4g447zhv6jcqwdl447y88guwm0eevnrelgzc",
 		httpmock.NewBytesResponder(200, assets.GetBytesOrPanic("consumer-commission.json")),
 	)
 
@@ -259,8 +259,8 @@ func TestConsumerCommissionFetcherQuerySuccess(t *testing.T) {
 		}},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}

diff --git a/pkg/fetchers/consumer_info.go b/pkg/fetchers/consumer_info.go
@@ -88,7 +88,7 @@ func (f *ConsumerInfoFetcher) processChain(
 		f.Logger.Error().
 			Err(err).
 			Str("chain", chain.Name).
-			Msg("Error querying consumer validators")
+			Msg("Error querying consumer info")
 		return
 	}
 
@@ -99,6 +99,6 @@ func (f *ConsumerInfoFetcher) processChain(
 	f.allInfos[chain.Name] = map[string]types.ConsumerChainInfo{}
 
 	for _, consumerInfo := range allInfosList.Chains {
-		f.allInfos[chain.Name][consumerInfo.ChainID] = consumerInfo
+		f.allInfos[chain.Name][consumerInfo.ConsumerID] = consumerInfo
 	}
 }
diff --git a/pkg/fetchers/consumer_info_test.go b/pkg/fetchers/consumer_info_test.go
@@ -121,8 +121,8 @@ func TestConsumerInfoFetcherQueryError(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_chains",
-		httpmock.NewErrorResponder(errors.New("error")),
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_chains/0",
+		httpmock.NewErrorResponder(errors.New("custom error")),
 	)
 
 	chains := []*config.Chain{{
@@ -162,7 +162,7 @@ func TestConsumerInfoFetcherNodeError(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_chains",
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_chains/0",
 		httpmock.NewBytesResponder(200, assets.GetBytesOrPanic("error.json")),
 	)
 
@@ -203,7 +203,7 @@ func TestConsumerInfoFetcherQuerySuccess(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_chains",
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_chains/0",
 		httpmock.NewBytesResponder(200, assets.GetBytesOrPanic("consumer-info.json")),
 	)
 

diff --git a/pkg/fetchers/consumer_validators.go b/pkg/fetchers/consumer_validators.go
@@ -75,7 +75,7 @@ func (f *ConsumerValidatorsFetcher) processChain(
 ) {
 	defer f.wg.Done()
 
-	allValidatorsList, queryInfo, err := rpc.GetConsumerValidators(ctx, chain.ChainID)
+	allValidatorsList, queryInfo, err := rpc.GetConsumerValidators(ctx, chain.ConsumerID)
 
 	f.mutex.Lock()
 	defer f.mutex.Unlock()

diff --git a/pkg/fetchers/consumer_validators_test.go b/pkg/fetchers/consumer_validators_test.go
@@ -59,8 +59,8 @@ func TestConsumerValidatorsFetcherQueryDisabled(t *testing.T) {
 		Queries:          map[string]bool{"consumer-validators": false},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}
@@ -96,7 +96,7 @@ func TestConsumerValidatorsFetcherQueryError(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_validators/consumer",
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_validators/0",
 		httpmock.NewErrorResponder(errors.New("error")),
 	)
 
@@ -107,8 +107,8 @@ func TestConsumerValidatorsFetcherQueryError(t *testing.T) {
 		Validators:       []config.Validator{{Address: "cosmosvaloper1xqz9pemz5e5zycaa89kys5aw6m8rhgsvw4328e"}},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}
@@ -142,7 +142,7 @@ func TestConsumerValidatorsFetcherNodeError(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_validators/consumer",
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_validators/0",
 		httpmock.NewBytesResponder(200, assets.GetBytesOrPanic("error.json")),
 	)
 
@@ -153,8 +153,8 @@ func TestConsumerValidatorsFetcherNodeError(t *testing.T) {
 		Validators:       []config.Validator{{Address: "cosmosvaloper1xqz9pemz5e5zycaa89kys5aw6m8rhgsvw4328e"}},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}
@@ -188,7 +188,7 @@ func TestConsumerValidatorsFetcherQuerySuccess(t *testing.T) {
 
 	httpmock.RegisterResponder(
 		"GET",
-		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_validators/consumer",
+		"https://api.cosmos.quokkastake.io/interchain_security/ccv/provider/consumer_validators/0",
 		httpmock.NewBytesResponder(200, assets.GetBytesOrPanic("consumer-validators.json")),
 	)
 
@@ -199,8 +199,8 @@ func TestConsumerValidatorsFetcherQuerySuccess(t *testing.T) {
 		Validators:       []config.Validator{{Address: "cosmosvaloper1xqz9pemz5e5zycaa89kys5aw6m8rhgsvw4328e"}},
 		ConsumerChains: []*config.ConsumerChain{
 			{
-				Name:    "consumer",
-				ChainID: "consumer",
+				Name:       "consumer",
+				ConsumerID: "0",
 			},
 		},
 	}}

diff --git a/pkg/fetchers/has_to_validate.go b/pkg/fetchers/has_to_validate.go
@@ -113,7 +113,7 @@ func (q *ValidatorConsumersFetcher) processChain(
 	}
 
 	q.allValidatorsConsumers[chainName][validator.Address] = map[string]bool{}
-	for _, chainID := range validatorConsumers.ConsumerChainIds {
-		q.allValidatorsConsumers[chainName][validator.Address][chainID] = true
+	for _, consumerID := range validatorConsumers.ConsumerIds {
+		q.allValidatorsConsumers[chainName][validator.Address][consumerID] = true
 	}
 }
diff --git a/pkg/fetchers/signing_info.go b/pkg/fetchers/signing_info.go
@@ -152,7 +152,7 @@ func (q *SigningInfoFetcher) processConsumerChain(
 	// 1. Fetching assigned key.
 	assignedKey, queryInfo, err := providerRPC.GetConsumerAssignedKey(
 		validator.ConsensusAddress,
-		chain.ChainID,
+		chain.ConsumerID,
 		ctx,
 	)