diff --git a/Cargo.lock b/Cargo.lock index d003c87..db3a052 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1212,11 +1212,13 @@ dependencies = [ [[package]] name = "gevulot-rs" -version = "0.1.3" -source = "git+https://github.com/gevulotnetwork/gevulot-rs?rev=9aad7a9cbea15e9007ff5b45a566212bdf853620#9aad7a9cbea15e9007ff5b45a566212bdf853620" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc328be91b31fbc8dd8c82b0d959f2a9c0349e35297f59d661436540597491f2" dependencies = [ "backon", "bip32", + "bytesize", "const_format", "cosmos-sdk-proto", "cosmrs", @@ -1224,6 +1226,7 @@ dependencies = [ "derive_builder", "hex", "http 1.1.0", + "humantime", "log", "pretty_env_logger", "prost 0.13.3", @@ -1899,8 +1902,8 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mia-installer" -version = "0.2.5" -source = "git+https://github.com/gevulotnetwork/mia.git?tag=mia-installer-0.2.5#2733a55e3290db99daaa5def9f4e77215df6c2fd" +version = "0.3.0" +source = "git+https://github.com/gevulotnetwork/mia.git?tag=mia-installer-0.3.0#537af9fd9823a061b1b9e07ceecb5827a57e1798" dependencies = [ "anyhow", "env_logger 0.11.5", diff --git a/Cargo.toml b/Cargo.toml index 099d96a..8f24182 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/gevulotnetwork/gvltctl" description = "Gevulot Control CLI" [dependencies] -gevulot-rs = "0.1.3" +gevulot-rs = "0.2.0" bip32 = "0.5.1" cargo_metadata = "0.19" @@ -27,7 +27,7 @@ toml = "0.8.19" openssl = { version = "*", optional = true } # Linux VM builder dependencies -mia-installer = { git = "https://github.com/gevulotnetwork/mia.git", tag = "mia-installer-0.2.5" } +mia-installer = { git = "https://github.com/gevulotnetwork/mia.git", tag = "mia-installer-0.3.0" } anyhow = "1" log = "0.4.22" @@ -68,6 +68,3 @@ vm-builder-v2 = [ "dep:tar", "dep:mbrman", ] - -[patch.crates-io] -gevulot-rs = { git = "https://github.com/gevulotnetwork/gevulot-rs", rev = "9aad7a9cbea15e9007ff5b45a566212bdf853620" } diff --git a/src/commands/pins.rs b/src/commands/pins.rs index 0fa141d..b9b146d 100644 --- a/src/commands/pins.rs +++ b/src/commands/pins.rs @@ -158,8 +158,11 @@ async fn create_pin( .creator(me.clone()) .cid(pin.spec.cid.clone()) .fallback_urls(pin.spec.fallback_urls.unwrap_or_default()) - .bytes(ByteSize::new(pin.spec.bytes as u64, ByteUnit::Byte)) - .time(pin.spec.time as u64) + .bytes(ByteSize::new( + pin.spec.bytes.bytes()? as u64, + ByteUnit::Byte, + )) + .time(pin.spec.time.seconds()? as u64) .redundancy(pin.spec.redundancy as u64) .name(pin.metadata.name) .description(pin.metadata.description) diff --git a/src/commands/tasks.rs b/src/commands/tasks.rs index 8bebb90..ca1883c 100644 --- a/src/commands/tasks.rs +++ b/src/commands/tasks.rs @@ -217,15 +217,15 @@ pub async fn create_task( .map(|oc| (oc.source, oc.retention_period as u64)) .collect(), ) - .cpus(task.spec.resources.cpus as u64) - .gpus(task.spec.resources.gpus as u64) + .cpus(task.spec.resources.cpus.millicores()? as u64) + .gpus(task.spec.resources.gpus.millicores()? as u64) .memory(ByteSize::new( - task.spec.resources.memory as u64, + task.spec.resources.memory.bytes()? as u64, ByteUnit::Byte, )) - .time(task.spec.resources.time as u64) - .store_stdout(task.spec.store_stdout.unwrap_or(false)) - .store_stderr(task.spec.store_stderr.unwrap_or(false)) + .time(task.spec.resources.time.seconds()? as u64) + .store_stdout(task.spec.store_stdout) + .store_stderr(task.spec.store_stderr) .labels(labels) .into_message()?, ) diff --git a/src/commands/workers.rs b/src/commands/workers.rs index a00d885..e8b1b56 100644 --- a/src/commands/workers.rs +++ b/src/commands/workers.rs @@ -108,10 +108,16 @@ async fn create_worker( .description(worker.metadata.description) .tags(worker.metadata.tags.into_iter().map(Into::into).collect()) .labels(worker.metadata.labels.into_iter().map(Into::into).collect()) - .cpus(worker.spec.cpus as u64) - .gpus(worker.spec.gpus as u64) - .memory(ByteSize::new(worker.spec.memory as u64, ByteUnit::Byte)) - .disk(ByteSize::new(worker.spec.disk as u64, ByteUnit::Byte)) + .cpus(worker.spec.cpus.millicores()? as u64) + .gpus(worker.spec.gpus.millicores()? as u64) + .memory(ByteSize::new( + worker.spec.memory.bytes()? as u64, + ByteUnit::Byte, + )) + .disk(ByteSize::new( + worker.spec.disk.bytes()? as u64, + ByteUnit::Byte, + )) .into_message()?, ) .await?;