Merge ethereum_support into cnd crate

Author: thomaseizinger

Cargo.lock

@@ -1,2 +1,2 @@
 [workspace]
-members = ["cnd", "libp2p-comit", "internal/*"]
+members = ["cnd", "libp2p-comit"]

Cargo.toml

@@ -9,9 +9,11 @@ description = "Reference implementation of a COMIT network daemon."
 anyhow = "1"
 async-std = "1"
 async-trait = "0.1"
+bigdecimal = "0.1.0"
 binary_macros = "0.6"
 bitcoin = "0.19.1"
 blockchain_contracts = "0.1"
+byteorder = "1.3"
 chrono = { version = "0.4", features = ["serde"] }
 config = { version = "0.9", features = ["toml"] }
 debug_stub_derive = "0.3"
@@ -23,7 +25,6 @@ directories = "2.0"
 either = "1.5"
 enum-display-derive = "0.1"
 ethbloom = "0.6.4"
-ethereum_support = { path = "../internal/ethereum_support" }
 fern = { version = "0.5", features = ["colored"] }
 futures = { version = "0.1" }
 futures-core = { version = "=0.3.0-alpha.19", features = ["alloc", "compat", "async-await"], package = "futures-preview" }
@@ -40,11 +41,12 @@ log = { version = "0.4", features = ["serde"] }
 maplit = "1"
 mime = "0.3"
 mime_guess = "2.0"
+num = "0.2"
 paste = "0.1"
 pem = "0.7"
 rand = "0.7"
+regex = "1.3"
 reqwest = { version = "0.9", default-features = false }
-rlp = "0.4"
 rust-crypto = "0.2"
 rustic_hal = "0.2"
 serde = { version = "1", features = ["derive"] }
@@ -56,13 +58,29 @@ strum = "0.16"
 strum_macros = "0.16"
 testcontainers = "0.8"
 thiserror = "1"
+tiny-keccak = { version = "2.0", features = ["keccak"] }
 tokio = "0.1"
 toml = "0.5"
 url_serde = "0.2.0"
 uuid = { version = "0.8", features = ["serde", "v4"] }
 void = "1.0.2"
 warp = { version = "0.1", default-features = false }
 
+# These versions need to be "in sync".
+# web3 0.8 gives us primitive-types 0.3.0
+# primitive-types 0.3.0 with the "rlp" feature gives us "rlp" version 0.4.2
+[dependencies.web3]
+default-features = false
+features = ["http"]
+version = "0.8"
+
+[dependencies.primitive-types]
+features = ["rlp"]
+version = "0.3.0"
+
+[dependencies.rlp]
+version = "0.4.2"
+
 [dev-dependencies]
 base64 = "0.11"
 bitcoincore-rpc = "0.8.0-rc1"
@@ -71,7 +89,6 @@ matches = "0.1.8"
 memsocket = "0.1"
 pretty_env_logger = "0.3"
 quickcheck = "0.9.0"
-regex = "1.3.1"
 serde_urlencoded = "0.6"
 spectral = "0.6"
 tempfile = "3.1.0"

cnd/Cargo.toml

@@ -5,8 +5,10 @@ pub use self::{
     transaction_pattern::{Event, Topic, TransactionPattern},
     web3_connector::Web3Connector,
 };
