fix: Wrong chain ID in error message when chain not found

fix: Chain lookup done even when network prefix in chain ID is wrong

packages/chains/chains.go

@@ -478,7 +478,7 @@ func (c *Chains) Get(chainID isc.ChainID) (chain.Chain, error) {
 
 	ret, exists := c.allChains.Get(chainID)
 	if !exists {
-		return nil, interfaces.ErrChainNotFound
+		return nil, interfaces.NewChainNotFoundError(chainID)
 	}
 	return ret.chain, nil
 }

packages/isc/chainid.go

@@ -45,13 +45,19 @@ func ChainIDFromBytes(data []byte) (ret ChainID, err error) {
 }
 
 func ChainIDFromString(bech32 string) (ChainID, error) {
-	_, addr, err := iotago.ParseBech32(bech32)
+	netPrefix, addr, err := iotago.ParseBech32(bech32)
 	if err != nil {
 		return ChainID{}, err
 	}
 	if addr.Type() != iotago.AddressAlias {
 		return ChainID{}, fmt.Errorf("chainID must be an alias address (%s)", bech32)
 	}
+
+	expectedNetPrefix := parameters.L1().Protocol.Bech32HRP
+	if netPrefix != expectedNetPrefix {
+		return ChainID{}, fmt.Errorf("invalid network prefix: %s", netPrefix)
+	}
+
 	return ChainIDFromAddress(addr.(*iotago.AliasAddress)), nil
 }
 

packages/webapi/controllers/chain/chain.go

@@ -65,7 +65,7 @@ func (c *Controller) getChainInfo(e echo.Context) error {
 	}
 
 	chainInfo, err := c.chainService.GetChainInfoByChainID(chainID, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
-	if errors.Is(err, interfaces.ErrChainNotFound) {
+	if errors.As(err, &interfaces.ChainNotFoundError{}) {
 		return e.NoContent(http.StatusNotFound)
 	} else if err != nil {
 		return err
@@ -97,7 +97,7 @@ func (c *Controller) getChainList(e echo.Context) error {
 		chainInfo, err := c.chainService.GetChainInfoByChainID(chainID, "")
 		c.log.Infof("getchaininfo %v", err)
 
-		if errors.Is(err, interfaces.ErrChainNotFound) {
+		if errors.As(err, &interfaces.ChainNotFoundError{}) {
 			// TODO: Validate this logic here. Is it possible to still get more chain info?
 			chainList = append(chainList, models.ChainInfoResponse{
 				IsActive: false,

packages/webapi/controllers/corecontracts/controller.go

@@ -27,9 +27,11 @@ func (c *Controller) Name() string {
 }
 
 func (c *Controller) handleViewCallError(err error, chainID isc.ChainID) error {
-	if errors.Is(err, interfaces.ErrChainNotFound) {
-		return apierrors.ChainNotFoundError(chainID.String())
+	var chainNotFound interfaces.ChainNotFoundError
+	if errors.As(err, &chainNotFound) {
+		return apierrors.ChainNotFoundError(chainNotFound.ChainID.String())
 	}
+
 	return apierrors.ContractExecutionError(err)
 }
 

packages/webapi/interfaces/errors.go

@@ -0,0 +1,31 @@
+package interfaces
+
+import (
+	"errors"
+
+	"github.com/iotaledger/wasp/packages/isc"
+)
+
+var (
+	ErrCantDeleteLastUser = errors.New("you can't delete the last user")
+)
+
+func NewChainNotFoundError(chainID isc.ChainID) error {
+	return ChainNotFoundError{
+		ChainID: chainID,
+	}
+}
+
+type ChainNotFoundError struct {
+	ChainID isc.ChainID
+}
+
+func (e ChainNotFoundError) Error() string {
+	errStr := "Chain not found"
+
+	if !e.ChainID.Empty() {
+		errStr = errStr + ": " + e.ChainID.String()
+	}
+
+	return errStr
+}

packages/webapi/interfaces/interfaces.go

@@ -17,11 +17,6 @@ import (
 	"github.com/iotaledger/wasp/packages/webapi/models"
 )
 
-var (
-	ErrChainNotFound      = errors.New("chain not found")
-	ErrCantDeleteLastUser = errors.New("you can't delete the last user")
-)
-
 type APIController interface {
 	Name() string
 	RegisterPublic(publicAPI echoswagger.ApiGroup, mocker Mocker)

packages/webapi/services/chain.go

@@ -163,7 +163,7 @@ func (c *ChainService) GetChainInfoByChainID(chainID isc.ChainID, blockIndexOrTr
 
 	governanceChainInfo, err := corecontracts.GetChainInfo(ch, blockIndexOrTrieRoot)
 	if err != nil {
-		if chainRecord != nil && errors.Is(err, interfaces.ErrChainNotFound) {
+		if chainRecord != nil && errors.As(err, &interfaces.ChainNotFoundError{}) {
 			return &dto.ChainInfo{ChainID: chainID, IsActive: false}, nil
 		}