Compare commits
1 Commits
main
...
fix_airdro
| Author | SHA1 | Date | |
|---|---|---|---|
7126ca108d
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
/target
|
||||
tmp
|
||||
|
||||
8
Cargo.lock
generated
8
Cargo.lock
generated
@ -1,6 +1,6 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
@ -1110,7 +1110,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "detee-cli"
|
||||
version = "0.1.1"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"bs58",
|
||||
"chrono",
|
||||
@ -1184,7 +1184,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "detee-shared"
|
||||
version = "0.1.0"
|
||||
source = "git+ssh://git@gitea.detee.cloud/testnet/proto.git?branch=remove_uuid#6765cafd68664dcfa269dd776039532eb4253e8a"
|
||||
source = "git+ssh://git@gitea.detee.cloud/testnet/proto.git?branch=offers#4753a17fa29393b3f99b6dfcdcec48d935e6ebd9"
|
||||
dependencies = [
|
||||
"bincode",
|
||||
"prost",
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
[package]
|
||||
name = "detee-cli"
|
||||
version = "0.1.1"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
@ -38,7 +37,7 @@ detee-sgx = { git = "ssh://git@gitea.detee.cloud/testnet/detee-sgx.git", branch
|
||||
shadow-rs = { version = "1.1.1", features = ["metadata"] }
|
||||
serde_default_utils = "0.3.1"
|
||||
|
||||
detee-shared = { git = "ssh://git@gitea.detee.cloud/testnet/proto.git", branch = "remove_uuid" }
|
||||
detee-shared = { git = "ssh://git@gitea.detee.cloud/testnet/proto.git", branch = "offers" }
|
||||
# detee-shared = { path = "../detee-shared" }
|
||||
|
||||
[build-dependencies]
|
||||
|
||||
218
LICENSE
218
LICENSE
@ -1,24 +1,202 @@
|
||||
This is free and unencumbered software released into the public domain.
|
||||
|
||||
Anyone is free to copy, modify, publish, use, compile, sell, or
|
||||
distribute this software, either in source code form or as a compiled
|
||||
binary, for any purpose, commercial or non-commercial, and by any
|
||||
means.
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
In jurisdictions that recognize copyright laws, the author or authors
|
||||
of this software dedicate any and all copyright interest in the
|
||||
software to the public domain. We make this dedication for the benefit
|
||||
of the public at large and to the detriment of our heirs and
|
||||
successors. We intend this dedication to be an overt act of
|
||||
relinquishment in perpetuity of all present and future rights to this
|
||||
software under copyright law.
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
OTHER DEALINGS IN THE SOFTWARE.
|
||||
1. Definitions.
|
||||
|
||||
For more information, please refer to <https://unlicense.org/>
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
<!--
|
||||
SPDX-License-Identifier: Apache-2.0
|
||||
SPDX-License-Identifier: Unlicense
|
||||
-->
|
||||
|
||||
# DeTEE CLI
|
||||
|
||||
1
build.rs
1
build.rs
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use shadow_rs::ShadowBuilder;
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
from archlinux:latest
|
||||
copy tmp/.detee /root/.detee
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
|
||||
scriptdir="$(pwd)"
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
reorder_impl_items = true
|
||||
use_small_heuristics = "Max"
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
dtrfs_url: http://registry.detee.ltd/dtrfs-payments2025-01-23.cpio.gz
|
||||
dtrfs_sha: 2e95d7969a0f2ae2ee6f37acd2789a032be1653e76ba93e607477c8b1cde42ed
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
node_pubkey: 3mWjE6FnKQ8f9WRjGHdj1Jtyewsri87GXQpqLWpwtjhr
|
||||
package_url: https://registry.detee.ltd/sgx/packages/actix-app-info_package_2025-03-19_13-49-56.tar.gz
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
environments:
|
||||
- name: APP_NAME
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
hostname: my-specific-vm-01
|
||||
price: 20000
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
hostname: my-vm-01
|
||||
hours: 5
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
hostname: my-public-vm-01
|
||||
hours: 5
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
hostname: my-bucharest-vm-01
|
||||
hours: 5
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
set -e
|
||||
cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-License-Identifier: Unlicense
|
||||
|
||||
cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
|
||||
scriptdir="$(pwd)"
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use clap::builder::PossibleValue;
|
||||
use clap::{Arg, Command};
|
||||
@ -211,8 +210,8 @@ fn clap_cmd() -> Command {
|
||||
)
|
||||
.subcommand(Command::new("inspect").about("list all available information about a App")
|
||||
.arg(
|
||||
Arg::new("id")
|
||||
.help("supply the long ID of the App contract")
|
||||
Arg::new("uuid")
|
||||
.help("supply the uuid of the App contract")
|
||||
.required(true)
|
||||
)
|
||||
.arg(
|
||||
@ -226,8 +225,8 @@ fn clap_cmd() -> Command {
|
||||
Command::new("delete")
|
||||
.about("delete deployed app")
|
||||
.arg(
|
||||
Arg::new("id")
|
||||
.help("supply the long ID of the App contract")
|
||||
Arg::new("uuid")
|
||||
.help("supply the uuid of the App contract")
|
||||
.required(true)
|
||||
)
|
||||
)
|
||||
@ -257,8 +256,8 @@ fn clap_cmd() -> Command {
|
||||
.required(true)
|
||||
)
|
||||
.arg(
|
||||
Arg::new("id")
|
||||
.help("supply the long ID of the App contract")
|
||||
Arg::new("uuid")
|
||||
.help("supply the uuid of the App contract")
|
||||
.required(true)
|
||||
)
|
||||
)
|
||||
@ -272,8 +271,8 @@ fn clap_cmd() -> Command {
|
||||
.required(true),
|
||||
)
|
||||
.arg(
|
||||
Arg::new("id")
|
||||
.help("supply the ID of the App contract")
|
||||
Arg::new("uuid")
|
||||
.help("supply the uuid of the App contract")
|
||||
.required(true)
|
||||
)
|
||||
)
|
||||
@ -311,7 +310,7 @@ fn clap_cmd() -> Command {
|
||||
.arg(
|
||||
Arg::new("contract")
|
||||
.long("contract")
|
||||
.help("ID of the active contract with this node")
|
||||
.help("UUID of the active contract with this node")
|
||||
.required(true)
|
||||
)
|
||||
.arg(
|
||||
@ -409,8 +408,8 @@ fn clap_cmd() -> Command {
|
||||
)
|
||||
.subcommand(Command::new("inspect").about("list all available information about a VM")
|
||||
.arg(
|
||||
Arg::new("id")
|
||||
.help("supply the long ID of the VM contract")
|
||||
Arg::new("uuid")
|
||||
.help("supply the uuid of the VM contract")
|
||||
.required(true)
|
||||
)
|
||||
.arg(
|
||||
@ -422,8 +421,8 @@ fn clap_cmd() -> Command {
|
||||
)
|
||||
.subcommand(Command::new("ssh").about("connect to the VM using SSH")
|
||||
.arg(
|
||||
Arg::new("id")
|
||||
.help("supply the ID of the VM contract")
|
||||
Arg::new("uuid")
|
||||
.help("supply the uuid of the VM contract")
|
||||
.required(true)
|
||||
)
|
||||
.arg(
|
||||
@ -443,8 +442,8 @@ fn clap_cmd() -> Command {
|
||||
)
|
||||
.subcommand(Command::new("delete").about("delete a VM from the DeTEE network")
|
||||
.arg(
|
||||
Arg::new("id")
|
||||
.help("the (long) ID of the VM that you wish to delete")
|
||||
Arg::new("uuid")
|
||||
.help("uuid of the VM that you wish to delete")
|
||||
.required(true)
|
||||
)
|
||||
)
|
||||
@ -455,8 +454,8 @@ fn clap_cmd() -> Command {
|
||||
"\nChanging the lifetime of a VM will not restart." +
|
||||
"\nIf changing the lifetime to a higher value, credits will locked accordingly.")
|
||||
.arg(
|
||||
Arg::new("id")
|
||||
.help("supply the ID of the VM you wish to upgrade")
|
||||
Arg::new("uuid")
|
||||
.help("supply the uuid of the VM you wish to upgrade")
|
||||
.required(true)
|
||||
)
|
||||
.arg(
|
||||
@ -553,7 +552,7 @@ fn clap_cmd() -> Command {
|
||||
.arg(
|
||||
Arg::new("contract")
|
||||
.long("contract")
|
||||
.help("ID of the active contract with this node")
|
||||
.help("UUID of the active contract with this node")
|
||||
.required(true)
|
||||
)
|
||||
.arg(
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use clap::{Arg, ArgMatches, Command};
|
||||
use clap_complete::{generate, Shell};
|
||||
use detee_cli::config::Config;
|
||||
use detee_cli::constants::TOKEN_DECIMAL;
|
||||
use detee_cli::*;
|
||||
use std::io;
|
||||
use utils::block_on;
|
||||
@ -144,7 +144,8 @@ fn handle_contracts(_matches: &ArgMatches) {
|
||||
|
||||
fn handle_airdrop(matches: &ArgMatches) {
|
||||
let wallet: String = matches.get_one::<String>("wallet").unwrap().clone();
|
||||
let tokens = *matches.get_one::<u64>("amount").unwrap();
|
||||
let nano_tokens = *matches.get_one::<u64>("amount").unwrap();
|
||||
let tokens = nano_tokens * TOKEN_DECIMAL;
|
||||
match block_on(general::grpc::admin_airdrop(wallet, tokens)) {
|
||||
Ok(()) => println!("Success."),
|
||||
Err(e) => println!("Could not give airdrop due to error: {e:?}"),
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::constants::{BRAIN_STAGING, BRAIN_TESTING, CONFIG_OVERRIDE_PATH_ENV};
|
||||
use crate::general;
|
||||
@ -179,12 +178,12 @@ impl Config {
|
||||
Ok(dir)
|
||||
}
|
||||
|
||||
pub fn vm_id_list_path() -> Result<String, Error> {
|
||||
pub fn vm_uuid_list_path() -> Result<String, Error> {
|
||||
let dir = Self::home_dir() + ("/.detee/cli/vms");
|
||||
if !Path::new(&dir).exists() {
|
||||
std::fs::create_dir_all(dir.clone())?;
|
||||
}
|
||||
Ok(dir + "/vm_id_list")
|
||||
Ok(dir + "/uuid_list")
|
||||
}
|
||||
|
||||
pub fn cli_dir_path() -> Result<String, Error> {
|
||||
@ -528,11 +527,11 @@ impl Config {
|
||||
}
|
||||
|
||||
impl Config {
|
||||
pub fn app_id_list_path() -> Result<String, Error> {
|
||||
pub fn app_uuid_list_path() -> Result<String, Error> {
|
||||
let dir = Self::home_dir() + ("/.detee/cli/apps");
|
||||
if !Path::new(&dir).exists() {
|
||||
std::fs::create_dir_all(dir.clone())?;
|
||||
}
|
||||
Ok(dir + "/app_id_list")
|
||||
Ok(dir + "/uuid_list")
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use rand::Rng;
|
||||
use std::sync::LazyLock;
|
||||
@ -7,7 +6,7 @@ use std::sync::LazyLock;
|
||||
pub const HRATLS_APP_PORT: u32 = 34500;
|
||||
pub const MAX_REDIRECTS: u16 = 3;
|
||||
pub const CONFIG_OVERRIDE_PATH_ENV: &str = "DETEE_API_USER_PATH";
|
||||
pub const CLI_VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||
pub const TOKEN_DECIMAL: u64 = 1_000_000_000;
|
||||
|
||||
pub const STAGING_BRAIN_URLS: [&str; 3] = [
|
||||
"https://156.146.63.216:31337", // staging brain 1
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use super::{operators, packagers};
|
||||
use crate::{cli_print, config};
|
||||
@ -26,9 +25,9 @@ pub fn handle_operators(matches: &ArgMatches) {
|
||||
cli_print(operators::inspect_operator(wallet).map_err(Into::into));
|
||||
}
|
||||
Some(("kick", subcom_args)) => {
|
||||
let app_id: String = subcom_args.get_one::<String>("contract").unwrap().clone();
|
||||
let uuid: String = subcom_args.get_one::<String>("contract").unwrap().clone();
|
||||
let reason: String = subcom_args.get_one::<String>("reason").unwrap().clone();
|
||||
cli_print(operators::kick(app_id, reason).map_err(Into::into));
|
||||
cli_print(operators::kick(uuid, reason).map_err(Into::into));
|
||||
}
|
||||
Some(("ban-user", subcom_args)) => {
|
||||
let user_wallet: String = subcom_args.get_one::<String>("wallet").unwrap().clone();
|
||||
@ -65,14 +64,14 @@ pub fn handle_account(matches: &ArgMatches) {
|
||||
}
|
||||
|
||||
const FISH_COMPLETION: &str = r#"
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from delete' -a '(cat ~/.detee/cli/vms/vm_id_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from update' -a '(cat ~/.detee/cli/vms/vm_id_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from inspect' -a '(cat ~/.detee/cli/vms/vm_id_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from ssh' -a '(cat ~/.detee/cli/vms/vm_id_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from update' -a '(cat ~/.detee/cli/apps/app_id_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from get' -a '(cat ~/.detee/cli/apps/app_id_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from delete' -a '(cat ~/.detee/cli/apps/app_id_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from inspect' -a '(cat ~/.detee/cli/apps/app_id_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from delete' -a '(cat ~/.detee/cli/vms/uuid_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from update' -a '(cat ~/.detee/cli/vms/uuid_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from inspect' -a '(cat ~/.detee/cli/vms/uuid_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from ssh' -a '(cat ~/.detee/cli/vms/uuid_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from update' -a '(cat ~/.detee/cli/apps/uuid_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from get' -a '(cat ~/.detee/cli/apps/uuid_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from delete' -a '(cat ~/.detee/cli/apps/uuid_list)' -f
|
||||
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from inspect' -a '(cat ~/.detee/cli/apps/uuid_list)' -f
|
||||
"#;
|
||||
|
||||
pub fn handle_completion(matches: &ArgMatches, cmd: Command) {
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::snp::grpc::proto::VmContract;
|
||||
use crate::utils::sign_request;
|
||||
use detee_shared::general_proto::{RecommendedVersions, ReportNodeReq};
|
||||
use detee_shared::general_proto::ReportNodeReq;
|
||||
use log::{debug, info, warn};
|
||||
use tokio_stream::StreamExt;
|
||||
use tonic::transport::Channel;
|
||||
@ -86,15 +85,13 @@ pub async fn list_operators() -> Result<Vec<ListOperatorsResp>, Error> {
|
||||
Ok(operators)
|
||||
}
|
||||
|
||||
pub async fn kick_contract(contract_id: String, reason: String) -> Result<u64, Error> {
|
||||
debug!(
|
||||
"gRPC module: connecting to brain and kicking contract {contract_id} for reason: {reason}"
|
||||
);
|
||||
pub async fn kick_contract(contract_uuid: String, reason: String) -> Result<u64, Error> {
|
||||
debug!("gRPC module: connecting to brain and kicking contract {contract_uuid} for reason: {reason}");
|
||||
Ok(client()
|
||||
.await?
|
||||
.kick_contract(sign_request(KickReq {
|
||||
operator_wallet: Config::get_detee_wallet()?,
|
||||
contract_id,
|
||||
contract_uuid,
|
||||
reason,
|
||||
})?)
|
||||
.await?
|
||||
@ -183,7 +180,3 @@ pub async fn admin_slash(pubkey: String, tokens: u64) -> Result<(), Error> {
|
||||
let _ = client().await?.slash(req).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn get_versions() -> Result<RecommendedVersions, Error> {
|
||||
Ok(client().await?.get_recommended_versions(Empty {}).await?.into_inner())
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
pub mod cli_handler;
|
||||
pub mod grpc;
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::general::grpc;
|
||||
use crate::utils::block_on;
|
||||
@ -75,8 +74,8 @@ pub fn print_operators() -> Result<Vec<grpc::proto::ListOperatorsResp>, grpc::Er
|
||||
block_on(grpc::list_operators())
|
||||
}
|
||||
|
||||
pub fn kick(contract_id: String, reason: String) -> Result<crate::SimpleOutput, grpc::Error> {
|
||||
let nano_lp = block_on(grpc::kick_contract(contract_id, reason))?;
|
||||
pub fn kick(contract_uuid: String, reason: String) -> Result<crate::SimpleOutput, grpc::Error> {
|
||||
let nano_lp = block_on(grpc::kick_contract(contract_uuid, reason))?;
|
||||
Ok(crate::SimpleOutput::from(
|
||||
format!("Successfully terminated contract. Refunded {} nanocredits.", nano_lp).as_str(),
|
||||
))
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use serde::Serialize;
|
||||
use tabled::Tabled;
|
||||
|
||||
18
src/lib.rs
18
src/lib.rs
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
pub mod config;
|
||||
pub mod constants;
|
||||
@ -11,10 +10,6 @@ pub mod utils;
|
||||
|
||||
use serde::Serialize;
|
||||
|
||||
use crate::constants::CLI_VERSION;
|
||||
use crate::general::grpc::get_versions;
|
||||
use crate::utils::block_on;
|
||||
|
||||
pub trait HumanOutput {
|
||||
fn human_cli_print(&self);
|
||||
}
|
||||
@ -41,19 +36,6 @@ pub fn cli_print<T: HumanOutput + serde::Serialize>(output: Result<T, Box<dyn st
|
||||
Ok(output) => output,
|
||||
Err(e) => {
|
||||
println!("Error: {e}");
|
||||
match block_on(get_versions()) {
|
||||
Ok(versions) => {
|
||||
if CLI_VERSION != versions.cli {
|
||||
log::error!(
|
||||
"The brain recommends the CLI version {}, but the local version is {}",
|
||||
versions.cli,
|
||||
CLI_VERSION
|
||||
);
|
||||
println!("Please upgrade the CLI to the latest docker image: detee/detee-cli:latest")
|
||||
}
|
||||
}
|
||||
Err(e) => log::warn!("Could not get recommended CLI version from the brain: {e}"),
|
||||
};
|
||||
std::process::exit(1);
|
||||
}
|
||||
};
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#![allow(dead_code)]
|
||||
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use rand::Rng;
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::name_generator::random_app_name;
|
||||
@ -9,7 +8,7 @@ use crate::sgx::grpc_brain::{delete_app, list_contracts};
|
||||
use crate::sgx::grpc_dtpm::{get_config, update_config};
|
||||
use crate::sgx::packaging::package_enclave;
|
||||
use crate::sgx::{
|
||||
get_app_node_by_contract, get_one_contract, inspect_node, print_nodes, write_app_id_list,
|
||||
get_app_node_by_contract, get_one_contract, inspect_node, print_nodes, write_uuid_list,
|
||||
AppContract, AppDeleteResponse, AppDeployResponse,
|
||||
};
|
||||
use crate::utils::block_on;
|
||||
@ -38,10 +37,10 @@ pub fn handle_app_nodes(matches: &ArgMatches) {
|
||||
}
|
||||
Some(("report", subcom_args)) => {
|
||||
let node_pubkey: String = subcom_args.get_one::<String>("pubkey").unwrap().clone();
|
||||
let contract_id: String = subcom_args.get_one::<String>("contract").unwrap().clone();
|
||||
let contract_uuid: String = subcom_args.get_one::<String>("contract").unwrap().clone();
|
||||
let reason: String = subcom_args.get_one::<String>("reason").unwrap().clone();
|
||||
cli_print(
|
||||
crate::general::report_node(node_pubkey, contract_id, reason).map_err(Into::into),
|
||||
crate::general::report_node(node_pubkey, contract_uuid, reason).map_err(Into::into),
|
||||
)
|
||||
}
|
||||
_ => {
|
||||
@ -105,26 +104,26 @@ fn handle_deploy(
|
||||
}
|
||||
|
||||
fn handle_inspect(inspect_match: &ArgMatches) {
|
||||
let app_id: String = inspect_match.get_one::<String>("id").unwrap().clone();
|
||||
let uuid: String = inspect_match.get_one::<String>("uuid").unwrap().clone();
|
||||
if *inspect_match.get_one::<bool>("show-node").unwrap() {
|
||||
cli_print(block_on(get_app_node_by_contract(&app_id)).map_err(Into::into));
|
||||
cli_print(block_on(get_app_node_by_contract(&uuid)).map_err(Into::into));
|
||||
} else {
|
||||
cli_print(block_on(get_one_contract(&app_id)).map_err(Into::into))
|
||||
cli_print(block_on(get_one_contract(&uuid)).map_err(Into::into))
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_delete(
|
||||
delete_match: &ArgMatches,
|
||||
) -> Result<AppDeleteResponse, Box<dyn std::error::Error>> {
|
||||
let app_id = delete_match
|
||||
.get_one::<String>("id")
|
||||
.ok_or_else(|| panic!("app ID argument required"))
|
||||
let app_uuid = delete_match
|
||||
.get_one::<String>("uuid")
|
||||
.ok_or_else(|| panic!("uuid argument required"))
|
||||
.unwrap()
|
||||
.to_owned();
|
||||
|
||||
match block_on(delete_app(app_id.clone())) {
|
||||
match block_on(delete_app(app_uuid.clone())) {
|
||||
Ok(_) => Ok(AppDeleteResponse {
|
||||
app_id,
|
||||
uuid: app_uuid,
|
||||
message: "App deleted successfully".to_string(),
|
||||
}),
|
||||
Err(e) => {
|
||||
@ -149,7 +148,7 @@ fn handle_list(list_matche: &ArgMatches) -> Result<Vec<AppContract>, Box<dyn std
|
||||
let contracts: Vec<AppContract> =
|
||||
block_on(list_contracts(req))?.into_iter().map(|n| n.into()).collect();
|
||||
|
||||
write_app_id_list(&contracts)?;
|
||||
write_uuid_list(&contracts)?;
|
||||
|
||||
Ok(contracts)
|
||||
}
|
||||
@ -179,28 +178,28 @@ fn handle_config_sub_validate(
|
||||
fn handle_config_sub_update(
|
||||
update_matche: &ArgMatches,
|
||||
) -> Result<SimpleOutput, Box<dyn std::error::Error>> {
|
||||
if let (Some(file_path), Some(app_id)) =
|
||||
(update_matche.get_one::<String>("config"), update_matche.get_one::<String>("id"))
|
||||
if let (Some(file_path), Some(uuid)) =
|
||||
(update_matche.get_one::<String>("config"), update_matche.get_one::<String>("uuid"))
|
||||
{
|
||||
let loaded_config = validate_yaml(file_path).unwrap();
|
||||
match block_on(update_config(app_id, loaded_config)) {
|
||||
match block_on(update_config(uuid, loaded_config)) {
|
||||
Ok(_) => Ok(SimpleOutput::from("App launch config updated successfully")),
|
||||
Err(e) => Err(Box::new(std::io::Error::other(format!(
|
||||
"Could not attest and update app launch config due to error: {e}"
|
||||
)))),
|
||||
}
|
||||
} else {
|
||||
Err(Box::new(std::io::Error::other("id and config arguments required")))
|
||||
Err(Box::new(std::io::Error::other("uuid and config arguments required")))
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_config_sub_get(
|
||||
get_matche: &ArgMatches,
|
||||
) -> Result<SimpleOutput, Box<dyn std::error::Error>> {
|
||||
if let (Some(file_path_to_save), Some(app_id)) =
|
||||
(get_matche.get_one::<String>("path"), get_matche.get_one::<String>("id"))
|
||||
if let (Some(file_path_to_save), Some(uuid)) =
|
||||
(get_matche.get_one::<String>("path"), get_matche.get_one::<String>("uuid"))
|
||||
{
|
||||
match block_on(get_config(app_id)) {
|
||||
match block_on(get_config(uuid)) {
|
||||
Ok(config) => {
|
||||
let config_yaml = serde_yaml::to_string(&config).unwrap();
|
||||
std::fs::write(file_path_to_save, config_yaml).unwrap();
|
||||
@ -213,6 +212,6 @@ fn handle_config_sub_get(
|
||||
)))),
|
||||
}
|
||||
} else {
|
||||
Err(Box::new(std::io::Error::other("path and id arguments required")))
|
||||
Err(Box::new(std::io::Error::other("path and uuid arguments required")))
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use detee_shared::sgx::types::brain::AppDeployConfig;
|
||||
use detee_shared::sgx::types::dtpm::DtpmConfig;
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::name_generator::random_app_name;
|
||||
use crate::sgx::grpc_brain::{get_app_node_list, new_app};
|
||||
@ -8,7 +6,7 @@ use crate::sgx::utils::{
|
||||
calculate_nanocredits_for_app, fetch_config, hratls_url_and_mr_enclave_from_app_id,
|
||||
};
|
||||
use crate::sgx::{
|
||||
append_app_id_list, package_entry_from_name, AppDeployResponse, Error, PackageElement,
|
||||
append_uuid_list, package_entry_from_name, AppDeployResponse, Error, PackageElement,
|
||||
};
|
||||
use crate::snp;
|
||||
use detee_shared::app_proto::{AppNodeFilters, AppNodeListResp, AppResource, NewAppReq};
|
||||
@ -67,7 +65,7 @@ impl Reqwest {
|
||||
tokio::time::sleep(tokio::time::Duration::from_millis(2500)).await;
|
||||
|
||||
let (hratls_uri, mr_enclave) =
|
||||
hratls_url_and_mr_enclave_from_app_id(&new_app_res.app_id).await?;
|
||||
hratls_url_and_mr_enclave_from_app_id(&new_app_res.uuid).await?;
|
||||
|
||||
let mr_enclave = mr_enclave.expect("App contract does not have a mr_enclave");
|
||||
|
||||
@ -90,7 +88,7 @@ impl Reqwest {
|
||||
let req = DtpmSetConfigReq { config_data, ..Default::default() };
|
||||
set_config_pb(req, &dtpm_client).await?;
|
||||
|
||||
append_app_id_list(&new_app_res.app_id, &self.app_name)?;
|
||||
append_uuid_list(&new_app_res.uuid, &self.app_name)?;
|
||||
Ok((new_app_res, self.app_name).into())
|
||||
} else {
|
||||
Err(Error::Deployment(new_app_res.error))
|
||||
@ -161,7 +159,7 @@ impl Reqwest {
|
||||
let new_app_req = NewAppReq {
|
||||
node_pubkey: node.node_pubkey.clone(),
|
||||
resource,
|
||||
app_id: "".to_string(),
|
||||
uuid: "".to_string(),
|
||||
price_per_unit: node.price,
|
||||
locked_nano: nano_credits,
|
||||
app_name: self.app_name.clone(),
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use detee_shared::app_proto::brain_app_cli_client::BrainAppCliClient;
|
||||
use detee_shared::app_proto::{
|
||||
@ -58,8 +57,8 @@ impl crate::HumanOutput for AppContract {
|
||||
.collect::<Vec<_>>()
|
||||
.join(", ");
|
||||
println!(
|
||||
"The App {} has the ID {}, and it runs on the node {}",
|
||||
self.app_name, self.app_id, self.node_pubkey
|
||||
"The App {} has the UUID {}, and it runs on the node {}",
|
||||
self.app_name, self.uuid, self.node_pubkey
|
||||
);
|
||||
println!("The app has mapped ports by the node are: {mapped_ports}");
|
||||
println!(
|
||||
@ -93,9 +92,9 @@ pub async fn new_app(req: NewAppReq) -> Result<NewAppRes> {
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn delete_app(app_id: String) -> Result<()> {
|
||||
pub async fn delete_app(app_uuid: String) -> Result<()> {
|
||||
let admin_pubkey = Config::get_detee_wallet()?;
|
||||
let delete_req = DelAppReq { app_id: app_id, admin_pubkey };
|
||||
let delete_req = DelAppReq { uuid: app_uuid, admin_pubkey };
|
||||
let client = client().await?;
|
||||
let _ = call_with_follow_redirect!(client, delete_req, delete_app).await?;
|
||||
Ok(())
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use detee_sgx::prelude::*;
|
||||
use detee_sgx::HRaTlsConfigBuilder;
|
||||
@ -65,8 +64,8 @@ pub async fn dtpm_client(
|
||||
Ok(DtpmConfigManagerClient::new(channel).send_compressed(CompressionEncoding::Zstd))
|
||||
}
|
||||
|
||||
pub async fn update_config(app_id: &str, config: DtpmConfig) -> Result<()> {
|
||||
let (hratls_uri, mr_enclave) = hratls_url_and_mr_enclave_from_app_id(app_id).await?;
|
||||
pub async fn update_config(app_uuid: &str, config: DtpmConfig) -> Result<()> {
|
||||
let (hratls_uri, mr_enclave) = hratls_url_and_mr_enclave_from_app_id(app_uuid).await?;
|
||||
let mr_enclave = mr_enclave.expect("App contract does not have a mr_enclave");
|
||||
|
||||
let dtpm_client = dtpm_client(&hratls_uri, &mr_enclave).await?;
|
||||
@ -77,8 +76,8 @@ pub async fn update_config(app_id: &str, config: DtpmConfig) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn get_config(app_id: &str) -> Result<DtpmConfig> {
|
||||
let (hratls_uri, mr_enclave) = hratls_url_and_mr_enclave_from_app_id(app_id).await?;
|
||||
pub async fn get_config(app_uuid: &str) -> Result<DtpmConfig> {
|
||||
let (hratls_uri, mr_enclave) = hratls_url_and_mr_enclave_from_app_id(app_uuid).await?;
|
||||
let mr_enclave = mr_enclave.expect("App contract does not have a mr_enclave");
|
||||
|
||||
let dtpm_client = dtpm_client(&hratls_uri, &mr_enclave).await?;
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
pub mod cli_handler;
|
||||
pub mod config;
|
||||
@ -47,8 +46,8 @@ pub enum Error {
|
||||
pub struct AppContract {
|
||||
#[tabled(rename = "Location")]
|
||||
pub location: String,
|
||||
#[tabled(rename = "Short ID", display_with = "shorten_string")]
|
||||
pub app_id: String,
|
||||
#[tabled(rename = "UUID pfx", display_with = "shorten_string")]
|
||||
pub uuid: String,
|
||||
pub name: String,
|
||||
#[tabled(rename = "Cores")]
|
||||
pub vcpus: u32,
|
||||
@ -158,7 +157,7 @@ impl From<AppContractPB> for AppContract {
|
||||
|
||||
Self {
|
||||
location,
|
||||
app_id: brain_app_contract.app_id,
|
||||
uuid: brain_app_contract.uuid,
|
||||
name: brain_app_contract.app_name,
|
||||
vcpus,
|
||||
memory_mib,
|
||||
@ -174,24 +173,24 @@ impl From<AppContractPB> for AppContract {
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_one_contract(app_id: &str) -> Result<AppContractPB, Error> {
|
||||
pub async fn get_one_contract(uuid: &str) -> Result<AppContractPB, Error> {
|
||||
let req = ListAppContractsReq {
|
||||
admin_pubkey: Config::get_detee_wallet()?,
|
||||
app_id: app_id.to_string(),
|
||||
uuid: uuid.to_string(),
|
||||
..Default::default()
|
||||
};
|
||||
let contracts = grpc_brain::list_contracts(req).await?;
|
||||
|
||||
if contracts.is_empty() {
|
||||
return Err(Error::AppContractNotFound(app_id.to_string()));
|
||||
return Err(Error::AppContractNotFound(uuid.to_string()));
|
||||
}
|
||||
// let _ = write_app_id_list(&contracts);
|
||||
// let _ = write_uuid_list(&contracts);
|
||||
Ok(contracts[0].clone())
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct AppDeployResponse {
|
||||
pub app_id: String,
|
||||
pub uuid: String,
|
||||
pub name: String,
|
||||
pub node_ip: String,
|
||||
pub hratls_port: u32,
|
||||
@ -200,14 +199,14 @@ pub struct AppDeployResponse {
|
||||
|
||||
impl crate::HumanOutput for AppDeployResponse {
|
||||
fn human_cli_print(&self) {
|
||||
println!("The application got deployed under the ID: {}", self.app_id);
|
||||
println!("The application got deployed under the UUID: {}", self.uuid);
|
||||
}
|
||||
}
|
||||
|
||||
impl From<(NewAppRes, String)> for AppDeployResponse {
|
||||
fn from((value, name): (NewAppRes, String)) -> Self {
|
||||
Self {
|
||||
app_id: value.app_id,
|
||||
uuid: value.uuid,
|
||||
name,
|
||||
node_ip: value.ip_address,
|
||||
hratls_port: value
|
||||
@ -223,13 +222,13 @@ impl From<(NewAppRes, String)> for AppDeployResponse {
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct AppDeleteResponse {
|
||||
pub app_id: String,
|
||||
pub uuid: String,
|
||||
pub message: String,
|
||||
}
|
||||
|
||||
impl crate::HumanOutput for AppDeleteResponse {
|
||||
fn human_cli_print(&self) {
|
||||
println!("App deleted successfully: ID: {}", self.app_id);
|
||||
println!("App deleted successfully: UUID: {}", self.uuid);
|
||||
}
|
||||
}
|
||||
|
||||
@ -280,18 +279,18 @@ pub fn print_nodes() -> Result<Vec<AppNodeListResp>, Error> {
|
||||
Ok(block_on(grpc_brain::get_app_node_list(req))?)
|
||||
}
|
||||
|
||||
pub async fn get_app_node_by_contract(app_id: &str) -> Result<AppNodeListResp, Error> {
|
||||
let contract = get_one_contract(app_id).await?;
|
||||
pub async fn get_app_node_by_contract(uuid: &str) -> Result<AppNodeListResp, Error> {
|
||||
let contract = get_one_contract(uuid).await?;
|
||||
Ok(get_one_app_node(AppNodeFilters { node_pubkey: contract.node_pubkey, ..Default::default() })
|
||||
.await?)
|
||||
}
|
||||
|
||||
fn write_app_id_list(app_contracts: &[AppContract]) -> Result<(), Error> {
|
||||
let app_app_id_list_path = Config::app_id_list_path()?;
|
||||
let mut file = std::fs::File::create(app_app_id_list_path)?;
|
||||
fn write_uuid_list(app_contracts: &[AppContract]) -> Result<(), Error> {
|
||||
let app_uuid_list_path = Config::app_uuid_list_path()?;
|
||||
let mut file = std::fs::File::create(app_uuid_list_path)?;
|
||||
let output: String = app_contracts
|
||||
.iter()
|
||||
.map(|app| format!("{}\t{}", app.app_id, app.name).to_string())
|
||||
.map(|app| format!("{}\t{}", app.uuid, app.name).to_string())
|
||||
.collect::<Vec<String>>()
|
||||
.join("\n");
|
||||
let output = output + "\n";
|
||||
@ -299,11 +298,11 @@ fn write_app_id_list(app_contracts: &[AppContract]) -> Result<(), Error> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn append_app_id_list(app_id: &str, app_name: &str) -> Result<(), Error> {
|
||||
pub fn append_uuid_list(uuid: &str, app_name: &str) -> Result<(), Error> {
|
||||
use std::fs::OpenOptions;
|
||||
use std::io::prelude::*;
|
||||
let mut file =
|
||||
OpenOptions::new().create(true).append(true).open(Config::app_id_list_path()?).unwrap();
|
||||
writeln!(file, "{app_id}\t{app_name}")?;
|
||||
OpenOptions::new().create(true).append(true).open(Config::app_uuid_list_path()?).unwrap();
|
||||
writeln!(file, "{uuid}\t{app_name}")?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::config::Config;
|
||||
use std::process::Command;
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::constants::HRATLS_APP_PORT;
|
||||
use crate::sgx::{get_one_contract, Error};
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::{cli_print, general, name_generator, snp, SimpleOutput};
|
||||
use clap::ArgMatches;
|
||||
@ -11,11 +10,11 @@ pub fn handle_vm(matches: &ArgMatches) {
|
||||
Some(("ssh", args)) => cli_print(handle_vm_ssh(args)),
|
||||
Some(("list", args)) => cli_print(handle_vm_list(args)),
|
||||
Some(("inspect", inspect_args)) => {
|
||||
let vm_id: String = inspect_args.get_one::<String>("id").unwrap().clone();
|
||||
let uuid: String = inspect_args.get_one::<String>("uuid").unwrap().clone();
|
||||
if *inspect_args.get_one::<bool>("show-node").unwrap() {
|
||||
cli_print(snp::get_node_by_contract(&vm_id).map_err(Into::into));
|
||||
cli_print(snp::get_node_by_contract(&uuid).map_err(Into::into));
|
||||
} else {
|
||||
cli_print(snp::get_one_contract(&vm_id).map_err(Into::into));
|
||||
cli_print(snp::get_one_contract(&uuid).map_err(Into::into));
|
||||
}
|
||||
}
|
||||
Some(("update", args)) => cli_print(handle_vm_update(args)),
|
||||
@ -42,10 +41,10 @@ pub fn handle_vm_nodes(matches: &ArgMatches) {
|
||||
}
|
||||
Some(("report", path_subcommand)) => {
|
||||
let node_pubkey: String = path_subcommand.get_one::<String>("pubkey").unwrap().clone();
|
||||
let contract_id: String =
|
||||
let contract_uuid: String =
|
||||
path_subcommand.get_one::<String>("contract").unwrap().clone();
|
||||
let reason: String = path_subcommand.get_one::<String>("reason").unwrap().clone();
|
||||
cli_print(general::report_node(node_pubkey, contract_id, reason).map_err(Into::into))
|
||||
cli_print(general::report_node(node_pubkey, contract_uuid, reason).map_err(Into::into))
|
||||
}
|
||||
_ => {
|
||||
println!("Available commands are search, inspect and report. Use --help for more information.")
|
||||
@ -90,8 +89,8 @@ fn handle_vm_deploy(matches: &ArgMatches) -> Result<snp::VmSshArgs, Box<dyn Erro
|
||||
}
|
||||
|
||||
fn handle_vm_ssh(ssh_args: &ArgMatches) -> Result<snp::VmSshArgs, Box<dyn Error>> {
|
||||
let vm_id: String = ssh_args.get_one::<String>("id").unwrap().clone();
|
||||
Ok(snp::ssh(&vm_id, *ssh_args.get_one::<bool>("just-print").unwrap())?)
|
||||
let uuid: String = ssh_args.get_one::<String>("uuid").unwrap().clone();
|
||||
Ok(snp::ssh(&uuid, *ssh_args.get_one::<bool>("just-print").unwrap())?)
|
||||
}
|
||||
|
||||
fn handle_vm_list(update_vm_args: &ArgMatches) -> Result<Vec<snp::VmContract>, Box<dyn Error>> {
|
||||
@ -99,12 +98,12 @@ fn handle_vm_list(update_vm_args: &ArgMatches) -> Result<Vec<snp::VmContract>, B
|
||||
}
|
||||
|
||||
fn handle_vm_update(update_vm_args: &ArgMatches) -> Result<SimpleOutput, Box<dyn Error>> {
|
||||
let vm_id = update_vm_args.get_one::<String>("id").unwrap().clone();
|
||||
let uuid = update_vm_args.get_one::<String>("uuid").unwrap().clone();
|
||||
let hostname = update_vm_args.get_one::<String>("hostname").unwrap().clone();
|
||||
let memory = *update_vm_args.get_one::<u32>("memory").unwrap();
|
||||
snp::update::Request::process_request(
|
||||
hostname,
|
||||
&vm_id,
|
||||
&uuid,
|
||||
*update_vm_args.get_one::<u32>("vcpus").unwrap(),
|
||||
memory,
|
||||
*update_vm_args.get_one::<u32>("disk").unwrap(),
|
||||
@ -112,14 +111,14 @@ fn handle_vm_update(update_vm_args: &ArgMatches) -> Result<SimpleOutput, Box<dyn
|
||||
)?;
|
||||
let hours = *update_vm_args.get_one::<u32>("hours").unwrap();
|
||||
if hours != 0 {
|
||||
snp::update::expand_vm_hours(&vm_id, hours)?;
|
||||
snp::update::expand_vm_hours(&uuid, hours)?;
|
||||
}
|
||||
Ok(SimpleOutput::from("VM successfully updated."))
|
||||
}
|
||||
|
||||
fn handle_vm_delete(delete_args: &ArgMatches) -> Result<SimpleOutput, Box<dyn Error>> {
|
||||
let vm_id: String = delete_args.get_one::<String>("id").unwrap().clone();
|
||||
snp::delete_contract(&vm_id)?;
|
||||
let uuid: String = delete_args.get_one::<String>("uuid").unwrap().clone();
|
||||
snp::delete_contract(&uuid)?;
|
||||
Ok(SimpleOutput::from("VM successfully deleted."))
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use std::u64::MAX;
|
||||
|
||||
@ -57,7 +56,7 @@ impl Request {
|
||||
};
|
||||
let args = new_vm_resp.args.ok_or(Error::NoMeasurement)?;
|
||||
let measurement_args = injector::Args {
|
||||
vm_id: new_vm_resp.vm_id.clone(),
|
||||
uuid: new_vm_resp.uuid.clone(),
|
||||
vcpus,
|
||||
kernel: kernel_sha,
|
||||
initrd: dtrfs_sha,
|
||||
@ -76,9 +75,9 @@ impl Request {
|
||||
Some((&template_url, &template_sha)),
|
||||
&self.hostname,
|
||||
)?;
|
||||
ssh_args.vm_id = new_vm_resp.vm_id;
|
||||
ssh_args.uuid = new_vm_resp.uuid;
|
||||
ssh_args.hostname = self.hostname.clone();
|
||||
let _ = super::append_vm_id_list(&ssh_args.vm_id, &ssh_args.hostname);
|
||||
let _ = super::append_uuid_list(&ssh_args.uuid, &ssh_args.hostname);
|
||||
Ok(ssh_args)
|
||||
}
|
||||
|
||||
@ -169,7 +168,7 @@ impl Request {
|
||||
node_pubkey: &str,
|
||||
offer: &proto::VmNodeOffer,
|
||||
) -> Option<proto::NewVmReq> {
|
||||
if offer.vcpus == 0 || offer.memory_mib == 0 || offer.disk_mib == 0 {
|
||||
if offer.vcpus == 0 {
|
||||
return None;
|
||||
}
|
||||
let memory_per_cpu = offer.memory_mib / offer.vcpus;
|
||||
@ -216,7 +215,7 @@ impl Request {
|
||||
);
|
||||
|
||||
let brain_req = proto::NewVmReq {
|
||||
vm_id: String::new(),
|
||||
uuid: String::new(),
|
||||
hostname: self.hostname.clone(),
|
||||
admin_pubkey,
|
||||
node_pubkey: node_pubkey.to_string(),
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
pub mod proto {
|
||||
pub use detee_shared::general_proto::*;
|
||||
@ -9,6 +8,7 @@ pub mod proto {
|
||||
use crate::call_with_follow_redirect;
|
||||
use crate::config::Config;
|
||||
use crate::utils::{self, sign_request};
|
||||
use lazy_static::lazy_static;
|
||||
use log::{debug, info, warn};
|
||||
use proto::brain_vm_cli_client::BrainVmCliClient;
|
||||
use proto::{
|
||||
@ -19,6 +19,14 @@ use tokio_stream::StreamExt;
|
||||
use tonic::metadata::errors::InvalidMetadataValue;
|
||||
use tonic::transport::Channel;
|
||||
|
||||
lazy_static! {
|
||||
static ref SECURE_PUBLIC_KEY: String = use_default_string();
|
||||
}
|
||||
|
||||
fn use_default_string() -> String {
|
||||
"ThisIsMyEternalClient".to_string()
|
||||
}
|
||||
|
||||
#[derive(thiserror::Error, Debug)]
|
||||
pub enum Error {
|
||||
#[error("Failed to connect to the brain: {0}")]
|
||||
@ -47,8 +55,8 @@ pub enum Error {
|
||||
impl crate::HumanOutput for VmContract {
|
||||
fn human_cli_print(&self) {
|
||||
println!(
|
||||
"The VM {} has the ID {}, and it runs on the node {}",
|
||||
self.hostname, self.vm_id, self.node_pubkey
|
||||
"The VM {} has the UUID {}, and it runs on the node {}",
|
||||
self.hostname, self.uuid, self.node_pubkey
|
||||
);
|
||||
if self.vm_public_ipv4.is_empty() {
|
||||
println!(
|
||||
@ -160,9 +168,9 @@ pub async fn list_contracts(req: ListVmContractsReq) -> Result<Vec<VmContract>,
|
||||
Ok(contracts)
|
||||
}
|
||||
|
||||
pub async fn delete_vm(vm_id: &str) -> Result<(), Error> {
|
||||
pub async fn delete_vm(uuid: &str) -> Result<(), Error> {
|
||||
let client = client().await?;
|
||||
let req = DeleteVmReq { vm_id: vm_id.to_string(), admin_pubkey: Config::get_detee_wallet()? };
|
||||
let req = DeleteVmReq { uuid: uuid.to_string(), admin_pubkey: Config::get_detee_wallet()? };
|
||||
match call_with_follow_redirect!(client, req, delete_vm).await {
|
||||
Ok(confirmation) => {
|
||||
log::debug!("VM deletion confirmation: {confirmation:?}");
|
||||
@ -175,9 +183,9 @@ pub async fn delete_vm(vm_id: &str) -> Result<(), Error> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn extend_vm(vm_id: String, admin_pubkey: String, locked_nano: u64) -> Result<(), Error> {
|
||||
pub async fn extend_vm(uuid: String, admin_pubkey: String, locked_nano: u64) -> Result<(), Error> {
|
||||
let mut client = client().await?;
|
||||
let req = ExtendVmReq { admin_pubkey, vm_id, locked_nano };
|
||||
let req = ExtendVmReq { admin_pubkey, uuid, locked_nano };
|
||||
let result = client.extend_vm(sign_request(req)?).await;
|
||||
match result {
|
||||
Ok(confirmation) => {
|
||||
@ -217,16 +225,16 @@ pub async fn update_vm(req: UpdateVmReq) -> Result<UpdateVmResp, Error> {
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_contract_by_id(vm_id: &str) -> Result<VmContract, Error> {
|
||||
pub async fn get_contract_by_uuid(uuid: &str) -> Result<VmContract, Error> {
|
||||
let req = ListVmContractsReq {
|
||||
wallet: Config::get_detee_wallet()?,
|
||||
vm_id: vm_id.to_string(),
|
||||
uuid: uuid.to_string(),
|
||||
..Default::default()
|
||||
};
|
||||
let contracts = list_contracts(req).await?;
|
||||
if contracts.is_empty() {
|
||||
log::error!("Could not find any contract by ID {vm_id}");
|
||||
return Err(Error::VmContractNotFound(vm_id.to_string()));
|
||||
log::error!("Could not find any contract by ID {uuid}");
|
||||
return Err(Error::VmContractNotFound(uuid.to_string()));
|
||||
}
|
||||
Ok(contracts[0].clone())
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::snp::grpc::proto;
|
||||
@ -8,7 +7,7 @@ use std::net::IpAddr;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Args {
|
||||
pub vm_id: String,
|
||||
pub uuid: String,
|
||||
pub vcpus: u32,
|
||||
pub kernel: String,
|
||||
pub initrd: String,
|
||||
@ -101,9 +100,9 @@ impl Args {
|
||||
ip_string = "detee_net_eth0=10.0.2.15_24_10.0.2.2 ".to_string() + &ip_string;
|
||||
}
|
||||
let admin_key = format!("detee_admin={} ", Config::get_detee_wallet()?);
|
||||
let hostname = format!("detee_vm_id={}", self.vm_id);
|
||||
let hostname = format!("detee_uuid={}", self.uuid);
|
||||
let params = format!("{}{}{}", ip_string, admin_key, hostname);
|
||||
debug!("Calculated kernel params for {} to: {}", self.vm_id, params);
|
||||
debug!("Calculated kernel params for {} to: {}", self.uuid, params);
|
||||
Ok(params)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
pub mod cli_handler;
|
||||
pub mod deploy;
|
||||
@ -65,7 +64,7 @@ impl From<&str> for Location {
|
||||
|
||||
#[derive(Serialize, Default)]
|
||||
pub struct VmSshArgs {
|
||||
vm_id: String,
|
||||
uuid: String,
|
||||
hostname: String,
|
||||
ip: String,
|
||||
port: String,
|
||||
@ -75,7 +74,7 @@ pub struct VmSshArgs {
|
||||
|
||||
impl crate::HumanOutput for VmSshArgs {
|
||||
fn human_cli_print(&self) {
|
||||
println!("To SSH into {} (ID: {}), run the following command:", self.hostname, self.vm_id);
|
||||
println!("To SSH into {} (UUID: {}), run the following command:", self.hostname, self.uuid);
|
||||
println!(" ssh -i {} -p {} {}@{}", self.key_path, self.port, self.user, self.ip);
|
||||
}
|
||||
}
|
||||
@ -85,7 +84,7 @@ impl TryFrom<grpc::proto::VmContract> for VmSshArgs {
|
||||
|
||||
fn try_from(contract: grpc::proto::VmContract) -> Result<Self, Self::Error> {
|
||||
let mut args = VmSshArgs { ..Default::default() };
|
||||
args.vm_id = contract.vm_id;
|
||||
args.uuid = contract.uuid;
|
||||
args.hostname = contract.hostname;
|
||||
args.user = "root".to_string();
|
||||
args.key_path =
|
||||
@ -177,8 +176,8 @@ impl Distro {
|
||||
pub struct VmContract {
|
||||
#[tabled(rename = "Location")]
|
||||
pub location: String,
|
||||
#[tabled(rename = "short ID", display_with = "shorten_string")]
|
||||
pub vm_id: String,
|
||||
#[tabled(rename = "UUID pfx", display_with = "shorten_string")]
|
||||
pub uuid: String,
|
||||
pub hostname: String,
|
||||
#[tabled(rename = "Cores")]
|
||||
pub vcpus: u64,
|
||||
@ -211,7 +210,7 @@ fn display_mins(minutes: &u64) -> String {
|
||||
impl From<proto::VmContract> for VmContract {
|
||||
fn from(brain_contract: proto::VmContract) -> Self {
|
||||
Self {
|
||||
vm_id: brain_contract.vm_id,
|
||||
uuid: brain_contract.uuid,
|
||||
hostname: brain_contract.hostname,
|
||||
vcpus: brain_contract.vcpus as u64,
|
||||
mem: brain_contract.memory_mb as u64,
|
||||
@ -274,16 +273,16 @@ impl From<proto::VmNodeListResp> for TabledVmNode {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ssh(vm_id: &str, just_print: bool) -> Result<VmSshArgs, Error> {
|
||||
log::info!("Getting VM information about {vm_id} from brain...");
|
||||
pub fn ssh(uuid: &str, just_print: bool) -> Result<VmSshArgs, Error> {
|
||||
log::info!("Getting VM information about {uuid} from brain...");
|
||||
let req = proto::ListVmContractsReq {
|
||||
wallet: Config::get_detee_wallet()?,
|
||||
vm_id: vm_id.to_string(),
|
||||
uuid: uuid.to_string(),
|
||||
..Default::default()
|
||||
};
|
||||
let contracts = block_on(snp::grpc::list_contracts(req))?;
|
||||
if contracts.is_empty() {
|
||||
return Err(Error::VmContractNotFound(vm_id.to_string()));
|
||||
return Err(Error::VmContractNotFound(uuid.to_string()));
|
||||
}
|
||||
let args: VmSshArgs = contracts[0].clone().try_into()?;
|
||||
if just_print {
|
||||
@ -309,30 +308,30 @@ pub fn ssh(vm_id: &str, just_print: bool) -> Result<VmSshArgs, Error> {
|
||||
std::process::exit(2);
|
||||
}
|
||||
|
||||
pub fn get_one_contract(vm_id: &str) -> Result<proto::VmContract, Error> {
|
||||
log::debug!("Getting contract {vm_id} from brain...");
|
||||
pub fn get_one_contract(uuid: &str) -> Result<proto::VmContract, Error> {
|
||||
log::debug!("Getting contract {uuid} from brain...");
|
||||
let req = proto::ListVmContractsReq {
|
||||
wallet: Config::get_detee_wallet()?,
|
||||
vm_id: vm_id.to_string(),
|
||||
uuid: uuid.to_string(),
|
||||
..Default::default()
|
||||
};
|
||||
let contracts = block_on(snp::grpc::list_contracts(req))?;
|
||||
if contracts.is_empty() {
|
||||
return Err(Error::VmContractNotFound(vm_id.to_string()));
|
||||
return Err(Error::VmContractNotFound(uuid.to_string()));
|
||||
}
|
||||
Ok(contracts[0].clone())
|
||||
}
|
||||
|
||||
pub fn get_node_by_contract(vm_id: &str) -> Result<proto::VmNodeListResp, Error> {
|
||||
let contract = get_one_contract(vm_id)?;
|
||||
pub fn get_node_by_contract(uuid: &str) -> Result<proto::VmNodeListResp, Error> {
|
||||
let contract = get_one_contract(uuid)?;
|
||||
Ok(block_on(snp::grpc::get_one_node(proto::VmNodeFilters {
|
||||
node_pubkey: contract.node_pubkey,
|
||||
..Default::default()
|
||||
}))?)
|
||||
}
|
||||
|
||||
pub fn delete_contract(vm_id: &str) -> Result<(), Error> {
|
||||
Ok(block_on(snp::grpc::delete_vm(vm_id))?)
|
||||
pub fn delete_contract(uuid: &str) -> Result<(), Error> {
|
||||
Ok(block_on(snp::grpc::delete_vm(uuid))?)
|
||||
}
|
||||
|
||||
pub fn list_contracts(as_operator: bool) -> Result<Vec<VmContract>, Error> {
|
||||
@ -343,16 +342,16 @@ pub fn list_contracts(as_operator: bool) -> Result<Vec<VmContract>, Error> {
|
||||
};
|
||||
let contracts: Vec<VmContract> =
|
||||
block_on(grpc::list_contracts(req))?.into_iter().map(|n| n.into()).collect();
|
||||
let _ = write_vm_id_list(&contracts);
|
||||
let _ = write_uuid_list(&contracts);
|
||||
Ok(contracts)
|
||||
}
|
||||
|
||||
fn write_vm_id_list(contracts: &[VmContract]) -> Result<(), Error> {
|
||||
let vm_id_list_path = Config::vm_id_list_path()?;
|
||||
let mut file = std::fs::File::create(vm_id_list_path)?;
|
||||
fn write_uuid_list(contracts: &[VmContract]) -> Result<(), Error> {
|
||||
let vm_uuid_list_path = Config::vm_uuid_list_path()?;
|
||||
let mut file = std::fs::File::create(vm_uuid_list_path)?;
|
||||
let output: String = contracts
|
||||
.iter()
|
||||
.map(|vm| format!("{}\t{}", vm.vm_id, vm.hostname).to_string())
|
||||
.map(|vm| format!("{}\t{}", vm.uuid, vm.hostname).to_string())
|
||||
.collect::<Vec<String>>()
|
||||
.join("\n");
|
||||
let output = output + "\n";
|
||||
@ -360,12 +359,12 @@ fn write_vm_id_list(contracts: &[VmContract]) -> Result<(), Error> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn append_vm_id_list(vm_id: &str, hostname: &str) -> Result<(), Error> {
|
||||
pub fn append_uuid_list(uuid: &str, hostname: &str) -> Result<(), Error> {
|
||||
use std::fs::OpenOptions;
|
||||
use std::io::prelude::*;
|
||||
let mut file =
|
||||
OpenOptions::new().create(true).append(true).open(Config::vm_id_list_path()?)?;
|
||||
writeln!(file, "{vm_id}\t{hostname}")?;
|
||||
OpenOptions::new().create(true).append(true).open(Config::vm_uuid_list_path()?)?;
|
||||
writeln!(file, "{uuid}\t{hostname}")?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use super::grpc::{self, proto};
|
||||
use super::{injector, Dtrfs, Error};
|
||||
@ -19,7 +18,7 @@ pub struct Request {
|
||||
impl Request {
|
||||
pub fn process_request(
|
||||
hostname: String,
|
||||
vm_id: &str,
|
||||
uuid: &str,
|
||||
vcpus: u32,
|
||||
memory_mb: u32,
|
||||
disk_size_gb: u32,
|
||||
@ -40,19 +39,19 @@ impl Request {
|
||||
return Ok(());
|
||||
}
|
||||
log::info!("Starting VM updated based on req: {req:#?}");
|
||||
req.update(vm_id)
|
||||
req.update(uuid)
|
||||
}
|
||||
|
||||
fn update(&self, vm_id: &str) -> Result<(), Error> {
|
||||
fn update(&self, uuid: &str) -> Result<(), Error> {
|
||||
info!("Starting the process of updating the VM. {self:?}");
|
||||
let update_vm_resp = self.send_update_vm_request(vm_id)?;
|
||||
let update_vm_resp = self.send_update_vm_request(uuid)?;
|
||||
debug!("The response for Update VM is: {update_vm_resp:#?}");
|
||||
if !update_vm_resp.error.is_empty() {
|
||||
return Err(Error::Node(update_vm_resp.error));
|
||||
}
|
||||
|
||||
eprintln!("The modifications got approved. Proceeding with update...");
|
||||
let updated_contract = block_on(grpc::get_contract_by_id(vm_id))?;
|
||||
let updated_contract = block_on(grpc::get_contract_by_uuid(uuid))?;
|
||||
debug!("Got the current contract for the VM after update. {updated_contract:#?}");
|
||||
|
||||
if !(self.vcpus != 0 || self.memory_mib != 0 || self.dtrfs.is_some()) {
|
||||
@ -62,7 +61,7 @@ impl Request {
|
||||
|
||||
let args = update_vm_resp.args.ok_or(Error::NoMeasurement)?;
|
||||
let measurement_args = injector::Args {
|
||||
vm_id: update_vm_resp.vm_id,
|
||||
uuid: update_vm_resp.uuid,
|
||||
vcpus: updated_contract.vcpus,
|
||||
kernel: updated_contract.kernel_sha,
|
||||
initrd: updated_contract.dtrfs_sha,
|
||||
@ -76,13 +75,13 @@ impl Request {
|
||||
}
|
||||
|
||||
// returns node IP and data regarding the new VM
|
||||
fn send_update_vm_request(&self, vm_id: &str) -> Result<proto::UpdateVmResp, Error> {
|
||||
fn send_update_vm_request(&self, uuid: &str) -> Result<proto::UpdateVmResp, Error> {
|
||||
let (kernel_url, kernel_sha, dtrfs_url, dtrfs_sha) = match self.dtrfs.clone() {
|
||||
Some(dtrfs) => (dtrfs.kernel_url, dtrfs.kernel_sha, dtrfs.dtrfs_url, dtrfs.dtrfs_sha),
|
||||
None => (String::new(), String::new(), String::new(), String::new()),
|
||||
};
|
||||
Ok(block_on(grpc::update_vm(proto::UpdateVmReq {
|
||||
vm_id: vm_id.to_string(),
|
||||
uuid: uuid.to_string(),
|
||||
hostname: self.hostname.clone(),
|
||||
admin_pubkey: Config::get_detee_wallet()?,
|
||||
disk_size_mib: self.disk_size_mib * 1024,
|
||||
@ -96,10 +95,10 @@ impl Request {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn expand_vm_hours(vm_id: &str, hours: u32) -> Result<(), Error> {
|
||||
let contract = super::get_one_contract(vm_id)?;
|
||||
pub fn expand_vm_hours(uuid: &str, hours: u32) -> Result<(), Error> {
|
||||
let contract = super::get_one_contract(uuid)?;
|
||||
// vcpus: u32, memory_mb: u32, disk_size_gb: u32, public_ipv4: bool, hours: u32, node_price:
|
||||
let locked_nano = contract.nano_per_minute * 60 * (hours as u64);
|
||||
block_on(grpc::extend_vm(vm_id.to_string(), Config::get_detee_wallet()?, locked_nano))?;
|
||||
block_on(grpc::extend_vm(uuid.to_string(), Config::get_detee_wallet()?, locked_nano))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// SPDX-License-Identifier: Unlicense
|
||||
|
||||
use crate::config::Config;
|
||||
use tonic::metadata::errors::InvalidMetadataValue;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user