-use crate::btsieve::{BlockByHash, LatestBlock, MatchingTransactions, ReceiptByHash};
-use ethereum_support::TransactionAndReceipt;
+use crate::{
+    btsieve::{BlockByHash, LatestBlock, MatchingTransactions, ReceiptByHash},
+    ethereum::TransactionAndReceipt,
+};
 use futures_core::{compat::Future01CompatExt, TryFutureExt};
 use std::ops::Add;
 use tokio::{
@@ -16,11 +18,11 @@ use tokio::{
 
 impl<C> MatchingTransactions<TransactionPattern> for C
 where
-    C: LatestBlock<Block = Option<ethereum_support::Block<ethereum_support::Transaction>>>
-        + BlockByHash<Block = Option<ethereum_support::Block<ethereum_support::Transaction>>>
+    C: LatestBlock<Block = Option<crate::ethereum::Block<crate::ethereum::Transaction>>>
+        + BlockByHash<Block = Option<crate::ethereum::Block<crate::ethereum::Transaction>>>
         + ReceiptByHash<
-            Receipt = Option<ethereum_support::TransactionReceipt>,
-            TransactionHash = ethereum_support::H256,
+            Receipt = Option<crate::ethereum::TransactionReceipt>,
+            TransactionHash = crate::ethereum::H256,
         > + Clone,
 {
     type Transaction = TransactionAndReceipt;
@@ -40,11 +42,11 @@ async fn matching_transaction<C>(
     pattern: TransactionPattern,
 ) -> Result<TransactionAndReceipt, ()>
 where
-    C: LatestBlock<Block = Option<ethereum_support::Block<ethereum_support::Transaction>>>
-        + BlockByHash<Block = Option<ethereum_support::Block<ethereum_support::Transaction>>>
+    C: LatestBlock<Block = Option<crate::ethereum::Block<crate::ethereum::Transaction>>>
+        + BlockByHash<Block = Option<crate::ethereum::Block<crate::ethereum::Transaction>>>
         + ReceiptByHash<
-            Receipt = Option<ethereum_support::TransactionReceipt>,
-            TransactionHash = ethereum_support::H256,
+            Receipt = Option<crate::ethereum::TransactionReceipt>,
+            TransactionHash = crate::ethereum::H256,
         > + Clone,
 {
     loop {

cnd/src/btsieve/ethereum/mod.rs

@@ -1,8 +1,5 @@
+use crate::ethereum::{Address, Block, Bytes, Transaction, TransactionReceipt, H256};
 use ethbloom::Input;
-use ethereum_support::{
-    web3::types::{TransactionReceipt, H256},
-    Address, Block, Bytes, Transaction,
-};
 
 #[derive(Clone, Default, Debug, Eq, PartialEq)]
 /// If the field is set to Some(foo) then only transactions matching foo are
@@ -165,9 +162,11 @@ pub struct Event {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::quickcheck::Quickcheck;
-    use ethereum_support::web3::types::{
-        Address, Block, Bytes, Log, Transaction, TransactionReceipt, H160, H2048, H256,
+    use crate::{
+        ethereum::{
+            Address, Block, Bytes, Log, Transaction, TransactionReceipt, H160, H2048, H256,
+        },
+        quickcheck::Quickcheck,
     };
     use spectral::prelude::*;
     use std::str::FromStr;

cnd/src/btsieve/ethereum/transaction_pattern.rs

@@ -1,14 +1,15 @@
-use crate::btsieve::{BlockByHash, LatestBlock, ReceiptByHash};
-use ethereum_support::{
-    web3::{
-        self,
-        futures::Future,
-        transports::{EventLoopHandle, Http},
-        types::BlockId,
-        Web3,
+use crate::{
+    btsieve::{BlockByHash, LatestBlock, ReceiptByHash},
+    ethereum::{
+        web3::{
+            self,
+            transports::{EventLoopHandle, Http},
+            Web3,
+        },
+        BlockId, BlockNumber,
     },
-    BlockNumber,
 };
+use futures::Future;
 use reqwest::Url;
 use std::sync::Arc;
 
@@ -30,9 +31,9 @@ impl Web3Connector {
 }
 
 impl LatestBlock for Web3Connector {
-    type Error = web3::Error;
-    type Block = Option<ethereum_support::Block<ethereum_support::Transaction>>;
-    type BlockHash = ethereum_support::H256;
+    type Error = crate::ethereum::web3::Error;
+    type Block = Option<crate::ethereum::Block<crate::ethereum::Transaction>>;
+    type BlockHash = crate::ethereum::H256;
 
     fn latest_block(
         &mut self,
@@ -46,9 +47,9 @@ impl LatestBlock for Web3Connector {
 }
 
 impl BlockByHash for Web3Connector {
-    type Error = web3::Error;
-    type Block = Option<ethereum_support::Block<ethereum_support::Transaction>>;
-    type BlockHash = ethereum_support::H256;
+    type Error = crate::ethereum::web3::Error;
+    type Block = Option<crate::ethereum::Block<crate::ethereum::Transaction>>;
+    type BlockHash = crate::ethereum::H256;
 
     fn block_by_hash(
         &self,
@@ -60,9 +61,9 @@ impl BlockByHash for Web3Connector {
 }
 
 impl ReceiptByHash for Web3Connector {
-    type Receipt = Option<ethereum_support::TransactionReceipt>;
-    type TransactionHash = ethereum_support::H256;
-    type Error = web3::Error;
+    type Receipt = Option<crate::ethereum::TransactionReceipt>;
+    type TransactionHash = crate::ethereum::H256;
+    type Error = crate::ethereum::web3::Error;
 
     fn receipt_by_hash(
         &self,

cnd/src/btsieve/ethereum/web3_connector.rs

@@ -1,4 +1,5 @@
 use crate::{
+    ethereum::Erc20Token,
     libp2p_comit_ext::{FromHeader, ToHeader},
     swap_protocols::{
         asset::AssetKind,
@@ -8,7 +9,6 @@ use crate::{
     },
 };
 use bitcoin::util::amount::Denomination;
-use ethereum_support::Erc20Token;
 use libp2p_comit::frame::Header;
 use serde::de::Error;
 use std::fmt;
@@ -146,9 +146,11 @@ impl FromHeader for Decision {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::swap_protocols::{ledger::ethereum, HashFunction};
+    use crate::{
+        ethereum::{Address, Erc20Quantity, U256},
+        swap_protocols::{ledger::ethereum, HashFunction},
+    };
     use bitcoin::Amount;
-    use ethereum_support::{Address, Erc20Quantity, U256};
     use spectral::prelude::*;
 
     #[test]

cnd/src/comit_api/mod.rs

@@ -4,14 +4,14 @@ use crate::{
         swap_types::{DetermineTypes, SwapTypes},
         AssetKind, LedgerKind, Retrieve, Save, Sqlite, Swap,
     },
+    ethereum::{Erc20Token, EtherQuantity},
     quickcheck::Quickcheck,
     swap_protocols::{
         ledger::{Bitcoin, Ethereum},
         rfc003::{Accept, Request},
     },
 };
 use bitcoin::Amount as BitcoinAmount;
-use ethereum_support::{Erc20Token, EtherQuantity};
 use std::path::Path;
 
 macro_rules! db_roundtrip_test {

cnd/src/db/integration_tests.rs

@@ -4,6 +4,7 @@ use crate::{
         new_types::{DecimalU256, EthereumAddress, Satoshis},
         schema, Sqlite,
     },
+    ethereum::{Erc20Quantity, Erc20Token, EtherQuantity, U256},
     swap_protocols::{
         asset::Asset,
         ledger::{ethereum::ChainId, Bitcoin, Ethereum},
@@ -16,7 +17,6 @@ use crate::{
 };
 use async_trait::async_trait;
 use diesel::{self, prelude::*, RunQueryDsl};
-use ethereum_support::{Erc20Quantity, Erc20Token, EtherQuantity, U256};
 
 pub type AcceptedSwap<AL, BL, AA, BA> = (Request<AL, BL, AA, BA>, Accept<AL, BL>);
 
@@ -53,7 +53,7 @@ impl LoadAcceptedSwap<Bitcoin, Ethereum, bitcoin::Amount, EtherQuantity> for Sql
         &self,
         key: SwapId,
     ) -> anyhow::Result<
-        AcceptedSwap<Bitcoin, Ethereum, bitcoin::Amount, ethereum_support::EtherQuantity>,
+        AcceptedSwap<Bitcoin, Ethereum, bitcoin::Amount, crate::ethereum::EtherQuantity>,
     > {
         use schema::{
             rfc003_bitcoin_ethereum_accept_messages as accept_messages,

cnd/src/db/load_swaps.rs

@@ -1,4 +1,4 @@
-use ethereum_support::{FromDecimalStr, U256};
+use crate::ethereum::{FromDecimalStr, U256};
 use std::{fmt, str::FromStr};
 
 /// A new type for representing satoshis
@@ -29,7 +29,7 @@ impl From<DecimalU256> for U256 {
 }
 
 impl FromStr for DecimalU256 {
-    type Err = <ethereum_support::U256 as FromDecimalStr>::Err;
+    type Err = <crate::ethereum::U256 as FromDecimalStr>::Err;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         U256::from_decimal_str(s).map(DecimalU256)
@@ -47,10 +47,10 @@ impl fmt::Display for DecimalU256 {
 /// Together with the `Text` sql type, this will store an ethereum address in
 /// hex encoding.
 #[derive(Debug, Clone, Copy, PartialEq)]
-pub struct EthereumAddress(pub ethereum_support::Address);
+pub struct EthereumAddress(pub crate::ethereum::Address);
 
 impl FromStr for EthereumAddress {
-    type Err = <ethereum_support::Address as FromStr>::Err;
+    type Err = <crate::ethereum::Address as FromStr>::Err;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         s.parse().map(EthereumAddress)