chore: update dependencies

zensh · zensh · commit 990fb79279fd · 2025-06-23T09:36:19.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ strip = true
 opt-level = 's'
 
 [workspace.package]
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 repository = "https://github.com/ldclabs/ic-tee"
 keywords = ["tee", "canister", "icp", "nitro"]
@@ -47,7 +47,7 @@ base64 = "0.22"
 clap = { version = "4.5", features = ["derive"] }
 candid = "0.10"
 ciborium = "0.2"
-const-hex = "1"
+hex = "0.4"
 lazy_static = "1.5"
 serde = "1"
 serde_json = "1"
diff --git a/src/declarations/ic_tee_identity_canister/ic_tee_identity_canister.did b/src/declarations/ic_tee_identity_canister/ic_tee_identity_canister.did
@@ -1,4 +1,4 @@
-type ChainArgs = variant { Upgrade : UpgradeArgs; Init : InitArgs };
+type CanArgs = variant { Upgrade : UpgradeArgs; Init : InitArgs };
 type Delegation = record {
   pubkey : blob;
   targets : opt vec principal;
@@ -23,7 +23,7 @@ type UpgradeArgs = record {
   session_expires_in_ms : opt nat64;
   name : opt text;
 };
-service : (opt ChainArgs) -> {
+service : (opt CanArgs) -> {
   get_delegation : (blob, blob, nat64) -> (Result) query;
   get_state : () -> (Result_1) query;
   sign_in : (text, blob) -> (Result_2);
diff --git a/src/declarations/ic_tee_identity_canister/ic_tee_identity_canister.did.d.ts b/src/declarations/ic_tee_identity_canister/ic_tee_identity_canister.did.d.ts
@@ -2,7 +2,7 @@ import type { Principal } from '@dfinity/principal';
 import type { ActorMethod } from '@dfinity/agent';
 import type { IDL } from '@dfinity/candid';
 
-export type ChainArgs = { 'Upgrade' : UpgradeArgs } |
+export type CanArgs = { 'Upgrade' : UpgradeArgs } |
   { 'Init' : InitArgs };
 export interface Delegation {
   'pubkey' : Uint8Array | number[],
diff --git a/src/declarations/ic_tee_identity_canister/ic_tee_identity_canister.did.js b/src/declarations/ic_tee_identity_canister/ic_tee_identity_canister.did.js
@@ -7,7 +7,7 @@ export const idlFactory = ({ IDL }) => {
     'session_expires_in_ms' : IDL.Nat64,
     'name' : IDL.Text,
   });
-  const ChainArgs = IDL.Variant({ 'Upgrade' : UpgradeArgs, 'Init' : InitArgs });
+  const CanArgs = IDL.Variant({ 'Upgrade' : UpgradeArgs, 'Init' : InitArgs });
   const Delegation = IDL.Record({
     'pubkey' : IDL.Vec(IDL.Nat8),
     'targets' : IDL.Opt(IDL.Vec(IDL.Principal)),
@@ -50,6 +50,6 @@ export const init = ({ IDL }) => {
     'session_expires_in_ms' : IDL.Nat64,
     'name' : IDL.Text,
   });
-  const ChainArgs = IDL.Variant({ 'Upgrade' : UpgradeArgs, 'Init' : InitArgs });
-  return [IDL.Opt(ChainArgs)];
+  const CanArgs = IDL.Variant({ 'Upgrade' : UpgradeArgs, 'Init' : InitArgs });
+  return [IDL.Opt(CanArgs)];
 };
diff --git a/src/ic_tee_cdk/Cargo.toml b/src/ic_tee_cdk/Cargo.toml
@@ -18,4 +18,4 @@ ic-canister-sig-creation = { workspace = true }
 ic_auth_types = { workspace = true }
 
 [dev-dependencies]
-const-hex = { workspace = true }
+hex = { workspace = true }
diff --git a/src/ic_tee_cdk/src/identity.rs b/src/ic_tee_cdk/src/identity.rs
@@ -39,7 +39,7 @@ mod tests {
         let kind = "NITRO";
         let seed = [8u8; 32];
         let user_key = canister_user_key(canister, kind, &seed, None).to_der();
-        println!("{:?}", const_hex::encode(user_key.as_slice()));
+        println!("{:?}", hex::encode(user_key.as_slice()));
         assert!(is_sub(&user_key, canister.as_slice()));
         assert!(is_sub(&user_key, kind.as_bytes()));
         assert!(!is_sub(&user_key, seed.as_slice()));
diff --git a/src/ic_tee_cli/Cargo.toml b/src/ic_tee_cli/Cargo.toml
@@ -16,7 +16,7 @@ ic_tee_nitro_attestation = { path = "../ic_tee_nitro_attestation", version = "0.
 candid = { workspace = true, features = ["value", "printer"] }
 serde_bytes = { workspace = true }
 tokio = { workspace = true }
-const-hex = { workspace = true }
+hex = { workspace = true }
 ic-agent = { workspace = true }
 ed25519-consensus = { workspace = true }
 ic_cose = { workspace = true }
diff --git a/src/ic_tee_cli/src/main.rs b/src/ic_tee_cli/src/main.rs
@@ -230,7 +230,7 @@ async fn main() -> Result<(), BoxError> {
             rng.fill_bytes(&mut bytes);
             match format.as_str() {
                 "hex" => {
-                    println!("{}", const_hex::encode(&bytes));
+                    println!("{}", hex::encode(&bytes));
                 }
                 "base64" => {
                     println!("{}", BASE64_URL_SAFE_NO_PAD.encode(&bytes));
@@ -291,21 +291,15 @@ async fn main() -> Result<(), BoxError> {
                 if let Ok(doc) = String::from_utf8(payload.clone()) {
                     println!("-----------:payload:-----------\n{}", doc);
                 } else {
-                    println!(
-                        "-----------:payload:-----------\n{}",
-                        const_hex::encode(&payload)
-                    );
+                    println!("-----------:payload:-----------\n{}", hex::encode(&payload));
                 }
             } else if *vetkey && res.payload.is_some() {
                 let (vk, _dpk) = cose.vetkey(&path).await?;
                 let payload = vetkey_decrypt_payload(&vk, &res.payload.unwrap())?;
                 if let Ok(doc) = String::from_utf8(payload.clone()) {
                     println!("-----------:payload:-----------\n{}", doc);
                 } else {
-                    println!(
-                        "-----------:payload:-----------\n{}",
-                        const_hex::encode(&payload)
-                    );
+                    println!("-----------:payload:-----------\n{}", hex::encode(&payload));
                 }
             } else {
                 pretty_println(&res)?;
@@ -507,6 +501,6 @@ where
 
 fn decode_hex(s: &str) -> Result<Vec<u8>, BoxError> {
     let s = s.replace("\\", "");
-    let rt = const_hex::decode(s.strip_prefix("0x").unwrap_or(&s))?;
+    let rt = hex::decode(s.strip_prefix("0x").unwrap_or(&s))?;
     Ok(rt)
 }
diff --git a/src/ic_tee_identity_canister/ic_tee_identity_canister.did b/src/ic_tee_identity_canister/ic_tee_identity_canister.did
@@ -1,4 +1,4 @@
-type ChainArgs = variant { Upgrade : UpgradeArgs; Init : InitArgs };
+type CanArgs = variant { Upgrade : UpgradeArgs; Init : InitArgs };
 type Delegation = record {
   pubkey : blob;
   targets : opt vec principal;
@@ -23,7 +23,7 @@ type UpgradeArgs = record {
   session_expires_in_ms : opt nat64;
   name : opt text;
 };
-service : (opt ChainArgs) -> {
+service : (opt CanArgs) -> {
   get_delegation : (blob, blob, nat64) -> (Result) query;
   get_state : () -> (Result_1) query;
   sign_in : (text, blob) -> (Result_2);
diff --git a/src/ic_tee_identity_canister/src/api_init.rs b/src/ic_tee_identity_canister/src/api_init.rs
@@ -5,7 +5,7 @@ use serde::Deserialize;
 use crate::store;
 
 #[derive(Clone, Debug, CandidType, Deserialize)]
-pub enum ChainArgs {
+pub enum CanArgs {
     Init(InitArgs),
     Upgrade(UpgradeArgs),
 }
@@ -23,18 +23,18 @@ pub struct UpgradeArgs {
 }
 
 #[ic_cdk::init]
-fn init(args: Option<ChainArgs>) {
-    match args.unwrap_or(ChainArgs::Init(InitArgs {
+fn init(args: Option<CanArgs>) {
+    match args.unwrap_or(CanArgs::Init(InitArgs {
         name: "IC TEE Identity Service".to_string(),
         session_expires_in_ms: SESSION_EXPIRES_IN_MS, // 1 day
     })) {
-        ChainArgs::Init(args) => {
+        CanArgs::Init(args) => {
             store::state::with_mut(|s| {
                 s.name = args.name;
                 s.session_expires_in_ms = args.session_expires_in_ms;
             });
         }
-        ChainArgs::Upgrade(_) => {
+        CanArgs::Upgrade(_) => {
             ic_cdk::trap(
                 "cannot initialize the canister with an Upgrade args. Please provide an Init args.",
             );
@@ -48,11 +48,11 @@ fn pre_upgrade() {
 }
 
 #[ic_cdk::post_upgrade]
-fn post_upgrade(args: Option<ChainArgs>) {
+fn post_upgrade(args: Option<CanArgs>) {
     store::state::load();
 
     match args {
-        Some(ChainArgs::Upgrade(args)) => {
+        Some(CanArgs::Upgrade(args)) => {
             store::state::with_mut(|s| {
                 if let Some(name) = args.name {
                     s.name = name;
@@ -62,7 +62,7 @@ fn post_upgrade(args: Option<ChainArgs>) {
                 }
             });
         }
-        Some(ChainArgs::Init(_)) => {
+        Some(CanArgs::Init(_)) => {
             ic_cdk::trap(
                 "cannot upgrade the canister with an Init args. Please provide an Upgrade args.",
             );
diff --git a/src/ic_tee_identity_canister/src/lib.rs b/src/ic_tee_identity_canister/src/lib.rs
@@ -6,6 +6,6 @@ mod api;
 mod api_init;
 mod store;
 
-use api_init::ChainArgs;
+use api_init::CanArgs;
 
 ic_cdk::export_candid!();
diff --git a/src/ic_tee_nitro_attestation/Cargo.toml b/src/ic_tee_nitro_attestation/Cargo.toml
@@ -17,9 +17,6 @@ ciborium = { workspace = true }
 sha2 = { workspace = true }
 coset = { workspace = true }
 x509-parser = { workspace = true, features = ["verify"] }
-const-hex = { workspace = true }
+hex = { workspace = true }
 ic_auth_types = { workspace = true }
 ring = "0.17"
-
-[dev-dependencies]
-const-hex = { workspace = true }
diff --git a/src/ic_tee_nitro_attestation/src/attestation.rs b/src/ic_tee_nitro_attestation/src/attestation.rs
@@ -132,7 +132,7 @@ mod tests {
     #[test]
     fn test_parse_and_verify() {
         let doc: &[u8] = include_bytes!("./test/attestation2.hex");
-        let doc = const_hex::decode(doc).unwrap();
+        let doc = hex::decode(doc).unwrap();
         let attestation = parse_and_verify(&doc).unwrap();
         println!("{:?}", attestation);
     }
