Add new GraphQL field to query tx directly

Author: Junha Yang

graphql-engine/src/lib.rs

@@ -48,6 +48,11 @@ impl QueryRoot {
     async fn event(&self, tx_hash: GqlH256) -> async_graphql::Result<Vec<Vec<u8>>> {
         Ok(self.client.events_by_tx_hash(&ctypes::TxHash::from(tx_hash.0)).into_iter().map(|x| x.value).collect())
     }
+
+    /// FIXME: Design a general query scheme to handle both block to tx and tx to block.
+    async fn transaction(&self, tx_hash: GqlH256) -> Option<u64> {
+        self.client.transaction(&ctypes::TxHash::from(tx_hash.0).into()).map(|tx| tx.block_number)
+    }
 }
 
 #[derive(Clone)]

integration-test/src/lib.rs

@@ -168,6 +168,19 @@ pub async fn get_event(port: u16, tx_hash: primitives::H256) -> Vec<Vec<u8>> {
     list.iter().map(|event| event.as_array().unwrap().iter().map(|x| x.as_i64().unwrap() as u8).collect()).collect()
 }
 
+/// Returns the number of block including it, if there is.
+pub async fn get_tx(port: u16, tx_hash: primitives::H256) -> Option<u64> {
+    let query = "query Test($txHash: String!) {
+        transaction(txHash: $txHash)
+    }";
+    let mut variables = Value::Object(Default::default());
+    variables["txHash"] = Value::String(hex::encode(tx_hash.as_ref()));
+
+    let query_result = request_query(port, "engine", query, &variables.to_string()).await;
+    let value: Value = serde_json::from_str(&query_result).unwrap();
+    serde_json::from_value(value["data"]["transaction"].clone()).unwrap()
+}
+
 /// This is a copy from `foundry-timestamp`.
 #[derive(serde::Serialize, serde::Deserialize, Debug)]
 pub struct SignedTransaction {

integration-test/tests/integration_test.rs

@@ -176,4 +176,6 @@ async fn events() {
 
     let result = get_event(GRAPHQL_PORT, *tx2.hash()).await;
     assert!(result.is_empty());
+
+    assert!(get_tx(GRAPHQL_PORT, *tx1.hash()).await.unwrap() <= get_latest_block(GRAPHQL_PORT).await);
 }