feat: Add inclusion states to webapis (#476)

* feat: Add inclusion states to weapis

* refactor: Rename Conflict to Rejected

plugins/webapi/value/gettransactionbyid/handler.go

@@ -26,13 +26,21 @@ func Handler(c echo.Context) error {
 	}
 	txn := utils.ParseTransaction(txnObj.Unwrap())
 
-	// TODO: get inclusion state
+	// get txn metadata
+	txnMetadataObj := valuetransfers.Tangle.TransactionMetadata(txnID)
+	defer txnMetadataObj.Release()
+	if !txnMetadataObj.Exists() {
+		return c.JSON(http.StatusNotFound, Response{Error: "Transaction Metadata not found"})
+	}
+	txnMetadata := txnMetadataObj.Unwrap()
+
 	return c.JSON(http.StatusOK, Response{
 		Transaction: txn,
 		InclusionState: utils.InclusionState{
-			Confirmed: true,
-			Conflict:  false,
-			Liked:     true,
+			Solid:     txnMetadata.Solid(),
+			Confirmed: txnMetadata.Confirmed(),
+			Rejected:  txnMetadata.Rejected(),
+			Liked:     txnMetadata.Liked(),
 		},
 	})
 }

plugins/webapi/value/unspentoutputs/handler.go

@@ -32,7 +32,6 @@ func Handler(c echo.Context) error {
 			defer outputObj.Release()
 			output := outputObj.Unwrap()
 
-			// TODO: get inclusion state
 			if output.ConsumerCount() == 0 {
 				// iterate balances
 				var b []utils.Balance
@@ -47,9 +46,10 @@ func Handler(c echo.Context) error {
 					ID:       id.String(),
 					Balances: b,
 					InclusionState: utils.InclusionState{
-						Confirmed: true,
-						Conflict:  false,
-						Liked:     true,
+						Solid:     output.Solid(),
+						Confirmed: output.Confirmed(),
+						Rejected:  output.Rejected(),
+						Liked:     output.Liked(),
 					},
 				})
 			}

plugins/webapi/value/utils/transaction_handler.go

@@ -64,7 +64,8 @@ type Balance struct {
 
 // InclusionState represents the different states of an OutputID
 type InclusionState struct {
+	Solid     bool `json:"solid,omitempty"`
 	Confirmed bool `json:"confirmed,omitempty"`
-	Conflict  bool `json:"conflict,omitempty"`
+	Rejected  bool `json:"rejected,omitempty"`
 	Liked     bool `json:"liked,omitempty"`
 }