Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ license = "LICENSE.md"
readme = "README.md"
authors = ["Torben Poguntke <torben@drasil.io>"]


[dependencies]
surf = "2.3.2"
async-std = "1.12.0"
mobc = "0.5.11"
mobc-postgres = "0.5.0"
hyper = "0.13"
hyper-tls = "0.4.1"
cardano-serialization-lib = "11.4.0"
csl-common = { git = "https://github.com/drasil-blockchain/csl-common.git", branch = "main" }
#cryptoxide = { version = "0.4.2", features = ["blake2"] }
Expand Down Expand Up @@ -52,7 +57,7 @@ blockfrost = "0.2.0"
async-trait = "0.1.58"


tokio = { version = "1", features = ["full"] }
tokio = { version = "1.33", features = ["full", "macros", "sync", "sync", "rt-multi-thread"] }
tokio-stream = "0.1.6"
futures = "0.3.21"
warp = { version = "0.3", features = ["tls"] }
Expand Down Expand Up @@ -86,3 +91,7 @@ path = "src/lib.rs"
[[bin]]
name = "cdp-server"
path = "src/bin/server.rs"

[dev-dependencies]
wiremock = "0.5"
lazy_static = "=1.4.0"
2 changes: 2 additions & 0 deletions src/bin/server.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![recursion_limit = "256"]

use std::path::PathBuf;
pub type Error = Box<dyn std::error::Error + Send + Sync>;
pub type Result<T> = std::result::Result<T, cdp::provider::error::DataProviderError>;

Expand Down
11 changes: 2 additions & 9 deletions src/blockfrost/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub fn select_addr_of_first_transaction(
}

/// get all utxos of an address
pub fn utxo_by_dataumhash(
pub fn utxo_by_datumhash(
bfp: &BlockfrostProvider,
addr: &str,
datumhash: &Vec<u8>,
Expand Down Expand Up @@ -262,7 +262,7 @@ pub fn retrieve_generated_rewards (
pub fn pool_vrf_key_hash (
bfp: &BlockfrostProvider,
pool_hash: &str,
) -> Result<Vec<u8>, DataProviderError> {
) -> Result<String, DataProviderError> {
todo!()
}

Expand Down Expand Up @@ -315,13 +315,6 @@ pub fn pool_fixed_cost(
todo!()
}

pub fn pool_reward_address(
bfp: &BlockfrostProvider,
pool_hash: &str,
) -> Result<String, DataProviderError> {
todo!()
}

pub fn pool_owner(
bfp: &BlockfrostProvider,
pool_hash: &str,
Expand Down
15 changes: 4 additions & 11 deletions src/blockfrost/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl super::provider::CardanoDataProvider for BlockfrostProvider {
Ok(api::get_stake_address_utxos(self, stake_addr).await?)
}

async fn script_utxos(
async fn get_address_utxos(
&self,
addr: &str,
) -> Result<dcslc::TransactionUnspentOutputs, DataProviderError> {
Expand Down Expand Up @@ -93,12 +93,12 @@ impl super::provider::CardanoDataProvider for BlockfrostProvider {
Ok(dcslc::addr_from_str(&str_addr)?)
}

async fn utxo_by_dataumhash(
async fn utxo_by_datumhash(
&self,
addr: &str,
datumhash: &Vec<u8>,
) -> Result<dcslc::TransactionUnspentOutput, DataProviderError> {
let utxo = api::utxo_by_dataumhash(self, addr, datumhash)?;
let utxo = api::utxo_by_datumhash(self, addr, datumhash)?;
Ok(utxo)
}

Expand Down Expand Up @@ -272,7 +272,7 @@ impl super::provider::CardanoDataProvider for BlockfrostProvider {
async fn pool_vrf_key_hash (
&self,
pool_hash: &str,
) -> Result<Vec<u8>, DataProviderError> {
) -> Result<String, DataProviderError> {
Ok(api::pool_vrf_key_hash(self, pool_hash)?)
}

Expand Down Expand Up @@ -325,13 +325,6 @@ impl super::provider::CardanoDataProvider for BlockfrostProvider {
Ok(api::pool_fixed_cost(self, pool_hash)?)
}

async fn pool_reward_address(
&self,
pool_hash: &str,
) -> Result<String, DataProviderError> {
Ok(api::pool_reward_address(self, pool_hash)?)
}

async fn pool_owner(
&self,
pool_hash: &str,
Expand Down
11 changes: 2 additions & 9 deletions src/carb/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub fn select_addr_of_first_transaction(
}

/// get all utxos of an address
pub fn utxo_by_dataumhash(
pub fn utxo_by_datumhash(
bfp: &CarbProvider,
addr: &str,
datumhash: &Vec<u8>,
Expand Down Expand Up @@ -203,7 +203,7 @@ pub fn retrieve_generated_rewards (
pub fn pool_vrf_key_hash (
bfp: &CarbProvider,
pool_hash: &str,
) -> Result<Vec<u8>, DataProviderError> {
) -> Result<String, DataProviderError> {
todo!()
}

Expand Down Expand Up @@ -256,13 +256,6 @@ pub fn pool_fixed_cost(
todo!()
}

pub fn pool_reward_address(
bfp: &CarbProvider,
pool_hash: &str,
) -> Result<String, DataProviderError> {
todo!()
}

pub fn pool_owner(
bfp: &CarbProvider,
pool_hash: &str,
Expand Down
15 changes: 4 additions & 11 deletions src/carb/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl super::provider::CardanoDataProvider for CarbProvider {
Ok(api::get_stake_address_utxos(self, stake_addr)?)
}

async fn script_utxos(
async fn get_address_utxos(
&self,
addr: &str,
) -> Result<dcslc::TransactionUnspentOutputs, DataProviderError> {
Expand Down Expand Up @@ -81,12 +81,12 @@ impl super::provider::CardanoDataProvider for CarbProvider {
Ok(dcslc::addr_from_str(&str_addr)?)
}

async fn utxo_by_dataumhash(
async fn utxo_by_datumhash(
&self,
addr: &str,
datumhash: &Vec<u8>,
) -> Result<dcslc::TransactionUnspentOutput, DataProviderError> {
let utxo = api::utxo_by_dataumhash(self, addr, datumhash)?;
let utxo = api::utxo_by_datumhash(self, addr, datumhash)?;
Ok(utxo)
}

Expand Down Expand Up @@ -260,7 +260,7 @@ impl super::provider::CardanoDataProvider for CarbProvider {
async fn pool_vrf_key_hash (
&self,
pool_hash: &str,
) -> Result<Vec<u8>, DataProviderError> {
) -> Result<String, DataProviderError> {
Ok(api::pool_vrf_key_hash(self, pool_hash)?)
}

Expand Down Expand Up @@ -313,13 +313,6 @@ impl super::provider::CardanoDataProvider for CarbProvider {
Ok(api::pool_fixed_cost(self, pool_hash)?)
}

async fn pool_reward_address(
&self,
pool_hash: &str,
) -> Result<String, DataProviderError> {
Ok(api::pool_reward_address(self, pool_hash)?)
}

async fn pool_owner(
&self,
pool_hash: &str,
Expand Down
Loading