feat(nexus)!: expose IsChainRegistered query to cw

app/wasm.go

@@ -156,8 +156,8 @@ type QueryRequest struct {
 }
 
 // NewQueryPlugins returns a new instance of the custom query plugins
-func NewQueryPlugins(msgIDGenerator nexustypes.MsgIDGenerator) *wasmkeeper.QueryPlugins {
-	nexusWasmQuerier := nexusKeeper.NewWasmQuerier(msgIDGenerator)
+func NewQueryPlugins(nexus nexustypes.Nexus) *wasmkeeper.QueryPlugins {
+	nexusWasmQuerier := nexusKeeper.NewWasmQuerier(nexus)
 
 	return &wasmkeeper.QueryPlugins{
 		Custom: func(ctx sdk.Context, request json.RawMessage) ([]byte, error) {

app/wasm_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/axelarnetwork/axelar-core/cmd/axelard/cmd"
 	"github.com/axelarnetwork/axelar-core/testutils/fake"
 	"github.com/axelarnetwork/axelar-core/testutils/rand"
+	nexus "github.com/axelarnetwork/axelar-core/x/nexus/exported"
 	nexusmock "github.com/axelarnetwork/axelar-core/x/nexus/types/mock"
 	"github.com/axelarnetwork/utils/funcs"
 	. "github.com/axelarnetwork/utils/test"
@@ -334,21 +335,21 @@ func TestMaxSizeOverrideForClient(t *testing.T) {
 
 func TestQueryPlugins(t *testing.T) {
 	var (
-		msgIDGenerator *nexusmock.MsgIDGeneratorMock
-		req            json.RawMessage
-		ctx            sdk.Context
+		nexusK *nexusmock.NexusMock
+		req    json.RawMessage
+		ctx    sdk.Context
 	)
 
-	Given("the tx id generator", func() {
+	Given("the nexus keeper", func() {
 		ctx = sdk.NewContext(nil, tmproto.Header{}, false, log.TestingLogger())
-		msgIDGenerator = &nexusmock.MsgIDGeneratorMock{}
+		nexusK = &nexusmock.NexusMock{}
 	}).
 		Branch(
 			When("request is invalid", func() {
 				req = []byte("{\"invalid\"}")
 			}).
 				Then("it should return an error", func(t *testing.T) {
-					_, err := app.NewQueryPlugins(msgIDGenerator).Custom(ctx, req)
+					_, err := app.NewQueryPlugins(nexusK).Custom(ctx, req)
 
 					assert.ErrorContains(t, err, "invalid Custom query request")
 				}),
@@ -357,7 +358,7 @@ func TestQueryPlugins(t *testing.T) {
 				req = []byte("{\"unknown\":{}}")
 			}).
 				Then("it should return an error", func(t *testing.T) {
-					_, err := app.NewQueryPlugins(msgIDGenerator).Custom(ctx, req)
+					_, err := app.NewQueryPlugins(nexusK).Custom(ctx, req)
 
 					assert.ErrorContains(t, err, "unknown Custom query request")
 				}),
@@ -366,26 +367,38 @@ func TestQueryPlugins(t *testing.T) {
 				req = []byte("{\"nexus\":{}}")
 			}).
 				Then("it should return an error", func(t *testing.T) {
-					_, err := app.NewQueryPlugins(msgIDGenerator).Custom(ctx, req)
+					_, err := app.NewQueryPlugins(nexusK).Custom(ctx, req)
 
 					assert.ErrorContains(t, err, "unknown Nexus query request")
 				}),
 
 			When("request is a nexus wasm TxID query", func() {
 				req = []byte("{\"nexus\":{\"tx_hash_and_nonce\":{}}}")
 			}).
-				Then("it should return an error", func(t *testing.T) {
+				Then("it should return a TxHashAndNonce response", func(t *testing.T) {
 					txHash := [32]byte(rand.Bytes(32))
 					index := uint64(rand.PosI64())
-					msgIDGenerator.CurrIDFunc = func(ctx sdk.Context) ([32]byte, uint64) {
+					nexusK.CurrIDFunc = func(ctx sdk.Context) ([32]byte, uint64) {
 						return txHash, index
 					}
 
-					actual, err := app.NewQueryPlugins(msgIDGenerator).Custom(ctx, req)
+					actual, err := app.NewQueryPlugins(nexusK).Custom(ctx, req)
 
 					assert.NoError(t, err)
 					assert.Equal(t, fmt.Sprintf("{\"tx_hash\":%s,\"nonce\":%d}", funcs.Must(json.Marshal(txHash)), index), string(actual))
 				}),
+			When("request is a nexus wasm IsChainRegistered query", func() {
+				req = []byte("{\"nexus\":{\"is_chain_registered\":{\"chain\": \"chain-0\"}}}")
+			}).
+				Then("it should return a chain registered response", func(t *testing.T) {
+					nexusK.GetChainFunc = func(ctx sdk.Context, chain nexus.ChainName) (nexus.Chain, bool) {
+						return nexus.Chain{}, true
+					}
+					actual, err := app.NewQueryPlugins(nexusK).Custom(ctx, req)
+
+					assert.NoError(t, err)
+					assert.Equal(t, fmt.Sprintf("{\"registered\":true}"), string(actual))
+				}),
 		).
 		Run(t)
 

x/nexus/exported/types.go

@@ -417,11 +417,20 @@ func (bz *WasmBytes) UnmarshalJSON(data []byte) error {
 
 // WasmQueryRequest is the request for wasm contracts to query
 type WasmQueryRequest struct {
-	TxHashAndNonce *struct{} `json:"tx_hash_and_nonce,omitempty"`
+	TxHashAndNonce    *struct{}          `json:"tx_hash_and_nonce,omitempty"`
+	IsChainRegistered *IsChainRegistered `json:"is_chain_registered,omitempty"`
 }
 
 // WasmQueryTxHashAndNonceResponse is the response for the TxHashAndNonce query
 type WasmQueryTxHashAndNonceResponse struct {
 	TxHash [32]byte `json:"tx_hash,omitempty"` // the hash of the current transaction
 	Nonce  uint64   `json:"nonce,omitempty"`   // the nonce of the current execution, which increments with each entry of any wasm execution
 }
+
+type IsChainRegistered struct {
+	Chain string `json:"chain"`
+}
+
+type WasmQueryIsChainRegisteredResponse struct {
+	Registered bool `json:"registered"`
+}

x/nexus/keeper/wasm_querier.go

@@ -13,24 +13,36 @@ import (
 
 // WasmQuerier is a querier for the wasm contracts
 type WasmQuerier struct {
-	msgIDGenerator types.MsgIDGenerator
+	nexus types.Nexus
 }
 
 // NewWasmQuerier creates a new WasmQuerier
-func NewWasmQuerier(msgIDGenerator types.MsgIDGenerator) *WasmQuerier {
-	return &WasmQuerier{msgIDGenerator}
+func NewWasmQuerier(nexus types.Nexus) *WasmQuerier {
+	return &WasmQuerier{nexus}
 }
 
 // Query handles the wasm queries for the nexus module
 func (q WasmQuerier) Query(ctx sdk.Context, req exported.WasmQueryRequest) ([]byte, error) {
-	if req.TxHashAndNonce != nil {
-		txHash, nonce := q.msgIDGenerator.CurrID(ctx)
+	switch {
+	case req.TxHashAndNonce != nil:
+		txHash, nonce := q.nexus.CurrID(ctx)
 
 		return funcs.Must(json.Marshal(exported.WasmQueryTxHashAndNonceResponse{
 			TxHash: txHash,
 			Nonce:  nonce,
 		})), nil
-	}
+	case req.IsChainRegistered != nil:
+		chainName := exported.ChainName(req.IsChainRegistered.Chain)
+		if err := chainName.Validate(); err != nil {
+			return nil, err
+		}
+
+		_, registered := q.nexus.GetChain(ctx, chainName)
+		return funcs.Must(json.Marshal(exported.WasmQueryIsChainRegisteredResponse{
+			Registered: registered,
+		})), nil
 
-	return nil, wasmvmtypes.UnsupportedRequest{Kind: "unknown Nexus query request"}
+	default:
+		return nil, wasmvmtypes.UnsupportedRequest{Kind: "unknown Nexus query request"}
+	}
 }

x/nexus/types/expected_keepers.go

@@ -50,6 +50,7 @@ type Nexus interface {
 	RouteMessage(ctx sdk.Context, id string, routingCtx ...exported.RoutingContext) error
 	DequeueRouteMessage(ctx sdk.Context) (exported.GeneralMessage, bool)
 	IsAssetRegistered(ctx sdk.Context, chain exported.Chain, denom string) bool
+	CurrID(ctx sdk.Context) ([32]byte, uint64)
 }
 
 // MsgIDGenerator provides functionality to generate msg IDs