updated api for raw_trasaction

Author: nagarajm22

lib/ain-ocean/src/api/mod.rs

@@ -4,18 +4,18 @@ use axum::{extract::Request, http::StatusCode, response::IntoResponse, Json, Rou
 
 // mod address;
 mod block;
+mod cache;
+pub mod common;
 mod fee;
 mod governance;
 mod loan;
 mod masternode;
 mod oracle;
+mod path;
 mod pool_pair;
 pub mod prices;
-mod rawtx;
-mod cache;
-pub mod common;
-mod path;
 mod query;
+mod rawtx;
 mod response;
 mod stats;
 mod tokens;
@@ -80,10 +80,8 @@ pub async fn ocean_router(
             .nest("/masternodes", masternode::router(Arc::clone(&context)))
             .nest("/oracles", oracle::router(Arc::clone(&context)))
             .nest("/poolpairs", pool_pair::router(Arc::clone(&context)))
-            // .nest("/prices", prices::router(Arc::clone(&context)))
-            // .nest("/poolpairs", poolpairs::router(Arc::clone(&context)))
             .nest("/prices", prices::router(Arc::clone(&context)))
-            // .nest("/rawtx", rawtx::router(Arc::clone(&context)))
+            .nest("/rawtx", rawtx::router(Arc::clone(&context)))
             .nest("/stats", stats::router(Arc::clone(&context)))
             .nest("/tokens", tokens::router(Arc::clone(&context)))
             .nest("/transactions", transactions::router(Arc::clone(&context)))

lib/ain-ocean/src/api/pool_pair/mod.rs

@@ -20,6 +20,7 @@ use path::{
     SwapPathsResponse,
 };
 use petgraph::graphmap::UnGraphMap;
+use price::DexPriceResponse;
 use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 use serde::{Deserialize, Serialize};
@@ -42,8 +43,6 @@ use crate::{
     Result, TokenIdentifier,
 };
 
-use price::DexPriceResponse;
-
 pub mod path;
 pub mod price;
 pub mod service;

lib/ain-ocean/src/api/pool_pair/price.rs

@@ -1,10 +1,9 @@
-use serde::Serialize;
 use std::{collections::HashMap, sync::Arc};
 
 use defichain_rpc::json::token::TokenInfo;
+use serde::Serialize;
 
 use super::{path::get_best_path, AppContext};
-
 use crate::{
     api::{
         cache::{get_token_cached, list_token_cached},

lib/ain-ocean/src/api/rawtx.rs

@@ -1,62 +1,77 @@
-use std::sync::Arc;
-use crate::{
-    error::{ApiError, Error, NotFoundKind},
-    model::RawTx,
-    repository::RepositoryOps,
-    storage::SortOrder,
-    Result,
-};
-use super::{
-    query::PaginationQuery,
-    response::{ApiPagedResponse, Response},
-    AppContext,
-};
+use std::{str::FromStr, sync::Arc};
+
+use ain_macros::ocean_endpoint;
 use axum::{
-    extract::{Path, Query},
-    routing::{get,post},
+    extract::Path,
+    response::Json,
+    routing::{get, post},
     Extension, Router,
 };
-use defichain_rpc::{Client, RpcApi};
+use bitcoin::{consensus::encode::deserialize, Transaction, Txid};
+use defichain_rpc::{
+    json::{GetTransactionResult, TestMempoolAcceptResult},
+    RpcApi,
+};
+use rust_decimal::Decimal;
+use rust_decimal_macros::dec;
 
-use ain_macros::ocean_endpoint;
+use super::{response::Response, AppContext};
+use crate::{api::response::ApiPagedResponse, error::ApiError, model::RawTxDto, Result};
+const DEFAULT_MAX_FEE_RATE: Decimal = dec!(0.1);
 
 #[ocean_endpoint]
 async fn send_rawtx(
-    Path(tx): Path<RawTx>,
+    Path(tx): Path<RawTxDto>,
     Extension(ctx): Extension<Arc<AppContext>>,
 ) -> Result<Response<String>> {
-    
-    Ok(Response::new("Sending raw transaction".to_string()))
+    let mut tx = tx.clone();
+    if tx.max_fee_rate.is_none() {
+        tx.max_fee_rate = Some(DEFAULT_MAX_FEE_RATE);
+    };
+    let trx = defichain_rpc::RawTx::raw_hex(tx.hex);
+    let tx_hash = ctx.client.send_raw_transaction(trx).await?;
+    Ok(Response::new(tx_hash.to_string()))
 }
 
 #[ocean_endpoint]
 async fn test_rawtx(
-    Path(tx): Path<RawTx>,
+    Path(tx): Path<RawTxDto>,
     Extension(ctx): Extension<Arc<AppContext>>,
-) -> Result<Response<String>> {
- 
-Ok(Response::new("Testing raw transaction".to_string()))
+) -> Result<Response<Vec<TestMempoolAcceptResult>>> {
+    let mut tx = tx.clone();
+    if tx.max_fee_rate.is_none() {
+        tx.max_fee_rate = Some(DEFAULT_MAX_FEE_RATE);
+    };
+    let trx = defichain_rpc::RawTx::raw_hex(tx.hex);
+    let mempool_tx = ctx.client.test_mempool_accept(&[trx]).await?;
+    Ok(Response::new(mempool_tx))
 }
 #[ocean_endpoint]
-async fn get_rawtx(
+async fn get_raw_tx(
     Path(txid): Path<String>,
     Extension(ctx): Extension<Arc<AppContext>>,
-) -> Result<Response<String>> {
-   format!("Details of raw transaction with txid {}", txid);
-   Ok(Response::new("Testing raw transaction".to_string()))
+) -> Result<Response<GetTransactionResult>> {
+    format!("Details of raw transaction with txid {}", txid);
+    let tx_hash = Txid::from_str(&txid)?;
+    let tx_result = ctx.client.get_transaction(&tx_hash, Some(true)).await?;
+    Ok(Response::new(tx_result))
 }
 
-async fn validate(hex:String) {
-   if !hex.starts_with("040000000001") {
-      return
+async fn validate(hex: String) {
+    if !hex.starts_with("040000000001") {
+        return;
+    }
+    let buffer = hex::decode(hex).expect("Decoding failed");
+    let transaction: Transaction = deserialize(&buffer).expect("Failed to deserialize transaction");
+    if transaction.output.len() != 2 {
+        return;
     }
-   
 }
 
 pub fn router(ctx: Arc<AppContext>) -> Router {
     Router::new()
         .route("/send", post(send_rawtx))
         .route("/test", get(test_rawtx))
-        .route("/:txid", get(get_rawtx))
+        // .route("/:txid", get(get_raw_tx))
         .layer(Extension(ctx))
 }

lib/ain-ocean/src/model/mod.rs

@@ -34,6 +34,7 @@ pub use oracle_token_currency::*;
 pub use poolswap::*;
 pub use poolswap_aggregated::*;
 pub use price_ticker::*;
+pub use raw_tx::*;
 // pub use raw_block::*;
 // pub use script_activity::*;
 // pub use script_aggregation::*;

lib/ain-ocean/src/model/raw_tx.rs

@@ -1,9 +1,9 @@
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, Default)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone)]
 #[serde(rename_all = "camelCase")]
-pub struct RawTx {
+pub struct RawTxDto {
     pub hex: String,
     pub max_fee_rate: Option<Decimal>,
 }