refactor: enable compile without sqlite, move emoji id and common typ…

…es to tari_common_types (tari-project#3266) Description --- It moves emoji id and common types to tari_common_types Motivation and Context --- The main problem here was a dependency on tari_base_node -> tari_wallet for `EmojiId`. Then EmojiId references PublicKey, so ended up moving a whole bunch around. > Note: Hidden in all of this is feature to compile SQLite without having it installed as a lib How Has This Been Tested? --- Manually
hansieodendaal · Aug 31, 2021 · 95ac87d · 95ac87d
1 parent 2c58c12
commit 95ac87d
Show file tree

Hide file tree

Showing 158 changed files with 1,328 additions and 1,093 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml
@@ -11,6 +11,7 @@ edition = "2018"
 tari_common_types = { version = "^0.9", path = "../../base_layer/common_types"}
 tari_core = {  path = "../../base_layer/core"}
 tari_wallet = {  path = "../../base_layer/wallet", optional = true}
+tari_crypto = "0.11.1"
 tari_comms = { path = "../../comms"}
 
 chrono = "0.4.6"
@@ -22,4 +23,4 @@ tonic = "0.5.2"
 tonic-build = "0.5.2"
 
 [features]
-wallet = ["tari_wallet"]
+wallet = ["tari_wallet"]
diff --git a/applications/tari_app_grpc/src/conversions/block_header.rs b/applications/tari_app_grpc/src/conversions/block_header.rs
@@ -25,12 +25,9 @@ use crate::{
     tari_rpc as grpc,
 };
 use std::convert::TryFrom;
-use tari_core::{
-    blocks::BlockHeader,
-    crypto::tari_utilities::{ByteArray, Hashable},
-    proof_of_work::ProofOfWork,
-    transactions::types::BlindingFactor,
-};
+use tari_common_types::types::BlindingFactor;
+use tari_core::{blocks::BlockHeader, proof_of_work::ProofOfWork};
+use tari_crypto::tari_utilities::{ByteArray, Hashable};
 
 impl From<BlockHeader> for grpc::BlockHeader {
     fn from(h: BlockHeader) -> Self {

diff --git a/applications/tari_app_grpc/src/conversions/com_signature.rs b/applications/tari_app_grpc/src/conversions/com_signature.rs
@@ -24,7 +24,7 @@ use std::convert::TryFrom;
 use tari_core::crypto::tari_utilities::ByteArray;
 
 use crate::tari_rpc as grpc;
-use tari_core::transactions::types::{ComSignature, Commitment, PrivateKey};
+use tari_common_types::types::{ComSignature, Commitment, PrivateKey};
 
 impl TryFrom<grpc::ComSignature> for ComSignature {
     type Error = String;

diff --git a/applications/tari_app_grpc/src/conversions/new_block_template.rs b/applications/tari_app_grpc/src/conversions/new_block_template.rs
@@ -22,11 +22,11 @@
 
 use crate::tari_rpc as grpc;
 use std::convert::{TryFrom, TryInto};
+use tari_common_types::types::BlindingFactor;
 use tari_core::{
     blocks::{NewBlockHeaderTemplate, NewBlockTemplate},
     crypto::tari_utilities::ByteArray,
     proof_of_work::ProofOfWork,
-    transactions::types::BlindingFactor,
 };
 impl From<NewBlockTemplate> for grpc::NewBlockTemplate {
     fn from(block: NewBlockTemplate) -> Self {

diff --git a/applications/tari_app_grpc/src/conversions/signature.rs b/applications/tari_app_grpc/src/conversions/signature.rs
@@ -24,7 +24,7 @@ use std::convert::TryFrom;
 use tari_core::crypto::tari_utilities::ByteArray;
 
 use crate::tari_rpc as grpc;
-use tari_core::transactions::types::{PrivateKey, PublicKey, Signature};
+use tari_common_types::types::{PrivateKey, PublicKey, Signature};
 
 impl TryFrom<grpc::Signature> for Signature {
     type Error = String;

diff --git a/applications/tari_app_grpc/src/conversions/transaction_input.rs b/applications/tari_app_grpc/src/conversions/transaction_input.rs
@@ -22,15 +22,11 @@
 
 use crate::tari_rpc as grpc;
 use std::convert::{TryFrom, TryInto};
-use tari_core::{
-    crypto::{
-        script::{ExecutionStack, TariScript},
-        tari_utilities::{ByteArray, Hashable},
-    },
-    transactions::{
-        transaction::TransactionInput,
-        types::{Commitment, PublicKey},
-    },
+use tari_common_types::types::{Commitment, PublicKey};
+use tari_core::transactions::transaction::TransactionInput;
+use tari_crypto::{
+    script::{ExecutionStack, TariScript},
+    tari_utilities::{ByteArray, Hashable},
 };
 
 impl TryFrom<grpc::TransactionInput> for TransactionInput {

diff --git a/applications/tari_app_grpc/src/conversions/transaction_kernel.rs b/applications/tari_app_grpc/src/conversions/transaction_kernel.rs
@@ -22,14 +22,12 @@
 
 use crate::tari_rpc as grpc;
 use std::convert::{TryFrom, TryInto};
-use tari_core::{
-    crypto::tari_utilities::{ByteArray, Hashable},
-    transactions::{
-        tari_amount::MicroTari,
-        transaction::{KernelFeatures, TransactionKernel},
-        types::Commitment,
-    },
+use tari_common_types::types::Commitment;
+use tari_core::transactions::{
+    tari_amount::MicroTari,
+    transaction::{KernelFeatures, TransactionKernel},
 };
+use tari_crypto::tari_utilities::{ByteArray, Hashable};
 
 impl TryFrom<grpc::TransactionKernel> for TransactionKernel {
     type Error = String;

diff --git a/applications/tari_app_grpc/src/conversions/transaction_output.rs b/applications/tari_app_grpc/src/conversions/transaction_output.rs
@@ -22,16 +22,13 @@
 
 use crate::tari_rpc as grpc;
 use std::convert::{TryFrom, TryInto};
+use tari_common_types::types::{BulletRangeProof, Commitment, PublicKey};
 use tari_core::{
     crypto::{
         script::TariScript,
         tari_utilities::{ByteArray, Hashable},
     },
-    transactions::{
-        bullet_rangeproofs::BulletRangeProof,
-        transaction::TransactionOutput,
-        types::{Commitment, PublicKey},
-    },
+    transactions::transaction::TransactionOutput,
 };
 
 impl TryFrom<grpc::TransactionOutput> for TransactionOutput {

diff --git a/applications/tari_app_grpc/src/conversions/unblinded_output.rs b/applications/tari_app_grpc/src/conversions/unblinded_output.rs
@@ -22,16 +22,13 @@
 
 use crate::tari_rpc as grpc;
 use std::convert::{TryFrom, TryInto};
+use tari_common_types::types::{PrivateKey, PublicKey};
 use tari_core::{
     crypto::{
         script::{ExecutionStack, TariScript},
         tari_utilities::ByteArray,
     },
-    transactions::{
-        tari_amount::MicroTari,
-        transaction::UnblindedOutput,
-        types::{PrivateKey, PublicKey},
-    },
+    transactions::{tari_amount::MicroTari, transaction::UnblindedOutput},
 };
 
 impl From<UnblindedOutput> for grpc::UnblindedOutput {

diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2018"
 tari_comms = { path = "../../comms"}
 tari_crypto = "0.11.1"
 tari_common = { path = "../../common" }
+tari_common_types ={ path ="../../base_layer/common_types"}
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
 tari_wallet = { path = "../../base_layer/wallet", optional = true }
 

diff --git a/applications/tari_app_utilities/src/identity_management.rs b/applications/tari_app_utilities/src/identity_management.rs
@@ -25,8 +25,8 @@ use log::*;
 use rand::rngs::OsRng;
 use std::{clone::Clone, fs, path::Path, string::ToString, sync::Arc};
 use tari_common::configuration::bootstrap::prompt;
+use tari_common_types::types::PrivateKey;
 use tari_comms::{multiaddr::Multiaddr, peer_manager::PeerFeatures, NodeIdentity};
-use tari_core::transactions::types::PrivateKey;
 use tari_crypto::{
     keys::SecretKey,
     tari_utilities::{hex::Hex, message_format::MessageFormat},

diff --git a/applications/tari_app_utilities/src/utilities.rs b/applications/tari_app_utilities/src/utilities.rs
@@ -20,9 +20,11 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use crate::identity_management::load_from_json;
 use futures::future::Either;
 use log::*;
+use thiserror::Error;
+use tokio::{runtime, runtime::Runtime};
+
 use tari_common::{CommsTransport, GlobalConfig, SocksAuthentication, TorControlAuthentication};
 use tari_comms::{
     connectivity::ConnectivityError,
@@ -35,10 +37,11 @@ use tari_comms::{
     types::CommsPublicKey,
     utils::multiaddr::multiaddr_to_socketaddr,
 };
-use tari_core::{tari_utilities::hex::Hex, transactions::emoji::EmojiId};
+use tari_core::tari_utilities::hex::Hex;
 use tari_p2p::transport::{TorConfig, TransportType};
-use thiserror::Error;
-use tokio::{runtime, runtime::Runtime};
+
+use crate::identity_management::load_from_json;
+use tari_common_types::emoji::EmojiId;
 
 pub const LOG_TARGET: &str = "tari::application";
 

diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml
@@ -12,6 +12,7 @@ tari_app_grpc = { path = "../tari_app_grpc" }
 tari_app_utilities = { path = "../tari_app_utilities" }
 tari_common = { path = "../../common" }
 tari_comms = { path = "../../comms", features = ["rpc"] }
+tari_common_types = {path = "../../base_layer/common_types"}
 tari_comms_dht = { path = "../../comms/dht" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
 tari_crypto = "0.11.1"
@@ -43,7 +44,7 @@ opentelemetry = { version = "0.16", default-features = false, features = ["trace
 opentelemetry-jaeger = { version="0.15", features=["rt-tokio"]}
 
 [features]
-avx2 = ["tari_core/avx2", "tari_crypto/avx2", "tari_p2p/avx2", "tari_comms/avx2", "tari_comms_dht/avx2"]
+avx2 = ["tari_core/avx2", "tari_crypto/avx2", "tari_p2p/avx2",  "tari_comms/avx2", "tari_comms_dht/avx2"]
 safe = []
 
 
diff --git a/applications/tari_base_node/src/bootstrap.rs b/applications/tari_base_node/src/bootstrap.rs
@@ -20,9 +20,11 @@
 //  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+use std::{cmp, fs, str::FromStr, sync::Arc, time::Duration};
+
 use anyhow::anyhow;
 use log::*;
-use std::{cmp, fs, str::FromStr, sync::Arc, time::Duration};
+
 use tari_app_utilities::{consts, identity_management, utilities::create_transport_type};
 use tari_common::{configuration::bootstrap::ApplicationType, GlobalConfig};
 use tari_comms::{peer_manager::Peer, protocol::rpc::RpcServer, NodeIdentity, UnspawnedCommsNode};
@@ -47,7 +49,7 @@ use tari_core::{
         MempoolServiceInitializer,
         MempoolSyncInitializer,
     },
-    transactions::types::CryptoFactories,
+    transactions::CryptoFactories,
 };
 use tari_p2p::{
     auto_update::{AutoUpdateConfig, SoftwareUpdaterService},

diff --git a/applications/tari_base_node/src/builder.rs b/applications/tari_base_node/src/builder.rs
@@ -20,9 +20,11 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use crate::bootstrap::BaseNodeBootstrapper;
-use log::*;
 use std::sync::Arc;
+
+use log::*;
+use tokio::sync::watch;
+
 use tari_common::{configuration::Network, DatabaseType, GlobalConfig};
 use tari_comms::{peer_manager::NodeIdentity, protocol::rpc::RpcServerHandle, CommsNode};
 use tari_comms_dht::Dht;
@@ -32,7 +34,7 @@ use tari_core::{
     consensus::ConsensusManager,
     mempool::{service::LocalMempoolService, Mempool, MempoolConfig},
     proof_of_work::randomx_factory::RandomXFactory,
-    transactions::types::CryptoFactories,
+    transactions::CryptoFactories,
     validation::{
         block_validators::{BodyOnlyValidator, OrphanBlockValidator},
         header_validator::HeaderValidator,
@@ -48,7 +50,8 @@ use tari_core::{
 use tari_p2p::{auto_update::SoftwareUpdaterHandle, services::liveness::LivenessHandle};
 use tari_service_framework::ServiceHandles;
 use tari_shutdown::ShutdownSignal;
-use tokio::sync::watch;
+
+use crate::bootstrap::BaseNodeBootstrapper;
 
 const LOG_TARGET: &str = "c::bn::initialization";
 

diff --git a/applications/tari_base_node/src/command_handler.rs b/applications/tari_base_node/src/command_handler.rs
@@ -34,6 +34,10 @@ use std::{
 };
 use tari_app_utilities::consts;
 use tari_common::GlobalConfig;
+use tari_common_types::{
+    emoji::EmojiId,
+    types::{Commitment, HashOutput, Signature},
+};
 use tari_comms::{
     connectivity::ConnectivityRequester,
     peer_manager::{NodeId, Peer, PeerFeatures, PeerManager, PeerManagerError, PeerQuery},
@@ -53,10 +57,6 @@ use tari_core::{
     mempool::service::LocalMempoolService,
     proof_of_work::PowAlgorithm,
     tari_utilities::{hex::Hex, message_format::MessageFormat},
-    transactions::{
-        emoji::EmojiId,
-        types::{Commitment, HashOutput, Signature},
-    },
 };
 use tari_crypto::{ristretto::RistrettoPublicKey, tari_utilities::Hashable};
 use tari_p2p::auto_update::SoftwareUpdaterHandle;

diff --git a/applications/tari_base_node/src/grpc/base_node_grpc_server.rs b/applications/tari_base_node/src/grpc/base_node_grpc_server.rs
@@ -37,6 +37,7 @@ use tari_app_grpc::{
     tari_rpc::{CalcType, Sorting},
 };
 use tari_app_utilities::consts;
+use tari_common_types::types::Signature;
 use tari_comms::{Bytes, CommsNode};
 use tari_core::{
     base_node::{
@@ -50,7 +51,7 @@ use tari_core::{
     crypto::tari_utilities::{hex::Hex, ByteArray},
     mempool::{service::LocalMempoolService, TxStorageResponse},
     proof_of_work::PowAlgorithm,
-    transactions::{transaction::Transaction, types::Signature},
+    transactions::transaction::Transaction,
 };
 use tari_crypto::tari_utilities::{message_format::MessageFormat, Hashable};
 use tari_p2p::{auto_update::SoftwareUpdaterHandle, services::liveness::LivenessHandle};

diff --git a/applications/tari_base_node/src/parser.rs b/applications/tari_base_node/src/parser.rs
@@ -40,12 +40,8 @@ use tari_app_utilities::utilities::{
     parse_emoji_id_or_public_key,
     parse_emoji_id_or_public_key_or_node_id,
 };
-use tari_core::{
-    crypto::tari_utilities::hex::from_hex,
-    proof_of_work::PowAlgorithm,
-    tari_utilities::hex::Hex,
-    transactions::types::{Commitment, PrivateKey, PublicKey, Signature},
-};
+use tari_common_types::types::{Commitment, PrivateKey, PublicKey, Signature};
+use tari_core::{crypto::tari_utilities::hex::from_hex, proof_of_work::PowAlgorithm, tari_utilities::hex::Hex};
 use tari_shutdown::Shutdown;
 
 /// Enum representing commands used by the basenode

diff --git a/applications/tari_base_node/src/recovery.rs b/applications/tari_base_node/src/recovery.rs
@@ -21,14 +21,16 @@
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-use anyhow::anyhow;
-use log::*;
 use std::{
     fs,
     io::{self, Write},
     path::Path,
     sync::Arc,
 };
+
+use anyhow::anyhow;
+use log::*;
+
 use tari_app_utilities::utilities::ExitCodes;
 use tari_common::{configuration::Network, DatabaseType, GlobalConfig};
 use tari_core::{
@@ -43,7 +45,7 @@ use tari_core::{
     },
     consensus::ConsensusManager,
     proof_of_work::randomx_factory::RandomXFactory,
-    transactions::types::CryptoFactories,
+    transactions::CryptoFactories,
     validation::{
         block_validators::{BodyOnlyValidator, OrphanBlockValidator},
         header_validator::HeaderValidator,