switch from LP to credits and allow slots

Cargo.lock

@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+# SPDX-License-Identifier: Apache-2.0
 version = 4
 
 [[package]]
@@ -1184,7 +1183,7 @@ dependencies = [
 [[package]]
 name = "detee-shared"
 version = "0.1.0"
-source = "git+ssh://git@gitea.detee.cloud/testnet/proto.git?branch=surreal_brain_app#0b195b4589e4ec689af7ddca27dc051716ecee78"
+source = "git+ssh://git@gitea.detee.cloud/testnet/proto.git?branch=credits-v2#f344c171c5a8d7ae8cad1628396e6b3a1af0f1ba"
 dependencies = [
  "bincode",
  "prost",

Cargo.toml

@@ -36,7 +36,7 @@ tokio-retry = "0.3.0"
 detee-sgx = { git = "ssh://git@gitea.detee.cloud/testnet/detee-sgx.git", branch = "hratls", features=["hratls", "qvl"] }
 shadow-rs = { version = "1.1.1", features = ["metadata"] }
 
-detee-shared = { git = "ssh://git@gitea.detee.cloud/testnet/proto.git", branch = "surreal_brain_app" }
+detee-shared = { git = "ssh://git@gitea.detee.cloud/testnet/proto.git", branch = "credits-v2" }
 # detee-shared = { path = "../detee-shared" }
 
 [build-dependencies]

src/bin/detee-cli.rs

@@ -347,16 +347,16 @@ fn clap_cmd() -> Command {
                 .arg(
                     Arg::new("memory")
                     .long("memory")
-                    .default_value("1000")
+                    .default_value("1")
-                    .value_parser(clap::value_parser!(u32).range(800..123000))
+                    .value_parser(clap::value_parser!(u32).range(1..500))
-                    .help("memory in MB")
+                    .help("memory in GiB")
                 )
                 .arg(
                     Arg::new("disk")
                     .long("disk")
                     .default_value("10")
                     .value_parser(clap::value_parser!(u32).range(5..500))
-                    .help("disk size in GB")
+                    .help("disk size in GiB")
                 )
                 .arg(
                     Arg::new("distribution")
@@ -375,8 +375,8 @@ fn clap_cmd() -> Command {
                 .arg(
                     Arg::new("price")
                     .long("price")
-                    .help("price per unit per minute; check docs")
+                    .help("maxium accepted price per unit per minute")
-                    .default_value("20000")
+                    .default_value("4000")
                     .value_parser(clap::value_parser!(u64).range(1..50000000))
                 )
                 .arg(

src/general/grpc.rs

@@ -96,7 +96,7 @@ pub async fn kick_contract(contract_uuid: String, reason: String) -> Result<u64,
         })?)
         .await?
         .into_inner()
-        .nano_lp)
+        .nano_credits)
 }
 
 pub async fn ban_user(user_wallet: String) -> Result<(), Error> {

src/snp/cli_handler.rs

@@ -69,8 +69,8 @@ fn handle_vm_deploy(matches: &ArgMatches) -> Result<snp::VmSshArgs, Box<dyn Erro
         ipv4,
         public_ipv6: false,
         vcpus: *matches.get_one::<u32>("vcpus").unwrap(),
-        memory_mb: *matches.get_one::<u32>("memory").unwrap(),
+        memory_gib: *matches.get_one::<u32>("memory").unwrap(),
-        disk_size_gb: *matches.get_one::<u32>("disk").unwrap(),
+        disk_size_gib: *matches.get_one::<u32>("disk").unwrap(),
         dtrfs: None,
         hours: *matches.get_one::<u32>("hours").unwrap(),
         price: *matches.get_one::<u64>("price").unwrap(),

src/snp/deploy.rs

@@ -51,8 +51,8 @@ pub struct Request {
     pub ipv4: IPv4Config,
     pub public_ipv6: bool,
     pub vcpus: u32,
-    pub memory_mb: u32,
+    pub memory_gib: u32,
-    pub disk_size_gb: u32,
+    pub disk_size_gib: u32,
     pub dtrfs: Option<Dtrfs>,
     pub distro: Option<Distro>,
 }
@@ -126,8 +126,8 @@ impl Request {
         };
         let locked_nano = super::calculate_nanolp(
             self.vcpus,
-            self.memory_mb,
+            self.memory_gib,
-            self.disk_size_gb,
+            self.disk_size_gib,
             public_ipv4,
             self.hours,
             self.price,
@@ -140,9 +140,9 @@ impl Request {
             extra_ports,
             public_ipv4,
             public_ipv6: self.public_ipv6,
-            disk_size_gb: self.disk_size_gb,
+            disk_size_mib: self.disk_size_gib * 1024,
             vcpus: self.vcpus,
-            memory_mb: self.memory_mb,
+            memory_mib: self.memory_gib * 1024,
             kernel_url,
             kernel_sha,
             dtrfs_url,
@@ -157,7 +157,11 @@ impl Request {
         Ok((node.ip, new_vm_resp))
     }
 
-    pub fn get_node(&self) -> Result<proto::VmNodeListResp, Error> {
+    fn get_node(&self) -> Result<proto::VmNodeListResp, Error> {
+        Ok(self.get_cheapest_node()?)
+    }
+
+    fn get_cheapest_node(&self) -> Result<proto::VmNodeListResp, Error> {
         let (free_ports, offers_ipv4) = match &self.ipv4 {
             IPv4Config::PublishPorts(vec) => (vec.len() as u32, false),
             IPv4Config::PublicIPv4 => (0, true),
@@ -167,20 +171,24 @@ impl Request {
             offers_ipv4,
             offers_ipv6: self.public_ipv6,
             vcpus: self.vcpus,
-            memory_mb: self.memory_mb,
+            memory_mib: self.memory_gib * 1024,
-            storage_gb: self.disk_size_gb,
+            storage_mib: self.disk_size_gib * 1024,
             country: self.location.country.clone().unwrap_or_default(),
             region: self.location.region.clone().unwrap_or_default(),
             city: self.location.city.clone().unwrap_or_default(),
             ip: self.location.node_ip.clone().unwrap_or_default(),
             node_pubkey: String::new(),
         };
-        match block_on(grpc::get_one_node(filters)) {
+        let node_list = match block_on(grpc::get_node_list(filters)) {
-            Ok(node) => Ok(node),
+            Ok(node_list) => Ok(node_list),
             Err(e) => {
                 log::error!("Coult not get node from brain: {e:?}");
                 Err(Error::NoValidNodeFound)
             }
-        }
+        }?;
+        
+        // TODO: calculate best price per node
+
+        todo!();
     }
 }

src/snp/update.rs

@@ -12,8 +12,8 @@ use log::{debug, info};
 pub struct Request {
     hostname: String,
     vcpus: u32,
-    memory_mb: u32,
+    memory_mib: u32,
-    disk_size_gb: u32,
+    disk_size_mib: u32,
     dtrfs: Option<Dtrfs>,
 }
 
@@ -34,7 +34,7 @@ impl Request {
                 Some(Dtrfs::load_from_file(path)?)
             }
         };
-        let req = Self { hostname, vcpus, memory_mb, disk_size_gb, dtrfs };
+        let req = Self { hostname, vcpus, memory_mib: memory_mb, disk_size_mib: disk_size_gb, dtrfs };
         if req == Self::default() {
             log::info!("Skipping hardware upgrade (no arguments specified).");
             return Ok(());
@@ -90,9 +90,9 @@ impl Request {
             uuid: uuid.to_string(),
             hostname: self.hostname.clone(),
             admin_pubkey: Config::get_detee_wallet()?,
-            disk_size_gb: self.disk_size_gb,
+            disk_size_mib: self.disk_size_mib * 1024,
             vcpus: self.vcpus,
-            memory_mb: self.memory_mb,
+            memory_mib: self.memory_mib * 1024,
             kernel_url,
             kernel_sha,
             dtrfs_url,