comparing 806b263de268647910a2c2cd613572c77a629b71 and main on edouard.paris/vnd-atproto

+2 -1

cli/Cargo.toml

···

       14
       14
        
       shellwords = "1.1.0"

     

       15
       15
        
       hidapi = "2.6.3"

     

       16
       16
        
       ledger-transport-hid = "0.11.0"

     

       17
       17
       -
       serde_ipld_dagcbor = { git = "http://github.com/edouardparis/serde_ipld_dagcbor", branch = "scopeguard-no-default-features", default-features = false }

     

       17
       17
       +
       cid = { version = "0.11.1", default-features = false }

     

       18
       18
       +
       serde_ipld_dagcbor = { git = "http://github.com/ipld/serde_ipld_dagcbor", branch = "master", default-features = false }

     

       18
       19
        
       serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }

     

       19
       20
        
       serde_json = { version = "1.0", default-features = false, features = ["alloc"] }

     

       20
       21
        
       tokio = { version = "1.38.1", features = ["io-util", "macros", "net", "rt", "rt-multi-thread", "sync"] }

+20

cli/previous_operation.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "alsoKnownAs": [

     

       3
       3
       +
           "at://test-vnd.edouard.paris"

     

       4
       4
       +
         ],

     

       5
       5
       +
         "prev": null,

     

       6
       6
       +
         "rotationKeys": [

     

       7
       7
       +
           "did:key:zQ3shiNS7Bm7F3AH5NU4uimiSpZ8ryYj365Uq1N7KMsWUaXKp"

     

       8
       8
       +
         ],

     

       9
       9
       +
         "services": {

     

       10
       10
       +
           "atproto_pds": {

     

       11
       11
       +
             "endpoint": "https://pds.edouard.paris",

     

       12
       12
       +
             "type": "AtprotoPersonalDataServer"

     

       13
       13
       +
           }

     

       14
       14
       +
         },

     

       15
       15
       +
         "sig": "kfShJ7A67jZAjZhydcnz3HRnrlE0NqocV2RmjRNlCB5hyj4Qiw51Kn_Bkqj704KYOTEiyhpiVajRc-qVc9ssWw",

     

       16
       16
       +
         "type": "plc_operation",

     

       17
       17
       +
         "verificationMethods": {

     

       18
       18
       +
           "atproto": "did:key:zQ3shiNS7Bm7F3AH5NU4uimiSpZ8ryYj365Uq1N7KMsWUaXKp"

     

       19
       19
       +
         }

     

       20
       20
       +
       }

+24 -15

cli/src/main.rs

···

       1
       1
        
       use base58::ToBase58;

     

       2
       2
        
       use base64::Engine;

     

       3
       3
       +
       use cid::multihash;

     

       3
       4
        
       use clap::{CommandFactory, Parser, Subcommand};

     

       4
       5
        
       use rustyline::completion::{Completer, Pair};

     

       5
       6
        
       use rustyline::error::ReadlineError;

     
···

       18
       19
        
           AtprotoAppClient,

     

       19
       20
        
       };

     

       20
       21
        
       

     

       21
       21
       -
       use serde::{Deserialize, Serialize};

     

       22
       22
        
       use std::borrow::Cow;

     

       23
       23
        
       use std::fs::File;

     

       24
       24
        
       use std::io::Read;

     
···

       52
       52
        
               #[clap(long, default_missing_value = "true", num_args = 0..=1)]

     

       53
       53
        
               new_plc_did: bool,

     

       54
       54
        
           },

     

       55
       55
       +
           GetCID {

     

       56
       56
       +
               /// Path to operation json file

     

       57
       57
       +
               #[clap(long)]

     

       58
       58
       +
               operation: String,

     

       59
       59
       +
           },

     

       55
       60
        
           Exit,

     

       56
       61
        
       }

     

       57
       62
        
       

     
