Skip to content

Commit 92d15fa

Browse files
Merge #118
118: chore: move nuc, nilauth-client, and nilchain-client to external repos r=mfontanini a=mfontanini In the anticipation of open sourcing the nilauth repo we want to have its dependencies split out into separate repos. In particular, nuc-rs and nilchain-client were here just because they've always been part of the monorepo but in reality they're not really part of `nilvm`, or at least not exclusively in the case of nilchain-client. They may _use_ it but they're not part of it. These dependencies are now moved to the following repos: * [nuc-rs](https://github.com/NillionNetwork/nuc-rs) * [nilauth-client-rs](https://github.com/NillionNetwork/nilauth-client-rs) * [nilchain-client-rs](https://github.com/NillionNetwork/nilchain-client-rs) As part of this I also renamed `nillion-chain-node` to `nilchain-node` for consistency. Co-authored-by: Matias Fontanini <[email protected]>
2 parents 2c37924 + 06919ae commit 92d15fa

File tree

47 files changed

+82
-4505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+82
-4505
lines changed

Cargo.lock

Lines changed: 44 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ members = [
2525
"libs/threshold-keypair",
2626
"libs/nada-values-args",
2727
"libs/client-metrics",
28-
"libs/nillion-chain/client",
29-
"libs/nillion-chain/node",
30-
"libs/nillion-chain/transactions",
31-
"libs/nucs",
28+
"libs/nilchain-node",
3229
"nada-lang/compiler-backend",
3330
"nada-lang/compiler-backend-tests",
3431
"nada-lang/pynadac",
@@ -63,11 +60,13 @@ members = [
6360
"libs/node-api",
6461
"libs/grpc-channel",
6562
"libs/client-core",
66-
"libs/nilauth-client",
6763
]
6864

6965
exclude = ["wasm-workspace"]
7066

67+
[workspace.dependencies]
68+
nilchain-client = { git = "https://github.com/NillionNetwork/nilchain-client-rs.git", rev = "958674cd4d667632c469e2d210fb3b6e1867ab7c" }
69+
7170
[profile.release]
7271
lto = true
7372
strip = true

client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ nada-value = { path = "../libs/nada-value", default-features = false, features =
2020
math_lib = { path = "../libs/math" }
2121
node-api = { path = "../libs/node-api", features = ["rust-types"] }
2222
user-keypair = { path = "../libs/user-keypair" }
23-
nillion-chain-client = { path = "../libs/nillion-chain/client" }
23+
nilchain-client = { workspace = true }

client/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub mod payments;
2222
pub(crate) mod retry;
2323
pub mod vm;
2424

25-
pub use nillion_chain_client::transactions::TokenAmount;
25+
pub use nilchain_client::transactions::TokenAmount;
2626
pub use nillion_client_core::values::{Clear, NadaType, NadaValue};
2727
pub use node_api::auth::rust::UserId;
2828
pub use tonic::async_trait;

client/src/operation/add_funds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use super::{BuildError, InitialState, InitialStateInvokeError, InvokeError, PaymentError};
44
use crate::{payments::TxHash, vm::VmClient};
5-
use nillion_chain_client::transactions::TokenAmount;
5+
use nilchain_client::transactions::TokenAmount;
66
use node_api::{
77
auth::rust::UserId,
88
payments::rust::{AddFundsPayload, AddFundsRequest},

client/src/operation/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
vm::{PaymentMode, VmClient},
88
};
99
use nada_value::protobuf::nada_values_to_protobuf;
10-
use nillion_chain_client::transactions::TokenAmount;
10+
use nilchain_client::transactions::TokenAmount;
1111
use nillion_client_core::values::{EncryptedValues, PartyId, PartyShares};
1212
use node_api::{
1313
errors::StatusExt,

client/src/payments.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//! Payments related types.
22
3-
use nillion_chain_client::transactions::TokenAmount;
3+
use nilchain_client::transactions::TokenAmount;
44
use std::{fmt, sync::Arc};
55
use tokio::sync::Mutex;
66
use tonic::async_trait;
77

8-
pub use nillion_chain_client::{client::NillionChainClient, key::NillionChainPrivateKey};
8+
pub use nilchain_client::{client::NillionChainClient, key::NillionChainPrivateKey};
99

1010
/// A payer that uses the nilchain to submit payments.
1111
#[async_trait]

libs/nilauth-client/Cargo.toml

Lines changed: 0 additions & 21 deletions
This file was deleted.

libs/nilauth-client/examples/mint.rs

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)