Allow transaction replacement. Txs should not get stuck

Author: sanket1729

src/client/src/bin/http_server.rs

@@ -1,10 +1,12 @@
 use actix_web::web::Data;
 use actix_web::{middleware, web, App, HttpResponse, HttpServer};
 use options_lib::OptionsContract;
-use options_rpc::ClientArgs;
 use options_rpc::rpc::OptionOps;
+use options_rpc::ClientArgs;
 
-use options_rpc::data_structures::{ContractId, InfoResponse, InitArgs, NetworkParams, ContractArgs};
+use options_rpc::data_structures::{
+    ContractArgs, ContractId, InfoResponse, InitArgs, NetworkParams,
+};
 
 async fn info(item: web::Json<ContractId>, args: Data<ClientArgs>) -> HttpResponse {
     let db = args.read_options_db();
@@ -31,47 +33,59 @@ async fn list(args: Data<ClientArgs>) -> HttpResponse {
 async fn init(init_args: web::Json<InitArgs>, data: Data<ClientArgs>) -> HttpResponse {
     let mut db = data.read_options_db();
     let e_cli = data.elements_cli();
-    let net = NetworkParams {network: data.network.clone()};
+    let net = NetworkParams {
+        network: data.network.clone(),
+    };
     let res = e_cli.initialize(&net, &init_args, &mut db);
     HttpResponse::Ok().json(res) // <- send response
 }
 
 async fn fund(fund_args: web::Json<ContractArgs>, data: Data<ClientArgs>) -> HttpResponse {
     let db = data.read_options_db();
     let e_cli = data.elements_cli();
-    let net = NetworkParams {network: data.network.clone()};
+    let net = NetworkParams {
+        network: data.network.clone(),
+    };
     let res = e_cli.fund(&net, &fund_args, &db);
     HttpResponse::Ok().json(res) // <- send response
 }
 
 async fn exercise(exercise_args: web::Json<ContractArgs>, data: Data<ClientArgs>) -> HttpResponse {
     let db = data.read_options_db();
     let e_cli = data.elements_cli();
-    let net = NetworkParams {network: data.network.clone()};
+    let net = NetworkParams {
+        network: data.network.clone(),
+    };
     let res = e_cli.exercise(&net, &exercise_args, &db);
     HttpResponse::Ok().json(res) // <- send response
 }
 
 async fn cancel(cancel_args: web::Json<ContractArgs>, data: Data<ClientArgs>) -> HttpResponse {
     let db = data.read_options_db();
     let e_cli = data.elements_cli();
-    let net = NetworkParams {network: data.network.clone()};
+    let net = NetworkParams {
+        network: data.network.clone(),
+    };
     let res = e_cli.cancel(&net, &cancel_args, &db);
     HttpResponse::Ok().json(res) // <- send response
 }
 
 async fn expiry(expiry_args: web::Json<ContractArgs>, data: Data<ClientArgs>) -> HttpResponse {
     let db = data.read_options_db();
     let e_cli = data.elements_cli();
-    let net = NetworkParams {network: data.network.clone()};
+    let net = NetworkParams {
+        network: data.network.clone(),
+    };
     let res = e_cli.expiry(&net, &expiry_args, &db);
     HttpResponse::Ok().json(res) // <- send response
 }
 
 async fn settle(settle_args: web::Json<ContractArgs>, data: Data<ClientArgs>) -> HttpResponse {
     let db = data.read_options_db();
     let e_cli = data.elements_cli();
-    let net = NetworkParams {network: data.network.clone()};
+    let net = NetworkParams {
+        network: data.network.clone(),
+    };
     let res = e_cli.settle(&net, &settle_args, &db);
     HttpResponse::Ok().json(res) // <- send response
 }
@@ -102,4 +116,4 @@ async fn main() -> std::io::Result<()> {
     .bind(("127.0.0.1", 8080))?
     .run()
     .await
-}
+}

src/client/src/bin/opt_cli.rs

@@ -1,12 +1,12 @@
-use std::fmt::Debug;
-use std::path::{PathBuf};
-use std::{env, panic, process};
 use options_rpc::data_structures::InfoResponse;
 use options_rpc::{data_structures, utils};
+use std::fmt::Debug;
+use std::path::PathBuf;
+use std::{env, panic, process};
 
 use clap::{Parser, Subcommand};
-use data_structures::{InitArgs, ContractArgs, ContractId, NetworkParams};
-use elementsd::bitcoincore_rpc::{Client};
+use data_structures::{ContractArgs, ContractId, InitArgs, NetworkParams};
+use elementsd::bitcoincore_rpc::Client;
 use options_lib::OptionsContract;
 use options_rpc::rpc::OptionOps;
 
@@ -135,4 +135,4 @@ where
     T: ?Sized + Serialize + Debug,
 {
     println!("{}", serde_json::to_string_pretty(value).unwrap())
-}
+}

src/client/src/contract.rs

@@ -15,7 +15,9 @@ pub struct OptionsBook {
 impl OptionsBook {
     /// Creates a new [`OptionsBook`].
     pub fn new(path: &Path) -> Self {
-        Self { book: sled::open(path).unwrap() }
+        Self {
+            book: sled::open(path).unwrap(),
+        }
     }
 
     /// Gets the contract from the book. Panic if the contract is not found
@@ -27,6 +29,8 @@ impl OptionsBook {
     /// Inserts a contract into the book
     pub fn insert(&self, contract: &OptionsContract) {
         let key = contract.id();
-        self.book.insert(key.as_inner(), contract.serialize()).unwrap();
+        self.book
+            .insert(key.as_inner(), contract.serialize())
+            .unwrap();
     }
 }

src/client/src/data_structures.rs

@@ -1,16 +1,16 @@
 //! Data structures shared across local client and RPC server
 
-use std::path::{PathBuf};
-use std::{panic};
+use std::panic;
+use std::path::PathBuf;
 
+use bitcoin::hashes::hex::FromHex;
 use clap::Args;
 use elementsd::bitcoincore_rpc::bitcoin;
-use bitcoin::hashes::hex::FromHex;
-use elementsd::bitcoincore_rpc::{Client};
+use elementsd::bitcoincore_rpc::Client;
+use options_lib::miniscript::elements::{self, AddressParams, AssetId};
 use options_lib::OptionsContract;
-use options_lib::miniscript::elements::{AddressParams, AssetId, self};
 use secp256k1::hashes::sha256;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use crate::contract::OptionsBook;
 use crate::rpc::OptionOps;
@@ -85,7 +85,6 @@ pub struct InfoResponse {
 }
 
 impl InfoResponse {
-
     pub fn from_contract(contract: &OptionsContract, e_cli: &Client) -> Self {
         InfoResponse {
             id: contract.id(),
@@ -170,4 +169,4 @@ impl ClientArgs {
         let data_dir = utils::_data_dir(&self.data_dir);
         utils::_new_client(data_dir, self.rpc_port, &self.network, &self.wallet_name)
     }
-}
+}

src/client/src/lib.rs

@@ -1,6 +1,6 @@
+pub mod contract;
 ///! Library for exporting common utilities to the rest of the project.
 pub mod data_structures;
-pub mod contract;
 pub mod rpc;
 pub mod utils;
-pub use data_structures::ClientArgs;
+pub use data_structures::ClientArgs;