Merge pull request #890 from crypto-com/feat/ibc-msg-eth-tx

Fix: parse ibc connection msg
crypto-com · Aug 5, 2024 · 844b0c4 · 844b0c4
2 parents 60eecbe + b9fe0b0
commit 844b0c4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ GOLANGCI_LINT_VERSION := "v1.49.0"
 GO = $(shell command -v go)
 GINKGO = $(shell command -v ginkgo)
 DOCKER = $(shell command -v docker)
-DOCKER_COMPOSE = $(shell command -v docker-compose)
+DOCKER_COMPOSE = $(shell command -v docker compose)
 
 TEST_DB ?= 1
 
@@ -30,7 +30,7 @@ endif
 
 has_docker_compose:
 ifndef DOCKER_COMPOSE
-	@echo "docker-compose not found. Please install docker-compose and try again."
+	@echo "docker compose not found. Please install docker compose and try again."
 	@exit 1
 endif
 
@@ -49,7 +49,7 @@ build_ginkgo_image:
 
 test: has_docker has_docker_compose has_golang build_ginkgo_image
 ifeq ($(TEST_DB), 1)
-	docker-compose -f docker/docker-compose.test.yml up --abort-on-container-exit
+	docker compose -f docker/docker-compose.test.yml up --abort-on-container-exit
 else
 	# TODO: Migrate coin test cases to Ginkgo
 	docker run --rm -v $(shell pwd):/app -w /app \

diff --git a/test.sh b/test.sh
@@ -49,13 +49,13 @@ handle_ctrlc() {
 
 teardown() {
     if [[ "${TEST_DB}" == 1 ]]; then
-        docker-compose -f ./docker/docker-compose.test.yml -p "${DOCKER_COMPOSE_PROJECT}" down
+        docker compose -f ./docker/docker-compose.test.yml -p "${DOCKER_COMPOSE_PROJECT}" down
     fi
 }
 
 setup() {
     if [[ "${TEST_DB}" == 1 ]]; then
-        docker-compose -f ./docker/docker-compose.test.yml -p "${DOCKER_COMPOSE_PROJECT}" up -d
+        docker compose -f ./docker/docker-compose.test.yml -p "${DOCKER_COMPOSE_PROJECT}" up -d
         wait_postgres_ready
     fi
 }

diff --git a/usecase/parser/ibc/msg.go b/usecase/parser/ibc/msg.go
@@ -241,10 +241,13 @@ func ParseMsgConnectionOpenInit(
 func ParseMsgConnectionOpenTry(
 	parserParams utils.CosmosParserParams,
 ) ([]command.Command, []string) {
-	clientStateType := parserParams.Msg["client_state"].(map[string]interface{})["@type"]
-	if clientStateType != "/ibc.lightclients.tendermint.v1.ClientState" {
-		// TODO: SoloMachine and Localhost LightClient
-		return []command.Command{}, []string{}
+	clientState, ok := parserParams.Msg["client_state"]
+	if ok {
+		clientStateType := clientState.(map[string]interface{})["@type"]
+		if clientStateType != "/ibc.lightclients.tendermint.v1.ClientState" {
+			// TODO: SoloMachine and Localhost LightClient
+			return []command.Command{}, []string{}
+		}
 	}
 
 	var rawMsg ibc_model.RawMsgConnectionOpenTryTendermintClient
@@ -319,10 +322,13 @@ func ParseMsgConnectionOpenTry(
 func ParseMsgConnectionOpenAck(
 	parserParams utils.CosmosParserParams,
 ) ([]command.Command, []string) {
-	clientStateType := parserParams.Msg["client_state"].(map[string]interface{})["@type"]
-	if clientStateType != "/ibc.lightclients.tendermint.v1.ClientState" {
-		// TODO: SoloMachine and Localhost LightClient
-		return []command.Command{}, []string{}
+	clientState, ok := parserParams.Msg["client_state"]
+	if ok {
+		clientStateType := clientState.(map[string]interface{})["@type"]
+		if clientStateType != "/ibc.lightclients.tendermint.v1.ClientState" {
+			// TODO: SoloMachine and Localhost LightClient
+			return []command.Command{}, []string{}
+		}
 	}
 
 	var rawMsg ibc_model.RawMsgConnectionOpenAckTendermintClient