Merge pull request #57 from cloudstruct/feature/better-reject-reason-handling

feat: better handling of reject reason parse failure

Author: agaffney

go.mod

@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/Bitrue-exchange/libada-go v0.0.1-rc.0.20220817020305-79d8b4c4dd9c
 	github.com/cloudstruct/go-cardano-ledger v0.2.1
-	github.com/cloudstruct/go-ouroboros-network v0.14.0
+	github.com/cloudstruct/go-ouroboros-network v0.16.1
 	github.com/fxamacker/cbor/v2 v2.4.0
 	github.com/gin-contrib/zap v0.0.2
 	github.com/gin-gonic/gin v1.8.1

go.sum

@@ -61,10 +61,11 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudstruct/go-cardano-ledger v0.1.0/go.mod h1:EBB9JG+3nBs3IV0p751yz1468XYkzJce1/A2X+xH8L8=
 github.com/cloudstruct/go-cardano-ledger v0.2.1 h1:J5DAs5GiP4iROwnukEgQhRdSh94cFFGifjnFNnFBSgU=
 github.com/cloudstruct/go-cardano-ledger v0.2.1/go.mod h1:EBB9JG+3nBs3IV0p751yz1468XYkzJce1/A2X+xH8L8=
-github.com/cloudstruct/go-ouroboros-network v0.14.0 h1:1X56wtgo2a8BLYNuCADjWH1mC6Z0NjkkYrfNtXbyzE0=
-github.com/cloudstruct/go-ouroboros-network v0.14.0/go.mod h1:06ggUMerJLwKJkVi5DLX1QMDz8r+R8o92rht7Z4ss9k=
+github.com/cloudstruct/go-ouroboros-network v0.16.1 h1:iAYviR5keS3/rbAnJp2slXsTcEAE04ut8WDcRYzK6qM=
+github.com/cloudstruct/go-ouroboros-network v0.16.1/go.mod h1:/Rz+GYS+ItV7e5F4rXfZuCVuHa+SkFfaH3zgqjVN3eI=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -350,7 +351,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d h1:3qF+Z8Hkrw9sOhrFHti9TlB1Hkac1x+DNRkv0XQiFjo=
 golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=

internal/api/api.go

@@ -226,8 +226,13 @@ func handleSubmitTx(c *gin.Context) {
 			_ = ginmetrics.GetMonitor().GetMetric("tx_submit_count").Inc(nil)
 			return nil
 		},
-		RejectTxFunc: func(reason interface{}) error {
-			c.String(400, fmt.Sprintf("transaction rejected by node: %#v", reason))
+		RejectTxFunc: func(reasonCbor []byte) error {
+			var reason interface{}
+			if err := cbor.Unmarshal(reasonCbor, &reason); err == nil {
+				c.String(400, fmt.Sprintf("transaction rejected by node: %v (raw CBOR: %x)", reason, reasonCbor))
+			} else {
+				c.String(400, fmt.Sprintf("transaction rejected by node, but the 'reason' data could not be parsed (raw CBOR: %x)", reasonCbor))
+			}
 			doneChan <- true
 			// Increment custom metric
 			_ = ginmetrics.GetMonitor().GetMetric("tx_failure_count").Inc(nil)