comparing bfa7ed98c60679ec88a7cb2ab90785e09bb8e2f7 and main on edouard.paris/vnd-atproto

-11

cli/history.txt

···

       1
       1
       -
       #V2

     

       2
       2
       -
       help

     

       3
       3
       -
       get_did_key key_index=0 display=true

     

       4
       4
       -
       get_did_key

     

       5
       5
       -
       get_did_key --key_index 0

     

       6
       6
       -
       get_did_key key_index=0

     

       7
       7
       -
       get_key_index

     

       8
       8
       -
       get_did_key

     

       9
       9
       -
       exit

     

       10
       10
       -
       get_key_index

     

       11
       11
       -
       get_did_key

+2 -2

common/Cargo.toml

···

       2
       2
        
       name = "vnd-atproto-common"

     

       3
       3
        
       version = "0.0.1"

     

       4
       4
        
       authors = ["Edouard Paris <m@edouard.paris>"]

     

       5
       5
       -
       edition = "2018"

     

       5
       5
       +
       edition = "2024"

     

       6
       6
        
       description = "Vanadium app for atproto plc"

     

       7
       7
        
       

     

       8
       8
        
       [dependencies]

     

       9
       9
       -
       serde = { version = "1.0", default-features = false, features = ["alloc"] }

     

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

+1 -25

common/src/lib.rs

···

       2
       2
        
       

     

       3
       3
        
       extern crate alloc;

     

       4
       4
        
       

     

       5
       5
       -
       pub mod message {

     

       6
       6
       -
           use alloc::{string::String, vec::Vec};

     

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

     

       8
       8
       -
       

     

       9
       9
       -
           #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]

     

       10
       10
       -
           pub enum Request {

     

       11
       11
       -
               Exit,

     

       12
       12
       -
               GetDidKey { index: u32, display: bool },

     

       13
       13
       -
               // SignPlcOperation {

     

       14
       14
       -
               //     key_index: u32,

     

       15
       15
       -
               //     previous: Option<PlcOperation>,

     

       16
       16
       -
               //     operation: PlcOperation,

     

       17
       17
       -
               // },

     

       18
       18
       -
           }

     

       19
       19
       -
       

     

       20
       20
       -
           #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]

     

       21
       21
       -
           pub enum PlcOperation {}

     

       22
       22
       -
       

     

       23
       23
       -
           #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]

     

       24
       24
       -
           pub enum Response {

     

       25
       25
       -
               DidKey(Vec<u8>),

     

       26
       26
       -
               // Signature(Vec<u8>),

     

       27
       27
       -
               Error(String),

     

       28
       28
       -
           }

     

       29
       29
       -
       }

     

       5
       5
       +
       pub mod message;

+1

.gitignore

···

       1
       1
        
       target/

     

       2
       2
        
       cli/history.txt

     

       3
       3
        
       cli/operation.json

     

       4
       4
       +
       cli/previous_operation.json

+4 -2

Cargo.lock