···

       209
       214
        
                   previous,

     

       210
       215
        
                   new_plc_did,

     

       211
       216
        
               } => {

     

       212
       212
       -
                   let operation = read_operation_file(&operation)?;

     

       213
       213
       -
                   let previous = if let Some(path) = previous {

     

       214
       214
       -
                       Some(read_operation_file(&path)?)

     

       217
       217
       +
                   let operation: client::PlcOperation = read_json_file(&operation)?;

     

       218
       218
       +
                   let previous: Option<client::SignedPlcOperation> = if let Some(path) = previous {

     

       219
       219
       +
                       Some(read_json_file(&path)?)

     

       215
       220
        
                   } else {

     

       216
       221
        
                       None

     

       217
       222
        
                   };

     
···

       221
       226
        
                       .map(|s| base64::prelude::BASE64_URL_SAFE_NO_PAD.encode(s))?;

     

       222
       227
        
                   println!("sig: {}", sig);

     

       223
       228
        
                   if *new_plc_did {

     

       224
       224
       -
                       let b = serde_ipld_dagcbor::to_vec(&SignedPlcOperation { operation, sig }).unwrap();

     

       229
       229
       +
                       let b = serde_ipld_dagcbor::to_vec(&operation.signed(sig)).unwrap();

     

       225
       230
        
                       let hash = sha2::Sha256::digest(b);

     

       226
       231
        
                       let s = base32::encode(base32::Alphabet::Rfc4648Lower { padding: true }, &hash);

     

       227
       232
        
                       eprintln!("did:plc:{}", &s[..24]);

     

       228
       233
        
                   }

     

       229
       234
        
               }

     

       235
       235
       +
               CliCommand::GetCID { operation } => {

     

       236
       236
       +
                   let operation: client::SignedPlcOperation = read_json_file(&operation)?;

     

       237
       237
       +
                   let b = serde_ipld_dagcbor::to_vec(&operation).unwrap();

     

       238
       238
       +
                   let digest = sha2::Sha256::digest(b);

     

       239
       239
       +
                   let wrap = multihash::Multihash::wrap(0x12, &digest).unwrap();

     

       240
       240
       +
                   let cid = cid::Cid::new(cid::Version::V1, 0x71, wrap).unwrap();

     

       241
       241
       +
                   eprintln!("cid: {}", cid);

     

       242
       242
       +
               }

     

       230
       243
        
               CliCommand::Exit => {

     

       231
       244
        
                   app_client.exit().await?;

     

       232
       245
        
                   return Err("Exiting".into());

     
···

       235
       248
        
           Ok(())

     

       236
       249
        
       }

     

       237
       250
        
       

     

       238
       238
       -
       #[derive(Serialize)]

     

       239
       239
       -
       pub struct SignedPlcOperation {

     

       240
       240
       -
           #[serde(flatten)]

     

       241
       241
       -
           operation: client::PlcOperation,

     

       242
       242
       -
           sig: String,

     

       243
       243
       -
       }

     

       244
       244
       -
       

     

       245
       245
       -
       fn read_operation_file(path: &str) -> Result<client::PlcOperation, Box<dyn std::error::Error>> {

     

       251
       251
       +
       fn read_json_file<T>(path: &str) -> Result<T, Box<dyn std::error::Error>>

     

       252
       252
       +
       where

     

       253
       253
       +
           T: serde::de::DeserializeOwned,

     

       254
       254
       +
       {

     

       246
       255
        
           let mut file = File::open(path)?;

     

       247
       256
        
           let mut contents = String::new();

     

       248
       257
        
           file.read_to_string(&mut contents)?;

     

       249
       249
       -
           let operation: client::PlcOperation = serde_json::from_str(&contents)?;

     

       250
       250
       -
           Ok(operation)

     

       258
       258
       +
           let data: T = serde_json::from_str(&contents)?;

     

       259
       259
       +
           Ok(data)

     

       251
       260
        
       }

     

       252
       261
        
       

     

       253
       262
        
       #[tokio::main(flavor = "multi_thread")]

+1 -1

client/Cargo.toml

···

       7
       7
        
       postcard = { version = "1.1.1", features = ["alloc"] }

     

       8
       8
        
       common = { package = "vnd-atproto-common", path = "../common"}

     

       9
       9
        
       sdk = { package = "vanadium-client-sdk", git = "https://github.com/LedgerHQ/vanadium"}

     

       10
       10
       -
       serde_ipld_dagcbor = { git = "http://github.com/edouardparis/serde_ipld_dagcbor", branch = "scopeguard-no-default-features", default-features = false }

     

       10
       10
       +
       serde_ipld_dagcbor = { git = "http://github.com/ipld/serde_ipld_dagcbor", branch = "master", default-features = false }

Compare changes