Merge pull request #574 from lavanet/PRT-725-add-indicative-errors-on…

…-chain-fetcher-fails PRT-725 added prints to chain fetcher fails
lavanet · Jun 25, 2023 · aca444c · aca444c
2 parents 850be5b + ce05e6d
commit aca444c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/app/app.go b/app/app.go
@@ -165,6 +165,7 @@ var Upgrades = []upgrades.Upgrade{
 	upgrades.Upgrade_0_13_1,
 	upgrades.Upgrade_0_14_0,
 	upgrades.Upgrade_0_15_0,
+	upgrades.Upgrade_0_15_1,
 }
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals

diff --git a/app/upgrades/empty_upgrades.go b/app/upgrades/empty_upgrades.go
@@ -201,3 +201,9 @@ var Upgrade_0_15_0 = Upgrade{
 	CreateUpgradeHandler: defaultUpgradeHandler,
 	StoreUpgrades:        store.StoreUpgrades{},
 }
+
+var Upgrade_0_15_1 = Upgrade{
+	UpgradeName:          "v0.15.1",
+	CreateUpgradeHandler: defaultUpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{},
+}
diff --git a/protocol/chainlib/chain_fetcher.go b/protocol/chainlib/chain_fetcher.go
@@ -43,11 +43,15 @@ func (cf *ChainFetcher) FetchLatestBlockNum(ctx context.Context) (int64, error)
 	}
 	parserInput, err := cf.formatResponseForParsing(reply, chainMessage)
 	if err != nil {
-		return spectypes.NOT_APPLICABLE, err
+		return spectypes.NOT_APPLICABLE, utils.LavaFormatWarning(spectypes.GET_BLOCKNUM+" Failed formatResponseForParsing", err, []utils.Attribute{
+			{Key: "nodeUrl", Value: cf.endpoint.UrlsString()},
+			{Key: "Method", Value: serviceApi.GetName()},
+			{Key: "Response", Value: string(reply.Data)},
+		}...)
 	}
 	blockNum, err := parser.ParseBlockFromReply(parserInput, serviceApi.Parsing.ResultParsing)
 	if err != nil {
-		return spectypes.NOT_APPLICABLE, utils.LavaFormatWarning("Failed To Parse FetchLatestBlockNum", err, []utils.Attribute{
+		return spectypes.NOT_APPLICABLE, utils.LavaFormatWarning(spectypes.GET_BLOCKNUM+" Failed to parse Response", err, []utils.Attribute{
 			{Key: "nodeUrl", Value: cf.endpoint.UrlsString()},
 			{Key: "Method", Value: serviceApi.GetName()},
 			{Key: "Response", Value: string(reply.Data)},
@@ -76,10 +80,21 @@ func (cf *ChainFetcher) FetchBlockHashByNum(ctx context.Context, blockNum int64)
 	}
 	parserInput, err := cf.formatResponseForParsing(reply, chainMessage)
 	if err != nil {
-		return "", err
+		return "", utils.LavaFormatWarning(spectypes.GET_BLOCK_BY_NUM+" Failed formatResponseForParsing", err, []utils.Attribute{
+			{Key: "nodeUrl", Value: cf.endpoint.UrlsString()},
+			{Key: "Method", Value: serviceApi.GetName()},
+			{Key: "Response", Value: string(reply.Data)},
+		}...)
 	}
-
-	return parser.ParseMessageResponse(parserInput, serviceApi.Parsing.ResultParsing)
+	res, err := parser.ParseMessageResponse(parserInput, serviceApi.Parsing.ResultParsing)
+	if err != nil {
+		return "", utils.LavaFormatWarning(spectypes.GET_BLOCK_BY_NUM+" Failed ParseMessageResponse", err, []utils.Attribute{
+			{Key: "nodeUrl", Value: cf.endpoint.UrlsString()},
+			{Key: "Method", Value: serviceApi.GetName()},
+			{Key: "Response", Value: string(reply.Data)},
+		}...)
+	}
+	return res, nil
 }
 
 func (cf *ChainFetcher) formatResponseForParsing(reply *types.RelayReply, chainMessage ChainMessageForSend) (parsable parser.RPCInput, err error) {