···

       254
       254
        
       [[package]]

     

       255
       255
        
       name = "cid"

     

       256
       256
        
       version = "0.11.1"

     

       257
       257
       -
       source = "git+https://github.com/edouardparis/rust-cid?branch=fix-dep-serde_bytes-features#d8aeda78e2dd4784dbea3086a6ca85fa88782d2d"

     

       257
       257
       +
       source = "git+https://github.com/multiformats/rust-cid?branch=master#6a13cb931d3237e5e1f5635a943edfd166e2e78c"

     

       258
       258
        
       dependencies = [

     

       259
       259
        
        "core2",

     

       260
       260
        
        "multibase",

     
···

       1265
       1265
        
       [[package]]

     

       1266
       1266
        
       name = "serde_ipld_dagcbor"

     

       1267
       1267
        
       version = "0.6.3"

     

       1268
       1268
       -
       source = "git+http://github.com/edouardparis/serde_ipld_dagcbor?branch=scopeguard-no-default-features#82eca93ee126750ad80feedbfe9cee0bf162c587"

     

       1268
       1268
       +
       source = "git+http://github.com/ipld/serde_ipld_dagcbor?branch=master#d7f93d06ce6a19867abeea78d02d6ded6c476b81"

     

       1269
       1269
        
       dependencies = [

     

       1270
       1270
        
        "cbor4ii",

     

       1271
       1271
        
        "ipld-core",

     
···

       1612
       1612
        
       version = "0.0.1"

     

       1613
       1613
        
       dependencies = [

     

       1614
       1614
        
        "base58",

     

       1615
       1615
       +
        "cid",

     

       1615
       1616
        
        "hex-literal",

     

       1616
       1617
        
        "k256",

     

       1617
       1618
        
        "postcard",

     
···

       1628
       1629
        
        "base32",

     

       1629
       1630
        
        "base58",

     

       1630
       1631
        
        "base64",

     

       1632
       1632
       +
        "cid",

     

       1631
       1633
        
        "clap",

     

       1632
       1634
        
        "hidapi",

     

       1633
       1635
        
        "ledger-transport-hid",

+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
       +
       }

+4 -3

client/src/lib.rs

···

       1
       1
       -
       pub use common::message::PlcOperation;

     

       1
       1
       +
       pub use common::message::{PlcOperation, SignedPlcOperation};

     

       2
       2
        
       use common::message::{Request, Response};

     

       3
       3
        
       use sdk::vanadium_client::{VAppClient, VAppExecutionError};

     

       4
       4
        
       

     
···

       94
       94
        
               &mut self,

     

       95
       95
        
               key_index: u32,

     

       96
       96
        
               operation: PlcOperation,

     

       97
       97
       -
               previous: Option<PlcOperation>,

     

       97
       97
       +
               previous: Option<SignedPlcOperation>,

     

       98
       98
        
           ) -> Result<Vec<u8>, AtprotoAppClientError> {

     

       99
       99
        
               let msg = postcard::to_allocvec(&Request::SignPlcOperation {

     

       100
       100
        
                   key_index,

     

       101
       101
        
                   previous,

     

       102
       102
        
                   operation,

     

       103
       103
        
               })

     

       104
       104
       -
               .map_err(|_| {

     

       104
       104
       +
               .map_err(|e| {

     

       105
       105
       +
                   eprintln!("{:?}", e);

     

       105
       106
        
                   AtprotoAppClientError::GenericError("Failed to serialize SignPlcOperation request")

     

       106
       107
        
               })?;

     

       107
       108

+27 -1

common/src/message.rs

···

       11
       11
        
           },

     

       12
       12
        
           SignPlcOperation {

     

       13
       13
        
               key_index: u32,

     

       14
       14
       -
               previous: Option<PlcOperation>,

     

       15
       14
        
               operation: PlcOperation,

     

       15
       15
       +
               previous: Option<SignedPlcOperation>,

     

       16
       16
        
           },

     

       17
       17
        
       }

     

       18
       18
        
       

     
···

       27
       27
        
           pub prev: Option<String>,

     

       28
       28
        
       }

     

       29
       29
        
       

     

       30
       30
       +
       impl PlcOperation {

     

       31
       31
       +
           pub fn signed(self, sig: String) -> SignedPlcOperation {

     

       32
       32
       +
               SignedPlcOperation {

     

       33
       33
       +
                   r#type: self.r#type,

     

       34
       34
       +
                   rotation_keys: self.rotation_keys,

     

       35
       35
       +
                   verification_methods: self.verification_methods,

     

       36
       36
       +
                   also_known_as: self.also_known_as,

     

       37
       37
       +
                   services: self.services,

     

       38
       38
       +
                   prev: self.prev,

     

       39
       39
       +
                   sig,

     

       40
       40
       +
               }

     

       41
       41
       +
           }

     

       42
       42
       +
       }

     

       43
       43
       +
       

     

       44
       44
       +
       #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]

     

       45
       45
       +
       #[serde(rename_all = "camelCase")]

     

       46
       46
       +
       pub struct SignedPlcOperation {

     

       47
       47
       +
           pub r#type: String,

     

       48
       48
       +
           pub rotation_keys: Vec<String>,

     

       49
       49
       +
           pub verification_methods: VerificationMethods,

     

       50
       50
       +
           pub also_known_as: Vec<String>,

     

       51
       51
       +
           pub services: Services,

     

       52
       52
       +
           pub prev: Option<String>,

     

       53
       53
       +
           pub sig: String,

     

       54
       54
       +
       }

     

       55
       55
       +
       

     

       30
       56
        
       #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]

     

       31
       57
        
       #[serde(rename_all = "camelCase")]

     

       32
       58
        
       pub struct VerificationMethods {

Compare changes