re-import onion primitives from grin-wallet contracts branch

src/config.rs

@@ -12,6 +12,7 @@ use rand::{Rng, thread_rng};
 use ring::{aead, pbkdf2};
 use serde_derive::{Deserialize, Serialize};
 use thiserror::Error;
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 
 use grin_onion::crypto::dalek::DalekPublicKey;
 use grin_onion::crypto::secp::SecretKey;

src/mix_client.rs

@@ -10,6 +10,7 @@ use serde_json::json;
 use thiserror::Error;
 use tor_rtcompat::Runtime;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::dalek::{self, DalekPublicKey};
 use grin_onion::onion::Onion;
 

src/node.rs

@@ -12,6 +12,7 @@ use grin_util::ToHex;
 use serde_json::json;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::secp::Commitment;
 
 use crate::http;

src/servers/mix.rs

@@ -10,6 +10,7 @@ use grin_core::ser::ProtocolVersion;
 use itertools::Itertools;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::dalek::{self, DalekSignature};
 use grin_onion::onion::{Onion, OnionError, PeeledOnion};
 use secp256k1zkp::key::ZERO_KEY;

src/servers/mix_rpc.rs

@@ -6,6 +6,7 @@ use jsonrpc_http_server::{DomainsValidation, ServerBuilder};
 use jsonrpc_http_server::jsonrpc_core::{self, BoxFuture, IoHandler};
 use serde::{Deserialize, Serialize};
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::dalek::{self, DalekSignature};
 use grin_onion::onion::Onion;
 

src/servers/swap.rs

@@ -9,6 +9,7 @@ use itertools::Itertools;
 use secp256k1zkp::key::ZERO_KEY;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::comsig::ComSignature;
 use grin_onion::crypto::secp::{Commitment, Secp256k1, SecretKey};
 use grin_onion::onion::{Onion, OnionError};

src/servers/swap_rpc.rs

@@ -6,6 +6,7 @@ use jsonrpc_derive::rpc;
 use jsonrpc_http_server::{DomainsValidation, ServerBuilder};
 use serde::{Deserialize, Serialize};
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::comsig::{self, ComSignature};
 use grin_onion::onion::Onion;
 

src/store.rs

@@ -7,6 +7,7 @@ use grin_store::{self as store, Store};
 use grin_util::ToHex;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::secp::{self, Commitment, RangeProof, SecretKey};
 use grin_onion::onion::Onion;
 use grin_onion::util::{read_optional, write_optional};

src/tx.rs

@@ -4,6 +4,7 @@ use grin_core::core::{
 	FeeFields, Input, Inputs, KernelFeatures, Output, Transaction, TransactionBody, TxKernel,
 };
 use grin_keychain::BlindingFactor;
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::secp;
 use secp256k1zkp::{ContextFlag, Secp256k1, SecretKey};
 use serde::{Deserialize, Serialize};

src/wallet.rs

@@ -11,6 +11,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::json;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::secp;
 use secp256k1zkp::{PublicKey, Secp256k1, SecretKey};