Merge pull request #3481 from CheshireFox/fix/chain-not-found-err

Fix chain not found error

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/isc/chainid_test.go

@@ -3,6 +3,8 @@ package isc
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/iotaledger/wasp/packages/util/rwutil"
 )
 
@@ -12,3 +14,10 @@ func TestChainIDSerialization(t *testing.T) {
 	rwutil.BytesTest(t, chainID, ChainIDFromBytes)
 	rwutil.StringTest(t, chainID, ChainIDFromString)
 }
+
+func TestIncorrectPrefix(t *testing.T) {
+	chainID := "rms1prxunz807j39nmhzy3gre4hwdlzvdjyrkfn59d27x6xh426y8ajt205mh9g"
+	_, err := ChainIDFromString(chainID)
+
+	require.ErrorContains(t, err, "invalid network prefix: rms")
+}

packages/webapi/apierrors/errors.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 )
 
-func ChainNotFoundError(chainID string) *HTTPError {
-	return NewHTTPError(http.StatusNotFound, fmt.Sprintf("Chain ID: %v not found", chainID), nil)
+func ChainNotFoundError() *HTTPError {
+	return NewHTTPError(http.StatusNotFound, "Chain ID not found", nil)
 }
 
 func UserNotFoundError(username string) *HTTPError {

packages/webapi/controllers/chain/chain.go

@@ -34,7 +34,7 @@ func (c *Controller) getCommitteeInfo(e echo.Context) error {
 
 	chain, err := c.chainService.GetChainInfoByChainID(chainID, "")
 	if err != nil {
-		return apierrors.ChainNotFoundError(chainID.String())
+		return apierrors.ChainNotFoundError()
 	}
 
 	chainNodeInfo, err := c.committeeService.GetCommitteeInfo(chainID)

packages/webapi/controllers/controllerutils/controllerutils.go

@@ -23,7 +23,7 @@ func ChainIDFromParams(c echo.Context, cs interfaces.ChainService) (isc.ChainID,
 	}
 
 	if !cs.HasChain(chainID) {
-		return isc.ChainID{}, apierrors.ChainNotFoundError(chainID.String())
+		return isc.ChainID{}, apierrors.ChainNotFoundError()
 	}
 	// set chainID to be used by the prometheus metrics
 	c.Set(EchoContextKeyChainID, chainID)

packages/webapi/controllers/corecontracts/accounts.go

@@ -15,14 +15,14 @@ import (
 )
 
 func (c *Controller) getTotalAssets(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	assets, err := corecontracts.GetTotalAssets(ch, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	assetsResponse := &models.AssetsResponse{
@@ -34,9 +34,9 @@ func (c *Controller) getTotalAssets(e echo.Context) error {
 }
 
 func (c *Controller) getAccountBalance(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	agentID, err := params.DecodeAgentID(e)
@@ -46,7 +46,7 @@ func (c *Controller) getAccountBalance(e echo.Context) error {
 
 	assets, err := corecontracts.GetAccountBalance(ch, agentID, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	assetsResponse := &models.AssetsResponse{
@@ -58,9 +58,9 @@ func (c *Controller) getAccountBalance(e echo.Context) error {
 }
 
 func (c *Controller) getAccountNFTs(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	agentID, err := params.DecodeAgentID(e)
@@ -70,7 +70,7 @@ func (c *Controller) getAccountNFTs(e echo.Context) error {
 
 	nfts, err := corecontracts.GetAccountNFTs(ch, agentID, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	nftsResponse := &models.AccountNFTsResponse{
@@ -85,9 +85,9 @@ func (c *Controller) getAccountNFTs(e echo.Context) error {
 }
 
 func (c *Controller) getAccountFoundries(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 	agentID, err := params.DecodeAgentID(e)
 	if err != nil {
@@ -96,7 +96,7 @@ func (c *Controller) getAccountFoundries(e echo.Context) error {
 
 	foundries, err := corecontracts.GetAccountFoundries(ch, agentID, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	return e.JSON(http.StatusOK, &models.AccountFoundriesResponse{
@@ -105,9 +105,9 @@ func (c *Controller) getAccountFoundries(e echo.Context) error {
 }
 
 func (c *Controller) getAccountNonce(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	agentID, err := params.DecodeAgentID(e)
@@ -117,7 +117,7 @@ func (c *Controller) getAccountNonce(e echo.Context) error {
 
 	nonce, err := corecontracts.GetAccountNonce(ch, agentID, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	nonceResponse := &models.AccountNonceResponse{
@@ -128,9 +128,9 @@ func (c *Controller) getAccountNonce(e echo.Context) error {
 }
 
 func (c *Controller) getNFTData(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	nftID, err := params.DecodeNFTID(e)
@@ -140,7 +140,7 @@ func (c *Controller) getNFTData(e echo.Context) error {
 
 	nftData, err := corecontracts.GetNFTData(ch, *nftID, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	nftDataResponse := isc.NFTToJSONObject(nftData)
@@ -149,14 +149,14 @@ func (c *Controller) getNFTData(e echo.Context) error {
 }
 
 func (c *Controller) getNativeTokenIDRegistry(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	registries, err := corecontracts.GetNativeTokenIDRegistry(ch, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	nativeTokenIDRegistryResponse := &models.NativeTokenIDRegistryResponse{
@@ -171,9 +171,9 @@ func (c *Controller) getNativeTokenIDRegistry(e echo.Context) error {
 }
 
 func (c *Controller) getFoundryOutput(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	serialNumber, err := params.DecodeUInt(e, "serialNumber")
@@ -183,7 +183,7 @@ func (c *Controller) getFoundryOutput(e echo.Context) error {
 
 	foundryOutput, err := corecontracts.GetFoundryOutput(ch, uint32(serialNumber), e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	foundryOutputID, err := foundryOutput.ID()

packages/webapi/controllers/corecontracts/blob.go

@@ -26,9 +26,9 @@ type BlobValueResponse struct {
 }
 
 func (c *Controller) getBlobValue(e echo.Context) error {
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	blobHash, err := params.DecodeBlobHash(e)
@@ -40,7 +40,7 @@ func (c *Controller) getBlobValue(e echo.Context) error {
 
 	blobValueBytes, err := corecontracts.GetBlobValue(ch, *blobHash, fieldKey, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	blobValueResponse := &BlobValueResponse{
@@ -57,9 +57,9 @@ type BlobInfoResponse struct {
 func (c *Controller) getBlobInfo(e echo.Context) error {
 	fmt.Println("GET BLOB INFO")
 
-	ch, chainID, err := controllerutils.ChainFromParams(e, c.chainService)
+	ch, _, err := controllerutils.ChainFromParams(e, c.chainService)
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	blobHash, err := params.DecodeBlobHash(e)
@@ -69,7 +69,7 @@ func (c *Controller) getBlobInfo(e echo.Context) error {
 
 	blobInfo, ok, err := corecontracts.GetBlobInfo(ch, *blobHash, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
 	if err != nil {
-		return c.handleViewCallError(err, chainID)
+		return c.handleViewCallError(err)
 	}
 
 	fmt.Printf("GET BLOB INFO: ok:%v, err:%v", ok, err)